Patchwork [v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405

login
register
mail settings
Submitter Knut Omang
Date Jan. 16, 2013, 3:34 p.m.
Message ID <1358350474.8079.12.camel@ori.omang.mine.nu>
Download mbox | patch
Permalink /patch/212883/
State New
Headers show

Comments

Knut Omang - Jan. 16, 2013, 3:34 p.m.
Without this default q35/ppc405 based machines would no longer boot
after commit e4ada29e909787f629626660b1561f6a680187d3

Signed-off-by: Knut Omang <knut.omang@oracle.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 hw/pc_q35.c        | 1 +
 hw/ppc405_boards.c | 1 +
 2 files changed, 2 insertions(+)
Anthony Liguori - Jan. 16, 2013, 9:14 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 52d9976..d82353e 100644
--- a/hw/pc_q35.c
+++ b/hw/pc_q35.c
@@ -214,6 +214,7 @@  static QEMUMachine pc_q35_machine = {
     .desc = "Standard PC (Q35 + ICH9, 2009)",
     .init = pc_q35_init,
     .max_cpus = 255,
+    DEFAULT_MACHINE_OPTIONS,
 };
 
 static void pc_q35_machine_init(void)
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index 45ed376..cf371db 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -362,6 +362,7 @@  static QEMUMachine ref405ep_machine = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
+    DEFAULT_MACHINE_OPTIONS,
 };
 
 /*****************************************************************************/