pci: Move and clean up monitor command code
v2 cover pci: Move and clean up monitor command code
This is mainly about splitting off monitor-related code. There's also a few UI fixes to HMP command pcie_aer_inject_error.
v2:
* PATCH 08: Use qemu_strtoui() [David], commit message corrected
* PATCH 13: New
Markus Armbruster (13):
pci: Clean up a few things checkpatch.pl would flag later on
pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c
pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c
pci: Make query-pci stub consistent with the real one
pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI
pci: Deduplicate get_class_desc()
pci: Move pcibus_dev_print() to pci-hmp-cmds.c
pci: Fix silent truncation of pcie_aer_inject_error argument
pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c
pci: Inline do_pcie_aer_inject_error() into its only caller
pci: Rename hmp_pcie_aer_inject_error()'s local variable @err
pci: Improve do_pcie_aer_inject_error()'s error messages
pci: Reject pcie_aer_inject_error -c with symbolic error status
hw/pci/pci-internal.h | 25 +++++ include/monitor/hmp.h | 1 + include/sysemu/sysemu.h | 3 - hw/pci/pci-hmp-cmds.c | 238 ++++++++++++++++++++++++++++++++++++++++ hw/pci/pci-qmp-cmds.c | 201 +++++++++++++++++++++++++++++++++ hw/pci/pci-stub.c | 9 +- hw/pci/pci.c | 226 +------------------------------------- hw/pci/pcie_aer.c | 113 +------------------ monitor/hmp-cmds.c | 107 ------------------ hw/pci/meson.build | 2 + 10 files changed, 480 insertions(+), 445 deletions(-) create mode 100644 hw/pci/pci-internal.h create mode 100644 hw/pci/pci-hmp-cmds.c create mode 100644 hw/pci/pci-qmp-cmds.c
Signature · 1 line
2.37.3
PATCH v2 1/13 pci: Clean up a few things checkpatch.pl would flag later on
Fix a few style violations so that checkpatch.pl won't complain when I move this code.
--- hw/pci/pci.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
hw/pci/pci.c +6 -3
@@ -1851,10 +1851,12 @@ static PciBridgeInfo *qmp_query_pci_bridge(PCIDevice *dev, PCIBus *bus, range->limit =pci_bridge_get_limit (dev,PCI_BASE_ADDRESS_MEM_PREFETCH );if (dev->config[PCI_SECONDARY_BUS ] !=0 ) { -PCIBus *child_bus =pci_find_bus_nr (bus, dev->config[PCI_SECONDARY_BUS ]); +PCIBus *child_bus =pci_find_bus_nr (bus, + dev->config[PCI_SECONDARY_BUS ]);if (child_bus) { info->has_devices = true; - info->devices =qmp_query_pci_devices (child_bus, dev->config[PCI_SECONDARY_BUS ]); + info->devices =qmp_query_pci_devices (child_bus, + dev->config[PCI_SECONDARY_BUS ]); } }
@@ -2612,8 +2614,9 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) pci_get_word(d->config + PCI_SUBSYSTEM_ID));for (i =0 ; i <PCI_NUM_REGIONS ; i++) { r = &d->io_regions[i]; -if (!r->size) +if (!r->size) {continue ; + } monitor_printf(mon, "%*sbar %d: %s at 0x%"FMT_PCIBUS " [0x%"FMT_PCIBUS"]\n", indent, "",
Signature · 1 line
2.37.3
PATCH v2 2/13 pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c
In reply to Markus Armbruster--- hw/pci/pci-internal.h | 20 +++++ hw/pci/pci-qmp-cmds.c | 201 ++++++++++++++++++++++++++++++++++++++++++ hw/pci/pci.c | 188 +-------------------------------------- hw/pci/meson.build | 1 + 4 files changed, 226 insertions(+), 184 deletions(-) create mode 100644 hw/pci/pci-internal.h create mode 100644 hw/pci/pci-qmp-cmds.c
hw/pci/pci-internal.h new file +20 -0
@@ -0,0 +1,20 @@ +#ifndef HW_PCI_PCI_INTERNAL_H +#define HW_PCI_PCI_INTERNAL_H + +#include "qemu/queue.h" + +typedef struct { +uint16_t class; +const char *desc; +const char *fw_name; +uint16_t fw_ign_bits; +}pci_class_desc ; + +typedef QLIST_HEAD(, PCIHostState) PCIHostStateList; + +extern PCIHostStateList pci_host_bridges; + +const pci_class_desc *get_class_desc (int class); +PCIBus *pci_find_bus_nr (PCIBus *bus,int bus_num); + +#endif
hw/pci/pci-qmp-cmds.c new file +201 -0
201 lines not on this page · raw message
hw/pci/pci.c +4 -184
231 lines not on this page · raw message
hw/pci/meson.build +1 -0
@@ -5,6 +5,7 @@ pci_ss.add(files( 'pci.c', 'pci_bridge.c', 'pci_host.c', + 'pci-qmp-cmds.c', 'pcie_sriov.c', 'shpc.c', 'slotid_cap.c'
Signature · 1 line
2.37.3
PATCH v2 3/13 pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c
In reply to Markus ArmbrusterThis moves these commands from MAINTAINERS section "Human Monitor (HMP)" to "PCI".
--- hw/pci/pci-hmp-cmds.c | 126 ++++++++++++++++++++++++++++++++++++++++++ monitor/hmp-cmds.c | 107 ----------------------------------- hw/pci/meson.build | 1 + 3 files changed, 127 insertions(+), 107 deletions(-) create mode 100644 hw/pci/pci-hmp-cmds.c
hw/pci/pci-hmp-cmds.c new file +126 -0
@@ -0,0 +1,126 @@ +/* +* HMP commands related to PCI +* +* Copyright IBM, Corp. 2011 +* +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +* Contributions after 2012-01-13 are licensed under the terms of the +* GNU GPL, version 2 or (at your option) any later version. +*/ + +#include "qemu/osdep.h" +#include "monitor/hmp.h" +#include "monitor/monitor.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-pci.h" + +static void hmp_info_pci_device (Monitor *mon,const PciDeviceInfo *dev) +{ +PciMemoryRegionList *region; + +monitor_printf (mon," Bus %2" PRId64", " , dev->bus); +monitor_printf (mon,"device %3" PRId64", function %" PRId64":\n" , + dev->slot, dev->function); +monitor_printf (mon," " ); + +if (dev->class_info->has_desc) { +monitor_puts (mon, dev->class_info->desc); + }else { +monitor_printf (mon,"Class %04" PRId64, dev->class_info->q_class); + } + +monitor_printf (mon,": PCI device %04" PRIx64":%04" PRIx64"\n" , + dev->id->vendor, dev->id->device); +if (dev->id->has_subsystem_vendor && dev->id->has_subsystem) { +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", pin %c\n" , + dev->irq, (char )('A' + dev->irq_pin -1 )); + } + +if (dev->has_pci_bridge) { +monitor_printf (mon," BUS %" PRId64".\n" , + dev->pci_bridge->bus->number); +monitor_printf (mon," secondary bus %" PRId64".\n" , + dev->pci_bridge->bus->secondary); +monitor_printf (mon," subordinate bus %" PRId64".\n" , + dev->pci_bridge->bus->subordinate); + +monitor_printf (mon," IO range [0x%04" PRIx64", 0x%04" PRIx64"]\n" , + dev->pci_bridge->bus->io_range->base, + dev->pci_bridge->bus->io_range->limit); + +monitor_printf (mon, +" memory range [0x%08" PRIx64", 0x%08" PRIx64"]\n" , + dev->pci_bridge->bus->memory_range->base, + dev->pci_bridge->bus->memory_range->limit); + +monitor_printf (mon," prefetchable memory range " +"[0x%08" PRIx64", 0x%08" PRIx64"]\n" , + dev->pci_bridge->bus->prefetchable_range->base, + dev->pci_bridge->bus->prefetchable_range->limit); + } + +for (region = dev->regions; region; region = region->next) { +uint64_t addr, size; + + addr = region->value->address; + size = region->value->size; + +monitor_printf (mon," BAR%" PRId64": " , region->value->bar); + +if (!strcmp (region->value->type,"io" )) { +monitor_printf (mon,"I/O at 0x%04" PRIx64 +" [0x%04" PRIx64"].\n" , + addr, addr + size -1 ); + }else { +monitor_printf (mon,"%d bit%s memory at 0x%08" PRIx64 +" [0x%08" PRIx64"].\n" , + region->value->mem_type_64 ?64 :32 , + region->value->prefetch ?" prefetchable" :"" , + addr, addr + size -1 ); + } + } + +monitor_printf (mon," id \"%s\"\n" , dev->qdev_id); + +if (dev->has_pci_bridge) { +if (dev->pci_bridge->has_devices) { +PciDeviceInfoList *cdev; +for (cdev = dev->pci_bridge->devices; cdev; cdev = cdev->next) { +hmp_info_pci_device (mon, cdev->value); + } + } + } +} + +void hmp_info_pci (Monitor *mon,const QDict *qdict) +{ +PciInfoList *info_list, *info; +Error *err =NULL ; + + info_list =qmp_query_pci (&err); +if (err) { +monitor_printf (mon,"PCI devices not supported\n" ); +error_free (err); +return ; + } + +for (info = info_list; info; info = info->next) { +PciDeviceInfoList *dev; + +for (dev = info->value->devices; dev; dev = dev->next) { +hmp_info_pci_device (mon, dev->value); + } + } + +qapi_free_PciInfoList (info_list); +}
monitor/hmp-cmds.c +0 -107
125 lines not on this page · raw message
hw/pci/meson.build +1 -0
@@ -20,3 +20,4 @@ softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c')) +softmmu_ss.add(files('pci-hmp-cmds.c'))
Signature · 1 line
2.37.3
PATCH v2 4/13 pci: Make query-pci stub consistent with the real one
In reply to Markus ArmbrusterQMP query-pci and HMP info pci can behave differently when there are no PCI devices. They can report nothing, like this:
qemu-system-aarch64 -S -M spitz -display none -monitor stdio QEMU 7.1.91 monitor - type 'help' for more information (qemu) info pci
Or they can fail, like this:
qemu-system-microblaze -M petalogix-s3adsp1800 -display none -monitor stdio QEMU 7.1.91 monitor - type 'help' for more information
(qemu) info pci
PCI devices not supported
They fail when none of the target's machines supports PCI, i.e. when we're using qmp_query_pci() from hw/pci/pci-stub.c.
The error is not useful, and reporting nothing makes sense, so do that in pci-stub.c, too.
Now qmp_query_pci() can't fail anymore. Drop the dead error handling from hmp_info_pci().
--- hw/pci/pci-hmp-cmds.c | 8 +------- hw/pci/pci-stub.c | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-)
hw/pci/pci-hmp-cmds.c +1 -7
@@ -105,14 +105,8 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev)void hmp_info_pci (Monitor *mon,const QDict *qdict) {PciInfoList *info_list, *info; -Error *err =NULL ; - info_list =qmp_query_pci (&err); -if (err) { -monitor_printf (mon,"PCI devices not supported\n" ); -error_free (err); -return ; - } + info_list =qmp_query_pci (&error_abort);for (info = info_list; info; info = info->next) {PciDeviceInfoList *dev;
hw/pci/pci-stub.c +0 -3
@@ -21,9 +21,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" -#include "qapi/error.h" #include "qapi/qapi-commands-pci.h" -#include "qapi/qmp/qerror.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "hw/pci/msix.h"
@@ -33,7 +31,6 @@ bool pci_available;PciInfoList *qmp_query_pci (Error **errp) { -error_setg (errp,QERR_UNSUPPORTED );return NULL ; }
Signature · 1 line
2.37.3
PATCH v2 5/13 pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI
In reply to Markus ArmbrusterWe compile pci-hmp-cmds.c always, but pci-qmp-cmds.c only when CONFIG_PCI. hw/pci/pci-stub.c keeps the linker happy when !CONFIG_PCI. Build pci-hmp-cmds.c that way, too.
--- hw/pci/pci-stub.c | 5 +++++ hw/pci/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
hw/pci/pci-stub.c +5 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "qapi/qapi-commands-pci.h" #include "hw/pci/pci.h" #include "hw/pci/msi.h"
@@ -34,6 +35,10 @@ PciInfoList *qmp_query_pci(Error **errp)return NULL ; } +void hmp_info_pci (Monitor *mon,const QDict *qdict) +{ +} +void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict) {monitor_printf (mon,"PCI devices not supported\n" );
hw/pci/meson.build +1 -1
@@ -5,6 +5,7 @@ pci_ss.add(files( 'pci.c', 'pci_bridge.c', 'pci_host.c', + 'pci-hmp-cmds.c', 'pci-qmp-cmds.c', 'pcie_sriov.c', 'shpc.c',
@@ -20,4 +21,3 @@ softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) softmmu_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c')) -softmmu_ss.add(files('pci-hmp-cmds.c'))
Signature · 1 line
2.37.3
PATCH v2 6/13 pci: Deduplicate get_class_desc()
In reply to Markus Armbrusterpcibus_dev_print() contains a copy of get_class_desc(). Call the function instead.
--- hw/pci/pci.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
hw/pci/pci.c +3 -6
@@ -2409,15 +2409,12 @@ uint8_t pci_find_capability(PCIDevice *pdev, uint8_t cap_id)static void pcibus_dev_print (Monitor *mon,DeviceState *dev,int indent) {PCIDevice *d = (PCIDevice *)dev; -const pci_class_desc *desc; +int class =pci_get_word (d->config +PCI_CLASS_DEVICE ); +const pci_class_desc *desc =get_class_desc (class);char ctxt[64 ];PCIIORegion *r; -int i, class; +int i; - class =pci_get_word (d->config +PCI_CLASS_DEVICE ); - desc = pci_class_descriptions; -while (desc->desc && class != desc->class) - desc++;if (desc->desc) {snprintf (ctxt,sizeof (ctxt),"%s" , desc->desc); }else {
Signature · 1 line
2.37.3
PATCH v2 7/13 pci: Move pcibus_dev_print() to pci-hmp-cmds.c
In reply to Markus ArmbrusterThis method is for HMP command "info qtree".
--- hw/pci/pci-internal.h | 1 + hw/pci/pci-hmp-cmds.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/pci/pci.c | 38 -------------------------------------- 3 files changed, 39 insertions(+), 38 deletions(-)
hw/pci/pci-internal.h +1 -0
@@ -16,5 +16,6 @@ extern PCIHostStateList pci_host_bridges;const pci_class_desc *get_class_desc (int class);PCIBus *pci_find_bus_nr (PCIBus *bus,int bus_num); +void pcibus_dev_print (Monitor *mon,DeviceState *dev,int indent);#endif
hw/pci/pci-hmp-cmds.c +38 -0
@@ -14,8 +14,10 @@*/ #include "qemu/osdep.h" +#include "hw/pci/pci.h" #include "monitor/hmp.h" #include "monitor/monitor.h" +#include "pci-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-pci.h"
@@ -118,3 +120,39 @@ void hmp_info_pci(Monitor *mon, const QDict *qdict)qapi_free_PciInfoList (info_list); } + +void pcibus_dev_print (Monitor *mon,DeviceState *dev,int indent) +{ +PCIDevice *d = (PCIDevice *)dev; +int class =pci_get_word (d->config +PCI_CLASS_DEVICE ); +const pci_class_desc *desc =get_class_desc (class); +char ctxt[64 ]; +PCIIORegion *r; +int i; + +if (desc->desc) { +snprintf (ctxt,sizeof (ctxt),"%s" , desc->desc); + }else { +snprintf (ctxt,sizeof (ctxt),"Class %04x" , class); + } + +monitor_printf (mon,"%*sclass %s, addr %02x:%02x.%x, " +"pci id %04x:%04x (sub %04x:%04x)\n" , + indent,"" , ctxt,pci_dev_bus_num (d), +PCI_SLOT (d->devfn),PCI_FUNC (d->devfn), +pci_get_word (d->config +PCI_VENDOR_ID ), +pci_get_word (d->config +PCI_DEVICE_ID ), +pci_get_word (d->config +PCI_SUBSYSTEM_VENDOR_ID ), +pci_get_word (d->config +PCI_SUBSYSTEM_ID )); +for (i =0 ; i <PCI_NUM_REGIONS ; i++) { + r = &d->io_regions[i]; +if (!r->size) { +continue ; + } +monitor_printf (mon,"%*sbar %d: %s at 0x%" FMT_PCIBUS +" [0x%" FMT_PCIBUS "]\n" , + indent,"" , + i, r->type &PCI_BASE_ADDRESS_SPACE_IO ?"i/o" :"mem" , + r->addr, r->addr + r->size -1 ); + } +}
hw/pci/pci.c +0 -38
@@ -34,7 +34,6 @@#include "hw/qdev-properties-system.h" #include "migration/qemu-file-types.h" #include "migration/vmstate.h" -#include "monitor/monitor.h" #include "net/net.h" #include "sysemu/numa.h" #include "sysemu/sysemu.h"
@@ -59,7 +58,6 @@bool pci_available = true; -static void pcibus_dev_print (Monitor *mon,DeviceState *dev,int indent);static char *pcibus_get_dev_path (DeviceState *dev);static char *pcibus_get_fw_dev_path (DeviceState *dev);static void pcibus_reset (BusState *qbus);
@@ -2406,42 +2404,6 @@ uint8_t pci_find_capability(PCIDevice *pdev, uint8_t cap_id)return pci_find_capability_list (pdev, cap_id,NULL ); } -static void pcibus_dev_print (Monitor *mon,DeviceState *dev,int indent) -{ -PCIDevice *d = (PCIDevice *)dev; -int class =pci_get_word (d->config +PCI_CLASS_DEVICE ); -const pci_class_desc *desc =get_class_desc (class); -char ctxt[64 ]; -PCIIORegion *r; -int i; - -if (desc->desc) { -snprintf (ctxt,sizeof (ctxt),"%s" , desc->desc); - }else { -snprintf (ctxt,sizeof (ctxt),"Class %04x" , class); - } - -monitor_printf (mon,"%*sclass %s, addr %02x:%02x.%x, " -"pci id %04x:%04x (sub %04x:%04x)\n" , - indent,"" , ctxt,pci_dev_bus_num (d), -PCI_SLOT (d->devfn),PCI_FUNC (d->devfn), -pci_get_word (d->config +PCI_VENDOR_ID ), -pci_get_word (d->config +PCI_DEVICE_ID ), -pci_get_word (d->config +PCI_SUBSYSTEM_VENDOR_ID ), -pci_get_word (d->config +PCI_SUBSYSTEM_ID )); -for (i =0 ; i <PCI_NUM_REGIONS ; i++) { - r = &d->io_regions[i]; -if (!r->size) { -continue ; - } -monitor_printf (mon,"%*sbar %d: %s at 0x%" FMT_PCIBUS -" [0x%" FMT_PCIBUS "]\n" , - indent,"" , - i, r->type &PCI_BASE_ADDRESS_SPACE_IO ?"i/o" :"mem" , - r->addr, r->addr + r->size -1 ); - } -} -static char *pci_dev_fw_name (DeviceState *dev,char *buf,int len) {PCIDevice *d = (PCIDevice *)dev;
Signature · 1 line
2.37.3
PATCH v2 8/13 pci: Fix silent truncation of pcie_aer_inject_error argument
In reply to Markus ArmbrusterPCI AER error status is 32 bit. The HMP command supports both symbolic and numeric error status: anything that isn't a known symbolic value is parsed as number with strtol(). Issues:
* Empty argument yields value zero.
* Range errors from strtol() are ignored, value is UINT32_MAX.
* Values not representable in uint32_t are silently truncated.
Fix to reject such input by switching to strtoui().
--- hw/pci/pcie_aer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
hw/pci/pcie_aer.c +5 -4
@@ -30,6 +30,7 @@#include "hw/pci/pci_bus.h" #include "hw/pci/pcie_regs.h" #include "qapi/error.h" +#include "qemu/cutils.h" //#define DEBUG_PCIE #ifdef DEBUG_PCIE
@@ -963,6 +964,7 @@ static int do_pcie_aer_inject_error(Monitor *mon,const char *id =qdict_get_str (qdict,"id" );const char *error_name;uint32_t error_status; +unsigned int num;bool correctable;PCIDevice *dev;PCIEAERErr err;
@@ -983,14 +985,13 @@ static int do_pcie_aer_inject_error(Monitor *mon, error_name =qdict_get_str (qdict,"error_status" );if (pcie_aer_parse_error_string (error_name, &error_status, &correctable)) { -char *e =NULL ; - error_status =strtoul (error_name, &e,0 ); - correctable =qdict_get_try_bool (qdict,"correctable" , false); -if (!e || *e !='\0' ) { +if (qemu_strtoui (error_name,NULL ,0 , &num) <0 ) {monitor_printf (mon,"invalid error status value. \"%s\"" , error_name);return -EINVAL ; } + error_status = num; + correctable =qdict_get_try_bool (qdict,"correctable" , false); } err.status = error_status; err.source_id =pci_requester_id (dev);
Signature · 1 line
2.37.3
PATCH v2 9/13 pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c
In reply to Markus Armbruster--- hw/pci/pci-internal.h | 4 ++ include/monitor/hmp.h | 1 + include/sysemu/sysemu.h | 3 -- hw/pci/pci-hmp-cmds.c | 104 ++++++++++++++++++++++++++++++++++++ hw/pci/pci-stub.c | 1 - hw/pci/pcie_aer.c | 114 ++-------------------------------------- 6 files changed, 113 insertions(+), 114 deletions(-)
hw/pci/pci-internal.h +4 -0
@@ -18,4 +18,8 @@ const pci_class_desc *get_class_desc(int class);PCIBus *pci_find_bus_nr (PCIBus *bus,int bus_num);void pcibus_dev_print (Monitor *mon,DeviceState *dev,int indent); +int pcie_aer_parse_error_string (const char *error_name, +uint32_t *status,bool *correctable); +int pcie_aer_inject_error (PCIDevice *dev,const PCIEAERErr *err); +#endif
include/monitor/hmp.h +1 -0
@@ -143,5 +143,6 @@ void hmp_info_vcpu_dirty_limit(Monitor *mon, const QDict *qdict);void hmp_human_readable_text_helper (Monitor *mon,HumanReadableText *(*qmp_handler)(Error **));void hmp_info_stats (Monitor *mon,const QDict *qdict); +void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict);#endif
include/sysemu/sysemu.h +0 -3
@@ -61,9 +61,6 @@ extern int nb_option_roms;extern const char *prom_envs[MAX_PROM_ENVS ];extern unsigned int nb_prom_envs; -/* pcie aer error injection */ -void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict); -/* serial ports */ /* Return the Chardev for serial port i, or NULL if none */
hw/pci/pci-hmp-cmds.c +104 -0
114 lines not on this page · raw message
hw/pci/pci-stub.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "monitor/hmp.h" #include "qapi/qapi-commands-pci.h"
hw/pci/pcie_aer.c +4 -110
148 lines not on this page · raw message
Signature · 1 line
2.37.3
PATCH v2 10/13 pci: Inline do_pcie_aer_inject_error() into its only caller
In reply to Markus Armbruster--- hw/pci/pci-hmp-cmds.c | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-)
hw/pci/pci-hmp-cmds.c +6 -35
@@ -159,21 +159,7 @@ void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) } } -typedef struct PCIEErrorDetails { -const char *id; -const char *root_bus; -int bus; -int devfn; -}PCIEErrorDetails ; - -/* -* Inject an error described by @qdict. -* On success, set @details to show where error was sent. -* Return negative errno if injection failed and a message was emitted. -*/ -static int do_pcie_aer_inject_error (Monitor *mon, -const QDict *qdict, -PCIEErrorDetails *details) +void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict) {const char *id =qdict_get_str (qdict,"id" );const char *error_name;
@@ -189,12 +175,12 @@ static int do_pcie_aer_inject_error(Monitor *mon,monitor_printf (mon,"id or pci device path is invalid or device not " "found. %s\n" , id); -return ret; +return ; }if (!pci_is_express (dev)) {monitor_printf (mon,"the device doesn't support pci express. %s\n" , id); -return -ENOSYS ; +return ; } error_name =qdict_get_str (qdict,"error_status" );
@@ -202,7 +188,7 @@ static int do_pcie_aer_inject_error(Monitor *mon,if (qemu_strtoui (error_name,NULL ,0 , &num) <0 ) {monitor_printf (mon,"invalid error status value. \"%s\"" , error_name); -return -EINVAL ; +return ; } error_status = num; correctable =qdict_get_try_bool (qdict,"correctable" , false);
@@ -238,25 +224,10 @@ static int do_pcie_aer_inject_error(Monitor *mon,if (ret <0 ) {monitor_printf (mon,"failed to inject error: %s\n" ,strerror (-ret)); -return ret; - } - details->id = id; - details->root_bus =pci_root_bus_path (dev); - details->bus =pci_dev_bus_num (dev); - details->devfn = dev->devfn; - -return 0 ; -} - -void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict) -{ -PCIEErrorDetails data; - -if (do_pcie_aer_inject_error (mon, qdict, &data) <0 ) {return ; }monitor_printf (mon,"OK id: %s root bus: %s, bus: %x devfn: %x.%x\n" , - data.id, data.root_bus, data.bus, -PCI_SLOT (data.devfn),PCI_FUNC (data.devfn)); + id,pci_root_bus_path (dev),pci_dev_bus_num (dev), +PCI_SLOT (dev->devfn),PCI_FUNC (dev->devfn)); }
Signature · 1 line
2.37.3
PATCH v2 11/13 pci: Rename hmp_pcie_aer_inject_error()'s local variable @err
In reply to Markus ArmbrusterI'd like to use @err for an Error *err. Rename PCIEAERErr err to aer_err.
--- hw/pci/pci-hmp-cmds.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
hw/pci/pci-hmp-cmds.c +17 -17
@@ -167,7 +167,7 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict)unsigned int num;bool correctable;PCIDevice *dev; -PCIEAERErr err; +PCIEAERErr aer_err;int ret; ret =pci_qdev_find_device (id, &dev);
@@ -193,34 +193,34 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) error_status = num; correctable =qdict_get_try_bool (qdict,"correctable" , false); } - err.status = error_status; - err.source_id =pci_requester_id (dev); + aer_err.status = error_status; + aer_err.source_id =pci_requester_id (dev); - err.flags =0 ; + aer_err.flags =0 ;if (correctable) { - err.flags |=PCIE_AER_ERR_IS_CORRECTABLE ; + aer_err.flags |=PCIE_AER_ERR_IS_CORRECTABLE ; }if (qdict_get_try_bool (qdict,"advisory_non_fatal" , false)) { - err.flags |=PCIE_AER_ERR_MAYBE_ADVISORY ; + aer_err.flags |=PCIE_AER_ERR_MAYBE_ADVISORY ; }if (qdict_haskey (qdict,"header0" )) { - err.flags |=PCIE_AER_ERR_HEADER_VALID ; + aer_err.flags |=PCIE_AER_ERR_HEADER_VALID ; }if (qdict_haskey (qdict,"prefix0" )) { - err.flags |=PCIE_AER_ERR_TLP_PREFIX_PRESENT ; + aer_err.flags |=PCIE_AER_ERR_TLP_PREFIX_PRESENT ; } - err.header[0 ] =qdict_get_try_int (qdict,"header0" ,0 ); - err.header[1 ] =qdict_get_try_int (qdict,"header1" ,0 ); - err.header[2 ] =qdict_get_try_int (qdict,"header2" ,0 ); - err.header[3 ] =qdict_get_try_int (qdict,"header3" ,0 ); + aer_err.header[0 ] =qdict_get_try_int (qdict,"header0" ,0 ); + aer_err.header[1 ] =qdict_get_try_int (qdict,"header1" ,0 ); + aer_err.header[2 ] =qdict_get_try_int (qdict,"header2" ,0 ); + aer_err.header[3 ] =qdict_get_try_int (qdict,"header3" ,0 ); - err.prefix[0 ] =qdict_get_try_int (qdict,"prefix0" ,0 ); - err.prefix[1 ] =qdict_get_try_int (qdict,"prefix1" ,0 ); - err.prefix[2 ] =qdict_get_try_int (qdict,"prefix2" ,0 ); - err.prefix[3 ] =qdict_get_try_int (qdict,"prefix3" ,0 ); + aer_err.prefix[0 ] =qdict_get_try_int (qdict,"prefix0" ,0 ); + aer_err.prefix[1 ] =qdict_get_try_int (qdict,"prefix1" ,0 ); + aer_err.prefix[2 ] =qdict_get_try_int (qdict,"prefix2" ,0 ); + aer_err.prefix[3 ] =qdict_get_try_int (qdict,"prefix3" ,0 ); - ret =pcie_aer_inject_error (dev, &err); + ret =pcie_aer_inject_error (dev, &aer_err);if (ret <0 ) {monitor_printf (mon,"failed to inject error: %s\n" ,strerror (-ret));
Signature · 1 line
2.37.3
PATCH v2 12/13 pci: Improve do_pcie_aer_inject_error()'s error messages
In reply to Markus Armbruster--- hw/pci/pci-hmp-cmds.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
hw/pci/pci-hmp-cmds.c +15 -15
@@ -161,6 +161,7 @@ void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent)void hmp_pcie_aer_inject_error (Monitor *mon,const QDict *qdict) { +Error *err =NULL ;const char *id =qdict_get_str (qdict,"id" );const char *error_name;uint32_t error_status;
@@ -171,24 +172,20 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict)int ret; ret =pci_qdev_find_device (id, &dev); -if (ret <0 ) { -monitor_printf (mon, -"id or pci device path is invalid or device not " -"found. %s\n" , id); -return ; +if (ret == -ENODEV ) { +error_setg (&err,"device '%s' not found" , id); + goto out; } -if (!pci_is_express (dev)) { -monitor_printf (mon,"the device doesn't support pci express. %s\n" , - id); -return ; +if (ret <0 || !pci_is_express (dev)) { +error_setg (&err,"device '%s' is not a PCIe device" , id); + goto out; } error_name =qdict_get_str (qdict,"error_status" );if (pcie_aer_parse_error_string (error_name, &error_status, &correctable)) {if (qemu_strtoui (error_name,NULL ,0 , &num) <0 ) { -monitor_printf (mon,"invalid error status value. \"%s\"" , - error_name); -return ; +error_setg (&err,"invalid error status value '%s'" , error_name); + goto out; } error_status = num; correctable =qdict_get_try_bool (qdict,"correctable" , false);
@@ -222,12 +219,15 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) ret =pcie_aer_inject_error (dev, &aer_err);if (ret <0 ) { -monitor_printf (mon,"failed to inject error: %s\n" , -strerror (-ret)); -return ; +error_setg_errno (&err, -ret,"failed to inject error" ); + goto out; } +monitor_printf (mon,"OK id: %s root bus: %s, bus: %x devfn: %x.%x\n" , id,pci_root_bus_path (dev),pci_dev_bus_num (dev),PCI_SLOT (dev->devfn),PCI_FUNC (dev->devfn)); + +out: +hmp_handle_error (mon, err); }
Signature · 1 line
2.37.3
PATCH v2 13/13 pci: Reject pcie_aer_inject_error -c with symbolic error status
In reply to Markus ArmbrusterWhen argument @error_status is symbolic, flag -c is ignored. Reject it instead.
--- hw/pci/pci-hmp-cmds.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/pci/pci-hmp-cmds.c +5 -0
@@ -189,6 +189,11 @@ void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) } error_status = num; correctable =qdict_get_try_bool (qdict,"correctable" , false); + }else { +if (qdict_haskey (qdict,"correctable" )) { +error_setg (&err,"-c is only valid with numeric error status" ); + goto out; + } } aer_err.status = error_status; aer_err.source_id =pci_requester_id (dev);
Signature · 1 line
2.37.3