Commit 35efba2c authored by Hans de Goede's avatar Hans de Goede Committed by Gerd Hoffmann
Browse files

usb-redir: Revert usb-redir part of commit 93bfef4c 



Commit 93bfef4c 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: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 09054d19

hw/usb/redirect.c

+3 −5
Original line number Diff line number Diff line
@@ -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);

}