From patchwork Fri Jun 13 19:43:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 359610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 87552140093 for ; Sat, 14 Jun 2014 05:52:36 +1000 (EST) Received: from localhost ([::1]:32881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXWc-0006R6-Hq for incoming@patchwork.ozlabs.org; Fri, 13 Jun 2014 15:52:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPW-0005y0-4P for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WvXPP-0006e2-Uw for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64145) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WvXPP-0006ds-NZ for qemu-devel@nongnu.org; Fri, 13 Jun 2014 15:45:07 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5DJj6ao019422 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 13 Jun 2014 15:45:06 -0400 Received: from localhost (ovpn-113-83.phx2.redhat.com [10.3.113.83]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5DJj5LL022412; Fri, 13 Jun 2014 15:45:05 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org, "Michael S. Tsirkin" Date: Fri, 13 Jun 2014 16:43:51 -0300 Message-Id: <1402688658-22333-13-git-send-email-ehabkost@redhat.com> In-Reply-To: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> References: <1402688658-22333-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcel Apfelbaum , Alexander Graf , Don Slutz , Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC v2 12/39] q35: Eliminate pc_q35_machine_options() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Instead of calling it on every q35 class_init function, just register a common parent class for all q35 machine-types. Signed-off-by: Eduardo Habkost --- hw/i386/pc_q35.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 521bff7..5750239 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -319,15 +319,24 @@ static void pc_q35_init_1_4(MachineState *machine) pc_q35_init(machine); } -static void pc_q35_machine_options(MachineClass *mc) +static void pc_q35_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); mc->desc = "Standard PC (Q35 + ICH9, 2009)"; mc->hot_add_cpu = pc_hot_add_cpu; } +#define TYPE_PC_Q35_MACHINE "pc-q35" TYPE_MACHINE_SUFFIX + +static TypeInfo pc_q35_machine_type_info = { + .name = TYPE_PC_Q35_MACHINE, + .parent = TYPE_PC_MACHINE, + .class_init = pc_q35_machine_class_init, + .abstract = true, +}; + static void pc_q35_2_1_machine_options(MachineClass *mc) { - pc_q35_machine_options(mc); mc->default_machine_opts = "firmware=bios-256k.bin"; } @@ -342,7 +351,7 @@ static void pc_q35_machine_v2_1_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v2_1_type_info = { .name = "pc-q35-2.1" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v2_1_class_init, }; @@ -363,12 +372,10 @@ static void pc_q35_machine_v2_0_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v2_0_type_info = { .name = "pc-q35-2.0" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v2_0_class_init, }; -#define pc_q35_1_7_machine_options pc_q35_machine_options - static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -376,7 +383,6 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) PC_Q35_COMPAT_1_7, { /* end of list */ } }; - pc_q35_1_7_machine_options(mc); mc->init = pc_q35_init_1_7; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.7"; @@ -384,12 +390,10 @@ static void pc_q35_machine_v1_7_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_7_type_info = { .name = "pc-q35-1.7" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_7_class_init, }; -#define pc_q35_1_6_machine_options pc_q35_machine_options - static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -397,7 +401,6 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) PC_Q35_COMPAT_1_6, { /* end of list */ } }; - pc_q35_1_6_machine_options(mc); mc->init = pc_q35_init_1_6; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.6"; @@ -405,7 +408,7 @@ static void pc_q35_machine_v1_6_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_6_type_info = { .name = "pc-q35-1.6" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_6_class_init, }; @@ -416,7 +419,6 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass *oc, void *data) PC_Q35_COMPAT_1_5, { /* end of list */ } }; - pc_q35_1_6_machine_options(mc); mc->init = pc_q35_init_1_5; machine_class_add_compat_props(mc, compat_props); mc->name = "pc-q35-1.5"; @@ -424,13 +426,12 @@ static void pc_q35_machine_v1_5_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_5_type_info = { .name = "pc-q35-1.5" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_5_class_init, }; static void pc_q35_1_4_machine_options(MachineClass *mc) { - pc_q35_1_6_machine_options(mc); mc->hot_add_cpu = NULL; } @@ -449,12 +450,13 @@ static void pc_q35_machine_v1_4_class_init(ObjectClass *oc, void *data) static TypeInfo pc_q35_machine_v1_4_type_info = { .name = "pc-q35-1.4" TYPE_MACHINE_SUFFIX, - .parent = TYPE_PC_MACHINE, + .parent = TYPE_PC_Q35_MACHINE, .class_init = pc_q35_machine_v1_4_class_init, }; static void pc_q35_machine_init(void) { + type_register_static(&pc_q35_machine_type_info); type_register_static(&pc_q35_machine_v2_1_type_info); type_register_static(&pc_q35_machine_v2_0_type_info); type_register_static(&pc_q35_machine_v1_7_type_info);