[V13,5/5] xl: add pvusb commands

Message ID	1453192795-15693-6-git-send-email-cyliu@suse.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <xen-devel-bounces@lists.xen.org> From: Chunyan Liu <cyliu@suse.com> To: xen-devel@lists.xen.org Date: Tue, 19 Jan 2016 16:39:55 +0800 Message-Id: <1453192795-15693-6-git-send-email-cyliu@suse.com> In-Reply-To: <1453192795-15693-1-git-send-email-cyliu@suse.com> References: <1453192795-15693-1-git-send-email-cyliu@suse.com> Cc: jgross@suse.com, wei.liu2@citrix.com, ian.campbell@citrix.com, george.dunlap@eu.citrix.com, Ian.Jackson@eu.citrix.com, Chunyan Liu <cyliu@suse.com>, jfehlig@suse.com, Simon Cao <caobosimon@gmail.com> Subject: [Xen-devel] [PATCH V13 5/5] xl: add pvusb commands Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org

diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 4279c7c..7e0a380 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1345,6 +1345,41 @@ List pass-through pci devices for a domain. =back +=head1 USB PASS-THROUGH + +=over 4 + +=item B<usbctrl-attach> I<domain-id> I<usbctrl-device> + +Create a new USB controller in the domain specified by I<domain-id>, +I<usbctrl-device> describes the device to attach, using the same format +as the B<usbctrl> string in the domain config file. See L<xl.cfg> for +more information. + +=item B<usbctrl-detach> I<domain-id> I<devid> + +Destroy a USB controller from the specified domain. +B<devid> is devid of the USB controller. + +=item B<usbdev-attach> I<domain-id> I<usbdev-device> + +Hot-plug a new pass-through USB device to the domain specified by +I<domain-id>, I<usbdev-device> describes the device to attach, using +the same format as the B<usbdev> string in the domain config file. +See L<xl.cfg> for more information. + +=item B<usbdev-detach> I<domain-id> I<controller=devid> I<port=number> + +Hot-unplug a previously assigned USB device from a domain. +B<controller=devid> and B<port=number> is USB controller:port in guest +where the USB device is attached to. + +=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 bdab125..309627a 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -92,6 +92,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_usbdev_attach(int argc, char **argv); +int main_usbdev_detach(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 d0715e6..a968e46 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3507,6 +3507,196 @@ int main_cd_insert(int argc, char **argv) return 0; } +int main_usbctrl_attach(int argc, char **argv) +{ + uint32_t domid; + int opt, rc = 0; + libxl_device_usbctrl usbctrl; + + SWITCH_FOREACH_OPT(opt, "", NULL, "usbctrl-attach", 1) { + /* No options */ + } + + domid = find_domain(argv[optind++]); + + libxl_device_usbctrl_init(&usbctrl); + + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { + if (parse_usbctrl_config(&usbctrl, *argv)) + return 1; + } + + rc = libxl_device_usbctrl_add(ctx, domid, &usbctrl, 0); + if (rc) { + fprintf(stderr, "libxl_device_usbctrl_add failed.\n"); + rc = 1; + } + + libxl_device_usbctrl_dispose(&usbctrl); + return rc; +} + +int main_usbctrl_detach(int argc, char **argv) +{ + uint32_t domid; + int opt, devid, rc; + libxl_device_usbctrl usbctrl; + + SWITCH_FOREACH_OPT(opt, "", NULL, "usbctrl-detach", 2) { + /* No options */ + } + + domid = find_domain(argv[optind]); + devid = atoi(argv[optind+1]); + + libxl_device_usbctrl_init(&usbctrl); + if (libxl_devid_to_device_usbctrl(ctx, domid, devid, &usbctrl)) { + fprintf(stderr, "Unknown device %s.\n", argv[optind+1]); + return 1; + } + + rc = libxl_device_usbctrl_remove(ctx, domid, &usbctrl, 0); + if (rc) { + fprintf(stderr, "libxl_device_usbctrl_remove failed.\n"); + rc = 1; + } + + libxl_device_usbctrl_dispose(&usbctrl); + return rc; + +} + +int main_usbdev_attach(int argc, char **argv) +{ + uint32_t domid; + int opt, rc; + libxl_device_usbdev usbdev; + + SWITCH_FOREACH_OPT(opt, "", NULL, "usbdev-attach", 2) { + /* No options */ + } + + libxl_device_usbdev_init(&usbdev); + + domid = find_domain(argv[optind++]); + + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { + if (parse_usbdev_config(&usbdev, *argv)) + return 1; + } + + rc = libxl_device_usbdev_add(ctx, domid, &usbdev, 0); + if (rc) { + fprintf(stderr, "libxl_device_usbdev_add failed.\n"); + rc = 1; + } + + libxl_device_usbdev_dispose(&usbdev); + return rc; +} + +int main_usbdev_detach(int argc, char **argv) +{ + uint32_t domid; + int ctrl, port; + int opt, rc = 1; + libxl_device_usbdev usbdev; + + SWITCH_FOREACH_OPT(opt, "", NULL, "usbdev-detach", 3) { + /* No options */ + } + + domid = find_domain(argv[optind]); + ctrl = atoi(argv[optind+1]); + port = atoi(argv[optind+2]); + + if (argc - optind > 3) { + fprintf(stderr, "Invalid arguments.\n"); + return 1; + } + + libxl_device_usbdev_init(&usbdev); + if (libxl_ctrlport_to_device_usbdev(ctx, domid, ctrl, port, &usbdev)) { + fprintf(stderr, "Unknown device at controller %d port %d.\n", + ctrl, port); + return 1; + } + + rc = libxl_device_usbdev_remove(ctx, domid, &usbdev, 0); + if (rc) { + fprintf(stderr, "libxl_device_usbdev_remove failed.\n"); + rc = 1; + } + + libxl_device_usbdev_dispose(&usbdev); + return rc; +} + +int main_usblist(int argc, char **argv) +{ + uint32_t domid; + libxl_device_usbctrl *usbctrls; + libxl_usbctrlinfo usbctrlinfo; + int numctrl, i, j, 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\n", + "Devid", "Type", "BE", "state", "usb-ver", "ports"); + + libxl_usbctrlinfo_init(&usbctrlinfo); + + if (!libxl_device_usbctrl_getinfo(ctx, domid, + &usbctrls[i], &usbctrlinfo)) { + printf("%-6d %-6s %-3d %-5d %-7d %-5d\n", + usbctrlinfo.devid, + libxl_usbctrl_type_to_string(usbctrlinfo.type), + usbctrlinfo.backend_id, usbctrlinfo.state, + usbctrlinfo.version, usbctrlinfo.ports); + + for (j = 1; j <= usbctrlinfo.ports; j++) { + libxl_device_usbdev usbdev; + + libxl_device_usbdev_init(&usbdev); + + printf(" Port %d:", j); + + if (!libxl_ctrlport_to_device_usbdev(ctx, domid, + usbctrlinfo.devid, + j, &usbdev)) { + printf(" Bus %03x Device %03x\n", + usbdev.u.hostdev.hostbus, + usbdev.u.hostdev.hostaddr); + } else { + printf("\n"); + } + + libxl_device_usbdev_dispose(&usbdev); + } + } + + libxl_usbctrlinfo_dispose(&usbctrlinfo); + } + + libxl_device_usbctrl_list_free(usbctrls, numctrl); + 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 fdc1ac6..b14b881 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -553,6 +553,31 @@ struct cmd_spec cmd_table[] = { }, #endif + { "usbctrl-attach", + &main_usbctrl_attach, 0, 1, + "Create a virtual USB controller for a domain", + "<Domain> [type=pv] [version=<version>] [ports=<number>]", + }, + { "usbctrl-detach", + &main_usbctrl_detach, 0, 1, + "Remove the virtual USB controller specified by <DevId> for a domain", + "<Domain> <DevId>", + }, + { "usbdev-attach", + &main_usbdev_attach, 0, 1, + "Attach a USB device to a domain", + "<Domain> hostbus=<busnum> hostaddr=<devnum> [controller=<DevId> [port=<port>]]", + }, + { "usbdev-detach", + &main_usbdev_detach, 0, 1, + "Detach a USB device from a domain", + "<Domain> <controller> <port>", + }, + { "usb-list", + &main_usblist, 0, 0, + "List information about all USB controllers and devices for a domain", + "<Domain>", + }, }; int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec);

[V13,5/5] xl: add pvusb commands

Commit Message

Comments

Patch