From patchwork Wed Feb 20 07:16:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 221971 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8AB142C007B for ; Wed, 20 Feb 2013 18:16:33 +1100 (EST) Received: from localhost ([::1]:51498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U83uo-000395-Kk for incoming@patchwork.ozlabs.org; Wed, 20 Feb 2013 02:16:30 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U83uV-00038u-Mn for qemu-devel@nongnu.org; Wed, 20 Feb 2013 02:16:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U83uO-0008FZ-1o for qemu-devel@nongnu.org; Wed, 20 Feb 2013 02:16:11 -0500 Received: from [222.73.24.84] (port=31571 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U83uL-0008CQ-VQ for qemu-devel@nongnu.org; Wed, 20 Feb 2013 02:16:03 -0500 X-IronPort-AV: E=Sophos;i="4.84,700,1355068800"; d="scan'208";a="6734783" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 20 Feb 2013 15:13:33 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r1K7Fo3I022478 for ; Wed, 20 Feb 2013 15:15:50 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.225.128]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013022015151095-274132 ; Wed, 20 Feb 2013 15:15:10 +0800 From: liguang To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2013 15:16:00 +0800 Message-Id: <1361344560-19531-1-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/20 15:15:10, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/20 15:15:11, Serialize complete at 2013/02/20 15:15:11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH] machine: correct macro name for default boot_order X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org DEFAULT_MACHINE_OPTIONS is setting default boot_order, while QEMUMachine already has default_machine_opts to encapsulate some default options, so change it to DEFAULT_MACHINE_BOOT_ORDER. Signed-off-by: liguang --- hw/alpha_dp264.c | 2 +- hw/an5206.c | 2 +- hw/axis_dev88.c | 2 +- hw/boards.h | 2 +- hw/collie.c | 2 +- hw/dummy_m68k.c | 2 +- hw/exynos4_boards.c | 4 ++-- hw/gumstix.c | 4 ++-- hw/highbank.c | 2 +- hw/integratorcp.c | 2 +- hw/kzm.c | 2 +- hw/leon3.c | 2 +- hw/lm32_boards.c | 4 ++-- hw/mainstone.c | 2 +- hw/mcf5208.c | 2 +- hw/milkymist.c | 2 +- hw/mips_fulong2e.c | 2 +- hw/mips_jazz.c | 4 ++-- hw/mips_malta.c | 2 +- hw/mips_mipssim.c | 2 +- hw/mips_r4k.c | 2 +- hw/musicpal.c | 2 +- hw/nseries.c | 4 ++-- hw/null-machine.c | 2 +- hw/omap_sx1.c | 4 ++-- hw/openrisc_sim.c | 2 +- hw/palm.c | 2 +- hw/pc_piix.c | 26 +++++++++++++------------- hw/pc_q35.c | 2 +- hw/petalogix_ml605_mmu.c | 2 +- hw/petalogix_s3adsp1800_mmu.c | 2 +- hw/ppc/e500plat.c | 2 +- hw/ppc/mac_newworld.c | 2 +- hw/ppc/mac_oldworld.c | 2 +- hw/ppc/mpc8544ds.c | 2 +- hw/ppc/prep.c | 2 +- hw/ppc405_boards.c | 4 ++-- hw/ppc440_bamboo.c | 2 +- hw/puv3.c | 2 +- hw/r2d.c | 2 +- hw/realview.c | 8 ++++---- hw/s390x/s390-virtio-ccw.c | 2 +- hw/s390x/s390-virtio.c | 2 +- hw/shix.c | 2 +- hw/spitz.c | 8 ++++---- hw/stellaris.c | 4 ++-- hw/sun4m.c | 24 ++++++++++++------------ hw/sun4u.c | 6 +++--- hw/tosa.c | 2 +- hw/versatilepb.c | 4 ++-- hw/vexpress.c | 4 ++-- hw/virtex_ml507.c | 2 +- hw/xen_machine_pv.c | 2 +- hw/xilinx_zynq.c | 2 +- hw/xtensa_lx60.c | 4 ++-- hw/xtensa_sim.c | 2 +- hw/z2.c | 2 +- 57 files changed, 99 insertions(+), 99 deletions(-) diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index 1cd549c..643d236 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -171,7 +171,7 @@ static QEMUMachine clipper_machine = { .init = clipper_init, .max_cpus = 4, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void clipper_machine_init(void) diff --git a/hw/an5206.c b/hw/an5206.c index 924be81..fb132a4 100644 --- a/hw/an5206.c +++ b/hw/an5206.c @@ -89,7 +89,7 @@ static QEMUMachine an5206_machine = { .name = "an5206", .desc = "Arnewsh 5206", .init = an5206_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void an5206_machine_init(void) diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index dd37fa1..002025f 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -355,7 +355,7 @@ static QEMUMachine axisdev88_machine = { .desc = "AXIS devboard 88", .init = axisdev88_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void axisdev88_machine_init(void) diff --git a/hw/boards.h b/hw/boards.h index 3813d4e..6ed38a1 100644 --- a/hw/boards.h +++ b/hw/boards.h @@ -6,7 +6,7 @@ #include "sysemu/blockdev.h" #include "qdev.h" -#define DEFAULT_MACHINE_OPTIONS \ +#define DEFAULT_MACHINE_BOOT_ORDER \ .boot_order = "cad" typedef struct QEMUMachineInitArgs { diff --git a/hw/collie.c b/hw/collie.c index d19db59..68e8a1a 100644 --- a/hw/collie.c +++ b/hw/collie.c @@ -62,7 +62,7 @@ static QEMUMachine collie_machine = { .name = "collie", .desc = "Collie PDA (SA-1110)", .init = collie_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void collie_machine_init(void) diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index 3a88805..5d72bb0 100644 --- a/hw/dummy_m68k.c +++ b/hw/dummy_m68k.c @@ -73,7 +73,7 @@ static QEMUMachine dummy_m68k_machine = { .name = "dummy", .desc = "Dummy board", .init = dummy_m68k_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void dummy_m68k_machine_init(void) diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c index b59e6aa..aeee2cf 100644 --- a/hw/exynos4_boards.c +++ b/hw/exynos4_boards.c @@ -150,14 +150,14 @@ static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS] = { .desc = "Samsung NURI board (Exynos4210)", .init = nuri_init, .max_cpus = EXYNOS4210_NCPUS, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }, [EXYNOS4_BOARD_SMDKC210] = { .name = "smdkc210", .desc = "Samsung SMDKC210 board (Exynos4210)", .init = smdkc210_init, .max_cpus = EXYNOS4210_NCPUS, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }, }; diff --git a/hw/gumstix.c b/hw/gumstix.c index bea1605..399fafb 100644 --- a/hw/gumstix.c +++ b/hw/gumstix.c @@ -122,14 +122,14 @@ static QEMUMachine connex_machine = { .name = "connex", .desc = "Gumstix Connex (PXA255)", .init = connex_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine verdex_machine = { .name = "verdex", .desc = "Gumstix Verdex (PXA270)", .init = verdex_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void gumstix_machine_init(void) diff --git a/hw/highbank.c b/hw/highbank.c index defcc09..6fcb861 100644 --- a/hw/highbank.c +++ b/hw/highbank.c @@ -331,7 +331,7 @@ static QEMUMachine highbank_machine = { .init = highbank_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void highbank_machine_init(void) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 9e3630a..fe6040b 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -512,7 +512,7 @@ static QEMUMachine integratorcp_machine = { .desc = "ARM Integrator/CP (ARM926EJ-S)", .init = integratorcp_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void integratorcp_machine_init(void) diff --git a/hw/kzm.c b/hw/kzm.c index fb33165..04b4f3a 100644 --- a/hw/kzm.c +++ b/hw/kzm.c @@ -146,7 +146,7 @@ static QEMUMachine kzm_machine = { .name = "kzm", .desc = "ARM KZM Emulation Baseboard (ARM1136)", .init = kzm_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void kzm_machine_init(void) diff --git a/hw/leon3.c b/hw/leon3.c index f16a8bb..7718686 100644 --- a/hw/leon3.c +++ b/hw/leon3.c @@ -212,7 +212,7 @@ static QEMUMachine leon3_generic_machine = { .name = "leon3_generic", .desc = "Leon-3 generic", .init = leon3_generic_hw_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void leon3_machine_init(void) diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c index 2bc06d7..b27ee7c 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32_boards.c @@ -288,7 +288,7 @@ static QEMUMachine lm32_evr_machine = { .desc = "LatticeMico32 EVR32 eval system", .init = lm32_evr_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine lm32_uclinux_machine = { @@ -296,7 +296,7 @@ static QEMUMachine lm32_uclinux_machine = { .desc = "lm32 platform for uClinux and u-boot by Theobroma Systems", .init = lm32_uclinux_init, .is_default = 0, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void lm32_machine_init(void) diff --git a/hw/mainstone.c b/hw/mainstone.c index d1ff6e7..6a4bbcd 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -179,7 +179,7 @@ static QEMUMachine mainstone2_machine = { .name = "mainstone", .desc = "Mainstone II (PXA27x)", .init = mainstone_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mainstone_machine_init(void) diff --git a/hw/mcf5208.c b/hw/mcf5208.c index 86402d3..8e1cc85 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -295,7 +295,7 @@ static QEMUMachine mcf5208evb_machine = { .desc = "MCF5206EVB", .init = mcf5208evb_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mcf5208evb_machine_init(void) diff --git a/hw/milkymist.c b/hw/milkymist.c index c04eb35..81d6d92 100644 --- a/hw/milkymist.c +++ b/hw/milkymist.c @@ -207,7 +207,7 @@ static QEMUMachine milkymist_machine = { .desc = "Milkymist One", .init = milkymist_init, .is_default = 0, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void milkymist_machine_init(void) diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index 8b532e1..e62cdc4 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -400,7 +400,7 @@ static QEMUMachine mips_fulong2e_machine = { .name = "fulong2e", .desc = "Fulong 2e mini pc", .init = mips_fulong2e_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mips_fulong2e_machine_init(void) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 17fbdde..afb55ce 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -325,7 +325,7 @@ static QEMUMachine mips_magnum_machine = { .desc = "MIPS Magnum", .init = mips_magnum_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine mips_pica61_machine = { @@ -333,7 +333,7 @@ static QEMUMachine mips_pica61_machine = { .desc = "Acer Pica 61", .init = mips_pica61_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mips_jazz_machine_init(void) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 2a150df..64d4d47 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -1020,7 +1020,7 @@ static QEMUMachine mips_malta_machine = { .init = mips_malta_init, .max_cpus = 16, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mips_malta_register_types(void) diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index b0ab8f6..000224f 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -229,7 +229,7 @@ static QEMUMachine mips_mipssim_machine = { .name = "mipssim", .desc = "MIPS MIPSsim platform", .init = mips_mipssim_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mips_mipssim_machine_init(void) diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 5df7eb4..f2a51a4 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -302,7 +302,7 @@ static QEMUMachine mips_machine = { .name = "mips", .desc = "mips r4k platform", .init = mips_r4k_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void mips_machine_init(void) diff --git a/hw/musicpal.c b/hw/musicpal.c index 272cb80..0133c63 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1658,7 +1658,7 @@ static QEMUMachine musicpal_machine = { .name = "musicpal", .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)", .init = musicpal_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void musicpal_machine_init(void) diff --git a/hw/nseries.c b/hw/nseries.c index 99d353a..1bfd53e 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1411,14 +1411,14 @@ static QEMUMachine n800_machine = { .name = "n800", .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)", .init = n800_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine n810_machine = { .name = "n810", .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)", .init = n810_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void nseries_machine_init(void) diff --git a/hw/null-machine.c b/hw/null-machine.c index bdf109f..048db47 100644 --- a/hw/null-machine.c +++ b/hw/null-machine.c @@ -24,7 +24,7 @@ static QEMUMachine machine_none = { .desc = "empty machine", .init = machine_none_init, .max_cpus = 0, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void register_machines(void) diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c index 30998c5..4200021 100644 --- a/hw/omap_sx1.c +++ b/hw/omap_sx1.c @@ -219,14 +219,14 @@ static QEMUMachine sx1_machine_v2 = { .name = "sx1", .desc = "Siemens SX1 (OMAP310) V2", .init = sx1_init_v2, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine sx1_machine_v1 = { .name = "sx1-v1", .desc = "Siemens SX1 (OMAP310) V1", .init = sx1_init_v1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void sx1_machine_init(void) diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c index 30947de..2f027e3 100644 --- a/hw/openrisc_sim.c +++ b/hw/openrisc_sim.c @@ -139,7 +139,7 @@ static QEMUMachine openrisc_sim_machine = { .init = openrisc_sim_init, .max_cpus = 1, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void openrisc_sim_machine_init(void) diff --git a/hw/palm.c b/hw/palm.c index a633dfc..e8b76a2 100644 --- a/hw/palm.c +++ b/hw/palm.c @@ -280,7 +280,7 @@ static QEMUMachine palmte_machine = { .name = "cheetah", .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)", .init = palmte_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void palmte_machine_init(void) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 0af436c..d718b30 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -301,7 +301,7 @@ static QEMUMachine pc_i440fx_machine_v1_4 = { .init = pc_init_pci, .max_cpus = 255, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_1_3 \ @@ -328,7 +328,7 @@ static QEMUMachine pc_machine_v1_3 = { PC_COMPAT_1_3, { /* end of list */ } }, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_1_2 \ @@ -368,7 +368,7 @@ static QEMUMachine pc_machine_v1_2 = { PC_COMPAT_1_2, { /* end of list */ } }, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_1_1 \ @@ -412,7 +412,7 @@ static QEMUMachine pc_machine_v1_1 = { PC_COMPAT_1_1, { /* end of list */ } }, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_1_0 \ @@ -449,7 +449,7 @@ static QEMUMachine pc_machine_v1_0 = { { /* end of list */ } }, .hw_version = "1.0", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_0_15 \ @@ -465,7 +465,7 @@ static QEMUMachine pc_machine_v0_15 = { { /* end of list */ } }, .hw_version = "0.15", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_0_14 \ @@ -507,7 +507,7 @@ static QEMUMachine pc_machine_v0_14 = { { /* end of list */ } }, .hw_version = "0.14", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_0_13 \ @@ -545,7 +545,7 @@ static QEMUMachine pc_machine_v0_13 = { { /* end of list */ } }, .hw_version = "0.13", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_0_12 \ @@ -579,7 +579,7 @@ static QEMUMachine pc_machine_v0_12 = { { /* end of list */ } }, .hw_version = "0.12", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #define PC_COMPAT_0_11 \ @@ -613,7 +613,7 @@ static QEMUMachine pc_machine_v0_11 = { { /* end of list */ } }, .hw_version = "0.11", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine pc_machine_v0_10 = { @@ -647,7 +647,7 @@ static QEMUMachine pc_machine_v0_10 = { { /* end of list */ } }, .hw_version = "0.10", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine isapc_machine = { @@ -663,7 +663,7 @@ static QEMUMachine isapc_machine = { }, { /* end of list */ } }, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #ifdef CONFIG_XEN @@ -673,7 +673,7 @@ static QEMUMachine xenfv_machine = { .init = pc_xen_hvm_init, .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; #endif diff --git a/hw/pc_q35.c b/hw/pc_q35.c index 6f5ff8d..f24f437 100644 --- a/hw/pc_q35.c +++ b/hw/pc_q35.c @@ -215,7 +215,7 @@ static QEMUMachine pc_q35_machine = { .desc = "Standard PC (Q35 + ICH9, 2009)", .init = pc_q35_init, .max_cpus = 255, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void pc_q35_machine_init(void) diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c index 82d7183..9337b01 100644 --- a/hw/petalogix_ml605_mmu.c +++ b/hw/petalogix_ml605_mmu.c @@ -176,7 +176,7 @@ static QEMUMachine petalogix_ml605_machine = { .desc = "PetaLogix linux refdesign for xilinx ml605 little endian", .init = petalogix_ml605_init, .is_default = 0, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void petalogix_ml605_machine_init(void) diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c index 8605fb8..4346459 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/petalogix_s3adsp1800_mmu.c @@ -116,7 +116,7 @@ static QEMUMachine petalogix_s3adsp1800_machine = { .desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800", .init = petalogix_s3adsp1800_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void petalogix_s3adsp1800_machine_init(void) diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c index 25ac4b1..0ac440b 100644 --- a/hw/ppc/e500plat.c +++ b/hw/ppc/e500plat.c @@ -56,7 +56,7 @@ static QEMUMachine e500plat_machine = { .desc = "generic paravirt e500 platform", .init = e500plat_init, .max_cpus = 32, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void e500plat_machine_init(void) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 065ea87..56a46ee 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -459,7 +459,7 @@ static QEMUMachine core99_machine = { #ifdef TARGET_PPC64 .is_default = 1, #endif - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void core99_machine_init(void) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 2778e45..adfeb89 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -345,7 +345,7 @@ static QEMUMachine heathrow_machine = { #ifndef TARGET_PPC64 .is_default = 1, #endif - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void heathrow_machine_init(void) diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c index e25c70b..ebea732 100644 --- a/hw/ppc/mpc8544ds.c +++ b/hw/ppc/mpc8544ds.c @@ -56,7 +56,7 @@ static QEMUMachine ppce500_machine = { .desc = "mpc8544ds", .init = mpc8544ds_init, .max_cpus = 15, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void ppce500_machine_init(void) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index e06dded..d7048fa 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -669,7 +669,7 @@ static QEMUMachine prep_machine = { .desc = "PowerPC PREP platform", .init = ppc_prep_init, .max_cpus = MAX_CPUS, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void prep_machine_init(void) diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index cf371db..cde9591 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -362,7 +362,7 @@ static QEMUMachine ref405ep_machine = { .name = "ref405ep", .desc = "ref405ep", .init = ref405ep_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; /*****************************************************************************/ @@ -650,7 +650,7 @@ static QEMUMachine taihu_machine = { .name = "taihu", .desc = "taihu", .init = taihu_405ep_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void ppc405_machine_init(void) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 73b5ac7..ec4827a 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -295,7 +295,7 @@ static QEMUMachine bamboo_machine = { .name = "bamboo", .desc = "bamboo", .init = bamboo_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void bamboo_machine_init(void) diff --git a/hw/puv3.c b/hw/puv3.c index c722510..0b6297d 100644 --- a/hw/puv3.c +++ b/hw/puv3.c @@ -124,7 +124,7 @@ static QEMUMachine puv3_machine = { .desc = "PKUnity Version-3 based on UniCore32", .init = puv3_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void puv3_machine_init(void) diff --git a/hw/r2d.c b/hw/r2d.c index 2d0dd1f..d5d8d1d 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -353,7 +353,7 @@ static QEMUMachine r2d_machine = { .name = "r2d", .desc = "r2d-plus board", .init = r2d_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void r2d_machine_init(void) diff --git a/hw/realview.c b/hw/realview.c index 78da767..94b4e6a 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -365,7 +365,7 @@ static QEMUMachine realview_eb_machine = { .desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)", .init = realview_eb_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine realview_eb_mpcore_machine = { @@ -374,14 +374,14 @@ static QEMUMachine realview_eb_mpcore_machine = { .init = realview_eb_mpcore_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine realview_pb_a8_machine = { .name = "realview-pb-a8", .desc = "ARM RealView Platform Baseboard for Cortex-A8", .init = realview_pb_a8_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine realview_pbx_a9_machine = { @@ -390,7 +390,7 @@ static QEMUMachine realview_pbx_a9_machine = { .init = realview_pbx_a9_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void realview_machine_init(void) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 6549211..ade1a15 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -123,7 +123,7 @@ static QEMUMachine ccw_machine = { .no_sdcard = 1, .use_sclp = 1, .max_cpus = 255, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void ccw_machine_init(void) diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index e25c330..a6421dc 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -286,7 +286,7 @@ static QEMUMachine s390_machine = { .use_virtcon = 1, .max_cpus = 255, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void s390_machine_init(void) diff --git a/hw/shix.c b/hw/shix.c index 6f2d55a..52fcb96 100644 --- a/hw/shix.c +++ b/hw/shix.c @@ -92,7 +92,7 @@ static QEMUMachine shix_machine = { .desc = "shix card", .init = shix_init, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void shix_machine_init(void) diff --git a/hw/spitz.c b/hw/spitz.c index 5bc49fc..2c52ab2 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -959,28 +959,28 @@ static QEMUMachine akitapda_machine = { .name = "akita", .desc = "Akita PDA (PXA270)", .init = akita_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine spitzpda_machine = { .name = "spitz", .desc = "Spitz PDA (PXA270)", .init = spitz_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine borzoipda_machine = { .name = "borzoi", .desc = "Borzoi PDA (PXA270)", .init = borzoi_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine terrierpda_machine = { .name = "terrier", .desc = "Terrier PDA (PXA270)", .init = terrier_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void spitz_machine_init(void) diff --git a/hw/stellaris.c b/hw/stellaris.c index 9b8f203..3896046 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1331,14 +1331,14 @@ static QEMUMachine lm3s811evb_machine = { .name = "lm3s811evb", .desc = "Stellaris LM3S811EVB", .init = lm3s811evb_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine lm3s6965evb_machine = { .name = "lm3s6965evb", .desc = "Stellaris LM3S6965EVB", .init = lm3s6965evb_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void stellaris_machine_init(void) diff --git a/hw/sun4m.c b/hw/sun4m.c index 9903f44..a1ce098 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -1427,7 +1427,7 @@ static QEMUMachine ss5_machine = { .init = ss5_init, .block_default_type = IF_SCSI, .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine ss10_machine = { @@ -1436,7 +1436,7 @@ static QEMUMachine ss10_machine = { .init = ss10_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine ss600mp_machine = { @@ -1445,7 +1445,7 @@ static QEMUMachine ss600mp_machine = { .init = ss600mp_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine ss20_machine = { @@ -1454,7 +1454,7 @@ static QEMUMachine ss20_machine = { .init = ss20_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine voyager_machine = { @@ -1462,7 +1462,7 @@ static QEMUMachine voyager_machine = { .desc = "Sun4m platform, SPARCstation Voyager", .init = vger_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine ss_lx_machine = { @@ -1470,7 +1470,7 @@ static QEMUMachine ss_lx_machine = { .desc = "Sun4m platform, SPARCstation LX", .init = ss_lx_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine ss4_machine = { @@ -1478,7 +1478,7 @@ static QEMUMachine ss4_machine = { .desc = "Sun4m platform, SPARCstation 4", .init = ss4_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine scls_machine = { @@ -1486,7 +1486,7 @@ static QEMUMachine scls_machine = { .desc = "Sun4m platform, SPARCClassic", .init = scls_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine sbook_machine = { @@ -1494,7 +1494,7 @@ static QEMUMachine sbook_machine = { .desc = "Sun4m platform, SPARCbook", .init = sbook_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static const struct sun4d_hwdef sun4d_hwdefs[] = { @@ -1718,7 +1718,7 @@ static QEMUMachine ss1000_machine = { .init = ss1000_init, .block_default_type = IF_SCSI, .max_cpus = 8, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine ss2000_machine = { @@ -1727,7 +1727,7 @@ static QEMUMachine ss2000_machine = { .init = ss2000_init, .block_default_type = IF_SCSI, .max_cpus = 20, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static const struct sun4c_hwdef sun4c_hwdefs[] = { @@ -1905,7 +1905,7 @@ static QEMUMachine ss2_machine = { .desc = "Sun4c platform, SPARCstation 2", .init = ss2_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void sun4m_register_types(void) diff --git a/hw/sun4u.c b/hw/sun4u.c index 9fbda29..19af99d 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -977,7 +977,7 @@ static QEMUMachine sun4u_machine = { .init = sun4u_init, .max_cpus = 1, // XXX for now .is_default = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine sun4v_machine = { @@ -985,7 +985,7 @@ static QEMUMachine sun4v_machine = { .desc = "Sun4v platform", .init = sun4v_init, .max_cpus = 1, // XXX for now - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine niagara_machine = { @@ -993,7 +993,7 @@ static QEMUMachine niagara_machine = { .desc = "Sun4v platform, Niagara", .init = niagara_init, .max_cpus = 1, // XXX for now - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void sun4u_register_types(void) diff --git a/hw/tosa.c b/hw/tosa.c index efea109..863ee98 100644 --- a/hw/tosa.c +++ b/hw/tosa.c @@ -251,7 +251,7 @@ static QEMUMachine tosapda_machine = { .name = "tosa", .desc = "Tosa PDA (PXA255)", .init = tosa_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void tosapda_machine_init(void) diff --git a/hw/versatilepb.c b/hw/versatilepb.c index e0a28f0..bb18630 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -359,7 +359,7 @@ static QEMUMachine versatilepb_machine = { .desc = "ARM Versatile/PB (ARM926EJ-S)", .init = vpb_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine versatileab_machine = { @@ -367,7 +367,7 @@ static QEMUMachine versatileab_machine = { .desc = "ARM Versatile/AB (ARM926EJ-S)", .init = vab_init, .block_default_type = IF_SCSI, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void versatile_machine_init(void) diff --git a/hw/vexpress.c b/hw/vexpress.c index 741b044..f5f5edf 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -479,7 +479,7 @@ static QEMUMachine vexpress_a9_machine = { .init = vexpress_a9_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine vexpress_a15_machine = { @@ -488,7 +488,7 @@ static QEMUMachine vexpress_a15_machine = { .init = vexpress_a15_init, .block_default_type = IF_SCSI, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void vexpress_machine_init(void) diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 8c4e8e4..7c253fd 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -263,7 +263,7 @@ static QEMUMachine virtex_machine = { .name = "virtex-ml507", .desc = "Xilinx Virtex ML507 reference design", .init = virtex_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void virtex_machine_init(void) diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 66e8981..fc18aef 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -115,7 +115,7 @@ static QEMUMachine xenpv_machine = { .init = xen_init_pv, .max_cpus = 1, .default_machine_opts = "accel=xen", - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void xenpv_machine_init(void) diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c index 311f791..588c3f8 100644 --- a/hw/xilinx_zynq.c +++ b/hw/xilinx_zynq.c @@ -204,7 +204,7 @@ static QEMUMachine zynq_machine = { .block_default_type = IF_SCSI, .max_cpus = 1, .no_sdcard = 1, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void zynq_machine_init(void) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index a810b9e..2f0348c 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -295,7 +295,7 @@ static QEMUMachine xtensa_lx60_machine = { .desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", .init = xtensa_lx60_init, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static QEMUMachine xtensa_lx200_machine = { @@ -303,7 +303,7 @@ static QEMUMachine xtensa_lx200_machine = { .desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")", .init = xtensa_lx200_init, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void xtensa_lx_machines_init(void) diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c index 864e57c..d443289 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa_sim.c @@ -106,7 +106,7 @@ static QEMUMachine xtensa_sim_machine = { .is_default = true, .init = xtensa_sim_init, .max_cpus = 4, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void xtensa_sim_machine_init(void) diff --git a/hw/z2.c b/hw/z2.c index 731550f..f3067d0 100644 --- a/hw/z2.c +++ b/hw/z2.c @@ -373,7 +373,7 @@ static QEMUMachine z2_machine = { .name = "z2", .desc = "Zipit Z2 (PXA27x)", .init = z2_init, - DEFAULT_MACHINE_OPTIONS, + DEFAULT_MACHINE_BOOT_ORDER, }; static void z2_machine_init(void)