OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw: Clean up bogus default boot order 

We set default boot order "cad" in every single machine definition
except "pseries" and "moxiesim", even though very few boards actually
care for boot order, and "cad" makes sense for even fewer.

Machines that care:

* pc and its variants

  Accept up to three letters 'a', 'b' (undocumented alias for 'a'),
  'c', 'd' and 'n'.  Reject all others (fatal with -boot).

* nseries (n800, n810)

  Check whether order starts with 'n'.  Silently ignored otherwise.

* prep, g3beige, mac99

  Extract the first character the machine understands (subset of
  'a'..'f').  Silently ignored otherwise.

* spapr

  Accept an arbitrary string (vl.c restricts it to contain only
  'a'..'p', no duplicates).

* sun4[mdc]

  Use the first character.  Silently ignored otherwise.

Strip characters these machines ignore from their default boot order.

For all other machines, remove the unused default boot order
alltogether.

Note that my rename of QEMUMachine member boot_order to
default_boot_order and QEMUMachineInitArgs member boot_device to
boot_order has a welcome side effect: it makes every use of boot
orders visible in this patch, for easy review.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2013-08-16 13:13:50 +02:00 committed by Michael S. Tsirkin
parent 3bf4dfdd11
commit c165473269
59 changed files with 51 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/alpha/dp264.c
View File

@ -173,7 +173,6 @@ static QEMUMachine clipper_machine = {
.init = clipper_init,
.max_cpus = 4,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void clipper_machine_init(void)

1
hw/arm/collie.c
View File

@ -62,7 +62,6 @@ static QEMUMachine collie_machine = {
.name = "collie",
.desc = "Collie PDA (SA-1110)",
.init = collie_init,
DEFAULT_MACHINE_OPTIONS,
};
static void collie_machine_init(void)

2
hw/arm/exynos4_boards.c
View File

@ -150,14 +150,12 @@ static QEMUMachine exynos4_machines[EXYNOS4_NUM_OF_BOARDS] = {
.desc = "Samsung NURI board (Exynos4210)",
.init = nuri_init,
.max_cpus = EXYNOS4210_NCPUS,
DEFAULT_MACHINE_OPTIONS,
},
[EXYNOS4_BOARD_SMDKC210] = {
.name = "smdkc210",
.desc = "Samsung SMDKC210 board (Exynos4210)",
.init = smdkc210_init,
.max_cpus = EXYNOS4210_NCPUS,
DEFAULT_MACHINE_OPTIONS,
},
};

2
hw/arm/gumstix.c
View File

