[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/14] usb-redir: Revert usb-redir part of commit 93
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 13/14] usb-redir: Revert usb-redir part of commit 93bfef4c |
Date: |
Thu, 13 Sep 2012 10:39:59 +0200 |
From: Hans de Goede <address@hidden>
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 <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/redirect.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 9a4be6d..b10241a 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
*/
@@ -863,7 +865,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) */
@@ -872,9 +873,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;
@@ -906,7 +904,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.1
- [Qemu-devel] [PULL 00/14] usb patch queue, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 04/14] ehci: Don't process too much frames in 1 timer tick (v2), Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 07/14] ehci: Walk async schedule before and after migration, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 03/14] ehci: Fix interrupts stopping when Interrupt Threshold Control is 8, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 06/14] ehci: Don't set seen to 0 when removing unseen queue-heads, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 09/14] usb-redir: Add an already_in_flight packet-id queue, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 14/14] uhci: Don't queue up packets after one with the SPD flag set, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 05/14] configure: usbredir fixes, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 13/14] usb-redir: Revert usb-redir part of commit 93bfef4c,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 10/14] usb-redir: Store max_packet_size in endp_data, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 08/14] usb-redir: Change cancelled packet code into a generic packet-id queue, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 01/14] usb-host: allow emulated (non-async) control requests without USBPacket, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 12/14] usb-redir: Add chardev open / close debug logging, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 02/14] ehci: switch to new-style memory ops, Gerd Hoffmann, 2012/09/13
- [Qemu-devel] [PATCH 11/14] usb-redir: Add support for migration, Gerd Hoffmann, 2012/09/13
- Re: [Qemu-devel] [PULL 00/14] usb patch queue, Michael Tokarev, 2012/09/14
- Re: [Qemu-devel] [PULL 00/14] usb patch queue, Aurelien Jarno, 2012/09/21