diff options
author | Denis V. Lunev <den@openvz.org> | 2018-10-02 16:55:38 +0300 |
---|---|---|
committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2018-10-11 19:58:26 +0100 |
commit | 18613dc6d9f2f33c333440fecab4c584281305ee (patch) | |
tree | 0d20da3fa631c76f95e0b0a690c683368ef33384 /qapi | |
parent | 5ce43896e1679e706db1562d0e2d86ad428ed1e6 (diff) | |
download | qemu-18613dc6d9f2f33c333440fecab4c584281305ee.zip qemu-18613dc6d9f2f33c333440fecab4c584281305ee.tar.gz qemu-18613dc6d9f2f33c333440fecab4c584281305ee.tar.bz2 |
qmp, hmp: make subsystem/system-vendor identities optional
According to PCI specification, subsystem id and subsystem vendor id
are present only in type 0 and type 2 headers (at different offsets),
but not in type 1 headers.
Thus we should make this data optional in struct PciDeviceId and skip
reporting them via HMP if the information is not available.
Additional (wrong information) about PCI bridges (Type1 devices) has been
added in 5383a705 and fortunately not released. This patch fixes that
problem. The problem was spotted by Markus.
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
CC: Eric Blake <eblake@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
Message-Id: <20181002135538.12113-1-den@openvz.org>
Reported-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
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 f98de3a..3a68af9 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: |