* [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series
@ 2012-12-19 18:16 Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 1/2] Make default boot order machine specific Avik Sil
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Avik Sil @ 2012-12-19 18:16 UTC (permalink / raw)
To: aliguori, agraf; +Cc: qemu-ppc, qemu-devel, david
Hi,
This patch series allows a machine to specify if it wants a default boot order or not.
Regards,
Avik
Changes v2 -> v3:
- Implement boot_order as per Anthony's suggestion in http://lists.nongnu.org/archive/html/qemu-ppc/2012-10/msg00274.html
Changes v1 -> v2:
- Set default boot order for every machine
- Remove default boot order for pseries
Avik Sil (2):
Make default boot order machine specific
pseries: set no default boot order
hw/alpha_dp264.c | 1 +
hw/an5206.c | 1 +
hw/axis_dev88.c | 1 +
hw/boards.h | 4 ++++
hw/collie.c | 1 +
hw/dummy_m68k.c | 1 +
hw/exynos4_boards.c | 2 ++
hw/gumstix.c | 2 ++
hw/highbank.c | 1 +
hw/integratorcp.c | 1 +
hw/kzm.c | 1 +
hw/leon3.c | 1 +
hw/lm32_boards.c | 6 ++++--
hw/mainstone.c | 1 +
hw/mcf5208.c | 1 +
hw/milkymist.c | 3 ++-
hw/mips_fulong2e.c | 1 +
hw/mips_jazz.c | 2 ++
hw/mips_malta.c | 1 +
hw/mips_mipssim.c | 1 +
hw/mips_r4k.c | 1 +
hw/musicpal.c | 1 +
hw/nseries.c | 2 ++
hw/null-machine.c | 1 +
hw/omap_sx1.c | 2 ++
hw/openrisc_sim.c | 1 +
hw/palm.c | 1 +
hw/pc_piix.c | 13 +++++++++++++
hw/petalogix_ml605_mmu.c | 3 ++-
hw/petalogix_s3adsp1800_mmu.c | 3 ++-
hw/ppc/e500plat.c | 1 +
hw/ppc/mpc8544ds.c | 1 +
hw/ppc405_boards.c | 1 +
hw/ppc440_bamboo.c | 1 +
hw/ppc_newworld.c | 1 +
hw/ppc_oldworld.c | 1 +
hw/ppc_prep.c | 1 +
hw/puv3.c | 1 +
hw/r2d.c | 1 +
hw/realview.c | 4 ++++
hw/s390-virtio.c | 1 +
hw/shix.c | 1 +
hw/spapr.c | 5 ++++-
hw/spitz.c | 4 ++++
hw/stellaris.c | 2 ++
hw/sun4m.c | 12 ++++++++++++
hw/sun4u.c | 3 +++
hw/tosa.c | 1 +
hw/versatilepb.c | 2 ++
hw/vexpress.c | 2 ++
hw/virtex_ml507.c | 1 +
hw/xen_machine_pv.c | 1 +
hw/xilinx_zynq.c | 3 ++-
hw/xtensa_lx60.c | 2 ++
hw/xtensa_sim.c | 1 +
hw/z2.c | 1 +
vl.c | 6 ++++--
57 files changed, 113 insertions(+), 9 deletions(-)
--
1.7.11.7
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH v3 1/2] Make default boot order machine specific
2012-12-19 18:16 [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Avik Sil
@ 2012-12-19 18:16 ` Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 2/2] pseries: set no default boot order Avik Sil
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Avik Sil @ 2012-12-19 18:16 UTC (permalink / raw)
To: aliguori, agraf; +Cc: qemu-ppc, qemu-devel, david
This patch makes default boot order machine specific instead of
set globally. The default boot order can be set per machine in
QEMUMachine boot_order. This also allows a machine to receive a
NULL boot order when -boot isn't used and take an appropriate action
accordingly. This helps machine boots from the devices as set in
guest's non-volatile memory location in case no boot order is
provided by the user.
Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>
---
hw/alpha_dp264.c | 1 +
hw/an5206.c | 1 +
hw/axis_dev88.c | 1 +
hw/boards.h | 4 ++++
hw/collie.c | 1 +
hw/dummy_m68k.c | 1 +
hw/exynos4_boards.c | 2 ++
hw/gumstix.c | 2 ++
hw/highbank.c | 1 +
hw/integratorcp.c | 1 +
hw/kzm.c | 1 +
hw/leon3.c | 1 +
hw/lm32_boards.c | 6 ++++--
hw/mainstone.c | 1 +
hw/mcf5208.c | 1 +
hw/milkymist.c | 3 ++-
hw/mips_fulong2e.c | 1 +
hw/mips_jazz.c | 2 ++
hw/mips_malta.c | 1 +
hw/mips_mipssim.c | 1 +
hw/mips_r4k.c | 1 +
hw/musicpal.c | 1 +
hw/nseries.c | 2 ++
hw/null-machine.c | 1 +
hw/omap_sx1.c | 2 ++
hw/openrisc_sim.c | 1 +
hw/palm.c | 1 +
hw/pc_piix.c | 13 +++++++++++++
hw/petalogix_ml605_mmu.c | 3 ++-
hw/petalogix_s3adsp1800_mmu.c | 3 ++-
hw/ppc/e500plat.c | 1 +
hw/ppc/mpc8544ds.c | 1 +
hw/ppc405_boards.c | 1 +
hw/ppc440_bamboo.c | 1 +
hw/ppc_newworld.c | 1 +
hw/ppc_oldworld.c | 1 +
hw/ppc_prep.c | 1 +
hw/puv3.c | 1 +
hw/r2d.c | 1 +
hw/realview.c | 4 ++++
hw/s390-virtio.c | 1 +
hw/shix.c | 1 +
hw/spapr.c | 1 +
hw/spitz.c | 4 ++++
hw/stellaris.c | 2 ++
hw/sun4m.c | 12 ++++++++++++
hw/sun4u.c | 3 +++
hw/tosa.c | 1 +
hw/versatilepb.c | 2 ++
hw/vexpress.c | 2 ++
hw/virtex_ml507.c | 1 +
hw/xen_machine_pv.c | 1 +
hw/xilinx_zynq.c | 3 ++-
hw/xtensa_lx60.c | 2 ++
hw/xtensa_sim.c | 1 +
hw/z2.c | 1 +
vl.c | 6 ++++--
57 files changed, 110 insertions(+), 8 deletions(-)
diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c
index 76d8ae8..10a3c7e 100644
--- a/hw/alpha_dp264.c
+++ b/hw/alpha_dp264.c
@@ -171,6 +171,7 @@ static QEMUMachine clipper_machine = {
.init = clipper_init,
.max_cpus = 4,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void clipper_machine_init(void)
diff --git a/hw/an5206.c b/hw/an5206.c
index d887c0e..da7de1a 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -86,6 +86,7 @@ static QEMUMachine an5206_machine = {
.name = "an5206",
.desc = "Arnewsh 5206",
.init = an5206_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void an5206_machine_init(void)
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index aa1ac9e..e73151e 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -355,6 +355,7 @@ static QEMUMachine axisdev88_machine = {
.desc = "AXIS devboard 88",
.init = axisdev88_init,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void axisdev88_machine_init(void)
diff --git a/hw/boards.h b/hw/boards.h
index c66fa16..1bc96f2 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -6,6 +6,9 @@
#include "blockdev.h"
#include "qdev.h"
+#define DEFAULT_MACHINE_OPTIONS \
+ .boot_order = "cad"
+
typedef struct QEMUMachineInitArgs {
ram_addr_t ram_size;
const char *boot_device;
@@ -35,6 +38,7 @@ typedef struct QEMUMachine {
no_sdcard:1;
int is_default;
const char *default_machine_opts;
+ const char *boot_order;
GlobalProperty *compat_props;
struct QEMUMachine *next;
const char *hw_version;
diff --git a/hw/collie.c b/hw/collie.c
index 695982a..7864ab1 100644
--- a/hw/collie.c
+++ b/hw/collie.c
@@ -62,6 +62,7 @@ static QEMUMachine collie_machine = {
.name = "collie",
.desc = "Collie PDA (SA-1110)",
.init = collie_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void collie_machine_init(void)
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 20f790b..54f0205 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -73,6 +73,7 @@ static QEMUMachine dummy_m68k_machine = {
.name = "dummy",
.desc = "Dummy board",
.init = dummy_m68k_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void dummy_m68k_machine_init(void)
diff --git a/hw/exynos4_boards.c b/hw/exynos4_boards.c
index bc815bb..5c603ee 100644
--- a/hw/exynos4_boards.c
+++ b/hw/exynos4_boards.c
@@ -150,12 +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,
},
[EXYNOS4_BOARD_SMDKC210] = {
.name = "smdkc210",
.desc = "Samsung SMDKC210 board (Exynos4210)",
.init = smdkc210_init,
.max_cpus = EXYNOS4210_NCPUS,
+ DEFAULT_MACHINE_OPTIONS,
},
};
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 4103a88..90dabb6 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -122,12 +122,14 @@ 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)
diff --git a/hw/highbank.c b/hw/highbank.c
index 8e35127..56d528c 100644
--- a/hw/highbank.c
+++ b/hw/highbank.c
@@ -331,6 +331,7 @@ static QEMUMachine highbank_machine = {
.init = highbank_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
+ DEFAULT_MACHINE_OPTIONS,
};
static void highbank_machine_init(void)
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 77807c3..3dbd16a 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -512,6 +512,7 @@ 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)
diff --git a/hw/kzm.c b/hw/kzm.c
index 687daf3..a223f30 100644
--- a/hw/kzm.c
+++ b/hw/kzm.c
@@ -146,6 +146,7 @@ static QEMUMachine kzm_machine = {
.name = "kzm",
.desc = "ARM KZM Emulation Baseboard (ARM1136)",
.init = kzm_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void kzm_machine_init(void)
diff --git a/hw/leon3.c b/hw/leon3.c
index ef83dff..ed0eddf 100644
--- a/hw/leon3.c
+++ b/hw/leon3.c
@@ -212,6 +212,7 @@ 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)
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 772cb8b..4a7e0b1 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -288,14 +288,16 @@ static QEMUMachine lm32_evr_machine = {
.name = "lm32-evr",
.desc = "LatticeMico32 EVR32 eval system",
.init = lm32_evr_init,
- .is_default = 1
+ .is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine lm32_uclinux_machine = {
.name = "lm32-uclinux",
.desc = "lm32 platform for uClinux and u-boot by Theobroma Systems",
.init = lm32_uclinux_init,
- .is_default = 0
+ .is_default = 0,
+ DEFAULT_MACHINE_OPTIONS,
};
static void lm32_machine_init(void)
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 5bbecb7..2d82336 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -179,6 +179,7 @@ static QEMUMachine mainstone2_machine = {
.name = "mainstone",
.desc = "Mainstone II (PXA27x)",
.init = mainstone_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void mainstone_machine_init(void)
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index b1db549..0bf6336 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -292,6 +292,7 @@ static QEMUMachine mcf5208evb_machine = {
.desc = "MCF5206EVB",
.init = mcf5208evb_init,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void mcf5208evb_machine_init(void)
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 4c8111a..84c1751 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -207,7 +207,8 @@ static QEMUMachine milkymist_machine = {
.name = "milkymist",
.desc = "Milkymist One",
.init = milkymist_init,
- .is_default = 0
+ .is_default = 0,
+ DEFAULT_MACHINE_OPTIONS,
};
static void milkymist_machine_init(void)
diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c
index 5fcf900..b0e7863 100644
--- a/hw/mips_fulong2e.c
+++ b/hw/mips_fulong2e.c
@@ -400,6 +400,7 @@ 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)
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index ea1416a..092d120 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -325,6 +325,7 @@ 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 = {
@@ -332,6 +333,7 @@ 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)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 4d2464a..3c9c993 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -1017,6 +1017,7 @@ 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)
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 20b5f1a..c70355e 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -229,6 +229,7 @@ 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)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 325098a..c38f9a1 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -302,6 +302,7 @@ static QEMUMachine mips_machine = {
.name = "mips",
.desc = "mips r4k platform",
.init = mips_r4k_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void mips_machine_init(void)
diff --git a/hw/musicpal.c b/hw/musicpal.c
index e0c57c8..b733301 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -1659,6 +1659,7 @@ static QEMUMachine musicpal_machine = {
.name = "musicpal",
.desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
.init = musicpal_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void musicpal_machine_init(void)
diff --git a/hw/nseries.c b/hw/nseries.c
index 2de8d21..c7385c1 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1411,12 +1411,14 @@ static QEMUMachine n800_machine = {
.name = "n800",
.desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
.init = n800_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine n810_machine = {
.name = "n810",
.desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
.init = n810_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void nseries_machine_init(void)
diff --git a/hw/null-machine.c b/hw/null-machine.c
index d813c08..bdf109f 100644
--- a/hw/null-machine.c
+++ b/hw/null-machine.c
@@ -24,6 +24,7 @@ static QEMUMachine machine_none = {
.desc = "empty machine",
.init = machine_none_init,
.max_cpus = 0,
+ DEFAULT_MACHINE_OPTIONS,
};
static void register_machines(void)
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 21a5bbb..b22ce5a 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -219,12 +219,14 @@ 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)
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index 23c66df..d29cc3f 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -139,6 +139,7 @@ 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)
diff --git a/hw/palm.c b/hw/palm.c
index 6f6f414..d711737 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -280,6 +280,7 @@ 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)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 19e342a..8b76efc 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -288,6 +288,7 @@ static QEMUMachine pc_machine_v1_4 = {
.init = pc_init_pci_1_3,
.max_cpus = 255,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_3 \
@@ -306,6 +307,7 @@ static QEMUMachine pc_machine_v1_3 = {
PC_COMPAT_1_3,
{ /* end of list */ }
},
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_2 \
@@ -345,6 +347,7 @@ static QEMUMachine pc_machine_v1_2 = {
PC_COMPAT_1_2,
{ /* end of list */ }
},
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_1 \
@@ -388,6 +391,7 @@ static QEMUMachine pc_machine_v1_1 = {
PC_COMPAT_1_1,
{ /* end of list */ }
},
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_1_0 \
@@ -424,6 +428,7 @@ static QEMUMachine pc_machine_v1_0 = {
{ /* end of list */ }
},
.hw_version = "1.0",
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_15 \
@@ -439,6 +444,7 @@ static QEMUMachine pc_machine_v0_15 = {
{ /* end of list */ }
},
.hw_version = "0.15",
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_14 \
@@ -480,6 +486,7 @@ static QEMUMachine pc_machine_v0_14 = {
{ /* end of list */ }
},
.hw_version = "0.14",
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_13 \
@@ -517,6 +524,7 @@ static QEMUMachine pc_machine_v0_13 = {
{ /* end of list */ }
},
.hw_version = "0.13",
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_12 \
@@ -550,6 +558,7 @@ static QEMUMachine pc_machine_v0_12 = {
{ /* end of list */ }
},
.hw_version = "0.12",
+ DEFAULT_MACHINE_OPTIONS,
};
#define PC_COMPAT_0_11 \
@@ -583,6 +592,7 @@ static QEMUMachine pc_machine_v0_11 = {
{ /* end of list */ }
},
.hw_version = "0.11",
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine pc_machine_v0_10 = {
@@ -616,6 +626,7 @@ static QEMUMachine pc_machine_v0_10 = {
{ /* end of list */ }
},
.hw_version = "0.10",
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine isapc_machine = {
@@ -631,6 +642,7 @@ static QEMUMachine isapc_machine = {
},
{ /* end of list */ }
},
+ DEFAULT_MACHINE_OPTIONS,
};
#ifdef CONFIG_XEN
@@ -640,6 +652,7 @@ static QEMUMachine xenfv_machine = {
.init = pc_xen_hvm_init,
.max_cpus = HVM_MAX_VCPUS,
.default_machine_opts = "accel=xen",
+ DEFAULT_MACHINE_OPTIONS,
};
#endif
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c
index 3589a4b..f3ddec9 100644
--- a/hw/petalogix_ml605_mmu.c
+++ b/hw/petalogix_ml605_mmu.c
@@ -173,7 +173,8 @@ static QEMUMachine petalogix_ml605_machine = {
.name = "petalogix-ml605",
.desc = "PetaLogix linux refdesign for xilinx ml605 little endian",
.init = petalogix_ml605_init,
- .is_default = 0
+ .is_default = 0,
+ DEFAULT_MACHINE_OPTIONS,
};
static void petalogix_ml605_machine_init(void)
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index c5fd5e7..7a396b2 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -115,7 +115,8 @@ static QEMUMachine petalogix_s3adsp1800_machine = {
.name = "petalogix-s3adsp1800",
.desc = "PetaLogix linux refdesign for xilinx Spartan 3ADSP1800",
.init = petalogix_s3adsp1800_init,
- .is_default = 1
+ .is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void petalogix_s3adsp1800_machine_init(void)
diff --git a/hw/ppc/e500plat.c b/hw/ppc/e500plat.c
index 2992bd9..c98c164 100644
--- a/hw/ppc/e500plat.c
+++ b/hw/ppc/e500plat.c
@@ -54,6 +54,7 @@ static QEMUMachine e500plat_machine = {
.desc = "generic paravirt e500 platform",
.init = e500plat_init,
.max_cpus = 15,
+ DEFAULT_MACHINE_OPTIONS,
};
static void e500plat_machine_init(void)
diff --git a/hw/ppc/mpc8544ds.c b/hw/ppc/mpc8544ds.c
index 7e1761d..7e12178 100644
--- a/hw/ppc/mpc8544ds.c
+++ b/hw/ppc/mpc8544ds.c
@@ -54,6 +54,7 @@ static QEMUMachine ppce500_machine = {
.desc = "mpc8544ds",
.init = mpc8544ds_init,
.max_cpus = 15,
+ DEFAULT_MACHINE_OPTIONS,
};
static void ppce500_machine_init(void)
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 8dc693f..c1efbc1 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -649,6 +649,7 @@ static QEMUMachine taihu_machine = {
.name = "taihu",
.desc = "taihu",
.init = taihu_405ep_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void ppc405_machine_init(void)
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index cc85607..cb0da5b 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -295,6 +295,7 @@ static QEMUMachine bamboo_machine = {
.name = "bamboo",
.desc = "bamboo",
.init = bamboo_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void bamboo_machine_init(void)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 8c2114e..bc7d31b 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -442,6 +442,7 @@ static QEMUMachine core99_machine = {
#ifdef TARGET_PPC64
.is_default = 1,
#endif
+ DEFAULT_MACHINE_OPTIONS,
};
static void core99_machine_init(void)
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index e8138c0..17e2ed3 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -341,6 +341,7 @@ static QEMUMachine heathrow_machine = {
#ifndef TARGET_PPC64
.is_default = 1,
#endif
+ DEFAULT_MACHINE_OPTIONS,
};
static void heathrow_machine_init(void)
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index bf15730..641c5d5 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -694,6 +694,7 @@ static QEMUMachine prep_machine = {
.desc = "PowerPC PREP platform",
.init = ppc_prep_init,
.max_cpus = MAX_CPUS,
+ DEFAULT_MACHINE_OPTIONS,
};
static void prep_machine_init(void)
diff --git a/hw/puv3.c b/hw/puv3.c
index 3d77349..0baa3fb 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -122,6 +122,7 @@ 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)
diff --git a/hw/r2d.c b/hw/r2d.c
index 66212e9..07822c0 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -347,6 +347,7 @@ static QEMUMachine r2d_machine = {
.name = "r2d",
.desc = "r2d-plus board",
.init = r2d_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void r2d_machine_init(void)
diff --git a/hw/realview.c b/hw/realview.c
index 8ea4ad7..44ad4a9 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -365,6 +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,
};
static QEMUMachine realview_eb_mpcore_machine = {
@@ -373,12 +374,14 @@ 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 = {
@@ -387,6 +390,7 @@ 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)
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 7aca0c4..2a1aaf9 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -330,6 +330,7 @@ static QEMUMachine s390_machine = {
.use_virtcon = 1,
.max_cpus = 255,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void s390_machine_init(void)
diff --git a/hw/shix.c b/hw/shix.c
index b56dd54..4150699 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -92,6 +92,7 @@ static QEMUMachine shix_machine = {
.desc = "shix card",
.init = shix_init,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void shix_machine_init(void)
diff --git a/hw/spapr.c b/hw/spapr.c
index 504d0fc..a4a65c7 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -960,6 +960,7 @@ static QEMUMachine spapr_machine = {
.block_default_type = IF_SCSI,
.max_cpus = MAX_CPUS,
.no_parallel = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void spapr_machine_init(void)
diff --git a/hw/spitz.c b/hw/spitz.c
index 12e2815..aacc6c2 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -959,24 +959,28 @@ 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)
diff --git a/hw/stellaris.c b/hw/stellaris.c
index b038f10..094e25f 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1331,12 +1331,14 @@ 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)
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 52cf82b..6ac657f 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -1428,6 +1428,7 @@ static QEMUMachine ss5_machine = {
.init = ss5_init,
.block_default_type = IF_SCSI,
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine ss10_machine = {
@@ -1436,6 +1437,7 @@ static QEMUMachine ss10_machine = {
.init = ss10_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine ss600mp_machine = {
@@ -1444,6 +1446,7 @@ static QEMUMachine ss600mp_machine = {
.init = ss600mp_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine ss20_machine = {
@@ -1452,6 +1455,7 @@ static QEMUMachine ss20_machine = {
.init = ss20_init,
.block_default_type = IF_SCSI,
.max_cpus = 4,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine voyager_machine = {
@@ -1459,6 +1463,7 @@ static QEMUMachine voyager_machine = {
.desc = "Sun4m platform, SPARCstation Voyager",
.init = vger_init,
.block_default_type = IF_SCSI,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine ss_lx_machine = {
@@ -1466,6 +1471,7 @@ static QEMUMachine ss_lx_machine = {
.desc = "Sun4m platform, SPARCstation LX",
.init = ss_lx_init,
.block_default_type = IF_SCSI,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine ss4_machine = {
@@ -1473,6 +1479,7 @@ static QEMUMachine ss4_machine = {
.desc = "Sun4m platform, SPARCstation 4",
.init = ss4_init,
.block_default_type = IF_SCSI,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine scls_machine = {
@@ -1480,6 +1487,7 @@ static QEMUMachine scls_machine = {
.desc = "Sun4m platform, SPARCClassic",
.init = scls_init,
.block_default_type = IF_SCSI,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine sbook_machine = {
@@ -1487,6 +1495,7 @@ static QEMUMachine sbook_machine = {
.desc = "Sun4m platform, SPARCbook",
.init = sbook_init,
.block_default_type = IF_SCSI,
+ DEFAULT_MACHINE_OPTIONS,
};
static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1711,6 +1720,7 @@ static QEMUMachine ss1000_machine = {
.init = ss1000_init,
.block_default_type = IF_SCSI,
.max_cpus = 8,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine ss2000_machine = {
@@ -1719,6 +1729,7 @@ static QEMUMachine ss2000_machine = {
.init = ss2000_init,
.block_default_type = IF_SCSI,
.max_cpus = 20,
+ DEFAULT_MACHINE_OPTIONS,
};
static const struct sun4c_hwdef sun4c_hwdefs[] = {
@@ -1897,6 +1908,7 @@ static QEMUMachine ss2_machine = {
.desc = "Sun4c platform, SPARCstation 2",
.init = ss2_init,
.block_default_type = IF_SCSI,
+ DEFAULT_MACHINE_OPTIONS,
};
static void sun4m_register_types(void)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index b2b51e3..9bc0921 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -978,6 +978,7 @@ static QEMUMachine sun4u_machine = {
.init = sun4u_init,
.max_cpus = 1, // XXX for now
.is_default = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine sun4v_machine = {
@@ -985,6 +986,7 @@ static QEMUMachine sun4v_machine = {
.desc = "Sun4v platform",
.init = sun4v_init,
.max_cpus = 1, // XXX for now
+ DEFAULT_MACHINE_OPTIONS,
};
static QEMUMachine niagara_machine = {
@@ -992,6 +994,7 @@ static QEMUMachine niagara_machine = {
.desc = "Sun4v platform, Niagara",
.init = niagara_init,
.max_cpus = 1, // XXX for now
+ DEFAULT_MACHINE_OPTIONS,
};
static void sun4u_register_types(void)
diff --git a/hw/tosa.c b/hw/tosa.c
index 512278c..5150396 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -251,6 +251,7 @@ static QEMUMachine tosapda_machine = {
.name = "tosa",
.desc = "Tosa PDA (PXA255)",
.init = tosa_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void tosapda_machine_init(void)
diff --git a/hw/versatilepb.c b/hw/versatilepb.c
index 4892c1d..f20aba9 100644
--- a/hw/versatilepb.c
+++ b/hw/versatilepb.c
@@ -359,6 +359,7 @@ 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 = {
@@ -366,6 +367,7 @@ 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)
diff --git a/hw/vexpress.c b/hw/vexpress.c
index e89694c..5e73444 100644
--- a/hw/vexpress.c
+++ b/hw/vexpress.c
@@ -479,6 +479,7 @@ 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 = {
@@ -487,6 +488,7 @@ 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)
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c
index 6ab8fee..178e88a 100644
--- a/hw/virtex_ml507.c
+++ b/hw/virtex_ml507.c
@@ -264,6 +264,7 @@ 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)
diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index 4264703..6bd5ecb 100644
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -115,6 +115,7 @@ 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)
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 9ca22a4..521e51c 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -203,7 +203,8 @@ static QEMUMachine zynq_machine = {
.init = zynq_init,
.block_default_type = IF_SCSI,
.max_cpus = 1,
- .no_sdcard = 1
+ .no_sdcard = 1,
+ DEFAULT_MACHINE_OPTIONS,
};
static void zynq_machine_init(void)
diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c
index 4c42edc..89ae92d 100644
--- a/hw/xtensa_lx60.c
+++ b/hw/xtensa_lx60.c
@@ -294,6 +294,7 @@ 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 = {
@@ -301,6 +302,7 @@ 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)
diff --git a/hw/xtensa_sim.c b/hw/xtensa_sim.c
index 0d633e4..da58e63 100644
--- a/hw/xtensa_sim.c
+++ b/hw/xtensa_sim.c
@@ -106,6 +106,7 @@ 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)
diff --git a/hw/z2.c b/hw/z2.c
index f62b806..948f037 100644
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -373,6 +373,7 @@ static QEMUMachine z2_machine = {
.name = "z2",
.desc = "Zipit Z2 (PXA27x)",
.init = z2_init,
+ DEFAULT_MACHINE_OPTIONS,
};
static void z2_machine_init(void)
diff --git a/vl.c b/vl.c
index 3ebf01f..bb59906 100644
--- a/vl.c
+++ b/vl.c
@@ -2526,7 +2526,7 @@ int main(int argc, char **argv, char **envp)
const char *icount_option = NULL;
const char *initrd_filename;
const char *kernel_filename, *kernel_cmdline;
- char boot_devices[33] = "cad"; /* default to HD->floppy->CD-ROM */
+ char boot_devices[33] = "";
DisplayState *ds;
int cyls, heads, secs, translation;
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
@@ -3855,7 +3855,9 @@ int main(int argc, char **argv, char **envp)
qdev_machine_init();
QEMUMachineInitArgs args = { .ram_size = ram_size,
- .boot_device = boot_devices,
+ .boot_device = (boot_devices[0] == '\0') ?
+ machine->boot_order :
+ boot_devices,
.kernel_filename = kernel_filename,
.kernel_cmdline = kernel_cmdline,
.initrd_filename = initrd_filename,
--
1.7.11.7
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Qemu-devel] [PATCH v3 2/2] pseries: set no default boot order
2012-12-19 18:16 [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 1/2] Make default boot order machine specific Avik Sil
@ 2012-12-19 18:16 ` Avik Sil
2012-12-19 22:34 ` [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Alexander Graf
2013-01-16 1:43 ` Anthony Liguori
3 siblings, 0 replies; 8+ messages in thread
From: Avik Sil @ 2012-12-19 18:16 UTC (permalink / raw)
To: aliguori, agraf; +Cc: qemu-ppc, qemu-devel, david
This patch removes the default boot order for pseries machine. This allows
the machine to handle a NULL boot order in case no -boot option is provided.
Thus it helps SLOF firmware to verify if boot order is specified in command
line or not. If no boot order is provided SLOF tries to boot from the
device set in the nvram.
Signed-off-by: Avik Sil <aviksil@linux.vnet.ibm.com>
---
hw/spapr.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/spapr.c b/hw/spapr.c
index a4a65c7..abfa0d9 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -284,7 +284,9 @@ static void *spapr_create_fdt_skel(const char *cpu_model,
_FDT((fdt_property(fdt, "qemu,boot-kernel", &kprop, sizeof(kprop))));
}
- _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device)));
+ if (boot_device) {
+ _FDT((fdt_property_string(fdt, "qemu,boot-device", boot_device)));
+ }
_FDT((fdt_property_cell(fdt, "qemu,graphic-width", graphic_width)));
_FDT((fdt_property_cell(fdt, "qemu,graphic-height", graphic_height)));
_FDT((fdt_property_cell(fdt, "qemu,graphic-depth", graphic_depth)));
@@ -960,7 +962,7 @@ static QEMUMachine spapr_machine = {
.block_default_type = IF_SCSI,
.max_cpus = MAX_CPUS,
.no_parallel = 1,
- DEFAULT_MACHINE_OPTIONS,
+ .boot_order = NULL,
};
static void spapr_machine_init(void)
--
1.7.11.7
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series
2012-12-19 18:16 [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 1/2] Make default boot order machine specific Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 2/2] pseries: set no default boot order Avik Sil
@ 2012-12-19 22:34 ` Alexander Graf
2013-01-07 20:22 ` Anthony Liguori
2013-01-16 1:43 ` Anthony Liguori
3 siblings, 1 reply; 8+ messages in thread
From: Alexander Graf @ 2012-12-19 22:34 UTC (permalink / raw)
To: Avik Sil; +Cc: aliguori, qemu-ppc, qemu-devel, david
On 19.12.2012, at 19:16, Avik Sil wrote:
> Hi,
>
> This patch series allows a machine to specify if it wants a default boot order or not.
I like the patch set. Anthony, please (n)ack :).
Alex
>
> Regards,
> Avik
>
> Changes v2 -> v3:
> - Implement boot_order as per Anthony's suggestion in http://lists.nongnu.org/archive/html/qemu-ppc/2012-10/msg00274.html
>
> Changes v1 -> v2:
> - Set default boot order for every machine
> - Remove default boot order for pseries
>
> Avik Sil (2):
> Make default boot order machine specific
> pseries: set no default boot order
>
> hw/alpha_dp264.c | 1 +
> hw/an5206.c | 1 +
> hw/axis_dev88.c | 1 +
> hw/boards.h | 4 ++++
> hw/collie.c | 1 +
> hw/dummy_m68k.c | 1 +
> hw/exynos4_boards.c | 2 ++
> hw/gumstix.c | 2 ++
> hw/highbank.c | 1 +
> hw/integratorcp.c | 1 +
> hw/kzm.c | 1 +
> hw/leon3.c | 1 +
> hw/lm32_boards.c | 6 ++++--
> hw/mainstone.c | 1 +
> hw/mcf5208.c | 1 +
> hw/milkymist.c | 3 ++-
> hw/mips_fulong2e.c | 1 +
> hw/mips_jazz.c | 2 ++
> hw/mips_malta.c | 1 +
> hw/mips_mipssim.c | 1 +
> hw/mips_r4k.c | 1 +
> hw/musicpal.c | 1 +
> hw/nseries.c | 2 ++
> hw/null-machine.c | 1 +
> hw/omap_sx1.c | 2 ++
> hw/openrisc_sim.c | 1 +
> hw/palm.c | 1 +
> hw/pc_piix.c | 13 +++++++++++++
> hw/petalogix_ml605_mmu.c | 3 ++-
> hw/petalogix_s3adsp1800_mmu.c | 3 ++-
> hw/ppc/e500plat.c | 1 +
> hw/ppc/mpc8544ds.c | 1 +
> hw/ppc405_boards.c | 1 +
> hw/ppc440_bamboo.c | 1 +
> hw/ppc_newworld.c | 1 +
> hw/ppc_oldworld.c | 1 +
> hw/ppc_prep.c | 1 +
> hw/puv3.c | 1 +
> hw/r2d.c | 1 +
> hw/realview.c | 4 ++++
> hw/s390-virtio.c | 1 +
> hw/shix.c | 1 +
> hw/spapr.c | 5 ++++-
> hw/spitz.c | 4 ++++
> hw/stellaris.c | 2 ++
> hw/sun4m.c | 12 ++++++++++++
> hw/sun4u.c | 3 +++
> hw/tosa.c | 1 +
> hw/versatilepb.c | 2 ++
> hw/vexpress.c | 2 ++
> hw/virtex_ml507.c | 1 +
> hw/xen_machine_pv.c | 1 +
> hw/xilinx_zynq.c | 3 ++-
> hw/xtensa_lx60.c | 2 ++
> hw/xtensa_sim.c | 1 +
> hw/z2.c | 1 +
> vl.c | 6 ++++--
> 57 files changed, 113 insertions(+), 9 deletions(-)
>
> --
> 1.7.11.7
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series
2012-12-19 22:34 ` [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Alexander Graf
@ 2013-01-07 20:22 ` Anthony Liguori
2013-01-07 21:04 ` Alexander Graf
0 siblings, 1 reply; 8+ messages in thread
From: Anthony Liguori @ 2013-01-07 20:22 UTC (permalink / raw)
To: Alexander Graf, Avik Sil; +Cc: qemu-ppc, qemu-devel, david
Alexander Graf <agraf@suse.de> writes:
> On 19.12.2012, at 19:16, Avik Sil wrote:
>
>> Hi,
>>
>> This patch series allows a machine to specify if it wants a default boot order or not.
>
> I like the patch set. Anthony, please (n)ack :).
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Regards,
Anthony Liguori
>
>
> Alex
>
>>
>> Regards,
>> Avik
>>
>> Changes v2 -> v3:
>> - Implement boot_order as per Anthony's suggestion in http://lists.nongnu.org/archive/html/qemu-ppc/2012-10/msg00274.html
>>
>> Changes v1 -> v2:
>> - Set default boot order for every machine
>> - Remove default boot order for pseries
>>
>> Avik Sil (2):
>> Make default boot order machine specific
>> pseries: set no default boot order
>>
>> hw/alpha_dp264.c | 1 +
>> hw/an5206.c | 1 +
>> hw/axis_dev88.c | 1 +
>> hw/boards.h | 4 ++++
>> hw/collie.c | 1 +
>> hw/dummy_m68k.c | 1 +
>> hw/exynos4_boards.c | 2 ++
>> hw/gumstix.c | 2 ++
>> hw/highbank.c | 1 +
>> hw/integratorcp.c | 1 +
>> hw/kzm.c | 1 +
>> hw/leon3.c | 1 +
>> hw/lm32_boards.c | 6 ++++--
>> hw/mainstone.c | 1 +
>> hw/mcf5208.c | 1 +
>> hw/milkymist.c | 3 ++-
>> hw/mips_fulong2e.c | 1 +
>> hw/mips_jazz.c | 2 ++
>> hw/mips_malta.c | 1 +
>> hw/mips_mipssim.c | 1 +
>> hw/mips_r4k.c | 1 +
>> hw/musicpal.c | 1 +
>> hw/nseries.c | 2 ++
>> hw/null-machine.c | 1 +
>> hw/omap_sx1.c | 2 ++
>> hw/openrisc_sim.c | 1 +
>> hw/palm.c | 1 +
>> hw/pc_piix.c | 13 +++++++++++++
>> hw/petalogix_ml605_mmu.c | 3 ++-
>> hw/petalogix_s3adsp1800_mmu.c | 3 ++-
>> hw/ppc/e500plat.c | 1 +
>> hw/ppc/mpc8544ds.c | 1 +
>> hw/ppc405_boards.c | 1 +
>> hw/ppc440_bamboo.c | 1 +
>> hw/ppc_newworld.c | 1 +
>> hw/ppc_oldworld.c | 1 +
>> hw/ppc_prep.c | 1 +
>> hw/puv3.c | 1 +
>> hw/r2d.c | 1 +
>> hw/realview.c | 4 ++++
>> hw/s390-virtio.c | 1 +
>> hw/shix.c | 1 +
>> hw/spapr.c | 5 ++++-
>> hw/spitz.c | 4 ++++
>> hw/stellaris.c | 2 ++
>> hw/sun4m.c | 12 ++++++++++++
>> hw/sun4u.c | 3 +++
>> hw/tosa.c | 1 +
>> hw/versatilepb.c | 2 ++
>> hw/vexpress.c | 2 ++
>> hw/virtex_ml507.c | 1 +
>> hw/xen_machine_pv.c | 1 +
>> hw/xilinx_zynq.c | 3 ++-
>> hw/xtensa_lx60.c | 2 ++
>> hw/xtensa_sim.c | 1 +
>> hw/z2.c | 1 +
>> vl.c | 6 ++++--
>> 57 files changed, 113 insertions(+), 9 deletions(-)
>>
>> --
>> 1.7.11.7
>>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series
2013-01-07 20:22 ` Anthony Liguori
@ 2013-01-07 21:04 ` Alexander Graf
2013-01-07 21:19 ` Anthony Liguori
0 siblings, 1 reply; 8+ messages in thread
From: Alexander Graf @ 2013-01-07 21:04 UTC (permalink / raw)
To: Anthony Liguori; +Cc: qemu-devel, qemu-ppc, Avik Sil, david
On 07.01.2013, at 21:22, Anthony Liguori wrote:
> Alexander Graf <agraf@suse.de> writes:
>
>> On 19.12.2012, at 19:16, Avik Sil wrote:
>>
>>> Hi,
>>>
>>> This patch series allows a machine to specify if it wants a default boot order or not.
>>
>> I like the patch set. Anthony, please (n)ack :).
>
> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Good, now to step 2: Who should apply it? :)
I'd be happy if you take care of that. Though I'm not sure if any new machines got introduced in between.
Alex
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series
2013-01-07 21:04 ` Alexander Graf
@ 2013-01-07 21:19 ` Anthony Liguori
0 siblings, 0 replies; 8+ messages in thread
From: Anthony Liguori @ 2013-01-07 21:19 UTC (permalink / raw)
To: Alexander Graf; +Cc: qemu-devel, qemu-ppc, Avik Sil, david
Alexander Graf <agraf@suse.de> writes:
> On 07.01.2013, at 21:22, Anthony Liguori wrote:
>
>> Alexander Graf <agraf@suse.de> writes:
>>
>>> On 19.12.2012, at 19:16, Avik Sil wrote:
>>>
>>>> Hi,
>>>>
>>>> This patch series allows a machine to specify if it wants a default boot order or not.
>>>
>>> I like the patch set. Anthony, please (n)ack :).
>>
>> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
>
> Good, now to step 2: Who should apply it? :)
> I'd be happy if you take care of that. Though I'm not sure if any new
> machines got introduced in between.
I Reviewed-by it so that you could apply it :-)
It doesn't apply in it's current form probably because of the great
header rename.
Avik, please rebase and resend and CC me and I can apply it.
Regards,
Anthony Liguori
>
>
> Alex
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series
2012-12-19 18:16 [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Avik Sil
` (2 preceding siblings ...)
2012-12-19 22:34 ` [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Alexander Graf
@ 2013-01-16 1:43 ` Anthony Liguori
3 siblings, 0 replies; 8+ messages in thread
From: Anthony Liguori @ 2013-01-16 1:43 UTC (permalink / raw)
To: Avik Sil, aliguori, agraf; +Cc: qemu-ppc, qemu-devel, david
Thanks, applied.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-01-16 1:43 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-19 18:16 [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 1/2] Make default boot order machine specific Avik Sil
2012-12-19 18:16 ` [Qemu-devel] [PATCH v3 2/2] pseries: set no default boot order Avik Sil
2012-12-19 22:34 ` [Qemu-devel] [PATCH v3 0/2] Qemu boot order patch series Alexander Graf
2013-01-07 20:22 ` Anthony Liguori
2013-01-07 21:04 ` Alexander Graf
2013-01-07 21:19 ` Anthony Liguori
2013-01-16 1:43 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).