From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org, "Andreas Färber" <afaerber@suse.de>
Cc: Richard Henderson <rth@twiddle.net>,
Marcel Apfelbaum <marcel.a@redhat.com>,
Alexander Graf <agraf@suse.de>,
David Gibson <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH 06/10] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME
Date: Thu, 20 Aug 2015 14:54:32 -0700 [thread overview]
Message-ID: <1440107676-17326-7-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1440107676-17326-1-git-send-email-ehabkost@redhat.com>
Machine class names should use the "-machine" suffix to allow
class-name-based machine class lookup to work. Rename the s390-virtio
machine class using the MACHINE_TYPE_NAME macro.
Cc: Alexander Graf <agraf@suse.de>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
hw/s390x/s390-virtio.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 1284e77..43d6ccb 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -52,7 +52,8 @@
#define MAX_BLK_DEVS 10
#define ZIPL_FILENAME "s390-zipl.rom"
-#define TYPE_S390_MACHINE "s390-machine"
+#define S390_MACHINE "s390-virtio"
+#define TYPE_S390_MACHINE MACHINE_TYPE_NAME(S390_MACHINE)
#define S390_TOD_CLOCK_VALUE_MISSING 0x00
#define S390_TOD_CLOCK_VALUE_PRESENT 0x01
@@ -333,7 +334,7 @@ static void s390_machine_class_init(ObjectClass *oc, void *data)
MachineClass *mc = MACHINE_CLASS(oc);
NMIClass *nc = NMI_CLASS(oc);
- mc->name = "s390-virtio";
+ mc->name = S390_MACHINE;
mc->alias = "s390";
mc->desc = "VirtIO based S390 machine";
mc->init = s390_init;
--
2.1.0
next prev parent reply other threads:[~2015-08-20 21:55 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-20 21:54 [Qemu-devel] [PATCH 00/10] Fix machine class names to use the "-machine" suffix Eduardo Habkost
2015-08-20 21:54 ` [Qemu-devel] [PATCH 01/10] machine: MACHINE_TYPE_NAME macro Eduardo Habkost
2015-08-25 8:53 ` Marcel Apfelbaum
2015-08-30 5:59 ` David Gibson
2015-08-20 21:54 ` [Qemu-devel] [PATCH 02/10] vexpress: Don't set name on abstract class Eduardo Habkost
2015-08-30 6:42 ` David Gibson
2015-08-20 21:54 ` [Qemu-devel] [PATCH 03/10] vexpress: Rename machine classes to use MACHINE_TYPE_NAME Eduardo Habkost
2015-08-30 6:43 ` David Gibson
2015-09-19 6:30 ` Andreas Färber
2015-09-19 6:37 ` Andreas Färber
2015-08-20 21:54 ` [Qemu-devel] [PATCH 04/10] arm: Rename virt machine class " Eduardo Habkost
2015-08-30 6:43 ` David Gibson
2015-08-20 21:54 ` [Qemu-devel] [PATCH 05/10] pseries: Rename machine class names " Eduardo Habkost
2015-08-30 6:45 ` David Gibson
2015-08-20 21:54 ` Eduardo Habkost [this message]
2015-08-30 6:46 ` [Qemu-devel] [PATCH 06/10] s390-virtio: Rename machine class name " David Gibson
2015-08-20 21:54 ` [Qemu-devel] [PATCH 07/10] s390: Rename s390-ccw-virtio-2.4 " Eduardo Habkost
2015-08-30 6:46 ` David Gibson
2015-09-04 8:52 ` Christian Borntraeger
2015-09-04 14:54 ` Eduardo Habkost
2015-09-04 14:56 ` Andreas Färber
2015-09-04 15:06 ` Eduardo Habkost
2015-09-04 15:42 ` Eduardo Habkost
2015-08-20 21:54 ` [Qemu-devel] [PATCH 08/10] mac99: Use MACHINE_TYPE_NAME to encode class name Eduardo Habkost
2015-08-30 6:46 ` David Gibson
2015-08-20 21:54 ` [Qemu-devel] [PATCH 09/10] machine: Ensure all TYPE_MACHINE subclasses have the right suffix Eduardo Habkost
2015-08-25 8:53 ` Marcel Apfelbaum
2015-08-20 21:54 ` [Qemu-devel] [PATCH 10/10] machine: Set MachineClass::name automatically Eduardo Habkost
2015-08-25 8:50 ` Marcel Apfelbaum
2015-08-26 15:02 ` Eduardo Habkost
2015-08-26 16:13 ` Marcel Apfelbaum
2015-09-04 15:46 ` Eduardo Habkost
2015-09-19 6:23 ` Andreas Färber
2015-09-19 6:39 ` Andreas Färber
2015-08-21 10:23 ` [Qemu-devel] [PATCH 00/10] Fix machine class names to use the "-machine" suffix Cornelia Huck
2015-08-21 15:44 ` Eduardo Habkost
2015-09-02 19:58 ` Eduardo Habkost
2015-09-03 7:39 ` Cornelia Huck
2015-09-06 19:25 ` Andreas Färber
2015-09-07 9:05 ` Marcel Apfelbaum
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=1440107676-17326-7-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=david@gibson.dropbear.id.au \
--cc=marcel.a@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).