From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1jE0-0006Sb-68 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1jDx-0006UU-FV for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:52 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:35682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1jDx-0006Rj-6a for qemu-devel@nongnu.org; Wed, 15 Aug 2012 15:25:49 -0400 From: Markus Armbruster Date: Wed, 15 Aug 2012 21:17:28 +0200 Message-Id: <1345058260-16229-16-git-send-email-armbru@redhat.com> In-Reply-To: <1345058260-16229-1-git-send-email-armbru@redhat.com> References: <1345058260-16229-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 for-1.2 15/27] pc xen: Suppress unused default drives List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , anthony@codemonkey.ws, Stefano Stabellini Cc: Anthony Liguori Cc: Stefano Stabellini Suppress default SD card drive for machines pc-*, isapc, xenfv, xenpv. Signed-off-by: Markus Armbruster --- hw/pc_piix.c | 11 ----------- hw/xen_machine_pv.c | 1 - 2 files changed, 12 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 9374198..593f6b2 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -357,7 +357,6 @@ static QEMUMachine pc_machine_v1_2 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .is_default = 1, }; @@ -387,7 +386,6 @@ static QEMUMachine pc_machine_v1_1 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_1, { /* end of list */ } @@ -425,7 +423,6 @@ static QEMUMachine pc_machine_v1_0 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_0, { /* end of list */ } @@ -443,7 +440,6 @@ static QEMUMachine pc_machine_v0_15 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_15, { /* end of list */ } @@ -478,7 +474,6 @@ static QEMUMachine pc_machine_v0_14 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_14, { @@ -514,7 +509,6 @@ static QEMUMachine pc_machine_v0_13 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13, { @@ -554,7 +548,6 @@ static QEMUMachine pc_machine_v0_12 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_12, { @@ -590,7 +583,6 @@ static QEMUMachine pc_machine_v0_11 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, { @@ -614,7 +606,6 @@ static QEMUMachine pc_machine_v0_10 = { .max_cpus = 255, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, { @@ -650,7 +641,6 @@ static QEMUMachine isapc_machine = { .max_cpus = 1, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .compat_props = (GlobalProperty[]) { { .driver = "pc-sysfw", @@ -669,7 +659,6 @@ static QEMUMachine xenfv_machine = { .max_cpus = HVM_MAX_VCPUS, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .default_machine_opts = "accel=xen", }; #endif diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index f3660fa..8baf8dc 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -117,7 +117,6 @@ static QEMUMachine xenpv_machine = { .max_cpus = 1, .use_floppy = 1, .use_cdrom = 1, - .use_sdcard = 1, .default_machine_opts = "accel=xen", }; -- 1.7.11.2