Commit 1f66fe57 authored by Isaac Lozano's avatar Isaac Lozano Committed by Gerd Hoffmann
Browse files

usb-mtp: fix usb_mtp_get_device_info so that libmtp on the guest doesn't complain 



If an application uses libmtp on the guest system,
it will complain with the warning message:
LIBMTP WARNING: VendorExtensionID: ffffffff
LIBMTP WARNING: VendorExtensionDesc: (null)
LIBMTP WARNING: this typically means the device is PTP (i.e. a camera) but
not a MTP device at all. Trying to continue anyway.

This is because libmtp expects a MTP Vendor Extension ID of 0x00000006 and a
MTP Version of 0x0064. These numbers are taken from Microsoft's MTP Vendor
Extension Identification Message page and are what most physical devices
show.

Signed-off-by: default avatarIsaac Lozano <109lozanoi@gmail.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1460892593-5908-1-git-send-email-109lozanoi@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 491d68d9

hw/usb/dev-mtp.c

+2 −2
Original line number Diff line number Diff line
@@ -788,8 +788,8 @@ static MTPData *usb_mtp_get_device_info(MTPState *s, MTPControl *c) 
    trace_usb_mtp_op_get_device_info(s->dev.addr);



    usb_mtp_add_u16(d, 100);

    usb_mtp_add_u32(d, 0xffffffff);

    usb_mtp_add_u16(d, 0x0101);

    usb_mtp_add_u32(d, 0x00000006);

    usb_mtp_add_u16(d, 0x0064);

    usb_mtp_add_wstr(d, L"");

    usb_mtp_add_u16(d, 0x0000);