diff mbox

[PATCHv2,10/10] pseries: Add pseries-2.6 machine type

Message ID 1449459280-14983-11-git-send-email-david@gibson.dropbear.id.au
State New
Headers show

Commit Message

David Gibson Dec. 7, 2015, 3:34 a.m. UTC 
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/spapr.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Comments

Alexey Kardashevskiy Dec. 9, 2015, 3:37 a.m. UTC | #1 
On 12/07/2015 02:34 PM, David Gibson wrote:
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>   hw/ppc/spapr.c | 18 ++++++++++++++++--
>   1 file changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 8b8eb18..2d57ab0 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2337,6 +2337,20 @@ static const TypeInfo spapr_machine_info = {
>       machine_init(spapr_machine_register_##suffix)
>
>   /*
> + * pseries-2.6
> + */
> +static void spapr_machine_2_6_instance_options(MachineState *machine)
> +{
> +}
> +
> +static void spapr_machine_2_6_class_options(MachineClass *mc)
> +{
> +    /* Defaults for the latest behaviour inherited from the base class */
> +}
> +
> +DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
> +
> +/*
>    * pseries-2.5
>    */
>   static void spapr_machine_2_5_instance_options(MachineState *machine)
> @@ -2345,10 +2359,10 @@ static void spapr_machine_2_5_instance_options(MachineState *machine)
>
>   static void spapr_machine_2_5_class_options(MachineClass *mc)
>   {
> -    /* Defaults for the latest behaviour inherited from the base class */
> +    spapr_machine_2_6_class_options(mc);
>   }
>
> -DEFINE_SPAPR_MACHINE(2_5, "2.5", true);
> +DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
>
>   /*
>    * pseries-2.4
>

Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
diff mbox

Patch

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 8b8eb18..2d57ab0 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2337,6 +2337,20 @@  static const TypeInfo spapr_machine_info = {
     machine_init(spapr_machine_register_##suffix)
 
 /*
+ * pseries-2.6
+ */
+static void spapr_machine_2_6_instance_options(MachineState *machine)
+{
+}
+
+static void spapr_machine_2_6_class_options(MachineClass *mc)
+{
+    /* Defaults for the latest behaviour inherited from the base class */
+}
+
+DEFINE_SPAPR_MACHINE(2_6, "2.6", true);
+
+/*
  * pseries-2.5
  */
 static void spapr_machine_2_5_instance_options(MachineState *machine)
@@ -2345,10 +2359,10 @@  static void spapr_machine_2_5_instance_options(MachineState *machine)
 
 static void spapr_machine_2_5_class_options(MachineClass *mc)
 {
-    /* Defaults for the latest behaviour inherited from the base class */
+    spapr_machine_2_6_class_options(mc);
 }
 
-DEFINE_SPAPR_MACHINE(2_5, "2.5", true);
+DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
 
 /*
  * pseries-2.4