64-bit BAR memory address is truncated when removing a passthrough pci device from guest since it uses "unsigned int".
So, change to use "unsigned long long" to fix this problem. Signed-off-by: Jiqian Chen <[email protected]> --- cc: Anthony PERARD <[email protected]> cc: Juergen Gross <[email protected]> cc: Oleksii Kurochko <[email protected]> --- tools/libs/light/libxl_pci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/libs/light/libxl_pci.c b/tools/libs/light/libxl_pci.c index 2ea2caeb6624..88ffbbf08abe 100644 --- a/tools/libs/light/libxl_pci.c +++ b/tools/libs/light/libxl_pci.c @@ -2001,7 +2001,8 @@ static void pci_remove_detached(libxl__egc *egc, { STATE_AO_GC(prs->aodev->ao); libxl_ctx *ctx = libxl__gc_owner(gc); - unsigned int start = 0, end = 0, flags = 0, size = 0, irq = 0; + unsigned long long start = 0, end = 0, flags = 0, size = 0; + unsigned int irq = 0; int i, stubdomid = 0; const char *sysfs_path; FILE *f; @@ -2031,7 +2032,7 @@ static void pci_remove_detached(libxl__egc *egc, } for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { - if (fscanf(f, "0x%x 0x%x 0x%x\n", &start, &end, &flags) != 3) + if (fscanf(f, "0x%llx 0x%llx 0x%llx\n", &start, &end, &flags) != 3) continue; size = end - start + 1; if (start) { @@ -2040,7 +2041,7 @@ static void pci_remove_detached(libxl__egc *egc, size, 0); if (rc < 0) LOGED(ERROR, domid, - "xc_domain_ioport_permission error 0x%x/0x%x", + "xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); } else { @@ -2050,7 +2051,7 @@ static void pci_remove_detached(libxl__egc *egc, 0); if (rc < 0) LOGED(ERROR, domid, - "xc_domain_iomem_permission error 0x%x/0x%x", + "xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); } -- 2.34.1
