From 786657ed32cb68ae5cd4d099e6ea3f36290bcbcb Mon Sep 17 00:00:00 2001

From: Hans de Goede <hdegoede@redhat.com>

Date: Mon, 10 Sep 2012 13:49:46 +0200

Subject: [PATCH 367/369] usb-redir: Revert usb-redir part of commit 93bfef4c

Commit 93bfef4c6e4b23caea9d51e1099d06433d8835a4 makes qemu-devices

which report the qemu version string to the guest in some way use a

qemu_get_version function which reports a machine-specific version string.

However usb-redir does not expose the qemu version to the guest, only to

the usbredir-host as part of the initial handshake. This can then be logged

on the usbredir-host side for debugging purposes and is otherwise completely

unused! For debugging purposes it is important to have the real qemu version

in there, rather then the machine-specific version.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

---

 hw/usb/redirect.c | 8 +++-----

 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c

index 86c0398..78e93a7 100644

--- a/hw/usb/redirect.c

+++ b/hw/usb/redirect.c

@@ -142,6 +142,8 @@ static void usbredir_interrupt_packet(void *priv, uint64_t id,

 static int usbredir_handle_status(USBRedirDevice *dev,

                                        int status, int actual_len);

+#define VERSION "qemu usb-redir guest " QEMU_VERSION

+

 /*

  * Logging stuff

  */

@@ -873,7 +875,6 @@ static void usbredir_chardev_close_bh(void *opaque)

 static void usbredir_chardev_open(USBRedirDevice *dev)

 {

     uint32_t caps[USB_REDIR_CAPS_SIZE] = { 0, };

-    char version[32];

     int flags = 0;

     /* Make sure any pending closes are handled (no-op if none pending) */

@@ -882,9 +883,6 @@ static void usbredir_chardev_open(USBRedirDevice *dev)

     DPRINTF("creating usbredirparser\n");

-    strcpy(version, "qemu usb-redir guest ");

-    pstrcat(version, sizeof(version), qemu_get_version());

-

     dev->parser = qemu_oom_check(usbredirparser_create());

     dev->parser->priv = dev;

     dev->parser->log_func = usbredir_log;

@@ -916,7 +914,7 @@ static void usbredir_chardev_open(USBRedirDevice *dev)

     if (runstate_check(RUN_STATE_INMIGRATE)) {

         flags |= usbredirparser_fl_no_hello;

     }

-    usbredirparser_init(dev->parser, version, caps, USB_REDIR_CAPS_SIZE,

+    usbredirparser_init(dev->parser, VERSION, caps, USB_REDIR_CAPS_SIZE,

                         flags);

     usbredirparser_do_write(dev->parser);

 }

-- 

1.7.12