Commit 5383a705 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Dr. David Alan Gilbert
Browse files

qmp, hmp: add PCI subsystem id and vendor id to PCI info 



This is a long story. Red Hat has relicensed Windows KVM device drivers
in 2018 and there was an agreement that to avoid WHQL driver conflict
software manufacturers should set proper PCI subsystem vendor ID in
their distributions. Thus PCI subsystem vendor id becomes actively used.

The problem is that this field is applied by us via hardware compats.
Thus technically it could be lost.

This patch adds PCI susbsystem id and vendor id to exportable parameters
for validation.

Signed-off-by: default avatarDenis 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: <20180918095852.28422-1-den@openvz.org>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent d34a10af

hmp.c

+2 −0
Original line number Diff line number Diff line
@@ -824,6 +824,8 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev) 


    monitor_printf(mon, ": PCI device %04" PRIx64 ":%04" PRIx64 "\n",

                   dev->id->vendor, dev->id->device);

    monitor_printf(mon, "      PCI subsystem %04" PRIx64 ":%04" PRIx64 "\n",

                   dev->id->subsystem_vendor, dev->id->subsystem);



    if (dev->has_irq) {

        monitor_printf(mon, "      IRQ %" PRId64 ".\n", dev->irq);

hw/pci/pci.c

+3 −0
Original line number Diff line number Diff line
@@ -1737,6 +1737,9 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice *dev, PCIBus *bus, 
    info->id = g_new0(PciDeviceId, 1);

    info->id->vendor = pci_get_word(dev->config + PCI_VENDOR_ID);

    info->id->device = pci_get_word(dev->config + PCI_DEVICE_ID);

    info->id->subsystem = pci_get_word(dev->config + PCI_SUBSYSTEM_ID);

    info->id->subsystem_vendor =

        pci_get_word(dev->config + PCI_SUBSYSTEM_VENDOR_ID);

    info->regions = qmp_query_pci_regions(dev);

    info->qdev_id = g_strdup(dev->qdev.id ? dev->qdev.id : "");

qapi/misc.json

+6 −1
Original line number Diff line number Diff line
@@ -832,10 +832,15 @@ 
#

# @vendor: the PCI vendor id

#

# @subsystem: the PCI subsystem id (since 3.1)

#

# @subsystem-vendor: the PCI subsystem vendor id (since 3.1)

#

# Since: 2.4

##

{ 'struct': 'PciDeviceId',

  'data': {'device': 'int', 'vendor': 'int'} }

  'data': {'device': 'int', 'vendor': 'int', 'subsystem': 'int',

            'subsystem-vendor': 'int'} }



##

# @PciDeviceInfo: