[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/13] pci: Deduplicate get_class_desc()
From: |
Markus Armbruster |
Subject: |
[PULL 06/13] pci: Deduplicate get_class_desc() |
Date: |
Mon, 19 Dec 2022 16:51:13 +0100 |
pcibus_dev_print() contains a copy of get_class_desc(). Call the
function instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221201121133.3813857-7-armbru@redhat.com>
---
hw/pci/pci.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 7310a82cee..41718aaf60 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -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 {
--
2.37.3
- [PULL 00/13] Monitor patches for 2022-12-19, Markus Armbruster, 2022/12/19
- [PULL 04/13] pci: Make query-pci stub consistent with the real one, Markus Armbruster, 2022/12/19
- [PULL 02/13] pci: Move QMP commands to new hw/pci/pci-qmp-cmds.c, Markus Armbruster, 2022/12/19
- [PULL 01/13] pci: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2022/12/19
- [PULL 11/13] pci: Rename hmp_pcie_aer_inject_error()'s local variable @err, Markus Armbruster, 2022/12/19
- [PULL 10/13] pci: Inline do_pcie_aer_inject_error() into its only caller, Markus Armbruster, 2022/12/19
- [PULL 05/13] pci: Build hw/pci/pci-hmp-cmds.c only when CONFIG_PCI, Markus Armbruster, 2022/12/19
- [PULL 06/13] pci: Deduplicate get_class_desc(),
Markus Armbruster <=
- [PULL 03/13] pci: Move HMP commands from monitor/ to new hw/pci/pci-hmp-cmds.c, Markus Armbruster, 2022/12/19
- [PULL 12/13] pci: Improve do_pcie_aer_inject_error()'s error messages, Markus Armbruster, 2022/12/19
- [PULL 09/13] pci: Move HMP command from hw/pci/pcie_aer.c to pci-hmp-cmds.c, Markus Armbruster, 2022/12/19
- [PULL 07/13] pci: Move pcibus_dev_print() to pci-hmp-cmds.c, Markus Armbruster, 2022/12/19
- [PULL 08/13] pci: Fix silent truncation of pcie_aer_inject_error argument, Markus Armbruster, 2022/12/19
- [PULL 13/13] pci: Reject pcie_aer_inject_error -c with symbolic error status, Markus Armbruster, 2022/12/19
- Re: [PULL 00/13] Monitor patches for 2022-12-19, Peter Maydell, 2022/12/20