diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 15:49:25 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 15:49:25 +0100 |
| commit | 0a736f7ab83df26dbe5421bb3d1f7892def05dee (patch) | |
| tree | 6df73845d8291cf9c23cdfe4b48c1d3fa5e5a6f5 /hw | |
| parent | 71fbecea0f725bc16aec32cf89cbf3aa78058826 (diff) | |
| parent | 5383a705207790bbd82516b3665ba7d99522ce4a (diff) | |
| download | qemu-0a736f7ab83df26dbe5421bb3d1f7892def05dee.zip qemu-0a736f7ab83df26dbe5421bb3d1f7892def05dee.tar.gz qemu-0a736f7ab83df26dbe5421bb3d1f7892def05dee.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180925' into staging
HMP pull 2018-09-25
# gpg: Signature made Tue 25 Sep 2018 15:11:09 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-hmp-20180925:
qmp, hmp: add PCI subsystem id and vendor id to PCI info
hmp: fix migrate status timer leak
monitor: print message when using 'help' with an unknown command
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci/pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 80bc459..51d0dec 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -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 : ""); |