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 /scripts | |
| parent | b33afc415622e5eb26e0f14fd27eb86e32a5472e (diff) | |
| parent | 20bc94a2b8449b7700b6bfa25a87ce2320a1c649 (diff) | |
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 'scripts')
| -rwxr-xr-x | scripts/device-crash-test | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 043b24a4aa..c11fd81c52 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -102,7 +102,6 @@ ERROR_WHITELIST = [ {'device':'ivshmem', 'expected':True}, # You must specify either 'shm' or 'chardev' {'device':'ivshmem-doorbell', 'expected':True}, # You must specify a 'chardev' {'device':'ivshmem-plain', 'expected':True}, # You must specify a 'memdev' - {'device':'kvm-pci-assign', 'expected':True}, # no host device specified {'device':'loader', 'expected':True}, # please include valid arguments {'device':'nand', 'expected':True}, # Unsupported NAND block size 0x1 {'device':'nvdimm', 'expected':True}, # 'memdev' property is not set @@ -165,7 +164,6 @@ ERROR_WHITELIST = [ # KVM-specific devices shouldn't be tried without accel=kvm: {'accel':'(?!kvm).*', 'device':'kvmclock', 'expected':True}, - {'accel':'(?!kvm).*', 'device':'kvm-pci-assign', 'expected':True}, # xen-specific machines and devices: {'accel':'(?!xen).*', 'machine':'xen.*', 'expected':True}, |