From: Knut Omang <knuto@ifi.uio.no>
Date: Wed, 16 Jan 2013 15:34:34 +0000 (+0100)
Subject: Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405
X-Git-Tag: v1.4.0-rc0~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8e76b35d47d03f6f9bb3a7455316aaed8b25795;p=thirdparty%2Fqemu.git

Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405

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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 52d997613f4..d82353e84f0 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 45ed3769a31..cf371db053a 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,
 };
 
 /*****************************************************************************/