diff options
| author | Peter Maydell | 2018-10-12 12:00:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-12 12:00:07 +0200 |
| commit | 05b656dcaa62bd91c97bcfd335a2802f2a2d678d (patch) | |
| tree | 66e05da35ffb20d3229130fb7ec3ade8bbb55c86 /qapi | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-10-10' into ... (diff) | |
| parent | migration-test: Only generate a single target architecture (diff) | |
| download | qemu-05b656dcaa62bd91c97bcfd335a2802f2a2d678d.tar.gz qemu-05b656dcaa62bd91c97bcfd335a2802f2a2d678d.tar.xz qemu-05b656dcaa62bd91c97bcfd335a2802f2a2d678d.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20181011a' into staging
Migration pull 2018-10-11
With one bonus HMP fix.
# gpg: Signature made Thu 11 Oct 2018 20:23:12 BST
# gpg: using RSA key 0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20181011a:
migration-test: Only generate a single target architecture
qmp, hmp: make subsystem/system-vendor identities optional
vhost-user: Don't ask for reply on postcopy mem table set
vhost-user: Fix userfaultfd leak
migration: Stop postcopy fault thread before notifying
tests/migration: Enable the migration test on s390x, too
tests: Add migration test for aarch64
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/misc.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qapi/misc.json b/qapi/misc.json index f98de3a58c..3a68af9ca3 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -839,8 +839,8 @@ # Since: 2.4 ## { 'struct': 'PciDeviceId', - 'data': {'device': 'int', 'vendor': 'int', 'subsystem': 'int', - 'subsystem-vendor': 'int'} } + 'data': {'device': 'int', 'vendor': 'int', '*subsystem': 'int', + '*subsystem-vendor': 'int'} } ## # @PciDeviceInfo: |