|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v8-iwj 1/2] libxl: usb2 and usb3 controller support for upstream qemu
On Thu, Dec 05, 2013 at 02:40:47PM +0000, Ian Jackson wrote:
> Ian Jackson writes ("Re: [PATCH v7 1/2] libxl: usb2 and usb3 controller
> support for upstream qemu"):
> > So "usbdevice" is indeed being partially deprecated here, in some
> > sense, but we don't have a replacement.
> >
> > I'm not sure that describing it as "old" in the documentation is fair,
> > then. Even if it's regarded as "old" by upstream qemu. A user would
> > reasonably ask what to use instead.
> >
> > Perhaps the docs should say "unfortunately this does not work with the
> > usbdevice parameter" and leave the question of resolving the problem
> > for another day.
>
> Here is what I therefore propose for this.
>
> Thanks,
> Ian.
>
> From: Fabio Fantoni <fabio.fantoni@xxxxxxx>
> Date: Tue, 19 Nov 2013 16:20:19 +0100
> Subject: [PATCH] libxl: usb2 and usb3 controller support for upstream qemu
>
> Usage: usbversion=1|2|3 (default=0, no usb controller defined)
> Specifies the type of an emulated USB bus in the guest. 1 for usb1,
> 2 for usb2 and 3 for usb3, it is available only with upstream qemu.
> The old usb and usbdevice parameters cannot be used with this.
>
> Signed-off-by: Fabio Fantoni <fabio.fantoni@xxxxxxx>
> Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
>
> ---
> Changes in v8-iwj (Ian Jackson):
> - Remove whitespace errors
> - Change wording to no longer deprecate usb= and usbdevice=
> - Reformat commit message to have changes after --- separator
> and to mention "changes in" rather than "changes from"
>
> Changes in v7:
> - now usbversion cannot be used with usb and usbdevice parameters
> - now default is 0 (no usb controller defined)
> Will be used only with usb redirection (from spice client) and
> new usb passthrough (from dom0) with hotplug.
>
> Changes in v6:
> changed usb2 controller qemu parameters:
> - removed bus
> - added multifunction on all devices
> ---
> docs/man/xl.cfg.pod.5 | 8 ++++++++
> tools/libxl/libxl.h | 14 ++++++++++++++
> tools/libxl/libxl_create.c | 9 +++++++++
> tools/libxl/libxl_dm.c | 24 ++++++++++++++++++++++++
> tools/libxl/libxl_types.idl | 1 +
> tools/libxl/xl_cmdimpl.c | 2 ++
> 6 files changed, 58 insertions(+)
>
> diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
> index 7f107cb..6eb9c16 100644
> --- a/docs/man/xl.cfg.pod.5
> +++ b/docs/man/xl.cfg.pod.5
> @@ -1200,6 +1200,14 @@ device.
>
> Enables or disables an emulated USB bus in the guest.
>
> +=item B<usbversion=NUMBER>
> +
> +Specifies the type of an emulated USB bus in the guest. 1 for usb1,
> +2 for usb2 and 3 for usb3, it is available only with upstream qemu.
> +Due to implementation limitations this is not compatible with the usb
> +and usbdevice parameters.
> +Default is 0 (no usb controller defined).
> +
> =item B<usbdevice=[ "DEVICE", "DEVICE", ...]>
>
> Adds B<DEVICE>s to the emulated USB bus. The USB bus must also be
> diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
> index a9663e4..1c0bee7 100644
> --- a/tools/libxl/libxl.h
> +++ b/tools/libxl/libxl.h
> @@ -311,6 +311,20 @@
> #define LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST 1
>
> /*
> + * LIBXL_HAVE_BUILDINFO_USBVERSION
> + *
> + * If this is defined, then the libxl_domain_build_info structure will
> + * contain hvm.usbversion, a integer type that contains a USB
> + * controller version to specify on the qemu upstream command-line.
> + *
> + * If it is set, callers may use hvm.usbversion to specify if the usb
> + * controller is usb1, usb2 or usb3.
> + *
> + * If this is not defined, the hvm.usbversion field does not exist.
> + */
> +#define LIBXL_HAVE_BUILDINFO_USBVERSION 1
> +
> +/*
> * LIBXL_HAVE_DEVICE_BACKEND_DOMNAME
> *
> * If this is defined, libxl_device_* structures containing a backend_domid
> diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
> index fe7ba0d..409a312 100644
> --- a/tools/libxl/libxl_create.c
> +++ b/tools/libxl/libxl_create.c
> @@ -284,6 +284,15 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
> libxl_defbool_setdefault(&b_info->u.hvm.usb, false);
> libxl_defbool_setdefault(&b_info->u.hvm.xen_platform_pci, true);
>
> + if (b_info->u.hvm.usbversion &&
> + ( libxl_defbool_val(b_info->u.hvm.usb)
> + || b_info->u.hvm.usbdevice_list
> + || b_info->u.hvm.usbdevice) ){
> + LOG(ERROR,"usbversion cannot be enabled with usb or"
> + "usbdevice parameters.");
> + return ERROR_INVAL;
> + }
> +
> if (!b_info->u.hvm.boot) {
> b_info->u.hvm.boot = strdup("cda");
> if (!b_info->u.hvm.boot) return ERROR_NOMEM;
> diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
> index ea773b3..9f29d33 100644
> --- a/tools/libxl/libxl_dm.c
> +++ b/tools/libxl/libxl_dm.c
> @@ -544,6 +544,30 @@ static char **
> libxl__build_device_model_args_new(libxl__gc *gc,
> *p, NULL);
> }
> }
> + } else if (b_info->u.hvm.usbversion) {
> + switch (b_info->u.hvm.usbversion) {
> + case 1:
> + flexarray_vappend(dm_args,
> + "-device", "piix3-usb-uhci,id=usb", NULL);
> + break;
> + case 2:
> + flexarray_append_pair(dm_args, "-device",
> + "ich9-usb-ehci1,id=usb,addr=0x1d.0x7,multifunction=on");
> + for (i = 1; i < 4; i++)
> + flexarray_append_pair(dm_args, "-device",
> + GCSPRINTF("ich9-usb-uhci%d,masterbus=usb.0,"
> + "firstport=%d,addr=0x1d.%#x,multifunction=on",
> + i, 2*(i-1), i-1));
> + break;
> + case 3:
> + flexarray_vappend(dm_args,
> + "-device", "nec-usb-xhci,id=usb", NULL);
> + break;
> + default:
> + LOG(ERROR, "%s: usbversion parameter is invalid, "
> + "must be between 1 and 3", __func__);
> + return NULL;
> + }
Ack on the different command line to qemu.
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |