mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/xen: Don't use '#' flag of printf format

Browse Source 
Fix code style. Don't use '#' flag of printf format ('%#') in
format strings, use '0x' prefix instead

Signed-off-by: Xinhao Zhang <zhangxinhao1@huawei.com>
Signed-off-by: Kai Deng <dengkai1@huawei.com>
Message-Id: <20201104133709.3326630-1-zhangxinhao1@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Xinhao Zhang 2020-11-04 21:37:09 +08:00 committed by Laurent Vivier
parent 2f5f9bc88d
commit 01d152c0bf
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xen/xen_pt.c
View File

@ -489,7 +489,7 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s, uint16_t *cmd)
pci_register_bar(&s->dev, i, type, &s->bar[i]); pci_register_bar(&s->dev, i, type, &s->bar[i]);
XEN_PT_LOG(&s->dev, "IO region %i registered (size=0x%08"PRIx64 XEN_PT_LOG(&s->dev, "IO region %i registered (size=0x%08"PRIx64
" base_addr=0x%08"PRIx64" type: %#x)\n", " base_addr=0x%08"PRIx64" type: 0x%x)\n",
i, r->size, r->base_addr, type); i, r->size, r->base_addr, type);
} }
@ -578,7 +578,7 @@ static void xen_pt_check_bar_overlap(PCIBus *bus, PCIDevice *d, void *opaque)
if (ranges_overlap(arg->addr, arg->size, r->addr, r->size)) { if (ranges_overlap(arg->addr, arg->size, r->addr, r->size)) {
XEN_PT_WARN(&s->dev, XEN_PT_WARN(&s->dev,
"Overlapped to device [%02x:%02x.%d] Region: %i" "Overlapped to device [%02x:%02x.%d] Region: %i"
" (addr: %#"FMT_PCIBUS", len: %#"FMT_PCIBUS")\n", " (addr: 0x%"FMT_PCIBUS", len: 0x%"FMT_PCIBUS")\n",
pci_bus_num(bus), PCI_SLOT(d->devfn), pci_bus_num(bus), PCI_SLOT(d->devfn),
PCI_FUNC(d->devfn), i, r->addr, r->size); PCI_FUNC(d->devfn), i, r->addr, r->size);
arg->rc = true; arg->rc = true;
@ -618,8 +618,8 @@ static void xen_pt_region_update(XenPCIPassthroughState *s,
pci_for_each_device(pci_get_bus(d), pci_dev_bus_num(d), pci_for_each_device(pci_get_bus(d), pci_dev_bus_num(d),
xen_pt_check_bar_overlap, &args); xen_pt_check_bar_overlap, &args);
if (args.rc) { if (args.rc) {
XEN_PT_WARN(d, "Region: %d (addr: %#"FMT_PCIBUS XEN_PT_WARN(d, "Region: %d (addr: 0x%"FMT_PCIBUS
", len: %#"FMT_PCIBUS") is overlapped.\n", ", len: 0x%"FMT_PCIBUS") is overlapped.\n",
bar, sec->offset_within_address_space, bar, sec->offset_within_address_space,
int128_get64(sec->size)); int128_get64(sec->size));
} }
@ -786,7 +786,7 @@ static void xen_pt_realize(PCIDevice *d, Error **errp)
/* register real device */ /* register real device */
XEN_PT_LOG(d, "Assigning real physical device %02x:%02x.%d" XEN_PT_LOG(d, "Assigning real physical device %02x:%02x.%d"
" to devfn %#x\n", " to devfn 0x%x\n",
s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function, s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function,
s->dev.devfn); s->dev.devfn);

6
hw/xen/xen_pt_config_init.c
View File

@ -1622,7 +1622,7 @@ static int xen_pt_pcie_size_init(XenPCIPassthroughState *s,
case PCI_EXP_TYPE_PCIE_BRIDGE: case PCI_EXP_TYPE_PCIE_BRIDGE:
case PCI_EXP_TYPE_RC_EC: case PCI_EXP_TYPE_RC_EC:
default: default:
XEN_PT_ERR(d, "Unsupported device/port type %#x.\n", type); XEN_PT_ERR(d, "Unsupported device/port type 0x%x.\n", type);
return -1; return -1;
} }
} }
@ -1645,11 +1645,11 @@ static int xen_pt_pcie_size_init(XenPCIPassthroughState *s,
case PCI_EXP_TYPE_PCIE_BRIDGE: case PCI_EXP_TYPE_PCIE_BRIDGE:
case PCI_EXP_TYPE_RC_EC: case PCI_EXP_TYPE_RC_EC:
default: default:
XEN_PT_ERR(d, "Unsupported device/port type %#x.\n", type); XEN_PT_ERR(d, "Unsupported device/port type 0x%x.\n", type);
return -1; return -1;
} }
} else { } else {
XEN_PT_ERR(d, "Unsupported capability version %#x.\n", version); XEN_PT_ERR(d, "Unsupported capability version 0x%x.\n", version);
return -1; return -1;
} }

