[3/6] libxl: move library pvusb specific code into libxl_pvusb.c

Commit Message

Jürgen Groß July 12, 2016, 3:30 p.m. UTC

Outside libxl_pvusb.c only libxl_util.c still contains some pvusb code.

Move it to libxl_pvusb.c.

Signed-off-by: Juergen Gross <[e-mail]>
---
 tools/libxl/libxl_pvusb.c | 18 ++++++++++++++++++
 tools/libxl/libxl_utils.c | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

Comments

Wei Liu July 25, 2016, 10:46 a.m. UTC | #1

On Tue, Jul 12, 2016 at 05:30:41PM +0200, Juergen Gross wrote:
> Outside libxl_pvusb.c only libxl_util.c still contains some pvusb code.
> 
> Move it to libxl_pvusb.c.
> 
> Signed-off-by: Juergen Gross <[e-mail]>

Acked-by: Wei Liu <[e-mail]>

Patch

diff --git a/tools/libxl/libxl_pvusb.c b/tools/libxl/libxl_pvusb.c
index c86d0b6..88e9ed4 100644
--- a/tools/libxl/libxl_pvusb.c
+++ b/tools/libxl/libxl_pvusb.c
@@ -1695,6 +1695,24 @@  static int libxl_device_usbdev_compare(libxl_device_usbdev *d1,
     return COMPARE_USB(d1, d2);
 }
 
+void libxl_device_usbctrl_list_free(libxl_device_usbctrl *list, int nr)
+{
+   int i;
+
+   for (i = 0; i < nr; i++)
+       libxl_device_usbctrl_dispose(&list[i]);
+   free(list);
+}
+
+void libxl_device_usbdev_list_free(libxl_device_usbdev *list, int nr)
+{
+   int i;
+
+   for (i = 0; i < nr; i++)
+       libxl_device_usbdev_dispose(&list[i]);
+   free(list);
+}
+
 DEFINE_DEVICE_TYPE_STRUCT(usbctrl,
     .dm_needed = libxl_device_usbctrl_dm_needed
 );
diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c
index 1607d4f..c6933d6 100644
--- a/tools/libxl/libxl_utils.c
+++ b/tools/libxl/libxl_utils.c
@@ -1310,24 +1310,6 @@  int libxl__random_bytes(libxl__gc *gc, uint8_t *buf, size_t len)
     return ret;
 }
 
-void libxl_device_usbctrl_list_free(libxl_device_usbctrl *list, int nr)
-{
-   int i;
-
-   for (i = 0; i < nr; i++)
-       libxl_device_usbctrl_dispose(&list[i]);
-   free(list);
-}
-
-void libxl_device_usbdev_list_free(libxl_device_usbdev *list, int nr)
-{
-   int i;
-
-   for (i = 0; i < nr; i++)
-       libxl_device_usbdev_dispose(&list[i]);
-   free(list);
-}
-
 /*
  * Local variables:
  * mode: C