summary refs log tree commit diff stats
path: root/hw/ide/core.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-07-06 14:37:44 +0200
committerKevin Wolf <kwolf@redhat.com>2010-07-13 17:48:17 +0200
commit98f28ad7a7d26e5e77c5cb37b262d76d6ccd963d (patch)
treea17198bf6887562708d62a0cf13b17777645cd67 /hw/ide/core.c
parentd75d25e34e4b4eb6a18122b5fa3baac70cea0f2b (diff)
downloadfocaccia-qemu-98f28ad7a7d26e5e77c5cb37b262d76d6ccd963d.tar.gz
focaccia-qemu-98f28ad7a7d26e5e77c5cb37b262d76d6ccd963d.zip
ide scsi virtio-blk: Reject empty drives unless media is removable
Disks without media make no sense.  For SCSI, a Linux guest kernel
complains during boot.  I didn't try other combinations.

scsi-generic doesn't need the additional check, because it already
requires bdrv_is_sg(), which fails without media.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/core.c')
-rw-r--r--hw/ide/core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c
index af52c2cb2d..e20f2e7cbb 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2630,6 +2630,10 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs,
         s->drive_kind = IDE_CD;
         bdrv_set_change_cb(bs, cdrom_change_cb, s);
     } else {
+        if (!bdrv_is_inserted(s->bs)) {
+            error_report("Device needs media, but drive is empty");
+            return -1;
+        }
         if (bdrv_is_read_only(bs)) {
             error_report("Can't use a read-only drive");
             return -1;