diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-30 09:43:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-30 09:43:32 +0100 |
| commit | ee9545ed1543020fba52fa5fb8f2b71c63e5389f (patch) | |
| tree | dcb2bfcffdf3559b5a9efd205000513d4aa3a00a /hw/timer/lm32_timer.c | |
| parent | 34e2746bca222db7cd22f1481bb24e54d2765bc1 (diff) | |
| parent | 22235bb609c18547cf6b215bad1f9d2ec56ad371 (diff) | |
| download | focaccia-qemu-ee9545ed1543020fba52fa5fb8f2b71c63e5389f.tar.gz focaccia-qemu-ee9545ed1543020fba52fa5fb8f2b71c63e5389f.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, pc: fixes A couple of last minute bugfixes. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Mon 29 Jul 2019 22:13:22 BST # gpg: using RSA key 281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full] # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full] # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: pc-dimm: fix crash when invalid slot number is used Revert "hw: report invalid disable-legacy|modern usage for virtio-1-only devs" Revert "Revert "globals: Allow global properties to be optional"" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/lm32_timer.c')
0 files changed, 0 insertions, 0 deletions