From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NIHc7-0005mE-6P
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 03:09:35 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NIHc1-0005lc-MS
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 03:09:33 -0500
Received: from [199.232.76.173] (port=56296 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NIHc1-0005lW-JG
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 03:09:29 -0500
Received: from mx1.redhat.com ([209.132.183.28]:5222)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <armbru@redhat.com>) id 1NIHc1-0001Xv-7W
	for qemu-devel@nongnu.org; Wed, 09 Dec 2009 03:09:29 -0500
Received: from int-mx03.intmail.prod.int.phx2.redhat.com
	(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB989S2l021785
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Wed, 9 Dec 2009 03:09:28 -0500
From: Markus Armbruster <armbru@redhat.com>
References: <m3my1t2o00.fsf@crossbow.pond.sub.org>
	<4B1F545E.9090809@redhat.com>
Date: Wed, 09 Dec 2009 09:09:25 +0100
In-Reply-To: <4B1F545E.9090809@redhat.com> (Gerd Hoffmann's message of "Wed,
	09 Dec 2009 08:40:14 +0100")
Message-ID: <m34oo01scq.fsf@crossbow.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [Qemu-devel] Re: [FOR 0.12 PATCH] qdev: Replace device names
	containing whitespace
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org

Gerd Hoffmann <kraxel@redhat.com> writes:

>> diff --git a/hw/usb-msd.c b/hw/usb-msd.c
>> index bb39b62..dec35bc 100644
>> --- a/hw/usb-msd.c
>> +++ b/hw/usb-msd.c
>> @@ -591,7 +591,7 @@ static USBDevice *usb_msd_init(const char *filename)
>>       }
>>
>>       /* create guest device */
>> -    dev = usb_create(NULL /* FIXME */, "QEMU USB MSD");
>> +    dev = usb_create(NULL /* FIXME */, "usb-storage");
>>       qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
>>       if (qdev_init(&dev->qdev)<  0)
>>           return NULL;
>> @@ -600,8 +600,7 @@ static USBDevice *usb_msd_init(const char *filename)
>>   }
>>
>>   static struct USBDeviceInfo msd_info = {
>> -    .qdev.name      = "QEMU USB MSD",
>> -    .qdev.alias     = "usb-storage",
>> +    .qdev.name      = "usb-storage",
>>       .qdev.size      = sizeof(MSDState),
>>       .init           = usb_msd_initfn,
>>       .handle_packet  = usb_generic_handle_packet,
>
> No.  USB needs some more care.  DeviceInfo->name is also used as
> default value for USBDevice->devname.  See usb_qdev_init().   Most usb
> backends don't change it.  So this change is visible in both 'info
> usb' monitor command and within the guest (check
> /proc/bus/usb/devices).
>
> I'd suggest to add a new field to USBDeviceInfo, stick the long name
> there and use that in usb_qdev_init() then.

I missed that needle in the "grep -w name" haystack.

> Otherwise the patch looks fine to me.

Will fix.  Thanks!