From patchwork Sun Jun 12 15:51:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 69837 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1170575qgf; Sun, 12 Jun 2016 08:59:09 -0700 (PDT) X-Received: by 10.140.174.213 with SMTP id u204mr10820380qhu.42.1465747149745; Sun, 12 Jun 2016 08:59:09 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z123si12445538qhz.49.2016.06.12.08.59.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 12 Jun 2016 08:59:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:51696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bC7n3-0003f2-9i for patch@linaro.org; Sun, 12 Jun 2016 11:59:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bC7gH-00070E-KA for qemu-devel@nongnu.org; Sun, 12 Jun 2016 11:52:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bC7gF-0007Vh-PW for qemu-devel@nongnu.org; Sun, 12 Jun 2016 11:52:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bC7g9-0007QX-NY; Sun, 12 Jun 2016 11:52:01 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 109F4C0ED3EE; Sun, 12 Jun 2016 15:52:01 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-122.brq.redhat.com [10.34.1.122]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5CFpu6W014651; Sun, 12 Jun 2016 11:51:59 -0400 From: Andrew Jones To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Sun, 12 Jun 2016 17:51:50 +0200 Message-Id: <1465746713-30414-2-git-send-email-drjones@redhat.com> In-Reply-To: <1465746713-30414-1-git-send-email-drjones@redhat.com> References: <1465746713-30414-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sun, 12 Jun 2016 15:52:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/4] hw/arm/virt: separate versioned type-init code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wei@redhat.com, peter.maydell@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rename machvirt_info (which is specifically for 2.6 TypeInfo) to machvirt_2_6_info, and separate the type registration of the abstract machine type from the versioned type. Signed-off-by: Andrew Jones Reviewed-by: Peter Maydell --- hw/arm/virt.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 2.4.11 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 73113cfc4d9c9..57eb7fef251bd 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1387,6 +1387,12 @@ static const TypeInfo virt_machine_info = { .class_init = virt_machine_class_init, }; +static void machvirt_machine_init(void) +{ + type_register_static(&virt_machine_info); +} +type_init(machvirt_machine_init); + static void virt_2_6_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -1428,17 +1434,15 @@ static void virt_2_6_class_init(ObjectClass *oc, void *data) mc->alias = "virt"; } -static const TypeInfo machvirt_info = { +static const TypeInfo machvirt_2_6_info = { .name = MACHINE_TYPE_NAME("virt-2.6"), .parent = TYPE_VIRT_MACHINE, .instance_init = virt_2_6_instance_init, .class_init = virt_2_6_class_init, }; -static void machvirt_machine_init(void) +static void machvirt_machine_2_6_init(void) { - type_register_static(&virt_machine_info); - type_register_static(&machvirt_info); + type_register_static(&machvirt_2_6_info); } - -type_init(machvirt_machine_init); +type_init(machvirt_machine_2_6_init);