diff mbox

pseries: Include missing pseries-2.5 compat properties in pseries-2.4

Message ID 1455589200-12221-1-git-send-email-david@gibson.dropbear.id.au
State New, archived
Headers show

Commit Message

David Gibson Feb. 16, 2016, 2:20 a.m. UTC
Commit 4b23699 "pseries: Add pseries-2.6 machine type" added a new
SPAPR_COMPAT_2_5 macro in the usual way.  However, it didn't add this
macro to the existing SPAPR_COMPAT_2_4 macro so that pseries-2.4
inherits newer compatibility properties which are needed for 2.5 and
earlier.

This corrects the oversight.

Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/spapr.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Laszlo Ersek Feb. 16, 2016, 4:26 a.m. UTC | #1
On 02/16/16 03:20, David Gibson wrote:
> Commit 4b23699 "pseries: Add pseries-2.6 machine type" added a new
> SPAPR_COMPAT_2_5 macro in the usual way.  However, it didn't add this
> macro to the existing SPAPR_COMPAT_2_4 macro so that pseries-2.4
> inherits newer compatibility properties which are needed for 2.5 and
> earlier.
> 
> This corrects the oversight.
> 
> Reported-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  hw/ppc/spapr.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 276d6b4..e214a34 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2391,6 +2391,7 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
>   * pseries-2.4
>   */
>  #define SPAPR_COMPAT_2_4 \
> +        SPAPR_COMPAT_2_5 \
>          HW_COMPAT_2_4
>  
>  static void spapr_machine_2_4_instance_options(MachineState *machine)
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks!
Laszlo
Laurent Vivier Feb. 16, 2016, 11:11 a.m. UTC | #2
On 16/02/2016 03:20, David Gibson wrote:
> Commit 4b23699 "pseries: Add pseries-2.6 machine type" added a new
> SPAPR_COMPAT_2_5 macro in the usual way.  However, it didn't add this
> macro to the existing SPAPR_COMPAT_2_4 macro so that pseries-2.4
> inherits newer compatibility properties which are needed for 2.5 and
> earlier.
> 
> This corrects the oversight.
> 
> Reported-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Reviewed-by: Laurent Vivier <lvivier@redhat.com>

> ---
>  hw/ppc/spapr.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 276d6b4..e214a34 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2391,6 +2391,7 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
>   * pseries-2.4
>   */
>  #define SPAPR_COMPAT_2_4 \
> +        SPAPR_COMPAT_2_5 \
>          HW_COMPAT_2_4
>  
>  static void spapr_machine_2_4_instance_options(MachineState *machine)
>
diff mbox

Patch

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 276d6b4..e214a34 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2391,6 +2391,7 @@  DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
  * pseries-2.4
  */
 #define SPAPR_COMPAT_2_4 \
+        SPAPR_COMPAT_2_5 \
         HW_COMPAT_2_4
 
 static void spapr_machine_2_4_instance_options(MachineState *machine)