From: Chunyan Liu <cyliu@suse.com>
To: xen-devel@lists.xen.org
Cc: wei.liu2@citrix.com, ian.campbell@citrix.com,
george.dunlap@eu.citrix.com, Ian.Jackson@eu.citrix.com,
Chunyan Liu <cyliu@suse.com>, Simon Cao <caobosimon@gmail.com>
Subject: [PATCH V4 5/7] xl: add pvusb commands
Date: Wed, 10 Jun 2015 11:20:39 +0800 [thread overview]
Message-ID: <1433906441-3280-6-git-send-email-cyliu@suse.com> (raw)
In-Reply-To: <1433906441-3280-1-git-send-email-cyliu@suse.com>
Add pvusb commands: usb-ctrl-attach, usb-ctrl-detach, usb-list,
usb-attach and usb-detach.
To attach a usb device to guest through pvusb, one could follow
following example:
#xl usb-ctrl-attach test_vm version=1 num_ports=8
#xl usb-list test_vm
will show the usb controllers and port usage under the domain.
#xl usb-assignable-list
will list assignable USB devices
#xl usb-attach test_vm 1.6
will find the first usable controller:port, and attach usb
device whose bus address is 1.6 (busnum is 1, devnum is 6)
to it. One could also specify which <controller> and which <port>.
#xl usb-detach test_vm 1.6
#xl usb-ctrl-detach test_vm dev_id
will destroy the controller with specified dev_id. Dev_id
can be traced in usb-list info.
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Simon Cao <caobosimon@gmail.com>
---
docs/man/xl.pod.1 | 38 +++++++
tools/libxl/xl.h | 5 +
tools/libxl/xl_cmdimpl.c | 251 ++++++++++++++++++++++++++++++++++++++++++++++
tools/libxl/xl_cmdtable.c | 25 +++++
4 files changed, 319 insertions(+)
diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1
index 4eb929d..0259b43 100644
--- a/docs/man/xl.pod.1
+++ b/docs/man/xl.pod.1
@@ -1387,6 +1387,44 @@ List pass-through pci devices for a domain.
=back
+=head1 USB PASS-THROUGH
+
+=over 4
+
+=item B<usb-ctrl-attach> I<domain-id> [I<version=val>] [I<ports=number>]
+
+Create a new USB controller for the specified domain.
+B<version=val> is the usb controller version, could be 1 (USB1.1) or 2 (USB2.0).
+B<ports=number> is the total ports of the usb controller.
+By default, it will create a USB2.0 controller with 8 ports.
+
+=item B<usb-ctrl-detach> I<domain-id> I<devid>
+
+Destroy a USB controller from the specified domain.
+B<devid> is devid of the USB controller.
+
+=item B<usb-attach> I<domain-id> I<bus.addr> [I<controller=devid> [I<port=number>]]
+
+Hot-plug a new pass-through USB device to the specified domain.
+B<bus.addr> is the busnum.devnum of the physical USB device to pass-through.
+B<controller=devid> B<port=number> is the USB controller:port to hotplug the
+USB device to. By default, it will find the first available controller:port
+and use it; if there is no controller, it will create one.
+
+=item B<usb-detach> I<domain-id> I<bus.addr>
+
+Hot-unplug a previously assigned USB device from a domain. B<bus.addr> is
+busnum.devnum of the physical USB device to be removed from the guest domain.
+
+If B<-f> is specified, B<xl> is going to forcefully remove the device even
+without guest's collaboration.
+
+=item B<usb-list> I<domain-id>
+
+List pass-through usb devices for a domain.
+
+=back
+
=head1 TMEM
=over 4
diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h
index 5bc138c..2d57ee3 100644
--- a/tools/libxl/xl.h
+++ b/tools/libxl/xl.h
@@ -86,6 +86,11 @@ int main_blockdetach(int argc, char **argv);
int main_vtpmattach(int argc, char **argv);
int main_vtpmlist(int argc, char **argv);
int main_vtpmdetach(int argc, char **argv);
+int main_usbctrl_attach(int argc, char **argv);
+int main_usbctrl_detach(int argc, char **argv);
+int main_usbattach(int argc, char **argv);
+int main_usbdetach(int argc, char **argv);
+int main_usblist(int argc, char **argv);
int main_uptime(int argc, char **argv);
int main_claims(int argc, char **argv);
int main_tmem_list(int argc, char **argv);
diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index c858068..b29d0fc 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -3219,6 +3219,257 @@ int main_cd_insert(int argc, char **argv)
return 0;
}
+static void usbinfo_print(libxl_device_usb *usbs, int num) {
+ int i;
+ if (usbs == NULL)
+ return;
+ for (i = 0; i < num; i++) {
+ libxl_usbinfo usbinfo;
+ libxl_usbinfo_init(&usbinfo);
+
+ if (usbs[i].port)
+ printf(" Port %d:", usbs[i].port);
+ if (!libxl_device_usb_getinfo(ctx, &usbs[i], &usbinfo)) {
+ printf(" Bus %03x Device %03x: ID %04x:%04x %s %s\n",
+ usbinfo.busnum, usbinfo.devnum,
+ usbinfo.idVendor, usbinfo.idProduct,
+ usbinfo.manuf ?: "", usbinfo.prod ?: "");
+ }
+ libxl_usbinfo_dispose(&usbinfo);
+ }
+}
+
+int main_usbctrl_attach(int argc, char **argv)
+{
+ uint32_t domid;
+ int opt;
+ char *oparg;
+ libxl_device_usbctrl usbctrl;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "usb-ctrl-attach", 1) {
+ /* No options */
+ }
+
+ domid = find_domain(argv[optind++]);
+
+ libxl_device_usbctrl_init(&usbctrl);
+
+ while (argc > optind) {
+ if (MATCH_OPTION("type", argv[optind], oparg)) {
+ if (!strcmp(oparg, "pv")) {
+ usbctrl.protocol = LIBXL_USB_PROTOCOL_PV;
+ } else {
+ fprintf(stderr, "unsupported type `%s'\n", oparg);
+ exit(-1);
+ }
+ } else if (MATCH_OPTION("version", argv[optind], oparg)) {
+ usbctrl.version = atoi(oparg);
+ } else if (MATCH_OPTION("ports", argv[optind], oparg)) {
+ usbctrl.ports = atoi(oparg);
+ } else {
+ fprintf(stderr, "unrecognized argument `%s'\n", argv[optind]);
+ exit(-1);
+ }
+ optind++;
+ }
+
+ if (usbctrl.protocol == LIBXL_USB_PROTOCOL_AUTO)
+ usbctrl.protocol = LIBXL_USB_PROTOCOL_PV;
+
+ if (dryrun_only) {
+ char* json = libxl_device_usbctrl_to_json(ctx, &usbctrl);
+ printf("usb controller: %s\n", json);
+ free(json);
+ libxl_device_usbctrl_dispose(&usbctrl);
+ if (ferror(stdout) || fflush(stdout)) {
+ perror("stdout");
+ exit(-1);
+ }
+ return 0;
+ }
+
+ if (libxl_device_usbctrl_add(ctx, domid, &usbctrl, 0)) {
+ fprintf(stderr, "libxl_device_usbctrl_add failed.\n");
+ exit(-1);
+ }
+ libxl_device_usbctrl_dispose(&usbctrl);
+ return 0;
+}
+
+int main_usbctrl_detach(int argc, char **argv)
+{
+ uint32_t domid;
+ int opt;
+ libxl_device_usbctrl usbctrl;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "usb-ctrl-detach", 2) {
+ /* No options */
+ }
+
+ domid = find_domain(argv[optind]);
+
+ libxl_device_usbctrl_init(&usbctrl);
+ usbctrl.devid = atoi(argv[optind+1]);
+
+ if (libxl_device_usbctrl_remove(ctx, domid, &usbctrl, 0)) {
+ fprintf(stderr, "libxl_device_usbctrl_remove failed.\n");
+ exit(-1);
+ }
+ libxl_device_usbctrl_dispose(&usbctrl);
+ return 0;
+
+}
+
+int main_usbattach(int argc, char **argv)
+{
+ uint32_t domid;
+ char *devname, *p;
+ int opt;
+ char *oparg;
+ libxl_device_usb usb;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "usb-attach", 2) {
+ /* No options */
+ }
+
+ libxl_device_usb_init(&usb);
+
+ domid = find_domain(argv[optind++]);
+ devname = argv[optind++];
+ p = strchr(devname, '.');
+ if (p) {
+ usb.hostbus = strtoul(devname, NULL, 0);
+ usb.hostaddr = strtoul(p + 1, NULL, 0);
+ }
+
+ if (usb.hostbus < 1 || usb.hostaddr < 1) {
+ fprintf(stderr, "Invalid usb device.\n");
+ exit(-1);
+ }
+
+ while (argc > optind) {
+ if (MATCH_OPTION("controller", argv[optind], oparg)) {
+ usb.ctrl = atoi(oparg);
+ } else if (MATCH_OPTION("port", argv[optind], oparg)) {
+ usb.port = atoi(oparg);
+ } else {
+ fprintf(stderr, "unrecognized argument `%s'\n", argv[optind]);
+ exit(-1);
+ }
+ optind++;
+ }
+
+ if (dryrun_only) {
+ char *json = libxl_device_usb_to_json(ctx, &usb);
+ printf("usb: %s\n", json);
+ free(json);
+ libxl_device_usb_dispose(&usb);
+ if (ferror(stdout) || fflush(stdout)) {
+ perror("stdout");
+ exit(-1);
+ }
+ return 0;
+ }
+
+ if (libxl_device_usb_add(ctx, domid, &usb, 0)) {
+ fprintf(stderr, "libxl_device_usb_add failed.\n");
+ exit(-1);
+ }
+
+ libxl_device_usb_dispose(&usb);
+ return 0;
+}
+
+int main_usbdetach(int argc, char **argv)
+{
+ uint32_t domid;
+ char *devname, *p;
+ int opt;
+ libxl_device_usb usb;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "usb-detach", 2) {
+ /* No options */
+ }
+
+ libxl_device_usb_init(&usb);
+
+ domid = find_domain(argv[optind++]);
+ devname = argv[optind++];
+
+ if (argc > optind) {
+ fprintf(stderr, "Invalid arguments.\n");
+ exit(-1);
+ }
+
+ p = strchr(devname, '.');
+ if (p) {
+ usb.hostbus = strtoul(devname, NULL, 0);
+ usb.hostaddr = strtoul(p + 1, NULL, 0);
+ }
+
+ if (usb.hostbus < 1 || usb.hostaddr < 1) {
+ fprintf(stderr, "Invalid usb device.\n");
+ exit(-1);
+ }
+
+ if (libxl_device_usb_remove(ctx, domid, &usb, 0) ) {
+ fprintf(stderr, "libxl_device_usb_remove failed.\n");
+ exit(-1);
+ }
+ libxl_device_usb_dispose(&usb);
+ return 0;
+}
+
+int main_usblist(int argc, char **argv)
+{
+ uint32_t domid;
+ libxl_device_usbctrl *usbctrls;
+ libxl_device_usb *usbs;
+ libxl_usbctrlinfo usbctrlinfo;
+ int numctrl, numusb, i, opt;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "usb-list", 1) {
+ /* No options */
+ }
+
+ domid = find_domain(argv[optind++]);
+
+ if (argc > optind) {
+ fprintf(stderr, "Invalid arguments.\n");
+ exit(-1);
+ }
+
+ usbctrls = libxl_device_usbctrl_list(ctx, domid, &numctrl);
+ if (!usbctrls) {
+ return 0;
+ }
+
+ for (i = 0; i < numctrl; ++i) {
+ printf("%-6s %-6s %-3s %-5s %-7s %-5s %-30s\n",
+ "Devid", "Type", "BE", "state", "usb-ver", "ports", "BE-path");
+
+ if (!libxl_device_usbctrl_getinfo(ctx, domid,
+ &usbctrls[i], &usbctrlinfo)) {
+ printf("%-6d %-6s %-3d %-5d %-7d %-5d %-30s\n",
+ usbctrlinfo.devid,
+ libxl_usb_protocol_to_string(usbctrlinfo.protocol),
+ usbctrlinfo.backend_id, usbctrlinfo.state,
+ usbctrlinfo.version, usbctrlinfo.ports,
+ usbctrlinfo.backend);
+
+ usbs = libxl_device_usb_list_per_usbctrl(ctx, domid,
+ usbctrlinfo.devid, &numusb);
+ usbinfo_print(usbs, numusb);
+
+ libxl_usbctrlinfo_dispose(&usbctrlinfo);
+ }
+ libxl_device_usbctrl_dispose(&usbctrls[i]);
+ }
+
+ free(usbctrls);
+ return 0;
+}
+
int main_console(int argc, char **argv)
{
uint32_t domid;
diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c
index 7f4759b..f1c5b43 100644
--- a/tools/libxl/xl_cmdtable.c
+++ b/tools/libxl/xl_cmdtable.c
@@ -545,6 +545,31 @@ struct cmd_spec cmd_table[] = {
"\"local_mem_bandwidth\": Show local memory bandwidth(KB/s)\n",
},
#endif
+ { "usb-ctrl-attach",
+ &main_usbctrl_attach, 1, 1,
+ "Create a virtual USB controller for a domain",
+ "<Domain> [type=pv] [version=<version>] [ports=<number>]",
+ },
+ { "usb-ctrl-detach",
+ &main_usbctrl_detach, 0, 1,
+ "Remove the virtual USB controller specified by <DevId> for a domain",
+ "<Domain> <DevId>",
+ },
+ { "usb-attach",
+ &main_usbattach, 1, 2,
+ "Attach a USB device to a domain",
+ "<Domain> <bus.addr> [controller=<DevId> [port=<port>]]",
+ },
+ { "usb-detach",
+ &main_usbdetach, 0, 1,
+ "Detach a USB device from a domain",
+ "<Domain> <bus.addr>",
+ },
+ { "usb-list",
+ &main_usblist, 0, 0,
+ "List information about USB devices for a domain",
+ "<Domain>",
+ },
};
int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec);
--
2.1.4
next prev parent reply other threads:[~2015-06-10 3:20 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 3:20 [PATCH V4 0/7] xen pvusb toolstack work Chunyan Liu
2015-06-10 3:20 ` [PATCH V4 1/7] libxl: export some functions for pvusb use Chunyan Liu
2015-06-11 16:08 ` Ian Jackson
2015-06-11 16:28 ` Wei Liu
2015-06-12 15:14 ` Ian Jackson
2015-06-10 3:20 ` [PATCH V4 2/7] libxl_read_file_contents: add new entry to read sysfs file Chunyan Liu
2015-06-11 16:16 ` Ian Jackson
2015-06-12 7:00 ` Chun Yan Liu
2015-06-12 15:11 ` Ian Jackson
2015-06-10 3:20 ` [PATCH V4 3/7] libxl: add pvusb API Chunyan Liu
2015-06-11 15:00 ` Juergen Gross
2015-06-11 16:07 ` Ian Jackson
2015-06-11 16:42 ` Ian Jackson
2015-06-12 7:39 ` Chun Yan Liu
2015-06-12 8:06 ` Chun Yan Liu
2015-06-12 11:22 ` Ian Jackson
2015-06-15 14:17 ` George Dunlap
2015-06-15 14:25 ` Jürgen Groß
2015-06-15 14:34 ` George Dunlap
2015-06-15 18:26 ` Juergen Gross
2015-06-16 10:30 ` George Dunlap
2015-06-16 10:51 ` Juergen Gross
2015-06-16 11:11 ` George Dunlap
2015-06-16 11:19 ` Juergen Gross
2015-06-16 11:23 ` George Dunlap
2015-06-16 11:44 ` Ian Jackson
2015-06-17 11:24 ` Ian Campbell
2015-06-18 11:50 ` George Dunlap
2015-06-18 12:08 ` George Dunlap
2015-06-18 13:03 ` Juergen Gross
2015-06-22 13:29 ` Proposed plan for libxl USB interface (was Re: [PATCH V4 3/7] libxl: add pvusb API) George Dunlap
2015-06-22 14:14 ` Juergen Gross
2015-06-22 14:22 ` Ian Jackson
2015-06-23 2:42 ` Chun Yan Liu
2015-06-23 2:43 ` Chun Yan Liu
2015-06-23 2:44 ` Chun Yan Liu
2015-06-16 10:41 ` [PATCH V4 3/7] libxl: add pvusb API Ian Jackson
2015-06-16 10:56 ` Jürgen Groß
2015-06-16 11:03 ` George Dunlap
2015-06-16 11:10 ` Ian Jackson
2015-06-16 11:25 ` Juergen Gross
2015-06-16 11:45 ` George Dunlap
2015-06-16 12:02 ` Ian Jackson
2015-06-16 13:19 ` George Dunlap
2015-06-16 13:32 ` Juergen Gross
2015-06-16 13:37 ` [PATCH V4 3/7] libxl: add pvusb API [and 1 more messages] Ian Jackson
2015-06-16 14:41 ` George Dunlap
2015-06-16 15:58 ` Sander Eikelenboom
2015-06-16 15:59 ` Ian Jackson
2015-06-16 16:34 ` George Dunlap
2015-06-17 3:59 ` Juergen Gross
2015-06-17 10:27 ` George Dunlap
2015-06-18 6:24 ` Chun Yan Liu
2015-06-16 11:45 ` [PATCH V4 3/7] libxl: add pvusb API Ian Jackson
2015-06-16 13:06 ` Juergen Gross
2015-06-16 13:09 ` George Dunlap
2015-06-16 13:23 ` Juergen Gross
2015-06-16 13:29 ` George Dunlap
2015-06-16 13:49 ` Juergen Gross
2015-06-16 14:06 ` George Dunlap
2015-06-16 14:20 ` Juergen Gross
2015-06-16 14:37 ` George Dunlap
2015-06-17 11:34 ` Ian Campbell
2015-06-17 11:40 ` Juergen Gross
2015-06-18 6:20 ` Chun Yan Liu
2015-06-18 7:02 ` Juergen Gross
2015-06-18 8:50 ` Ian Campbell
2015-06-18 13:02 ` Juergen Gross
2015-06-16 15:38 ` George Dunlap
2015-06-16 11:01 ` George Dunlap
2015-06-16 11:12 ` Ian Jackson
2015-06-16 11:21 ` George Dunlap
2015-06-16 16:32 ` Ian Jackson
2015-06-16 16:39 ` George Dunlap
2015-06-16 16:51 ` Ross Philipson
2015-06-17 4:03 ` Jürgen Groß
2015-06-17 13:48 ` Ross Philipson
2015-06-15 17:47 ` George Dunlap
2015-06-23 10:18 ` Chun Yan Liu
2015-06-23 11:29 ` George Dunlap
2015-06-24 2:26 ` Chun Yan Liu
2015-06-10 3:20 ` [PATCH V4 4/7] libxl: add libxl_device_usb_assignable_list API Chunyan Liu
2015-06-10 3:20 ` Chunyan Liu [this message]
2015-06-12 7:37 ` [PATCH V4 5/7] xl: add pvusb commands Juergen Gross
2015-06-12 8:03 ` Chun Yan Liu
2015-06-12 8:22 ` Juergen Gross
2015-06-10 3:20 ` [PATCH V4 6/7] xl: add usb-assignable-list command Chunyan Liu
2015-06-10 3:20 ` [PATCH V4 7/7] domcreate: support pvusb in configuration file Chunyan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433906441-3280-6-git-send-email-cyliu@suse.com \
--to=cyliu@suse.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=caobosimon@gmail.com \
--cc=george.dunlap@eu.citrix.com \
--cc=ian.campbell@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.