[Qemu-devel] [PATCH for-2.5] hw/ppc/spapr: Remove duplicated "pseries" alias

[Qemu-devel] [PATCH for-2.5] hw/ppc/spapr: Remove duplicated "pseries" alias

[Thomas Huth]

The "pseries" alias is currently set twice, one time for the
pseries-2.4 machine and one time for the "pseries-2.5" machine.
To avoid confusion with the alias, let's remove the one from
the older machine class. And while we're at it, also remove
the "is_default = 0" there since the is_default variable
should be set to zero by default already.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/ppc/spapr.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 030ee35..32e595b 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2422,8 +2422,6 @@ static void spapr_machine_2_4_class_init(ObjectClass *oc, void *data)
     MachineClass *mc = MACHINE_CLASS(oc);
 
     mc->desc = "pSeries Logical Partition (PAPR compliant) v2.4";
-    mc->alias = "pseries";
-    mc->is_default = 0;
     mc->compat_props = compat_props;
 }
 
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH for-2.5] hw/ppc/spapr: Remove duplicated "pseries" alias

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

On Mon, Nov 23, 2015 at 05:13:37PM +0100, Thomas Huth wrote:
> The "pseries" alias is currently set twice, one time for the
> pseries-2.4 machine and one time for the "pseries-2.5" machine.
> To avoid confusion with the alias, let's remove the one from
> the older machine class. And while we're at it, also remove
> the "is_default = 0" there since the is_default variable
> should be set to zero by default already.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Applied to ppc-for-2.5, thanks.

I'll try to send a pull request for the couple of outstanding patches
against 2.5 today.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]