|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 2 of 4 v3] 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.
v3:
- Port to xen-unstable tip
Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r a2b528299c12 -r 62e682bdb103 docs/man/xl.pod.1
--- a/docs/man/xl.pod.1 Tue May 15 15:24:02 2012 +0100
+++ b/docs/man/xl.pod.1 Tue May 15 15:26:24 2012 +0100
@@ -693,13 +693,6 @@ explanatory.
Prints the current uptime of the domains running.
-=item B<pci-list-assignable-devices>
-
-List all the assignable PCI devices.
-These are devices in the system which are configured to be
-available for passthrough and are bound to a suitable PCI
-backend driver in domain 0 rather than a real driver.
-
=back
=head1 SCHEDULER SUBCOMMANDS
@@ -1032,6 +1025,13 @@ List virtual network interfaces for a do
=over 4
+=item B<pci-assignable-list>
+
+List all the assignable PCI devices.
+These are devices in the system which are configured to be
+available for passthrough and are bound to a suitable PCI
+backend driver in domain 0 rather than a real driver.
+
=item B<pci-attach> I<domain-id> I<BDF>
Hot-plug a new pass-through pci device to the specified domain.
diff -r a2b528299c12 -r 62e682bdb103 tools/libxl/libxl.h
--- a/tools/libxl/libxl.h Tue May 15 15:24:02 2012 +0100
+++ b/tools/libxl/libxl.h Tue May 15 15:26:24 2012 +0100
@@ -722,7 +722,7 @@ libxl_device_pci *libxl_device_pci_list(
* 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 -r a2b528299c12 -r 62e682bdb103 tools/libxl/libxl_pci.c
--- a/tools/libxl/libxl_pci.c Tue May 15 15:24:02 2012 +0100
+++ b/tools/libxl/libxl_pci.c Tue May 15 15:26:24 2012 +0100
@@ -357,7 +357,7 @@ static int sysfs_write_bdf(libxl__gc *gc
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
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 -r a2b528299c12 -r 62e682bdb103 tools/libxl/xl.h
--- a/tools/libxl/xl.h Tue May 15 15:24:02 2012 +0100
+++ b/tools/libxl/xl.h Tue May 15 15:26:24 2012 +0100
@@ -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 -r a2b528299c12 -r 62e682bdb103 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Tue May 15 15:24:02 2012 +0100
+++ b/tools/libxl/xl_cmdimpl.c Tue May 15 15:26:24 2012 +0100
@@ -2222,34 +2222,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;
@@ -2371,6 +2343,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 -r a2b528299c12 -r 62e682bdb103 tools/libxl/xl_cmdtable.c
--- a/tools/libxl/xl_cmdtable.c Tue May 15 15:24:02 2012 +0100
+++ b/tools/libxl/xl_cmdtable.c Tue May 15 15:26:24 2012 +0100
@@ -86,8 +86,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",
"",
},
diff -r a2b528299c12 -r 62e682bdb103 tools/python/xen/lowlevel/xl/xl.c
--- a/tools/python/xen/lowlevel/xl/xl.c Tue May 15 15:24:02 2012 +0100
+++ b/tools/python/xen/lowlevel/xl/xl.c Tue May 15 15:26:24 2012 +0100
@@ -566,13 +566,13 @@ static PyObject *pyxl_pci_parse(XlObject
return (PyObject *)pci;
}
-static PyObject *pyxl_pci_list_assignable(XlObject *self, PyObject *args)
+static PyObject *pyxl_pci_assignable_list(XlObject *self, PyObject *args)
{
libxl_device_pci *dev;
PyObject *list;
int nr_dev, i;
- dev = libxl_device_pci_list_assignable(self->ctx, &nr_dev);
+ dev = libxl_device_pci_assignable_list(self->ctx, &nr_dev);
if ( dev == NULL ) {
PyErr_SetString(xl_error_obj, "Cannot list assignable devices");
return NULL;
@@ -662,8 +662,8 @@ static PyMethodDef pyxl_methods[] = {
"Parse pass-through PCI device spec (BDF)"},
{"device_pci_list", (PyCFunction)pyxl_pci_list, METH_VARARGS,
"List PCI devices assigned to a domain"},
- {"device_pci_list_assignable",
- (PyCFunction)pyxl_pci_list_assignable, METH_NOARGS,
+ {"device_pci_assignable_list",
+ (PyCFunction)pyxl_pci_assignable_list, METH_NOARGS,
"List assignable PCI devices"},
{ NULL, NULL, 0, NULL }
};
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |