From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdJMc-0008EH-8A for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdJMa-0006cM-QN for qemu-devel@nongnu.org; Sat, 19 Sep 2015 10:43:42 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 16:43:22 +0200 Message-Id: <1442673810-2679-14-git-send-email-afaerber@suse.de> In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de> References: <1442673810-2679-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/21] machine: Set MachineClass::name automatically List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Alexander Graf , Christian Borntraeger , "open list:New World" , Cornelia Huck , Paolo Bonzini , Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , David Gibson From: Eduardo Habkost Now all TYPE_MACHINE subclasses use MACHINE_TYPE_NAME to generate the class name. So instead of requiring each subclass to set MachineClass::name manually, we can now set it automatically at the TYPE_MACHINE class_base_init() function. Signed-off-by: Eduardo Habkost Reviewed-by: Marcel Apfelbaum [AF/ehabkost: Updated for s390-ccw machines] [AF: Cleanup of intermediate virt and vexpress name handling] Signed-off-by: Andreas F=C3=A4rber --- hw/arm/vexpress.c | 8 ++------ hw/arm/virt.c | 4 +--- hw/core/machine.c | 3 +++ hw/ppc/mac_newworld.c | 1 - hw/ppc/spapr.c | 4 ---- hw/s390x/s390-virtio-ccw.c | 2 -- hw/s390x/s390-virtio.c | 1 - vl.c | 1 - 8 files changed, 6 insertions(+), 18 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 2bcd312..058abbd 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -168,10 +168,8 @@ typedef struct { } VexpressMachineState; =20 #define TYPE_VEXPRESS_MACHINE "vexpress" -#define VEXPRESS_A9_MACHINE_NAME "vexpress-a9" -#define VEXPRESS_A15_MACHINE_NAME "vexpress-a15" -#define TYPE_VEXPRESS_A9_MACHINE MACHINE_TYPE_NAME(VEXPRESS_A9_MACHINE= _NAME) -#define TYPE_VEXPRESS_A15_MACHINE MACHINE_TYPE_NAME(VEXPRESS_A15_MACHI= NE_NAME) +#define TYPE_VEXPRESS_A9_MACHINE MACHINE_TYPE_NAME("vexpress-a9") +#define TYPE_VEXPRESS_A15_MACHINE MACHINE_TYPE_NAME("vexpress-a15") #define VEXPRESS_MACHINE(obj) \ OBJECT_CHECK(VexpressMachineState, (obj), TYPE_VEXPRESS_MACHINE) #define VEXPRESS_MACHINE_GET_CLASS(obj) \ @@ -760,7 +758,6 @@ static void vexpress_a9_class_init(ObjectClass *oc, v= oid *data) MachineClass *mc =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); =20 - mc->name =3D VEXPRESS_A9_MACHINE_NAME; mc->desc =3D "ARM Versatile Express for Cortex-A9"; =20 vmc->daughterboard =3D &a9_daughterboard; @@ -771,7 +768,6 @@ static void vexpress_a15_class_init(ObjectClass *oc, = void *data) MachineClass *mc =3D MACHINE_CLASS(oc); VexpressMachineClass *vmc =3D VEXPRESS_MACHINE_CLASS(oc); =20 - mc->name =3D VEXPRESS_A15_MACHINE_NAME; mc->desc =3D "ARM Versatile Express for Cortex-A15"; =20 vmc->daughterboard =3D &a15_daughterboard; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index fba2595..6bf0d6d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -83,8 +83,7 @@ typedef struct { bool highmem; } VirtMachineState; =20 -#define VIRT_MACHINE_NAME "virt" -#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME(VIRT_MACHINE_NAME) +#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") #define VIRT_MACHINE(obj) \ OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE) #define VIRT_MACHINE_GET_CLASS(obj) \ @@ -1074,7 +1073,6 @@ static void virt_class_init(ObjectClass *oc, void *= data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->name =3D VIRT_MACHINE_NAME; mc->desc =3D "ARM Virtual Machine", mc->init =3D machvirt_init; mc->max_cpus =3D 8; diff --git a/hw/core/machine.c b/hw/core/machine.c index 3c1f248..f4db340 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -319,8 +319,11 @@ static void machine_class_init(ObjectClass *oc, void= *data) static void machine_class_base_init(ObjectClass *oc, void *data) { if (!object_class_is_abstract(oc)) { + MachineClass *mc =3D MACHINE_CLASS(oc); const char *cname =3D object_class_get_name(oc); assert(g_str_has_suffix(cname, TYPE_MACHINE_SUFFIX)); + mc->name =3D g_strndup(cname, + strlen(cname) - strlen(TYPE_MACHINE_SUFFIX))= ; } } =20 diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 31c40c9..e1c5ed7 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -508,7 +508,6 @@ static void core99_machine_class_init(ObjectClass *oc= , void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->name =3D "mac99"; mc->desc =3D "Mac99 based PowerMAC"; mc->init =3D ppc_core99_init; mc->max_cpus =3D MAX_CPUS; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 012b6ed..05926a3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1919,7 +1919,6 @@ static void spapr_machine_2_1_class_init(ObjectClas= s *oc, void *data) { /* end of list */ } }; =20 - mc->name =3D "pseries-2.1"; mc->desc =3D "pSeries Logical Partition (PAPR compliant) v2.1"; mc->compat_props =3D compat_props; } @@ -1939,7 +1938,6 @@ static void spapr_machine_2_2_class_init(ObjectClas= s *oc, void *data) }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->name =3D "pseries-2.2"; mc->desc =3D "pSeries Logical Partition (PAPR compliant) v2.2"; mc->compat_props =3D compat_props; } @@ -1959,7 +1957,6 @@ static void spapr_machine_2_3_class_init(ObjectClas= s *oc, void *data) }; MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->name =3D "pseries-2.3"; mc->desc =3D "pSeries Logical Partition (PAPR compliant) v2.3"; mc->compat_props =3D compat_props; } @@ -1975,7 +1972,6 @@ static void spapr_machine_2_4_class_init(ObjectClas= s *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->name =3D "pseries-2.4"; mc->desc =3D "pSeries Logical Partition (PAPR compliant) v2.4"; mc->alias =3D "pseries"; mc->is_default =3D 1; diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e738b5b..36f78b4 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -252,7 +252,6 @@ static void ccw_machine_2_4_class_init(ObjectClass *o= c, void *data) { /* end of list */ } }; =20 - mc->name =3D "s390-ccw-virtio-2.4"; mc->desc =3D "VirtIO-ccw based S390 machine v2.4"; mc->compat_props =3D compat_props; } @@ -267,7 +266,6 @@ static void ccw_machine_2_5_class_init(ObjectClass *o= c, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->name =3D "s390-ccw-virtio-2.5"; mc->alias =3D "s390-ccw-virtio"; mc->desc =3D "VirtIO-ccw based S390 machine v2.5"; mc->is_default =3D 1; diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index a1eca09..bc013eb 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -319,7 +319,6 @@ static void s390_machine_class_init(ObjectClass *oc, = void *data) MachineClass *mc =3D MACHINE_CLASS(oc); NMIClass *nc =3D NMI_CLASS(oc); =20 - mc->name =3D S390_MACHINE; mc->alias =3D "s390"; mc->desc =3D "VirtIO based S390 machine"; mc->init =3D s390_init; diff --git a/vl.c b/vl.c index 3c6c9b0..3b92635 100644 --- a/vl.c +++ b/vl.c @@ -1437,7 +1437,6 @@ static void qemu_machine_class_init(ObjectClass *oc= , void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); QEMUMachine *qm =3D data; - mc->name =3D qm->name; mc->desc =3D qm->desc; mc->init =3D qm->init; mc->kvm_type =3D qm->kvm_type; --=20 2.1.4