diff options
author | George Dunlap <george.dunlap@eu.citrix.com> | 2012-05-15 16:28:15 +0100 |
---|---|---|
committer | George Dunlap <george.dunlap@eu.citrix.com> | 2012-05-15 16:28:15 +0100 |
commit | 0773a6e830f805cc288a3f542daa67be400be1cd (patch) | |
tree | 8aa8da1cdb1f2ec10615321d2940a1feea9ff2fe /tools/libxl | |
parent | 494372a3f2dfeece8aed40af88bd270cfa491506 (diff) | |
download | xen-0773a6e830f805cc288a3f542daa67be400be1cd.tar.gz xen-0773a6e830f805cc288a3f542daa67be400be1cd.tar.bz2 xen-0773a6e830f805cc288a3f542daa67be400be1cd.zip |
libxl: Rename pci_list_assignable to pci_assignable_list
...to prepare for a consistent "pci_assignable_*" naming scheme.
Also move the man page entry into the PCI PASS-THROUGH section, rather
than the XEN HOST section.
No functional changes.
Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/libxl')
-rw-r--r-- | tools/libxl/libxl.h | 2 | ||||
-rw-r--r-- | tools/libxl/libxl_pci.c | 4 | ||||
-rw-r--r-- | tools/libxl/xl.h | 2 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 56 | ||||
-rw-r--r-- | tools/libxl/xl_cmdtable.c | 4 |
5 files changed, 34 insertions, 34 deletions
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 979940a14b..e3c78b28b8 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -722,7 +722,7 @@ libxl_device_pci *libxl_device_pci_list(libxl_ctx *ctx, uint32_t domid, int *num * could be assigned to a domain (i.e. are bound to the backend * driver) but are not currently. */ -libxl_device_pci *libxl_device_pci_list_assignable(libxl_ctx *ctx, int *num); +libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num); /* CPUID handling */ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 999b74d9d9..1acfd9241d 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -357,7 +357,7 @@ static int sysfs_write_bdf(libxl__gc *gc, const char * sysfs_path, return 0; } -libxl_device_pci *libxl_device_pci_list_assignable(libxl_ctx *ctx, int *num) +libxl_device_pci *libxl_device_pci_assignable_list(libxl_ctx *ctx, int *num) { GC_INIT(ctx); libxl_device_pci *pcidevs = NULL, *new, *assigned; @@ -684,7 +684,7 @@ static int libxl_pcidev_assignable(libxl_ctx *ctx, libxl_device_pci *pcidev) libxl_device_pci *pcidevs; int num, i; - pcidevs = libxl_device_pci_list_assignable(ctx, &num); + pcidevs = libxl_device_pci_assignable_list(ctx, &num); for (i = 0; i < num; i++) { if (pcidevs[i].domain == pcidev->domain && pcidevs[i].bus == pcidev->bus && diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 5d0d50440f..f267d9b673 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -35,9 +35,9 @@ int main_cd_insert(int argc, char **argv); int main_console(int argc, char **argv); int main_vncviewer(int argc, char **argv); int main_pcilist(int argc, char **argv); -int main_pcilist_assignable(int argc, char **argv); int main_pcidetach(int argc, char **argv); int main_pciattach(int argc, char **argv); +int main_pciassignable_list(int argc, char **argv); int main_restore(int argc, char **argv); int main_migrate_receive(int argc, char **argv); int main_save(int argc, char **argv); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 61de69f000..4f3aec50ac 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2291,34 +2291,6 @@ int main_vncviewer(int argc, char **argv) return 0; } -static void pcilist_assignable(void) -{ - libxl_device_pci *pcidevs; - int num, i; - - pcidevs = libxl_device_pci_list_assignable(ctx, &num); - - if ( pcidevs == NULL ) - return; - for (i = 0; i < num; i++) { - printf("%04x:%02x:%02x.%01x\n", - pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func); - libxl_device_pci_dispose(&pcidevs[i]); - } - free(pcidevs); -} - -int main_pcilist_assignable(int argc, char **argv) -{ - int opt; - - if ((opt = def_getopt(argc, argv, "", "pci-list-assignable-devices", 0)) != -1) - return opt; - - pcilist_assignable(); - return 0; -} - static void pcilist(const char *dom) { libxl_device_pci *pcidevs; @@ -2440,6 +2412,34 @@ int main_pciattach(int argc, char **argv) return 0; } +static void pciassignable_list(void) +{ + libxl_device_pci *pcidevs; + int num, i; + + pcidevs = libxl_device_pci_assignable_list(ctx, &num); + + if ( pcidevs == NULL ) + return; + for (i = 0; i < num; i++) { + printf("%04x:%02x:%02x.%01x\n", + pcidevs[i].domain, pcidevs[i].bus, pcidevs[i].dev, pcidevs[i].func); + libxl_device_pci_dispose(&pcidevs[i]); + } + free(pcidevs); +} + +int main_pciassignable_list(int argc, char **argv) +{ + int opt; + + if ((opt = def_getopt(argc, argv, "", "pci-assignable-list", 0)) != -1) + return opt; + + pciassignable_list(); + return 0; +} + static void pause_domain(const char *p) { find_domain(p); diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 7012d8464d..193d6a3a46 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -89,8 +89,8 @@ struct cmd_spec cmd_table[] = { "List pass-through pci devices for a domain", "<Domain>", }, - { "pci-list-assignable-devices", - &main_pcilist_assignable, 0, 0, + { "pci-assignable-list", + &main_pciassignable_list, 0, 0, "List all the assignable pci devices", "", }, |