diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-29 10:05:07 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-29 10:05:07 +0000 |
| commit | c5b95f6be72da7f10597f8a5d42ba0ff41901f36 (patch) | |
| tree | 4b7d8e01f5c4c231ab2d8b6428b27b6e2451823c /include/hw | |
| parent | 5a557602268bd7bdba87f030feec9edb68ece699 (diff) | |
| parent | c96f0ee6a67ca6277366e78ce5d84d5c20dd596f (diff) | |
| download | focaccia-qemu-c5b95f6be72da7f10597f8a5d42ba0ff41901f36.tar.gz focaccia-qemu-c5b95f6be72da7f10597f8a5d42ba0ff41901f36.zip | |
Merge remote-tracking branch 'bonzini/tags/for-upstream' into staging
Small fixes for rc2. # gpg: Signature made Mon 28 Nov 2016 03:45:20 PM GMT # gpg: using RSA key 0xBFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * bonzini/tags/for-upstream: rules.mak: Use -r instead of -Wl, -r to fix building when PIE is default migration/pcspk: Turn migration of pcspk off for 2.7 and older migration/pcspk: Add a property to state if pcspk is migrated pci-assign: sync MSI/MSI-X cap and table with PCIDevice megasas: clean up and fix request completion/cancellation megasas: do not call pci_dma_unmap after having freed the frame once Message-id: 1480372837-109736-1-git-send-email-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/i386/pc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 67a1a9e786..4b74130559 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -395,6 +395,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .driver = "Opteron_G3" "-" TYPE_X86_CPU,\ .property = "stepping",\ .value = "1",\ + },\ + {\ + .driver = "isa-pcspk",\ + .property = "migrate",\ + .value = "off",\ }, #define PC_COMPAT_2_6 \ |