aboutsummaryrefslogtreecommitdiff
path: root/hw/pc_q35.c
diff options
context:
space:
mode:
authorKnut Omang <knuto@ifi.uio.no>2013-01-16 16:34:34 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-16 11:49:05 -0600
commitb8e76b35d47d03f6f9bb3a7455316aaed8b25795 (patch)
tree7e65d8c22aef3b5e4d100b38542de14ce8ed8d70 /hw/pc_q35.c
parent249d41720b7dfbb5951b430b9eefdbee7464f515 (diff)
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>
Diffstat (limited to 'hw/pc_q35.c')
-rw-r--r--hw/pc_q35.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/pc_q35.c b/hw/pc_q35.c
index 52d997613f..d82353e84f 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)