From: Andrew Jones <drjones@redhat.com>
To: qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org
Subject: [Qemu-arm] [PATCH 1/5] hw/arm/virt: separate versioned type-init code
Date: Wed, 8 Jun 2016 20:24:47 +0200 [thread overview]
Message-ID: <1465410291-2971-2-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1465410291-2971-1-git-send-email-drjones@redhat.com>
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 <drjones@redhat.com>
---
hw/arm/virt.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8e46137e9be71..a0d35d0826590 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);
--
2.4.11
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Jones <drjones@redhat.com>
To: qemu-devel@nongnu.org, qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org, wei@redhat.com
Subject: [Qemu-devel] [PATCH 1/5] hw/arm/virt: separate versioned type-init code
Date: Wed, 8 Jun 2016 20:24:47 +0200 [thread overview]
Message-ID: <1465410291-2971-2-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1465410291-2971-1-git-send-email-drjones@redhat.com>
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 <drjones@redhat.com>
---
hw/arm/virt.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8e46137e9be71..a0d35d0826590 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);
--
2.4.11
next prev parent reply other threads:[~2016-06-08 18:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-08 18:24 [Qemu-arm] [PATCH 0/5] create the mach-virt 2.7 machine type Andrew Jones
2016-06-08 18:24 ` [Qemu-devel] " Andrew Jones
2016-06-08 18:24 ` Andrew Jones [this message]
2016-06-08 18:24 ` [Qemu-devel] [PATCH 1/5] hw/arm/virt: separate versioned type-init code Andrew Jones
2016-06-09 18:27 ` Peter Maydell
2016-06-09 18:27 ` Peter Maydell
2016-06-08 18:24 ` [Qemu-arm] [PATCH 2/5] hw/arm/virt: set is_default Andrew Jones
2016-06-08 18:24 ` [Qemu-devel] " Andrew Jones
2016-06-09 18:27 ` Peter Maydell
2016-06-09 18:27 ` Peter Maydell
2016-06-08 18:24 ` [Qemu-arm] [PATCH 3/5] hw/arm/virt: introduce DEFINE_VIRT_MACHINE Andrew Jones
2016-06-08 18:24 ` [Qemu-devel] " Andrew Jones
2016-06-09 18:29 ` Peter Maydell
2016-06-09 18:29 ` Peter Maydell
2016-06-08 18:24 ` [Qemu-arm] [PATCH 4/5] hw/arm/virt: introduce DEFINE_VIRT_MACHINE_AS_LATEST Andrew Jones
2016-06-08 18:24 ` [Qemu-devel] " Andrew Jones
2016-06-09 18:30 ` [Qemu-arm] " Peter Maydell
2016-06-09 18:30 ` [Qemu-devel] " Peter Maydell
2016-06-08 18:24 ` [Qemu-devel] [PATCH 5/5] hw/arm/virt: create the 2.7 machine type Andrew Jones
2016-06-08 18:24 ` Andrew Jones
2016-06-09 16:06 ` Alex Bennée
2016-06-09 16:19 ` Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465410291-2971-2-git-send-email-drjones@redhat.com \
--to=drjones@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.