From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSpx-0001lV-PU for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:31:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzSpm-0001lM-PM for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:31:41 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:37595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSpm-0001jP-Cs for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:31:30 -0400 From: Markus Armbruster Date: Thu, 9 Aug 2012 15:31:13 +0200 Message-Id: <1344519084-21847-13-git-send-email-armbru@redhat.com> In-Reply-To: <1344519084-21847-1-git-send-email-armbru@redhat.com> References: <1344519084-21847-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 12/23] 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 , 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 insertions(+) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 0c0096f..7ca5c26 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -355,6 +355,7 @@ static QEMUMachine pc_machine_v1_2 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .no_sdcard = 1, .is_default = 1, }; @@ -382,6 +383,7 @@ static QEMUMachine pc_machine_v1_1 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_1, { /* end of list */ } @@ -417,6 +419,7 @@ static QEMUMachine pc_machine_v1_0 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_1_0, { /* end of list */ } @@ -432,6 +435,7 @@ static QEMUMachine pc_machine_v0_15 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_15, { /* end of list */ } @@ -464,6 +468,7 @@ static QEMUMachine pc_machine_v0_14 = { .desc = "Standard PC", .init = pc_init_pci, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_14, { @@ -497,6 +502,7 @@ static QEMUMachine pc_machine_v0_13 = { .desc = "Standard PC", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_13, { @@ -534,6 +540,7 @@ static QEMUMachine pc_machine_v0_12 = { .desc = "Standard PC", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_12, { @@ -567,6 +574,7 @@ static QEMUMachine pc_machine_v0_11 = { .desc = "Standard PC, qemu 0.11", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, { @@ -588,6 +596,7 @@ static QEMUMachine pc_machine_v0_10 = { .desc = "Standard PC, qemu 0.10", .init = pc_init_pci_no_kvmclock, .max_cpus = 255, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { PC_COMPAT_0_11, { @@ -621,6 +630,7 @@ static QEMUMachine isapc_machine = { .desc = "ISA-only PC", .init = pc_init_isa, .max_cpus = 1, + .no_sdcard = 1, .compat_props = (GlobalProperty[]) { { .driver = "pc-sysfw", @@ -636,6 +646,7 @@ static QEMUMachine xenfv_machine = { .name = "xenfv", .desc = "Xen Fully-virtualized PC", .init = pc_xen_hvm_init, + .no_sdcard = 1, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", }; diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 4b72aa7..6f7bff2 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -115,6 +115,7 @@ static QEMUMachine xenpv_machine = { .desc = "Xen Para-virtualized PC", .init = xen_init_pv, .max_cpus = 1, + .no_sdcard = 1, .default_machine_opts = "accel=xen", }; -- 1.7.11.2