16
hw/xen/xen_pt_msi.c
View File

@ -123,7 +123,7 @@ static int msi_msix_setup(XenPCIPassthroughState *s,
*ppirq = XEN_PT_UNASSIGNED_PIRQ; *ppirq = XEN_PT_UNASSIGNED_PIRQ;
} else { } else {
XEN_PT_LOG(&s->dev, "requested pirq %d for MSI%s" XEN_PT_LOG(&s->dev, "requested pirq %d for MSI%s"
" (vec: %#x, entry: %#x)\n", " (vec: 0x%x, entry: 0x%x)\n",
*ppirq, is_msix ? "-X" : "", gvec, msix_entry); *ppirq, is_msix ? "-X" : "", gvec, msix_entry);
} }
} }
@ -142,7 +142,7 @@ static int msi_msix_setup(XenPCIPassthroughState *s,
msix_entry, table_base); msix_entry, table_base);
if (rc) { if (rc) {
XEN_PT_ERR(&s->dev, XEN_PT_ERR(&s->dev,
"Mapping of MSI%s (err: %i, vec: %#x, entry %#x)\n", "Mapping of MSI%s (err: %i, vec: 0x%x, entry 0x%x)\n",
is_msix ? "-X" : "", errno, gvec, msix_entry); is_msix ? "-X" : "", errno, gvec, msix_entry);
return rc; return rc;
} }
@ -165,8 +165,8 @@ static int msi_msix_update(XenPCIPassthroughState *s,
int rc = 0; int rc = 0;
uint64_t table_addr = 0; uint64_t table_addr = 0;
XEN_PT_LOG(d, "Updating MSI%s with pirq %d gvec %#x gflags %#x" XEN_PT_LOG(d, "Updating MSI%s with pirq %d gvec 0x%x gflags 0x%x"
" (entry: %#x)\n", " (entry: 0x%x)\n",
is_msix ? "-X" : "", pirq, gvec, gflags, msix_entry); is_msix ? "-X" : "", pirq, gvec, gflags, msix_entry);
if (is_msix) { if (is_msix) {
@ -208,11 +208,11 @@ static int msi_msix_disable(XenPCIPassthroughState *s,
} }
if (is_binded) { if (is_binded) {
XEN_PT_LOG(d, "Unbind MSI%s with pirq %d, gvec %#x\n", XEN_PT_LOG(d, "Unbind MSI%s with pirq %d, gvec 0x%x\n",
is_msix ? "-X" : "", pirq, gvec); is_msix ? "-X" : "", pirq, gvec);
rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags); rc = xc_domain_unbind_msi_irq(xen_xc, xen_domid, gvec, pirq, gflags);
if (rc) { if (rc) {
XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: %#x)\n", XEN_PT_ERR(d, "Unbinding of MSI%s failed. (err: %d, pirq: %d, gvec: 0x%x)\n",
is_msix ? "-X" : "", errno, pirq, gvec); is_msix ? "-X" : "", errno, pirq, gvec);
return rc; return rc;
} }
@ -539,7 +539,7 @@ int xen_pt_msix_init(XenPCIPassthroughState *s, uint32_t base)
} }
if (id != PCI_CAP_ID_MSIX) { if (id != PCI_CAP_ID_MSIX) {
XEN_PT_ERR(d, "Invalid id %#x base %#x\n", id, base); XEN_PT_ERR(d, "Invalid id 0x%x base 0x%x\n", id, base);
return -1; return -1;
} }
@ -582,7 +582,7 @@ int xen_pt_msix_init(XenPCIPassthroughState *s, uint32_t base)
XEN_PT_ERR(d, "Can't open /dev/mem: %s\n", strerror(errno)); XEN_PT_ERR(d, "Can't open /dev/mem: %s\n", strerror(errno));
goto error_out; goto error_out;
} }
XEN_PT_LOG(d, "table_off = %#x, total_entries = %d\n", XEN_PT_LOG(d, "table_off = 0x%x, total_entries = %d\n",
table_off, total_entries); table_off, total_entries);
msix->table_offset_adjust = table_off & 0x0fff; msix->table_offset_adjust = table_off & 0x0fff;
msix->phys_iomem_base = msix->phys_iomem_base =