[Qemu-devel] [PATCH 1/2] ppc440_bamboo: Add 0.12 and 0.13 machine types for backward compat

[Qemu-devel] [PATCH 1/2] ppc440_bamboo: Add 0.12 and 0.13 machine types for backward compat

[Amit Shah]

Add a 0.12 machine type for compatibility with older versions. Mark the
default one as 0.13.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/ppc440_bamboo.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 1ab9872..aa9f594 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -172,7 +172,15 @@ static void bamboo_init(ram_addr_t ram_size,
 }
 
 static QEMUMachine bamboo_machine = {
-    .name = "bamboo",
+    .name = "bamboo-0.13",
+    .alias = "bamboo",
+    .desc = "bamboo",
+    .init = bamboo_init,
+    .is_default = 1,
+};
+
+static QEMUMachine bamboo_machine_v0_12 = {
+    .name = "bamboo-0.12",
     .desc = "bamboo",
     .init = bamboo_init,
 };
@@ -180,6 +188,7 @@ static QEMUMachine bamboo_machine = {
 static void bamboo_machine_init(void)
 {
     qemu_register_machine(&bamboo_machine);
+    qemu_register_machine(&bamboo_machine_v0_12);
 }
 
 machine_init(bamboo_machine_init);
-- 
1.6.2.5

[Qemu-devel] [PATCH 2/2] ppc440_bamboo: Disable new virtio-serial features for 0.12 machine type

[Amit Shah]

Disable the MULTIPORT feature and MSI vectors for the 0.12 machine
types; those features are added only for 0.13 onwards.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 hw/ppc440_bamboo.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index aa9f594..db96f14 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -183,6 +183,18 @@ static QEMUMachine bamboo_machine_v0_12 = {
     .name = "bamboo-0.12",
     .desc = "bamboo",
     .init = bamboo_init,
+    .compat_props = (GlobalProperty[]) {
+        {
+            .driver   = "virtio-serial-pci",
+            .property = "max_nr_ports",
+            .value    = stringify(1),
+        },{
+            .driver   = "virtio-serial-pci",
+            .property = "vectors",
+            .value    = stringify(0),
+        },
+        { /* end of list */ }
+    },
 };
 
 static void bamboo_machine_init(void)
-- 
1.6.2.5

Re: [Qemu-devel] [PATCH 1/2] ppc440_bamboo: Add 0.12 and 0.13 machine types for backward compat

[Aurelien Jarno]

On Thu, Feb 25, 2010 at 07:26:11PM +0530, Amit Shah wrote:
> Add a 0.12 machine type for compatibility with older versions. Mark the
> default one as 0.13.
> 
> Signed-off-by: Amit Shah <amit.shah@redhat.com>

Thanks, applied.

> ---
>  hw/ppc440_bamboo.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
> index 1ab9872..aa9f594 100644
> --- a/hw/ppc440_bamboo.c
> +++ b/hw/ppc440_bamboo.c
> @@ -172,7 +172,15 @@ static void bamboo_init(ram_addr_t ram_size,
>  }
>  
>  static QEMUMachine bamboo_machine = {
> -    .name = "bamboo",
> +    .name = "bamboo-0.13",
> +    .alias = "bamboo",
> +    .desc = "bamboo",
> +    .init = bamboo_init,
> +    .is_default = 1,
> +};
> +
> +static QEMUMachine bamboo_machine_v0_12 = {
> +    .name = "bamboo-0.12",
>      .desc = "bamboo",
>      .init = bamboo_init,
>  };
> @@ -180,6 +188,7 @@ static QEMUMachine bamboo_machine = {
>  static void bamboo_machine_init(void)
>  {
>      qemu_register_machine(&bamboo_machine);
> +    qemu_register_machine(&bamboo_machine_v0_12);
>  }
>  
>  machine_init(bamboo_machine_init);
> -- 
> 1.6.2.5
> 
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

Re: [Qemu-devel] [PATCH 2/2] ppc440_bamboo: Disable new virtio-serial features for 0.12 machine type

[Aurelien Jarno]

On Thu, Feb 25, 2010 at 07:26:12PM +0530, Amit Shah wrote:
> Disable the MULTIPORT feature and MSI vectors for the 0.12 machine
> types; those features are added only for 0.13 onwards.
> 
> Signed-off-by: Amit Shah <amit.shah@redhat.com>

Thanks, applied.

> ---
>  hw/ppc440_bamboo.c |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
> index aa9f594..db96f14 100644
> --- a/hw/ppc440_bamboo.c
> +++ b/hw/ppc440_bamboo.c
> @@ -183,6 +183,18 @@ static QEMUMachine bamboo_machine_v0_12 = {
>      .name = "bamboo-0.12",
>      .desc = "bamboo",
>      .init = bamboo_init,
> +    .compat_props = (GlobalProperty[]) {
> +        {
> +            .driver   = "virtio-serial-pci",
> +            .property = "max_nr_ports",
> +            .value    = stringify(1),
> +        },{
> +            .driver   = "virtio-serial-pci",
> +            .property = "vectors",
> +            .value    = stringify(0),
> +        },
> +        { /* end of list */ }
> +    },
>  };
>  
>  static void bamboo_machine_init(void)
> -- 
> 1.6.2.5
> 
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net