From 38023d511ff6770e4ff1d2a4e3fdcc3820a45b3f Mon Sep 17 00:00:00 2001

From: Alex Williamson <alex.williamson@redhat.com>

Date: Fri, 29 Sep 2017 21:45:08 +0200

Subject: [PATCH 08/27] hw/vfio/pci: use name field in format strings

RH-Author: Alex Williamson <alex.williamson@redhat.com>

Message-id: <20170929214508.16765.18033.stgit@gimli.home>

Patchwork-id: 76766

O-Subject: [RHEL-7.5 qemu-kvm PATCH 08/16] hw/vfio/pci: use name field in format strings

Bugzilla: 1494181

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Auger Eric <eric.auger@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Eric Auger <eric.auger@linaro.org>

Upstream: df92ee444884ba66b5cc95e3ff3d5579f89ed4aa

Signed-off-by: Eric Auger <eric.auger@linaro.org>

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 hw/misc/vfio.c | 193 ++++++++++++++++++++-------------------------------------

 1 file changed, 68 insertions(+), 125 deletions(-)

diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c

index 92414b9..0d88313 100644

--- a/hw/misc/vfio.c

+++ b/hw/misc/vfio.c

@@ -375,8 +375,7 @@ static void vfio_intx_interrupt(void *opaque)

         return;

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x) Pin %c\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function,

+    DPRINTF("%s(%s) Pin %c\n", __func__, vdev->vbasedev.name,

             'A' + vdev->intx.pin);

     vdev->intx.pending = true;

@@ -396,8 +395,7 @@ static void vfio_eoi(VFIODevice *vbasedev)

         return;

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x) EOI\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s) EOI\n", __func__, vbasedev->name);

     vdev->intx.pending = false;

     qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0);

@@ -466,9 +464,7 @@ static void vfio_enable_intx_kvm(VFIOPCIDevice *vdev)

     vdev->intx.kvm_accel = true;

-    DPRINTF("%s(%04x:%02x:%02x.%x) KVM INTx accel enabled\n",

-            __func__, vdev->host.domain, vdev->host.bus,

-            vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s) KVM INTx accel enabled\n", __func__, vdev->vbasedev.name);

     return;

@@ -520,9 +516,7 @@ static void vfio_disable_intx_kvm(VFIOPCIDevice *vdev)

     /* If we've missed an event, let it re-fire through QEMU */

     vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX);

-    DPRINTF("%s(%04x:%02x:%02x.%x) KVM INTx accel disabled\n",

-            __func__, vdev->host.domain, vdev->host.bus,

-            vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s) KVM INTx accel disabled\n", __func__, vdev->vbasedev.name);

 #endif

 }

@@ -541,9 +535,8 @@ static void vfio_update_irq(PCIDevice *pdev)

         return; /* Nothing changed */

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x) IRQ moved %d -> %d\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, vdev->intx.route.irq, route.irq);

+    DPRINTF("%s(%s) IRQ moved %d -> %d\n", __func__,

+            vdev->vbasedev.name, vdev->intx.route.irq, route.irq);

     vfio_disable_intx_kvm(vdev);

@@ -618,8 +611,7 @@ static int vfio_enable_intx(VFIOPCIDevice *vdev)

     vdev->interrupt = VFIO_INT_INTx;

-    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s)\n", __func__, vdev->vbasedev.name);

     return 0;

 }

@@ -641,8 +633,7 @@ static void vfio_disable_intx(VFIOPCIDevice *vdev)

     vdev->interrupt = VFIO_INT_NONE;

