From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Alexander Graf" <agraf@suse.de>,
"Richard Henderson" <rth@twiddle.net>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PULL 09/21] s390-virtio: Rename machine class name to use MACHINE_TYPE_NAME
Date: Sat, 19 Sep 2015 16:43:18 +0200 [thread overview]
Message-ID: <1442673810-2679-10-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1442673810-2679-1-git-send-email-afaerber@suse.de>
From: Eduardo Habkost <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.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
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 e4000c9..a1eca09 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -54,7 +54,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
@@ -318,7 +319,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.4
next prev parent reply other threads:[~2015-09-19 14:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-19 14:43 [Qemu-devel] [PULL 00/21] QOM devices patch queue 2015-09-19 Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 01/21] qom: Do not reuse errp after a possible error Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 02/21] qom: Fix invalid error check in property_get_str() Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 03/21] qdev: Do not use slow [*] expansion for GPIO creation Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 04/21] machine: MACHINE_TYPE_NAME macro Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 05/21] vexpress: Don't set name on abstract class Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 06/21] vexpress: Rename machine classes to use MACHINE_TYPE_NAME Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 07/21] arm: Rename virt machine class " Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 08/21] pseries: Rename machine class names " Andreas Färber
2015-09-19 14:43 ` Andreas Färber [this message]
2015-09-19 14:43 ` [Qemu-devel] [PULL 10/21] s390: Rename s390-ccw-virtio-2.4 class name " Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 11/21] mac99: Use MACHINE_TYPE_NAME to encode class name Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 12/21] machine: Ensure all TYPE_MACHINE subclasses have the right suffix Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 13/21] machine: Set MachineClass::name automatically Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 14/21] exynos4: Use EXYNOS4210_NCPUS instead of max_cpus on error message Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 15/21] exynos4: Use MachineClass instead of exynos4_machines array Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 16/21] exynos4: Declare each QEMUMachine as a separate variable Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 17/21] machine: DEFINE_MACHINE() macro Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 18/21] mac_world: Break long line Andreas Färber
2015-09-19 15:14 ` Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 19/21] Use DEFINE_MACHINE() to register all machines Andreas Färber
2015-09-19 14:43 ` [Qemu-devel] [PULL 20/21] Revert use of DEFINE_MACHINE() for registrations of multiple machines Andreas Färber
2015-09-21 15:49 ` Eduardo Habkost
2015-09-21 15:52 ` Andreas Färber
2015-09-21 17:24 ` Eduardo Habkost
2015-09-21 17:57 ` Eduardo Habkost
2015-09-19 14:43 ` [Qemu-devel] [PULL 21/21] machine: Eliminate QEMUMachine and qemu_register_machine() Andreas Färber
2015-09-19 16:56 ` [Qemu-devel] [PULL 00/21] QOM devices patch queue 2015-09-19 Peter Maydell
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=1442673810-2679-10-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=agraf@suse.de \
--cc=ehabkost@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).