@ -122,14 +122,12 @@ static QEMUMachine connex_machine = {
.name = "connex",
.desc = "Gumstix Connex (PXA255)",
.init = connex_init,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine verdex_machine = {
.name = "verdex",
.desc = "Gumstix Verdex (PXA270)",
.init = verdex_init,
DEFAULT_MACHINE_OPTIONS,
};
static void gumstix_machine_init(void)

2
hw/arm/highbank.c
View File

@ -363,7 +363,6 @@ static QEMUMachine highbank_machine = {
.init = highbank_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine midway_machine = {
@ -372,7 +371,6 @@ static QEMUMachine midway_machine = {
.init = midway_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static void calxeda_machines_init(void)

1
hw/arm/integratorcp.c
View File

@ -526,7 +526,6 @@ static QEMUMachine integratorcp_machine = {
.desc = "ARM Integrator/CP (ARM926EJ-S)",
.init = integratorcp_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void integratorcp_machine_init(void)

1
hw/arm/kzm.c
View File

@ -144,7 +144,6 @@ static QEMUMachine kzm_machine = {
.name = "kzm",
.desc = "ARM KZM Emulation Baseboard (ARM1136)",
.init = kzm_init,
DEFAULT_MACHINE_OPTIONS,
};
static void kzm_machine_init(void)

1
hw/arm/mainstone.c
View File

@ -179,7 +179,6 @@ static QEMUMachine mainstone2_machine = {
.name = "mainstone",
.desc = "Mainstone II (PXA27x)",
.init = mainstone_init,
DEFAULT_MACHINE_OPTIONS,
};
static void mainstone_machine_init(void)

1
hw/arm/musicpal.c
View File

@ -1729,7 +1729,6 @@ static QEMUMachine musicpal_machine = {
.name = "musicpal",
.desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
.init = musicpal_init,
DEFAULT_MACHINE_OPTIONS,
};
static void musicpal_machine_init(void)

6
hw/arm/nseries.c
View File

@ -1340,7 +1340,7 @@ static void n8x0_init(QEMUMachineInitArgs *args,
}
if (option_rom[0].name &&
(args->boot_device[0] == 'n' || !args->kernel_filename)) {
(args->boot_order[0] == 'n' || !args->kernel_filename)) {
uint8_t nolo_tags[0x10000];
/* No, wait, better start at the ROM. */
s->mpu->cpu->env.regs[15] = OMAP2_Q2_BASE + 0x400000;
@ -1396,14 +1396,14 @@ static QEMUMachine n800_machine = {
.name = "n800",
.desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
.init = n800_init,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "",
};
static QEMUMachine n810_machine = {
.name = "n810",
.desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
.init = n810_init,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "",
};
static void nseries_machine_init(void)

2
hw/arm/omap_sx1.c
View File

@ -219,14 +219,12 @@ static QEMUMachine sx1_machine_v2 = {
.name = "sx1",
.desc = "Siemens SX1 (OMAP310) V2",
.init = sx1_init_v2,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine sx1_machine_v1 = {
.name = "sx1-v1",
.desc = "Siemens SX1 (OMAP310) V1",
.init = sx1_init_v1,
DEFAULT_MACHINE_OPTIONS,
};
static void sx1_machine_init(void)

1
hw/arm/palm.c
View File

@ -273,7 +273,6 @@ static QEMUMachine palmte_machine = {
.name = "cheetah",
.desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
.init = palmte_init,
DEFAULT_MACHINE_OPTIONS,
};
static void palmte_machine_init(void)

4
hw/arm/realview.c
View File

@ -369,7 +369,6 @@ static QEMUMachine realview_eb_machine = {
.desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
.init = realview_eb_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine realview_eb_mpcore_machine = {
@ -378,14 +377,12 @@ static QEMUMachine realview_eb_mpcore_machine = {
.init = realview_eb_mpcore_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
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,
};
static QEMUMachine realview_pbx_a9_machine = {
@ -394,7 +391,6 @@ static QEMUMachine realview_pbx_a9_machine = {
.init = realview_pbx_a9_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static void realview_machine_init(void)

4
hw/arm/spitz.c
View File

@ -966,28 +966,24 @@ static QEMUMachine akitapda_machine = {
.name = "akita",
.desc = "Akita PDA (PXA270)",
.init = akita_init,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine spitzpda_machine = {
.name = "spitz",
.desc = "Spitz PDA (PXA270)",
.init = spitz_init,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine borzoipda_machine = {
.name = "borzoi",
.desc = "Borzoi PDA (PXA270)",
.init = borzoi_init,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine terrierpda_machine = {
.name = "terrier",
.desc = "Terrier PDA (PXA270)",
.init = terrier_init,
DEFAULT_MACHINE_OPTIONS,
};
static void spitz_machine_init(void)

2
hw/arm/stellaris.c
View File

@ -1348,14 +1348,12 @@ static QEMUMachine lm3s811evb_machine = {
.name = "lm3s811evb",
.desc = "Stellaris LM3S811EVB",
.init = lm3s811evb_init,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine lm3s6965evb_machine = {
.name = "lm3s6965evb",
.desc = "Stellaris LM3S6965EVB",
.init = lm3s6965evb_init,
DEFAULT_MACHINE_OPTIONS,
};
static void stellaris_machine_init(void)

1
hw/arm/tosa.c
View File

@ -251,7 +251,6 @@ static QEMUMachine tosapda_machine = {
.name = "tosa",
.desc = "Tosa PDA (PXA255)",
.init = tosa_init,
DEFAULT_MACHINE_OPTIONS,
};
static void tosapda_machine_init(void)

2
hw/arm/versatilepb.c
View File

@ -367,7 +367,6 @@ static QEMUMachine versatilepb_machine = {
.desc = "ARM Versatile/PB (ARM926EJ-S)",
.init = vpb_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine versatileab_machine = {
@ -375,7 +374,6 @@ static QEMUMachine versatileab_machine = {
.desc = "ARM Versatile/AB (ARM926EJ-S)",
.init = vab_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
};
static void versatile_machine_init(void)

2
hw/arm/vexpress.c
View File

@ -647,7 +647,6 @@ static QEMUMachine vexpress_a9_machine = {
.init = vexpress_a9_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine vexpress_a15_machine = {
@ -656,7 +655,6 @@ static QEMUMachine vexpress_a15_machine = {
.init = vexpress_a15_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static void vexpress_machine_init(void)

1
hw/arm/xilinx_zynq.c
View File

@ -233,7 +233,6 @@ static QEMUMachine zynq_machine = {
.block_default_type = IF_SCSI,
.max_cpus = 1,
.no_sdcard = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void zynq_machine_init(void)

1
hw/arm/z2.c
View File

@ -373,7 +373,6 @@ static QEMUMachine z2_machine = {
.name = "z2",
.desc = "Zipit Z2 (PXA27x)",
.init = z2_init,
DEFAULT_MACHINE_OPTIONS,
};
static void z2_machine_init(void)

1
hw/core/null-machine.c
View File

@ -24,7 +24,6 @@ static QEMUMachine machine_none = {
.desc = "empty machine",
.init = machine_none_init,
.max_cpus = 0,
DEFAULT_MACHINE_OPTIONS,
};
static void register_machines(void)

1
hw/cris/axis_dev88.c
View File

@ -355,7 +355,6 @@ static QEMUMachine axisdev88_machine = {
.desc = "AXIS devboard 88",
.init = axisdev88_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void axisdev88_machine_init(void)

32
hw/i386/pc_piix.c
View File

@ -204,7 +204,7 @@ static void pc_init1(QEMUMachineInitArgs *args,
}
}
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, args->boot_device,
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, args->boot_order,
floppy, idebus[0], idebus[1], rtc_state);
if (pci_enabled && usb_enabled(false)) {
@ -342,7 +342,7 @@ static QEMUMachine pc_i440fx_machine_v1_6 = {
.hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cad",
};
static QEMUMachine pc_i440fx_machine_v1_5 = {
@ -355,7 +355,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = {
PC_COMPAT_1_5,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cad",
};
static QEMUMachine pc_i440fx_machine_v1_4 = {
@ -363,11 +363,11 @@ static QEMUMachine pc_i440fx_machine_v1_4 = {
.desc = "Standard PC (i440FX + PIIX, 1996)",
.init = pc_init_pci_1_4,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_4,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_3 \
@ -395,11 +395,11 @@ static QEMUMachine pc_machine_v1_3 = {
.desc = "Standard PC",
.init = pc_init_pci_1_3,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_3,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_2 \
@ -435,11 +435,11 @@ static QEMUMachine pc_machine_v1_2 = {
.desc = "Standard PC",
.init = pc_init_pci_1_2,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_2,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_1 \
@ -479,11 +479,11 @@ static QEMUMachine pc_machine_v1_1 = {
.desc = "Standard PC",
.init = pc_init_pci_1_2,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_1,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_0 \
@ -511,12 +511,12 @@ static QEMUMachine pc_machine_v1_0 = {
.desc = "Standard PC",
.init = pc_init_pci_1_2,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_0,
{ /* end of list */ }
},
.hw_version = "1.0",
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_15 \
@ -527,12 +527,12 @@ static QEMUMachine pc_machine_v0_15 = {
.desc = "Standard PC",
.init = pc_init_pci_1_2,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_15,
{ /* end of list */ }
},
.hw_version = "0.15",
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_14 \
@ -560,6 +560,7 @@ static QEMUMachine pc_machine_v0_14 = {
.desc = "Standard PC",
.init = pc_init_pci_1_2,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_14,
{
@ -574,7 +575,6 @@ static QEMUMachine pc_machine_v0_14 = {
{ /* end of list */ }
},
.hw_version = "0.14",
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_13 \
@ -594,6 +594,7 @@ static QEMUMachine pc_machine_v0_13 = {
.desc = "Standard PC",
.init = pc_init_pci_no_kvmclock,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_13,
{
@ -612,7 +613,6 @@ static QEMUMachine pc_machine_v0_13 = {
{ /* end of list */ }
},
.hw_version = "0.13",
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_12 \
@ -644,6 +644,7 @@ static QEMUMachine pc_machine_v0_12 = {
.desc = "Standard PC",
.init = pc_init_pci_no_kvmclock,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_12,
{
@ -658,7 +659,6 @@ static QEMUMachine pc_machine_v0_12 = {
{ /* end of list */ }
},
.hw_version = "0.12",
DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_11 \
@ -678,6 +678,7 @@ static QEMUMachine pc_machine_v0_11 = {
.desc = "Standard PC, qemu 0.11",
.init = pc_init_pci_no_kvmclock,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_11,
{
@ -692,7 +693,6 @@ static QEMUMachine pc_machine_v0_11 = {
{ /* end of list */ }
},
.hw_version = "0.11",
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine pc_machine_v0_10 = {
@ -700,6 +700,7 @@ static QEMUMachine pc_machine_v0_10 = {
.desc = "Standard PC, qemu 0.10",
.init = pc_init_pci_no_kvmclock,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_0_11,
{
@ -726,7 +727,6 @@ static QEMUMachine pc_machine_v0_10 = {
{ /* end of list */ }
},
.hw_version = "0.10",
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine isapc_machine = {
@ -734,10 +734,10 @@ static QEMUMachine isapc_machine = {
.desc = "ISA-only PC",
.init = pc_init_isa,
.max_cpus = 1,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
#ifdef CONFIG_XEN
@ -747,7 +747,7 @@ static QEMUMachine xenfv_machine = {
.init = pc_xen_hvm_init,
.max_cpus = HVM_MAX_VCPUS,
.default_machine_opts = "accel=xen",
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cad",
};
#endif

8
hw/i386/pc_q35.c
View File

@ -200,7 +200,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
0xb100),
8, NULL, 0);
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, args->boot_device,
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, args->boot_order,
floppy, idebus[0], idebus[1], rtc_state);
/* the rest devices to which pci devfn is automatically assigned */
@ -260,7 +260,7 @@ static QEMUMachine pc_q35_machine_v1_6 = {
.init = pc_q35_init_1_6,
.hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cad",
};
static QEMUMachine pc_q35_machine_v1_5 = {
@ -269,11 +269,11 @@ static QEMUMachine pc_q35_machine_v1_5 = {
.init = pc_q35_init_1_5,
.hot_add_cpu = pc_hot_add_cpu,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_5,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine pc_q35_machine_v1_4 = {
@ -281,11 +281,11 @@ static QEMUMachine pc_q35_machine_v1_4 = {
.desc = "Standard PC (Q35 + ICH9, 2009)",
.init = pc_q35_init_1_4,
.max_cpus = 255,
.default_boot_order = "cad",
.compat_props = (GlobalProperty[]) {
PC_COMPAT_1_4,
{ /* end of list */ }
},
DEFAULT_MACHINE_OPTIONS,
};
static void pc_q35_machine_init(void)

1
hw/i386/xen_machine_pv.c
View File

@ -99,7 +99,6 @@ static QEMUMachine xenpv_machine = {
.init = xen_init_pv,
.max_cpus = 1,
.default_machine_opts = "accel=xen",
DEFAULT_MACHINE_OPTIONS,
};
static void xenpv_machine_init(void)

2
hw/lm32/lm32_boards.c
View File

@ -289,7 +289,6 @@ static QEMUMachine lm32_evr_machine = {
.desc = "LatticeMico32 EVR32 eval system",
.init = lm32_evr_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine lm32_uclinux_machine = {
@ -297,7 +296,6 @@ 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,
};
static void lm32_machine_init(void)

1
hw/lm32/milkymist.c
View File

@ -208,7 +208,6 @@ static QEMUMachine milkymist_machine = {
.desc = "Milkymist One",
.init = milkymist_init,
.is_default = 0,
DEFAULT_MACHINE_OPTIONS,
};
static void milkymist_machine_init(void)

1
hw/m68k/an5206.c
View File

@ -89,7 +89,6 @@ static QEMUMachine an5206_machine = {
.name = "an5206",
.desc = "Arnewsh 5206",
.init = an5206_init,
DEFAULT_MACHINE_OPTIONS,
};
static void an5206_machine_init(void)

1
hw/m68k/dummy_m68k.c
View File

@ -73,7 +73,6 @@ static QEMUMachine dummy_m68k_machine = {
.name = "dummy",
.desc = "Dummy board",
.init = dummy_m68k_init,
DEFAULT_MACHINE_OPTIONS,
};
static void dummy_m68k_machine_init(void)

1
hw/m68k/mcf5208.c
View File

@ -295,7 +295,6 @@ static QEMUMachine mcf5208evb_machine = {
.desc = "MCF5206EVB",
.init = mcf5208evb_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void mcf5208evb_machine_init(void)

1
hw/microblaze/petalogix_ml605_mmu.c
View File

@ -186,7 +186,6 @@ static QEMUMachine petalogix_ml605_machine = {
.desc = "PetaLogix linux refdesign for xilinx ml605 little endian",
.init = petalogix_ml605_init,
.is_default = 0,
DEFAULT_MACHINE_OPTIONS,
};
static void petalogix_ml605_machine_init(void)

1
hw/microblaze/petalogix_s3adsp1800_mmu.c
View File

@ -116,7 +116,6 @@ static QEMUMachine petalogix_s3adsp1800_machine = {
.desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800",
.init = petalogix_s3adsp1800_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void petalogix_s3adsp1800_machine_init(void)

1
hw/mips/mips_fulong2e.c
View File

@ -403,7 +403,6 @@ static QEMUMachine mips_fulong2e_machine = {
.name = "fulong2e",
.desc = "Fulong 2e mini pc",
.init = mips_fulong2e_init,
DEFAULT_MACHINE_OPTIONS,
};
static void mips_fulong2e_machine_init(void)

2
hw/mips/mips_jazz.c
View File

@ -327,7 +327,6 @@ static QEMUMachine mips_magnum_machine = {
.desc = "MIPS Magnum",
.init = mips_magnum_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine mips_pica61_machine = {
@ -335,7 +334,6 @@ static QEMUMachine mips_pica61_machine = {
.desc = "Acer Pica 61",
.init = mips_pica61_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
};
static void mips_jazz_machine_init(void)

1
hw/mips/mips_malta.c
View File

@ -1136,7 +1136,6 @@ static QEMUMachine mips_malta_machine = {
.init = mips_malta_init,
.max_cpus = 16,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void mips_malta_register_types(void)

1
hw/mips/mips_mipssim.c
View File

@ -232,7 +232,6 @@ static QEMUMachine mips_mipssim_machine = {
.name = "mipssim",
.desc = "MIPS MIPSsim platform",
.init = mips_mipssim_init,
DEFAULT_MACHINE_OPTIONS,
};
static void mips_mipssim_machine_init(void)

1
hw/mips/mips_r4k.c
View File

@ -306,7 +306,6 @@ static QEMUMachine mips_machine = {
.name = "mips",
.desc = "mips r4k platform",
.init = mips_r4k_init,
DEFAULT_MACHINE_OPTIONS,
};
static void mips_machine_init(void)

1
hw/openrisc/openrisc_sim.c
View File

@ -139,7 +139,6 @@ static QEMUMachine openrisc_sim_machine = {
.init = openrisc_sim_init,
.max_cpus = 1,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void openrisc_sim_machine_init(void)

1
hw/ppc/e500plat.c
View File

@ -51,7 +51,6 @@ static QEMUMachine e500plat_machine = {
.desc = "generic paravirt e500 platform",
.init = e500plat_init,
.max_cpus = 32,
DEFAULT_MACHINE_OPTIONS,
};
static void e500plat_machine_init(void)

4
hw/ppc/mac_newworld.c
View File

@ -147,7 +147,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
const char *kernel_filename = args->kernel_filename;
const char *kernel_cmdline = args->kernel_cmdline;
const char *initrd_filename = args->initrd_filename;
const char *boot_device = args->boot_device;
const char *boot_device = args->boot_order;
PowerPCCPU *cpu = NULL;
CPUPPCState *env = NULL;
char *filename;
@ -477,7 +477,7 @@ static QEMUMachine core99_machine = {
.desc = "Mac99 based PowerMAC",
.init = ppc_core99_init,
.max_cpus = MAX_CPUS,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cd",
};
static void core99_machine_init(void)

4
hw/ppc/mac_oldworld.c
View File

@ -78,7 +78,7 @@ static void ppc_heathrow_init(QEMUMachineInitArgs *args)
const char *kernel_filename = args->kernel_filename;
const char *kernel_cmdline = args->kernel_cmdline;
const char *initrd_filename = args->initrd_filename;
const char *boot_device = args->boot_device;
const char *boot_device = args->boot_order;
MemoryRegion *sysmem = get_system_memory();
PowerPCCPU *cpu = NULL;
CPUPPCState *env = NULL;
@ -350,7 +350,7 @@ static QEMUMachine heathrow_machine = {
#ifndef TARGET_PPC64
.is_default = 1,
#endif
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cd", /* TOFIX "cad" when Mac floppy is implemented */
};
static void heathrow_machine_init(void)

1
hw/ppc/mpc8544ds.c
View File

@ -44,7 +44,6 @@ static QEMUMachine ppce500_machine = {
.desc = "mpc8544ds",
.init = mpc8544ds_init,
.max_cpus = 15,
DEFAULT_MACHINE_OPTIONS,
};
static void ppce500_machine_init(void)

2
hw/ppc/ppc405_boards.c
View File

@ -362,7 +362,6 @@ static QEMUMachine ref405ep_machine = {
.name = "ref405ep",
.desc = "ref405ep",
.init = ref405ep_init,
DEFAULT_MACHINE_OPTIONS,
};
/*****************************************************************************/
@ -650,7 +649,6 @@ static QEMUMachine taihu_machine = {
.name = "taihu",
.desc = "taihu",
.init = taihu_405ep_init,
DEFAULT_MACHINE_OPTIONS,
};
static void ppc405_machine_init(void)

1
hw/ppc/ppc440_bamboo.c
View File

@ -296,7 +296,6 @@ static QEMUMachine bamboo_machine = {
.name = "bamboo",
.desc = "bamboo",
.init = bamboo_init,
DEFAULT_MACHINE_OPTIONS,
};
static void bamboo_machine_init(void)

4
hw/ppc/prep.c
View File

@ -452,7 +452,7 @@ static void ppc_prep_init(QEMUMachineInitArgs *args)
const char *kernel_filename = args->kernel_filename;
const char *kernel_cmdline = args->kernel_cmdline;
const char *initrd_filename = args->initrd_filename;
const char *boot_device = args->boot_device;
const char *boot_device = args->boot_order;
MemoryRegion *sysmem = get_system_memory();
PowerPCCPU *cpu = NULL;
CPUPPCState *env = NULL;
@ -691,7 +691,7 @@ static QEMUMachine prep_machine = {
.desc = "PowerPC PREP platform",
.init = ppc_prep_init,
.max_cpus = MAX_CPUS,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "cad",
};
static void prep_machine_init(void)

4
hw/ppc/spapr.c
View File

@ -1071,7 +1071,7 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args)
const char *kernel_filename = args->kernel_filename;
const char *kernel_cmdline = args->kernel_cmdline;
const char *initrd_filename = args->initrd_filename;
const char *boot_device = args->boot_device;
const char *boot_device = args->boot_order;
PowerPCCPU *cpu;
CPUPPCState *env;
PCIHostState *phb;
@ -1325,7 +1325,7 @@ static QEMUMachine spapr_machine = {
.block_default_type = IF_SCSI,
.max_cpus = MAX_CPUS,
.no_parallel = 1,
.boot_order = NULL,
.default_boot_order = NULL,
};
static void spapr_machine_init(void)

1
hw/ppc/virtex_ml507.c
View File

@ -245,7 +245,6 @@ static QEMUMachine virtex_machine = {
.name = "virtex-ml507",
.desc = "Xilinx Virtex ML507 reference design",
.init = virtex_init,
DEFAULT_MACHINE_OPTIONS,
};
static void virtex_machine_init(void)

1
hw/s390x/s390-virtio-ccw.c
View File

@ -126,7 +126,6 @@ static QEMUMachine ccw_machine = {
.no_sdcard = 1,
.use_sclp = 1,
.max_cpus = 255,
DEFAULT_MACHINE_OPTIONS,
};
static void ccw_machine_init(void)

1
hw/s390x/s390-virtio.c
View File

@ -293,7 +293,6 @@ static QEMUMachine s390_machine = {
.use_virtcon = 1,
.max_cpus = 255,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void s390_machine_init(void)

1
hw/sh4/r2d.c
View File

@ -356,7 +356,6 @@ static QEMUMachine r2d_machine = {
.name = "r2d",
.desc = "r2d-plus board",
.init = r2d_init,
DEFAULT_MACHINE_OPTIONS,
};
static void r2d_machine_init(void)

1
hw/sh4/shix.c
View File

@ -96,7 +96,6 @@ static QEMUMachine shix_machine = {
.desc = "shix card",
.init = shix_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void shix_machine_init(void)

1
hw/sparc/leon3.c
View File

@ -216,7 +216,6 @@ static QEMUMachine leon3_generic_machine = {
.name = "leon3_generic",
.desc = "Leon-3 generic",
.init = leon3_generic_hw_init,
DEFAULT_MACHINE_OPTIONS,
};
static void leon3_machine_init(void)

22
hw/sparc/sun4m.c
View File

@ -996,7 +996,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
args->ram_size);
nvram_init(nvram, (uint8_t *)&nd_table[0].macaddr, args->kernel_cmdline,
args->boot_device, args->ram_size, kernel_size, graphic_width,
args->boot_order, args->ram_size, kernel_size, graphic_width,
graphic_height, graphic_depth, hwdef->nvram_machine_id,
"Sun4m");
@ -1027,7 +1027,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
}
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, INITRD_LOAD_ADDR);
fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, 0); // not used
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, args->boot_device[0]);
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, args->boot_order[0]);
qemu_register_boot_set(fw_cfg_boot_set, fw_cfg);
}
@ -1348,7 +1348,7 @@ static QEMUMachine ss5_machine = {
.init = ss5_init,
.block_default_type = IF_SCSI,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine ss10_machine = {
@ -1357,7 +1357,7 @@ static QEMUMachine ss10_machine = {
.init = ss10_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine ss600mp_machine = {
@ -1366,7 +1366,7 @@ static QEMUMachine ss600mp_machine = {
.init = ss600mp_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine ss20_machine = {
@ -1375,7 +1375,7 @@ static QEMUMachine ss20_machine = {
.init = ss20_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine voyager_machine = {
@ -1383,7 +1383,7 @@ static QEMUMachine voyager_machine = {
.desc = "Sun4m platform, SPARCstation Voyager",
.init = vger_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine ss_lx_machine = {
@ -1391,7 +1391,7 @@ static QEMUMachine ss_lx_machine = {
.desc = "Sun4m platform, SPARCstation LX",
.init = ss_lx_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine ss4_machine = {
@ -1399,7 +1399,7 @@ static QEMUMachine ss4_machine = {
.desc = "Sun4m platform, SPARCstation 4",
.init = ss4_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine scls_machine = {
@ -1407,7 +1407,7 @@ static QEMUMachine scls_machine = {
.desc = "Sun4m platform, SPARCClassic",
.init = scls_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine sbook_machine = {
@ -1415,7 +1415,7 @@ static QEMUMachine sbook_machine = {
.desc = "Sun4m platform, SPARCbook",
.init = sbook_init,
.block_default_type = IF_SCSI,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static void sun4m_register_types(void)

10
hw/sparc64/sun4u.c
View File

@ -881,7 +881,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
&kernel_addr, &kernel_entry);
sun4u_NVRAM_set_params(nvram, NVRAM_SIZE, "Sun4u", args->ram_size,
args->boot_device,
args->boot_order,
kernel_addr, kernel_size,
args->kernel_cmdline,
initrd_addr, initrd_size,
@ -906,7 +906,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
}
fw_cfg_add_i64(fw_cfg, FW_CFG_INITRD_ADDR, initrd_addr);
fw_cfg_add_i64(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size);
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, args->boot_device[0]);
fw_cfg_add_i16(fw_cfg, FW_CFG_BOOT_DEVICE, args->boot_order[0]);
fw_cfg_add_i16(fw_cfg, FW_CFG_SPARC64_WIDTH, graphic_width);
fw_cfg_add_i16(fw_cfg, FW_CFG_SPARC64_HEIGHT, graphic_height);
@ -969,7 +969,7 @@ static QEMUMachine sun4u_machine = {
.init = sun4u_init,
.max_cpus = 1, // XXX for now
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine sun4v_machine = {
@ -977,7 +977,7 @@ static QEMUMachine sun4v_machine = {
.desc = "Sun4v platform",
.init = sun4v_init,
.max_cpus = 1, // XXX for now
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static QEMUMachine niagara_machine = {
@ -985,7 +985,7 @@ static QEMUMachine niagara_machine = {
.desc = "Sun4v platform, Niagara",
.init = niagara_init,
.max_cpus = 1, // XXX for now
DEFAULT_MACHINE_OPTIONS,
.default_boot_order = "c",
};
static void sun4u_register_types(void)

1
hw/unicore32/puv3.c
View File

@ -128,7 +128,6 @@ static QEMUMachine puv3_machine = {
.desc = "PKUnity Version-3 based on UniCore32",
.init = puv3_init,
.is_default = 1,
DEFAULT_MACHINE_OPTIONS,
};
static void puv3_machine_init(void)

2
hw/xtensa/xtensa_lx60.c
View File

@ -297,7 +297,6 @@ static QEMUMachine xtensa_lx60_machine = {
.desc = "lx60 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
.init = xtensa_lx60_init,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine xtensa_lx200_machine = {
@ -305,7 +304,6 @@ static QEMUMachine xtensa_lx200_machine = {
.desc = "lx200 EVB (" XTENSA_DEFAULT_CPU_MODEL ")",
.init = xtensa_lx200_init,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static void xtensa_lx_machines_init(void)

1
hw/xtensa/xtensa_sim.c
View File

@ -108,7 +108,6 @@ static QEMUMachine xtensa_sim_machine = {
.is_default = true,
.init = xtensa_sim_init,
.max_cpus = 4,
DEFAULT_MACHINE_OPTIONS,
};
static void xtensa_sim_machine_init(void)

7
include/hw/boards.h
View File

@ -6,12 +6,9 @@
#include "sysemu/blockdev.h"
#include "hw/qdev.h"
#define DEFAULT_MACHINE_OPTIONS \
.boot_order = "cad"
typedef struct QEMUMachineInitArgs {
ram_addr_t ram_size;
const char *boot_device;
const char *boot_order;
const char *kernel_filename;
const char *kernel_cmdline;
const char *initrd_filename;
@ -42,7 +39,7 @@ typedef struct QEMUMachine {
no_sdcard:1;
int is_default;
const char *default_machine_opts;
const char *boot_order;
const char *default_boot_order;
GlobalProperty *compat_props;
struct QEMUMachine *next;
const char *hw_version;

4
vl.c
View File

@ -4121,7 +4121,7 @@ int main(int argc, char **argv, char **envp)
kernel_cmdline = qemu_opt_get(machine_opts, "append");
if (!boot_order) {
boot_order = machine->boot_order;
boot_order = machine->default_boot_order;
}
opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
if (opts) {
@ -4309,7 +4309,7 @@ int main(int argc, char **argv, char **envp)
qdev_machine_init();
QEMUMachineInitArgs args = { .ram_size = ram_size,
.boot_device = boot_order,
.boot_order = boot_order,
.kernel_filename = kernel_filename,
.kernel_cmdline = kernel_cmdline,
.initrd_filename = initrd_filename,