-    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s)\n", __func__, vdev->vbasedev.name);

 }

 /*

@@ -669,9 +660,8 @@ static void vfio_msi_interrupt(void *opaque)

         abort();

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x) vector %d 0x%"PRIx64"/0x%x\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, nr, msg.address, msg.data);

+    DPRINTF("%s(%s) vector %d 0x%"PRIx64"/0x%x\n", __func__,

+            vdev->vbasedev.name, nr, msg.address, msg.data);

 #endif

     if (vdev->interrupt == VFIO_INT_MSIX) {

@@ -778,9 +768,7 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, unsigned int nr,

     VFIOMSIVector *vector;

     int ret;

-    DPRINTF("%s(%04x:%02x:%02x.%x) vector %d used\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, nr);

+    DPRINTF("%s(%s) vector %d used\n", __func__, vdev->vbasedev.name, nr);

     vector = &vdev->msi_vectors[nr];

@@ -866,9 +854,7 @@ static void vfio_msix_vector_release(PCIDevice *pdev, unsigned int nr)

     VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     VFIOMSIVector *vector = &vdev->msi_vectors[nr];

-    DPRINTF("%s(%04x:%02x:%02x.%x) vector %d released\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, nr);

+    DPRINTF("%s(%s) vector %d released\n", __func__, vdev->vbasedev.name, nr);

     /*

      * There are still old guests that mask and unmask vectors on every

@@ -931,8 +917,7 @@ static void vfio_enable_msix(VFIOPCIDevice *vdev)

         error_report("vfio: msix_set_vector_notifiers failed");

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s)\n", __func__, vdev->vbasedev.name);

 }

 static void vfio_enable_msi(VFIOPCIDevice *vdev)

@@ -1008,9 +993,8 @@ retry:

         return;

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x) Enabled %d MSI vectors\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, vdev->nr_vectors);

+    DPRINTF("%s(%s) Enabled %d MSI vectors\n", __func__,

+            vdev->vbasedev.name, vdev->nr_vectors);

 }

 static void vfio_disable_msi_common(VFIOPCIDevice *vdev)

@@ -1060,8 +1044,7 @@ static void vfio_disable_msix(VFIOPCIDevice *vdev)

     vfio_disable_msi_common(vdev);

-    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s)\n", __func__, vdev->vbasedev.name);

 }

 static void vfio_disable_msi(VFIOPCIDevice *vdev)

@@ -1069,8 +1052,7 @@ static void vfio_disable_msi(VFIOPCIDevice *vdev)

     vfio_disable_irqindex(&vdev->vbasedev, VFIO_PCI_MSI_IRQ_INDEX);

     vfio_disable_msi_common(vdev);

-    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s)\n", __func__, vdev->vbasedev.name);

 }

 static void vfio_update_msi(VFIOPCIDevice *vdev)

@@ -1206,8 +1188,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev)

         return;

     }

-    DPRINTF("Device %04x:%02x:%02x.%x ROM:\n", vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("Device %s ROM:\n", vdev->vbasedev.name);

     DPRINTF("  size: 0x%lx, offset: 0x%lx, flags: 0x%lx\n",

             (unsigned long)reg_info.size, (unsigned long)reg_info.offset,

             (unsigned long)reg_info.flags);

@@ -1218,9 +1199,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev)

     if (!vdev->rom_size) {

         vdev->rom_read_failed = true;

         error_report("vfio-pci: Cannot read device rom at "

-                    "%04x:%02x:%02x.%x\n",

-                    vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                    vdev->host.function);

+                    "%s\n", vdev->vbasedev.name);

         error_printf("Device option ROM contents are probably invalid "

                     "(check dmesg).\nSkip option ROM probe with rombar=0, "

                     "or load from file with romfile=\n");

@@ -1261,9 +1240,8 @@ static uint64_t vfio_rom_read(void *opaque, hwaddr addr, unsigned size)

     memcpy(&val, vdev->rom + addr,

            (addr < vdev->rom_size) ? MIN(size, vdev->rom_size - addr) : 0);

-    DPRINTF("%s(%04x:%02x:%02x.%x, 0x%"HWADDR_PRIx", 0x%x) = 0x%"PRIx64"\n",

-            __func__, vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, addr, size, val);

+    DPRINTF("%s(%s, 0x%"HWADDR_PRIx", 0x%x) = 0x%"PRIx64"\n",

+            __func__, vdev->vbasedev.name, addr, size, val);

     return val;

 }

@@ -1360,8 +1338,7 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev)

         }

     }

-    DPRINTF("%04x:%02x:%02x.%x ROM size 0x%x\n", vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function, size);

+    DPRINTF("%s ROM size 0x%x\n", vdev->vbasedev.name, size);

     snprintf(name, sizeof(name), "vfio[%04x:%02x:%02x.%x].rom",

              vdev->host.domain, vdev->host.bus, vdev->host.slot,

@@ -1496,10 +1473,9 @@ static uint64_t vfio_generic_window_quirk_read(void *opaque,

         data = vfio_pci_read_config(&vdev->pdev,

                                     quirk->data.address_val + offset, size);

-        DPRINTF("%s read(%04x:%02x:%02x.%x:BAR%d+0x%"HWADDR_PRIx", %d) = 0x%"

-                PRIx64"\n", memory_region_name(&quirk->mem), vdev->host.domain,

-                vdev->host.bus, vdev->host.slot, vdev->host.function,

-                quirk->data.bar, addr, size, data);

+        DPRINTF("%s read(%s:BAR%d+0x%"HWADDR_PRIx", %d) = 0x%"

+                PRIx64"\n", memory_region_name(&quirk->mem),

+                vdev->vbasedev.name, quirk->data.bar, addr, size, data);

     } else {

         data = vfio_region_read(&vdev->bars[quirk->data.bar].region,

                                 addr + quirk->data.base_offset, size);

@@ -1545,10 +1521,9 @@ static void vfio_generic_window_quirk_write(void *opaque, hwaddr addr,

         vfio_pci_write_config(&vdev->pdev,

                               quirk->data.address_val + offset, data, size);

-        DPRINTF("%s write(%04x:%02x:%02x.%x:BAR%d+0x%"HWADDR_PRIx", 0x%"

+        DPRINTF("%s write(%s:BAR%d+0x%"HWADDR_PRIx", 0x%"

                 PRIx64", %d)\n", memory_region_name(&quirk->mem),

-                vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                vdev->host.function, quirk->data.bar, addr, data, size);

+                vdev->vbasedev.name, quirk->data.bar, addr, data, size);

         return;

     }

@@ -1581,10 +1556,9 @@ static uint64_t vfio_generic_quirk_read(void *opaque,

         data = vfio_pci_read_config(&vdev->pdev, addr - offset, size);

-        DPRINTF("%s read(%04x:%02x:%02x.%x:BAR%d+0x%"HWADDR_PRIx", %d) = 0x%"

-                PRIx64"\n", memory_region_name(&quirk->mem), vdev->host.domain,

-                vdev->host.bus, vdev->host.slot, vdev->host.function,

-                quirk->data.bar, addr + base, size, data);

+        DPRINTF("%s read(%s:BAR%d+0x%"HWADDR_PRIx", %d) = 0x%"

+                PRIx64"\n", memory_region_name(&quirk->mem),

+                vdev->vbasedev.name, quirk->data.bar, addr + base, size, data);

     } else {

         data = vfio_region_read(&vdev->bars[quirk->data.bar].region,

                                 addr + base, size);

@@ -1611,10 +1585,9 @@ static void vfio_generic_quirk_write(void *opaque, hwaddr addr,

         vfio_pci_write_config(&vdev->pdev, addr - offset, data, size);

-        DPRINTF("%s write(%04x:%02x:%02x.%x:BAR%d+0x%"HWADDR_PRIx", 0x%"

+        DPRINTF("%s write(%s:BAR%d+0x%"HWADDR_PRIx", 0x%"

                 PRIx64", %d)\n", memory_region_name(&quirk->mem),

-                vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                vdev->host.function, quirk->data.bar, addr + base, data, size);

+                vdev->vbasedev.name, quirk->data.bar, addr + base, data, size);

     } else {

         vfio_region_write(&vdev->bars[quirk->data.bar].region,

                           addr + base, data, size);

@@ -1685,9 +1658,8 @@ static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev)

     QLIST_INSERT_HEAD(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].quirks,

                       quirk, next);

-    DPRINTF("Enabled ATI/AMD quirk 0x3c3 BAR4for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled ATI/AMD quirk 0x3c3 BAR4for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -1728,9 +1700,8 @@ static void vfio_probe_ati_bar4_window_quirk(VFIOPCIDevice *vdev, int nr)

     QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);

-    DPRINTF("Enabled ATI/AMD BAR4 window quirk for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled ATI/AMD BAR4 window quirk for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -1763,9 +1734,8 @@ static void vfio_probe_ati_bar2_4000_quirk(VFIOPCIDevice *vdev, int nr)

     QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);

-    DPRINTF("Enabled ATI/AMD BAR2 0x4000 quirk for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled ATI/AMD BAR2 0x4000 quirk for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -1898,9 +1868,8 @@ static void vfio_vga_probe_nvidia_3d0_quirk(VFIOPCIDevice *vdev)

     QLIST_INSERT_HEAD(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].quirks,

                       quirk, next);

-    DPRINTF("Enabled NVIDIA VGA 0x3d0 quirk for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled NVIDIA VGA 0x3d0 quirk for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -1989,9 +1958,8 @@ static void vfio_probe_nvidia_bar5_window_quirk(VFIOPCIDevice *vdev, int nr)

     QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);

-    DPRINTF("Enabled NVIDIA BAR5 window quirk for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled NVIDIA BAR5 window quirk for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -2029,9 +1997,8 @@ static void vfio_probe_nvidia_bar0_88000_quirk(VFIOPCIDevice *vdev, int nr)

     QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);

-    DPRINTF("Enabled NVIDIA BAR0 0x88000 quirk for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled NVIDIA BAR0 0x88000 quirk for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -2068,9 +2035,8 @@ static void vfio_probe_nvidia_bar0_1800_quirk(VFIOPCIDevice *vdev, int nr)

     QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);

-    DPRINTF("Enabled NVIDIA BAR0 0x1800 quirk for device %04x:%02x:%02x.%x\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("Enabled NVIDIA BAR0 0x1800 quirk for device %s\n",

+            vdev->vbasedev.name);

 }

 /*

@@ -2156,9 +2122,8 @@ static uint32_t vfio_pci_read_config(PCIDevice *pdev, uint32_t addr, int len)

     val = (emu_val & emu_bits) | (phys_val & ~emu_bits);

-    DPRINTF("%s(%04x:%02x:%02x.%x, @0x%x, len=0x%x) %x\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, addr, len, val);

+    DPRINTF("%s(%s, @0x%x, len=0x%x) %x\n", __func__,

+            vdev->vbasedev.name, addr, len, val);

     return val;

 }

@@ -2169,9 +2134,8 @@ static void vfio_pci_write_config(PCIDevice *pdev, uint32_t addr,

     VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

     uint32_t val_le = cpu_to_le32(val);

-    DPRINTF("%s(%04x:%02x:%02x.%x, @0x%x, 0x%x, len=0x%x)\n", __func__,

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, addr, val, len);

+    DPRINTF("%s(%s, @0x%x, 0x%x, len=0x%x)\n", __func__,

+            vdev->vbasedev.name, addr, val, len);

     /* Write everything to VFIO, let it filter out what we can't write */

     if (pwrite(vdev->vbasedev.fd, &val_le, len, vdev->config_offset + addr)

@@ -2421,8 +2385,7 @@ static int vfio_setup_msi(VFIOPCIDevice *vdev, int pos)

     msi_maskbit = !!(ctrl & PCI_MSI_FLAGS_MASKBIT);

     entries = 1 << ((ctrl & PCI_MSI_FLAGS_QMASK) >> 1);

-    DPRINTF("%04x:%02x:%02x.%x PCI MSI CAP @0x%x\n", vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function, pos);

+    DPRINTF("%s PCI MSI CAP @0x%x\n", vdev->vbasedev.name, pos);

     ret = msi_init(&vdev->pdev, pos, entries, msi_64bit, msi_maskbit);

     if (ret < 0) {

@@ -2483,10 +2446,8 @@ static int vfio_early_setup_msix(VFIOPCIDevice *vdev)

     vdev->msix->pba_offset = pba & ~PCI_MSIX_FLAGS_BIRMASK;

     vdev->msix->entries = (ctrl & PCI_MSIX_FLAGS_QSIZE) + 1;

-    DPRINTF("%04x:%02x:%02x.%x "

-            "PCI MSI-X CAP @0x%x, BAR %d, offset 0x%x, entries %d\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function, pos, vdev->msix->table_bar,

+    DPRINTF("%s PCI MSI-X CAP @0x%x, BAR %d, offset 0x%x, entries %d\n",

+            vdev->vbasedev.name, pos, vdev->msix->table_bar,

             vdev->msix->table_offset, vdev->msix->entries);

     /*

@@ -2895,9 +2856,7 @@ static void vfio_check_pcie_flr(VFIOPCIDevice *vdev, uint8_t pos)

     uint32_t cap = pci_get_long(vdev->pdev.config + pos + PCI_EXP_DEVCAP);

     if (cap & PCI_EXP_DEVCAP_FLR) {

-        DPRINTF("%04x:%02x:%02x.%x Supports FLR via PCIe cap\n",

-                vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                vdev->host.function);

+        DPRINTF("%s Supports FLR via PCIe cap\n", vdev->vbasedev.name);

         vdev->has_flr = true;

     }

 }

@@ -2907,9 +2866,7 @@ static void vfio_check_pm_reset(VFIOPCIDevice *vdev, uint8_t pos)

     uint16_t csr = pci_get_word(vdev->pdev.config + pos + PCI_PM_CTRL);

     if (!(csr & PCI_PM_CTRL_NO_SOFT_RESET)) {

-        DPRINTF("%04x:%02x:%02x.%x Supports PM reset\n",

-                vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                vdev->host.function);

+        DPRINTF("%s Supports PM reset\n", vdev->vbasedev.name);

         vdev->has_pm_reset = true;

     }

 }

@@ -2919,9 +2876,7 @@ static void vfio_check_af_flr(VFIOPCIDevice *vdev, uint8_t pos)

     uint8_t cap = pci_get_byte(vdev->pdev.config + pos + PCI_AF_CAP);

     if ((cap & PCI_AF_CAP_TP) && (cap & PCI_AF_CAP_FLR)) {

-        DPRINTF("%04x:%02x:%02x.%x Supports FLR via AF cap\n",

-                vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                vdev->host.function);

+        DPRINTF("%s Supports FLR via AF cap\n", vdev->vbasedev.name);

         vdev->has_flr = true;

     }

 }

@@ -3072,8 +3027,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)

     int ret, i, count;

     bool multi = false;

-    DPRINTF("%s(%04x:%02x:%02x.%x) %s\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function,

+    DPRINTF("%s(%s) %s\n", __func__, vdev->vbasedev.name,

             single ? "one" : "multi");

     vfio_pci_pre_reset(vdev);

@@ -3105,9 +3059,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)

         goto out_single;

     }

-    DPRINTF("%04x:%02x:%02x.%x: hot reset dependent devices:\n",

-            vdev->host.domain, vdev->host.bus, vdev->host.slot,

-            vdev->host.function);

+    DPRINTF("%s: hot reset dependent devices:\n", vdev->vbasedev.name);

     /* Verify that we have all the groups required */

     for (i = 0; i < info->count; i++) {

@@ -3135,10 +3087,9 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)

         if (!group) {

             if (!vdev->has_pm_reset) {

-                error_report("vfio: Cannot reset device %04x:%02x:%02x.%x, "

+                error_report("vfio: Cannot reset device %s, "

                              "depends on group %d which is not owned.",

-                             vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                             vdev->host.function, devices[i].group_id);

+                             vdev->vbasedev.name, devices[i].group_id);

             }

             ret = -EPERM;

             goto out;

@@ -3153,8 +3104,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)

             if (vfio_pci_host_match(&host, &tmp->host)) {

                 if (single) {

                     DPRINTF("vfio: found another in-use device "

-                            "%04x:%02x:%02x.%x\n", host.domain, host.bus,

-                            host.slot, host.function);

+                            "%s\n", tmp->vbasedev.name);

                     ret = -EINVAL;

                     goto out_single;

                 }

@@ -3201,9 +3151,7 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single)

     ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_PCI_HOT_RESET, reset);

     g_free(reset);

-    DPRINTF("%04x:%02x:%02x.%x hot reset: %s\n", vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function,

-            ret ? "%m" : "Success");

+    DPRINTF("%s hot reset: %s\n", vdev->vbasedev.name, ret ? "%m" : "Success");

 out:

     /* Re-enable INTx on affected devices */

@@ -3691,10 +3639,9 @@ static int vfio_get_device(VFIOGroup *group, const char *name,

     } else if (irq_info.count == 1) {

         vdev->pci_aer = true;

     } else {

-        error_report("vfio: %04x:%02x:%02x.%x "

+        error_report("vfio: %s "

                      "Could not enable error recovery for the device",

-                     vdev->host.domain, vdev->host.bus, vdev->host.slot,

-                     vdev->host.function);

+                     vdev->vbasedev.name);

     }

 error:

@@ -3971,8 +3918,7 @@ static int vfio_initfn(PCIDevice *pdev)

         return -errno;

     }

