[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] blockdev: Reject multiple definitions for the s
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 3/5] blockdev: Reject multiple definitions for the same drive |
Date: |
Mon, 17 Jan 2011 19:31:28 +0100 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/5] -drive/drive_add fixes, Markus Armbruster, 2011/01/17
- [Qemu-devel] [PATCH 1/5] blockdev: Fix error message for invalid -drive CHS, Markus Armbruster, 2011/01/17
- [Qemu-devel] [PATCH 4/5] blockdev: Fix drive_del not to crash when drive is not in use, Markus Armbruster, 2011/01/17
- [Qemu-devel] [PATCH 3/5] blockdev: Reject multiple definitions for the same drive,
Markus Armbruster <=
- [Qemu-devel] Re: [PATCH 3/5] blockdev: Reject multiple definitions for the same drive, Kevin Wolf, 2011/01/21
- [Qemu-devel] Re: [PATCH 3/5] blockdev: Reject multiple definitions for the same drive, Markus Armbruster, 2011/01/21
- [Qemu-devel] Re: [PATCH 3/5] blockdev: Reject multiple definitions for the same drive, Kevin Wolf, 2011/01/21
- [Qemu-devel] Re: [PATCH 3/5] blockdev: Reject multiple definitions for the same drive, Markus Armbruster, 2011/01/21
- [Qemu-devel] Re: [PATCH 3/5] blockdev: Reject multiple definitions for the same drive, Kevin Wolf, 2011/01/21
- [Qemu-devel] Re: [PATCH 3/5] blockdev: Reject multiple definitions for the same drive, Markus Armbruster, 2011/01/24
[Qemu-devel] [PATCH 2/5] blockdev: Make drive_init() use error_report(), Markus Armbruster, 2011/01/17
[Qemu-devel] [PATCH 5/5] blockdev: Fix drive_add for drives without media, Markus Armbruster, 2011/01/17
Re: [Qemu-devel] [PATCH 0/5] -drive/drive_add fixes, Stefan Hajnoczi, 2011/01/21
[Qemu-devel] Re: [PATCH 0/5] -drive/drive_add fixes, Kevin Wolf, 2011/01/21