* Markus Armbruster (arm...@redhat.com) wrote:
> This moves these commands from MAINTAINERS section "Human
> Monitor (HMP)" to "PCI".
>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> ---
> 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
>
> diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c
> new file mode 100644
> index 0000000000..5adfe4f57f
> --- /dev/null
> +++ b/hw/pci/pci-hmp-cmds.c
> @@ -0,0 +1,126 @@
> +/*
> + * HMP commands related to PCI
> + *
> + * Copyright IBM, Corp. 2011
> + *
> + * Authors:
> + * Anthony Liguori <aligu...@us.ibm.com>
> + *
> + * 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.
Yes, unfortunately it looks like the bulk of this code was ~3 months
earlier than the cut off.
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> + */
> +
> +#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);
> +}
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 01b789a79e..03eae10663 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -37,7 +37,6 @@
> #include "qapi/qapi-commands-migration.h"
> #include "qapi/qapi-commands-misc.h"
> #include "qapi/qapi-commands-net.h"
> -#include "qapi/qapi-commands-pci.h"
> #include "qapi/qapi-commands-rocker.h"
> #include "qapi/qapi-commands-run-state.h"
> #include "qapi/qapi-commands-stats.h"
> @@ -701,89 +700,6 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
> qapi_free_BalloonInfo(info);
> }
>
> -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);
> - }
> - }
> - }
> -}
> -
> static int hmp_info_pic_foreach(Object *obj, void *opaque)
> {
> InterruptStatsProvider *intc;
> @@ -810,29 +726,6 @@ void hmp_info_pic(Monitor *mon, const QDict *qdict)
> hmp_info_pic_foreach, mon);
> }
>
> -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);
> -}
> -
> void hmp_info_tpm(Monitor *mon, const QDict *qdict)
> {
> #ifdef CONFIG_TPM
> diff --git a/hw/pci/meson.build b/hw/pci/meson.build
> index 40721f1514..e42a133f3a 100644
> --- a/hw/pci/meson.build
> +++ b/hw/pci/meson.build
> @@ -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'))
> --
> 2.37.3
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