-    DPRINTF("%s(%04x:%02x:%02x.%x) group %d\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function, groupid);

+    DPRINTF("%s(%s) group %d\n", __func__, vdev->vbasedev.name, groupid);

     group = vfio_get_group(groupid);

     if (!group) {

@@ -4111,16 +4057,14 @@ static void vfio_pci_reset(DeviceState *dev)

     PCIDevice *pdev = DO_UPCAST(PCIDevice, qdev, dev);

     VFIOPCIDevice *vdev = DO_UPCAST(VFIOPCIDevice, pdev, pdev);

-    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+    DPRINTF("%s(%s)\n", __func__, vdev->vbasedev.name);

     vfio_pci_pre_reset(vdev);

     if (vdev->vbasedev.reset_works &&

         (vdev->has_flr || !vdev->has_pm_reset) &&

         !ioctl(vdev->vbasedev.fd, VFIO_DEVICE_RESET)) {

-        DPRINTF("%04x:%02x:%02x.%x FLR/VFIO_DEVICE_RESET\n", vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+        DPRINTF("%s FLR/VFIO_DEVICE_RESET\n", vdev->vbasedev.name);

         goto post_reset;

     }

@@ -4132,8 +4076,7 @@ static void vfio_pci_reset(DeviceState *dev)

     /* If nothing else works and the device supports PM reset, use it */

     if (vdev->vbasedev.reset_works && vdev->has_pm_reset &&

         !ioctl(vdev->vbasedev.fd, VFIO_DEVICE_RESET)) {

-        DPRINTF("%04x:%02x:%02x.%x PCI PM Reset\n", vdev->host.domain,

-            vdev->host.bus, vdev->host.slot, vdev->host.function);

+        DPRINTF("%s PCI PM Reset\n", vdev->vbasedev.name);

         goto post_reset;

     }

-- 

1.8.3.1