From: Einar Lueck <elelueck@de.ibm.com>
Date: Sun, 22 Apr 2012 23:52:24 +0000 (+0000)
Subject: S390: remove default cdrom, sd-card and floppy support
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ad0bbc560026fb21c5b3d07631457e3be84d0f42;p=qemu.git

S390: remove default cdrom, sd-card and floppy support

This patch simply disables CDROM, SD card and floppy support for the
s390 virtio machine. Without this patch, a default CDROM drive would
get added which has currently no backing on s390.

Signed-off-by: Einar Lueck <elelueck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index d17602f939..d7dc8571d8 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -331,8 +331,11 @@ static QEMUMachine s390_machine = {
     .alias = "s390",
     .desc = "VirtIO based S390 machine",
     .init = s390_init,
+    .no_cdrom = 1,
+    .no_floppy = 1,
     .no_serial = 1,
     .no_parallel = 1,
+    .no_sdcard = 1,
     .use_virtcon = 1,
     .max_cpus = 255,
     .is_default = 1,