From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=59086 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OJ1ml-0008Ko-Nk
	for qemu-devel@nongnu.org; Mon, 31 May 2010 05:59:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <kraxel@redhat.com>) id 1OJ1mW-00027z-OQ
	for qemu-devel@nongnu.org; Mon, 31 May 2010 05:59:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:14832)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <kraxel@redhat.com>) id 1OJ1mW-00027t-Gu
	for qemu-devel@nongnu.org; Mon, 31 May 2010 05:59:40 -0400
Message-ID: <4C038882.3080007@redhat.com>
Date: Mon, 31 May 2010 11:59:30 +0200
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
Subject: Re: [Qemu-devel] [PATCH v3 04/17] qdev: Give qtree names precedence
	over user-assigned IDs
References: <cover.1274612367.git.jan.kiszka@web.de>	<cover.1274612367.git.jan.kiszka@web.de>	<3715da16813f7cdcb7ec023167a84a94e8a37089.1274612367.git.jan.kiszka@web.de>	<m37hmnjfve.fsf@blackfin.pond.sub.org>
	<4C021ED5.1080703@redhat.com>
	<m3r5ks8okg.fsf@blackfin.pond.sub.org>
In-Reply-To: <m3r5ks8okg.fsf@blackfin.pond.sub.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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.nongnu.org/archive/html/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: Markus Armbruster <armbru@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, Juan Quintela <quintela@redhat.com>, Jan Kiszka <jan.kiszka@siemens.com>, qemu-devel@nongnu.org, Luiz Capitulino <lcapitulino@redhat.com>, Blue Swirl <blauwirbel@gmail.com>, Jan Kiszka <jan.kiszka@web.de>, Avi Kivity <avi@redhat.com>

> pci_add nic -net use either the ID or option "name" of qemu_net_opts.
> And there's our hole.  Reproducible with "-net user -net nic,id=foo
> -device lsi,id=foo".

Oh.  Well.  Yes, better plug that.

> @@ -242,6 +243,10 @@ DeviceState *qdev_device_add(QemuOpts *opts)
>       qdev = qdev_create_from_info(bus, info);
>       id = qemu_opts_id(opts);
>       if (id) {
> +        if (qdev_find_recursive(main_system_bus, id)) {
> +            qerror_report(QERR_DUPLICATE_ID, id, "device");
> +            return NULL;
> +        }
>           qdev->id = id;
>       }
>       if (qemu_opt_foreach(opts, set_property, qdev, 1) != 0) {

Looks good..

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
   Gerd