libxl: spice usbredirection support for upstream qemu

Usage: spiceusbredirection=NUMBER (default=0)

Enables spice usbredirection. Creates NUMBER usbredirection channels
for redirection of up to 4 usb devices from spice client to domU's qemu.
It requires an usb controller and if not defined will automatically adds
an usb2 controller.

Changes from v3:
- fixed condition that enable usbversion if it isn't defined in presence
  of usbredirection enabled

Changes from v2:
- updated for usbversion patch v7
- now usbredirection cannot be used with usb and usbdevice parameters
- if usbversion is undefined it will creates an usb2 controller

Changes from v1:
- Now can be setted the number of redirection channels.
- Various code improvements.

Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz>

diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
index 6eb9c161d0af47b57c0b2a5c850f191919c49e56..a979a13645e411b89512dc44387a4cd178304b2a 100644 (file)
--- a/docs/man/xl.cfg.pod.5
+++ b/docs/man/xl.cfg.pod.5
@@ -1176,6 +1176,13 @@ requires vdagent service installed on domU o.s. to work. The default is 0.
 Enables Spice clipboard sharing (copy/paste). It requires spicevdagent
 enabled. The default is false (0).
 
+=item B<spiceusbredirection=NUMBER>
+
+Enables spice usbredirection. Creates NUMBER usbredirection channels
+for redirection of up to 4 usb devices from spice client to domU's qemu.
+It requires an usb controller and if not defined it will automatically adds
+an usb2 controller. The default is disabled (0).
+
 =back
 
 =head3 Miscellaneous Emulated Hardware

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 1c0bee7104a80c03eeb3f6d9ecd52b5a2f72a088..094ddd01d73eca8ef3a3e5a66faf931a568d7b71 100644 (file)
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -375,6 +375,17 @@
  */
 #define LIBXL_HAVE_SPICE_VDAGENT 1
 
+/*
+ * LIBXL_HAVE_SPICE_USBREDIRECTION
+ *
+ * If defined, then the libxl_spice_info structure will contain an integer type
+ * field: usbredirection. This value defines if Spice usbredirection is enabled
+ * and with how much channels.
+ *
+ * If this is not defined, the Spice usbredirection support is ignored.
+ */
+#define LIBXL_HAVE_SPICE_USBREDIREDIRECTION 1
+
 /*
  * LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS 1
  *

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 409a3128430b31153938598ac60c14045bb06edd..e03bb551b6133b7f47b43a30bad113bb5c843abd 100644 (file)
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -284,12 +284,16 @@ 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 &&
+        if (!b_info->u.hvm.usbversion &&
+            (b_info->u.hvm.spice.usbredirection > 0) )
+            b_info->u.hvm.usbversion = 2;
+
+        if ((b_info->u.hvm.usbversion || b_info->u.hvm.spice.usbredirection) &&
             ( 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.");
+            LOG(ERROR,"usbversion and/or usbredirection cannot be "
+            "enabled with usb and/or usbdevice parameters.");
             return ERROR_INVAL;
         }
 

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 9f29d331cd83f3826a1d4fd3eeaa11921b869c7c..f6f7bbd8bf6a5f0c070159e034c044d8231fe9a3 100644 (file)
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -568,6 +568,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
                     "must be between 1 and 3", __func__);
                 return NULL;
             }
+            if (b_info->u.hvm.spice.usbredirection >= 0 &&
+                b_info->u.hvm.spice.usbredirection < 5) {
+                for (i = 1; i <= b_info->u.hvm.spice.usbredirection; i++)
+                    flexarray_vappend(dm_args, "-chardev", libxl__sprintf(gc,
+                        "spicevmc,name=usbredir,id=usbrc%d", i), "-device",
+                        libxl__sprintf(gc, "usb-redir,chardev=usbrc%d,"
+                        "id=usbrc%d", i, i), NULL);
+            } else {
+                LOG(ERROR, "%s: usbredirection parameter is invalid, "
+                    "it must be between 1 and 4", __func__);
+                return NULL;
+            }
         }
         if (b_info->u.hvm.soundhw) {
             flexarray_vappend(dm_args, "-soundhw", b_info->u.hvm.soundhw, NULL);

diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 0d04c166ffafb9670e6ff3bd9d035dc29bdf751e..649ce501ff0c0199062f8109a08ad1e0282e3cea 100644 (file)
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -200,6 +200,7 @@ libxl_spice_info = Struct("spice_info", [
     ("agent_mouse", libxl_defbool),
     ("vdagent",     libxl_defbool),
     ("clipboard_sharing", libxl_defbool),
+    ("usbredirection", integer),
     ])
 
 libxl_sdl_info = Struct("sdl_info", [

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 5ab62a93b5f73a9401bc4c46900a588068d12543..4977a53a47420eeb0d484adf56db454c3099139f 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1586,6 +1586,8 @@ skip_vfb:
                             &b_info->u.hvm.spice.vdagent, 0);
         xlu_cfg_get_defbool(config, "spice_clipboard_sharing",
                             &b_info->u.hvm.spice.clipboard_sharing, 0);
+        if (!xlu_cfg_get_long (config, "spiceusbredirection", &l, 0))
+            b_info->u.hvm.spice.usbredirection = l;
         xlu_cfg_get_defbool(config, "nographic", &b_info->u.hvm.nographic, 0);
         xlu_cfg_get_defbool(config, "gfx_passthru", 
                             &b_info->u.hvm.gfx_passthru, 0);