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 /hmp.c | |
| parent | 71fbecea0f725bc16aec32cf89cbf3aa78058826 (diff) | |
| parent | 5383a705207790bbd82516b3665ba7d99522ce4a (diff) | |
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 'hmp.c')
| -rw-r--r-- | hmp.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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); @@ -2001,6 +2003,7 @@ static void hmp_migrate_status_cb(void *opaque) } monitor_resume(status->mon); timer_del(status->timer); + timer_free(status->timer); g_free(status); } |