diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 10:04:16 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 10:04:16 +0000 |
| commit | ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c (patch) | |
| tree | 4f470a0055f24505c86d789e746731c49d99fb45 /qdev-monitor.c | |
| parent | b33afc415622e5eb26e0f14fd27eb86e32a5472e (diff) | |
| parent | 20bc94a2b8449b7700b6bfa25a87ce2320a1c649 (diff) | |
| download | qemu-ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c.zip qemu-ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c.tar.gz qemu-ec7a8bf0b8f7dc7288fe8745464ee8217528cc6c.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Remove legacy KVM PCI device assignment
* Fix qemu-pr-helper.c compilation on older compilers
# gpg: Signature made Sun 05 Nov 2017 13:52:36 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
* remotes/bonzini/tags/for-upstream:
build: disable -Wmissing-braces on older compilers
pci-assign: Remove
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qdev-monitor.c')
| -rw-r--r-- | qdev-monitor.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c index 8fd6df9..b4abb4b 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -46,7 +46,6 @@ typedef struct QDevAlias static const QDevAlias qdev_alias_table[] = { { "e1000", "e1000-82540em" }, { "ich9-ahci", "ahci" }, - { "kvm-pci-assign", "pci-assign" }, { "lsi53c895a", "lsi" }, { "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_S390X }, { "virtio-9p-pci", "virtio-9p", QEMU_ARCH_ALL & ~QEMU_ARCH_S390X }, |