From patchwork Mon Feb 22 21:06:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Huang X-Patchwork-Id: 8383441 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 626A19F372 for ; Mon, 22 Feb 2016 21:09:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3CF2205CA for ; Mon, 22 Feb 2016 21:09:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 033DB205B5 for ; Mon, 22 Feb 2016 21:09:55 +0000 (UTC) Received: from localhost ([::1]:52022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXxju-00046J-BL for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 Feb 2016 16:09:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXxgs-0006hN-SX for qemu-devel@nongnu.org; Mon, 22 Feb 2016 16:06:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aXxgr-0004SC-VB for qemu-devel@nongnu.org; Mon, 22 Feb 2016 16:06:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aXxgo-0004R6-NA; Mon, 22 Feb 2016 16:06:42 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 648957EBB2; Mon, 22 Feb 2016 21:06:42 +0000 (UTC) Received: from apm-mustang-ev3-33.khw.lab.eng.bos.redhat.com (apm-mustang-ev3-33.khw.lab.eng.bos.redhat.com [10.16.184.127]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1ML6dUV015881; Mon, 22 Feb 2016 16:06:41 -0500 From: Wei Huang To: qemu-devel@nongnu.org Date: Mon, 22 Feb 2016 16:06:38 -0500 Message-Id: <1456175198-25210-3-git-send-email-wei@redhat.com> In-Reply-To: <1456175198-25210-1-git-send-email-wei@redhat.com> References: <1456175198-25210-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: wei@redhat.com, peter.maydell@linaro.org, drjones@redhat.com, qemu-arm@nongnu.org, abologna@redhat.com Subject: [Qemu-devel] [PATCH RFC 2/2] arm: virt: Move machine class init code to the abstract machine type 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch moves the common class initialization code from "virt-2.5" to the new abstract class. An empty property is added to "virt-2.5" machine. In the meanwhile, related machine funtion are renamed to "virt_2_5_blah_blah" for consistency. Signed-off-by: Wei Huang --- hw/arm/virt.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ee15301..650dfe6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1253,6 +1253,18 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp) static void virt_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc = MACHINE_CLASS(oc); + + mc->init = machvirt_init; + /* Start max_cpus at the maximum QEMU supports. We'll further restrict + * it later in machvirt_init, where we have more information about the + * configuration of the particular instance. + */ + mc->max_cpus = MAX_CPUMASK_BITS; + mc->has_dynamic_sysbus = true; + mc->block_default_type = IF_VIRTIO; + mc->no_cdrom = 1; + mc->pci_allow_0_address = true; } static const TypeInfo virt_machine_info = { @@ -1264,7 +1276,7 @@ static const TypeInfo virt_machine_info = { .class_init = virt_machine_class_init, }; -static void virt_instance_init(Object *obj) +static void virt_2_5_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -1297,30 +1309,24 @@ static void virt_instance_init(Object *obj) "Valid values are 2, 3 and host", NULL); } -static void virt_class_init(ObjectClass *oc, void *data) +static void virt_2_5_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + static GlobalProperty compat_props[] = { + { /* end of list */ } + }; mc->desc = "QEMU 2.5 ARM Virtual Machine"; mc->alias = "virt"; mc->is_default = 1; - mc->init = machvirt_init; - /* Start max_cpus at the maximum QEMU supports. We'll further restrict - * it later in machvirt_init, where we have more information about the - * configuration of the particular instance. - */ - mc->max_cpus = MAX_CPUMASK_BITS; - mc->has_dynamic_sysbus = true; - mc->block_default_type = IF_VIRTIO; - mc->no_cdrom = 1; - mc->pci_allow_0_address = true; + mc->compat_props = compat_props; } static const TypeInfo machvirt_info = { .name = MACHINE_TYPE_NAME("virt-2.5"), .parent = TYPE_VIRT_MACHINE, - .instance_init = virt_instance_init, - .class_init = virt_class_init, + .instance_init = virt_2_5_instance_init, + .class_init = virt_2_5_class_init, }; static void machvirt_machine_init(void)