xl: fix PCI resource parsing
PATCH 1/1 xl: fix PCI resource parsing
The parsing of PCI resources has two problems:
1. it assumes devices are 32-bits, whereas the fields in the "resources" file can have full 64-bit values
2. it only parses the first resource because the format string is missing a \n
Fix both of these up, which allows my Intel 82574L to work with MSI-X.
However, this should probably be using a PCI access library rather than rummaging around in /sys/bus/pci...
Signed-off-by Jeremy Fitzhardinge <[email protected]>
tools/libxl/libxl.c +3 -3
@@ -2268,7 +2268,7 @@char *sysfs_path =libxl_sprintf (ctx,SYSFS_PCI_DEV "/" PCI_BDF "/resource" , pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func);FILE *f =fopen (sysfs_path,"r" ); -unsigned int start =0 , end =0 , flags =0 , size =0 ; +unsigned long long start =0 , end =0 , flags =0 , size =0 ;int irq =0 ;int i;
@@ -2277,14 +2277,14 @@return -1 ; }for (i =0 ; i <PROC_PCI_NUM_RESOURCES ; i++) { -if (fscanf (f,"0x%x 0x%x 0x%x" , &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) {if (flags &PCI_BAR_IO ) { rc =xc_domain_ioport_permission (ctx->xch, domid, start, size,1 );if (rc <0 ) -XL_LOG_ERRNOVAL (ctx,XL_LOG_ERROR , rc,"Error: xc_domain_ioport_permission error 0x%x/0x%x" , start, size); +XL_LOG_ERRNOVAL (ctx,XL_LOG_ERROR , rc,"Error: xc_domain_ioport_permission error 0x%llx/0x%llx" , start, size); }else { rc =xc_domain_iomem_permission (ctx->xch, domid, start>>XC_PAGE_SHIFT , (size+(XC_PAGE_SIZE -1 ))>>XC_PAGE_SHIFT ,1 );