Skip to contentSkip to conversation

Add new DEFAULT_MACHINE_OPTIONS to q35 as well

PATCH In review Knut Omang 3 participants 5 messages Jan 16, 2013

lore
Share & tools
lore

Knut Omang

author
#0 lore raw

PATCH 1/1 Add new DEFAULT_MACHINE_OPTIONS to q35 as well

Without this a typical q35 based setup would no longer boot after commit e4ada29e909787f629626660b1561f6a680187d3

Signed-off-by Knut Omang <[email protected]>
---
 hw/pc_q35.c | 1 +
 1 file changed, 1 insertion(+)
hw/pc_q35.c +1 -0
index 52d9976..d82353e 100644
@@ -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)
Signature · 1 line
1.7.11.7
#1 lore raw
Quoted 13 lines · Knut Omang

Without this a typical q35 based setup would no longer boot after commit e4ada29e909787f629626660b1561f6a680187d3

Signed-off-by Knut Omang <[email protected]>
---
 hw/pc_q35.c | 1 +
 1 file changed, 1 insertion(+)
hw/pc_q35.c +0 -0
index 52d9976..d82353e 100644

hw/pc_q35.c static QEMUMachine pc_q35_machine = { · line 220

Quoted 7 lines
hw/pc_q35.c +1 -0
@@ -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)

The commit also missed ref405ep_machine in hw/ppc405_boards.c. Could you fix that one, too?

author
#2 lore raw

PATCH v2 1/1 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 <[email protected]>
---
 hw/pc_q35.c        | 1 +
 hw/ppc405_boards.c | 1 +
 2 files changed, 2 insertions(+)
hw/pc_q35.c +1 -0
index 52d9976..d82353e 100644
@@ -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)
hw/ppc405_boards.c +1 -0
index 45ed376..cf371db 100644
@@ -362,6 +362,7 @@ static QEMUMachine ref405ep_machine = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
+    DEFAULT_MACHINE_OPTIONS,
 };
 
 /*****************************************************************************/
Signature · 1 line
1.7.11.7
#4 lore raw

Re: [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405

In reply to Knut Omang
Quoted 4 lines · Knut Omang

Without this default q35/ppc405 based machines would no longer boot after commit e4ada29e909787f629626660b1561f6a680187d3

Signed-off-by Knut Omang <[email protected]>

Please post as a top-level patch. Doing it like this breaks threading.

Regards,

Anthony Liguori

Quoted 31 lines
---
 hw/pc_q35.c        | 1 +
 hw/ppc405_boards.c | 1 +
 2 files changed, 2 insertions(+)
hw/pc_q35.c +1 -0
index 52d9976..d82353e 100644
@@ -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)
hw/ppc405_boards.c +1 -0
index 45ed376..cf371db 100644
@@ -362,6 +362,7 @@ static QEMUMachine ref405ep_machine = {
     .name = "ref405ep",
     .desc = "ref405ep",
     .init = ref405ep_init,
+    DEFAULT_MACHINE_OPTIONS,
 };
 
 /*****************************************************************************/
Signature · 1 line
1.7.11.7