From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53931 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Petrc-0002ZT-Nn for qemu-devel@nongnu.org; Mon, 17 Jan 2011 13:31:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Petra-00022K-KE for qemu-devel@nongnu.org; Mon, 17 Jan 2011 13:31:36 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:46215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Petra-00021g-EY for qemu-devel@nongnu.org; Mon, 17 Jan 2011 13:31:34 -0500 Received: from blackfin.pond.sub.org (p5B32B9B0.dip.t-dialin.net [91.50.185.176]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 1AEB02DA971 for ; Mon, 17 Jan 2011 19:31:31 +0100 (CET) From: Markus Armbruster Date: Mon, 17 Jan 2011 19:31:28 +0100 Message-Id: <1295289090-18236-4-git-send-email-armbru@redhat.com> In-Reply-To: <1295289090-18236-1-git-send-email-armbru@redhat.com> References: <1295289090-18236-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] blockdev: Reject multiple definitions for the same drive List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com For reasons lost in the mist of time, we silently ignore multiple definitions for the same drive: $ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=ide,index=1,file=tmp.qcow2 -drive if=ide,index=1,file=nonexistant QEMU 0.13.50 monitor - type 'help' for more information (qemu) info block ide0-hd1: type=hd removable=0 file=tmp.qcow2 backing_file=tmp.img ro=0 drv=qcow2 encrypted=0 With if=none, this can become quite confusing: $ qemu-system-x86_64 -nodefaults -vnc :1 -S -monitor stdio -drive if=none,index=1,file=tmp.qcow2,id=eins -drive if=none,index=1,file=nonexistant,id=zwei -device ide-drive,drive=eins -device ide-drive,drive=zwei qemu-system-x86_64: -device ide-drive,drive=zwei: Property 'ide-drive.drive' can't find value 'zwei' The second -device fails, because it refers to drive zwei, which got silently ignored. Make multiple drive definitions fail cleanly. Signed-off-by: Markus Armbruster --- blockdev.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index 127c919..04a0e84 100644 --- a/blockdev.c +++ b/blockdev.c @@ -387,11 +387,12 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi, int *fatal_error) } /* - * ignore multiple definitions + * catch multiple definitions */ if (drive_get(type, bus_id, unit_id) != NULL) { - *fatal_error = 0; + error_report("drive with bus=%d, unit=%d (index=%d) exists", + bus_id, unit_id, index); return NULL; } -- 1.7.2.3