Patchwork Add new DEFAULT_MACHINE_OPTIONS to q35 as well

login
register
mail settings
Submitter Knut Omang
Date Jan. 16, 2013, 8:15 a.m.
Message ID <1358324127.1949.4.camel@abi.no.oracle.com>
Download mbox | patch
Permalink /patch/212428/
State New
Headers show

Comments

Knut Omang - Jan. 16, 2013, 8:15 a.m.
Without this a typical q35 based setup would no longer boot
after commit e4ada29e909787f629626660b1561f6a680187d3

Signed-off-by: Knut Omang <knut.omang@oracle.com>
---
 hw/pc_q35.c | 1 +
 1 file changed, 1 insertion(+)
Markus Armbruster - Jan. 16, 2013, 10:59 a.m.
Knut Omang <knut.omang@oracle.com> writes:

> Without this a typical q35 based setup would no longer boot
> after commit e4ada29e909787f629626660b1561f6a680187d3
>
> Signed-off-by: Knut Omang <knut.omang@oracle.com>
> ---
>  hw/pc_q35.c | 1 +
>  1 file changed, 1 insertion(+)
>
> 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)

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

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)