qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] Add new DEFAULT_MACHINE_OPTIONS to q35 as well
@ 2013-01-16  8:15 Knut Omang
  2013-01-16 10:59 ` Markus Armbruster
  0 siblings, 1 reply; 7+ messages in thread
From: Knut Omang @ 2013-01-16  8:15 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Liguori, Avik Sil

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)
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PATCH] Add new DEFAULT_MACHINE_OPTIONS to q35 as well
  2013-01-16  8:15 [Qemu-devel] [PATCH] Add new DEFAULT_MACHINE_OPTIONS to q35 as well Knut Omang
@ 2013-01-16 10:59 ` Markus Armbruster
  2013-01-16 12:25   ` [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405 Knut Omang
  0 siblings, 1 reply; 7+ messages in thread
From: Markus Armbruster @ 2013-01-16 10:59 UTC (permalink / raw)
  To: Knut Omang; +Cc: Anthony Liguori, qemu-devel, Avik Sil

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?

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405
  2013-01-16 10:59 ` Markus Armbruster
@ 2013-01-16 12:25   ` Knut Omang
  2013-01-16 13:54     ` Markus Armbruster
  2013-01-16 14:53     ` Anthony Liguori
  0 siblings, 2 replies; 7+ messages in thread
From: Knut Omang @ 2013-01-16 12:25 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Liguori, Avik Sil, Markus Armbruster

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

Signed-off-by: Knut Omang <knut.omang@oracle.com>
---
 hw/pc_q35.c        | 1 +
 hw/ppc405_boards.c | 1 +
 2 files changed, 2 insertions(+)

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,
 };
 
 /*****************************************************************************/
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405
  2013-01-16 12:25   ` [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405 Knut Omang
@ 2013-01-16 13:54     ` Markus Armbruster
  2013-01-16 14:53     ` Anthony Liguori
  1 sibling, 0 replies; 7+ messages in thread
From: Markus Armbruster @ 2013-01-16 13:54 UTC (permalink / raw)
  To: Knut Omang; +Cc: Anthony Liguori, qemu-devel, Avik Sil

Knut Omang <knut.omang@oracle.com> writes:

> 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>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405
  2013-01-16 12:25   ` [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405 Knut Omang
  2013-01-16 13:54     ` Markus Armbruster
@ 2013-01-16 14:53     ` Anthony Liguori
  1 sibling, 0 replies; 7+ messages in thread
From: Anthony Liguori @ 2013-01-16 14:53 UTC (permalink / raw)
  To: Knut Omang, qemu-devel; +Cc: Avik Sil, Markus Armbruster

Knut Omang <knut.omang@oracle.com> writes:

> Without this default q35/ppc405 based machines would no longer boot
> after commit e4ada29e909787f629626660b1561f6a680187d3
>
> Signed-off-by: Knut Omang <knut.omang@oracle.com>

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

Regards,

Anthony Liguori

> ---
>  hw/pc_q35.c        | 1 +
>  hw/ppc405_boards.c | 1 +
>  2 files changed, 2 insertions(+)
>
> 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,
>  };
>  
>  /*****************************************************************************/
> -- 
> 1.7.11.7

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405
@ 2013-01-16 15:34 Knut Omang
  2013-01-16 21:14 ` Anthony Liguori
  0 siblings, 1 reply; 7+ messages in thread
From: Knut Omang @ 2013-01-16 15:34 UTC (permalink / raw)
  To: qemu-devel; +Cc: Anthony Liguori, Avik Sil, Markus Armbruster

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(+)

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,
 };
 
 /*****************************************************************************/
-- 
1.7.11.7

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405
  2013-01-16 15:34 Knut Omang
@ 2013-01-16 21:14 ` Anthony Liguori
  0 siblings, 0 replies; 7+ messages in thread
From: Anthony Liguori @ 2013-01-16 21:14 UTC (permalink / raw)
  To: Knut Omang, qemu-devel; +Cc: Anthony Liguori, Avik Sil, Markus Armbruster

Applied.  Thanks.

Regards,

Anthony Liguori

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-01-16 21:14 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-16  8:15 [Qemu-devel] [PATCH] Add new DEFAULT_MACHINE_OPTIONS to q35 as well Knut Omang
2013-01-16 10:59 ` Markus Armbruster
2013-01-16 12:25   ` [Qemu-devel] [PATCH v2] Add new DEFAULT_MACHINE_OPTIONS to q35 and ppc405 Knut Omang
2013-01-16 13:54     ` Markus Armbruster
2013-01-16 14:53     ` Anthony Liguori
  -- strict thread matches above, loose matches on Subject: below --
2013-01-16 15:34 Knut Omang
2013-01-16 21:14 ` Anthony Liguori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).