From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <eduardo@habkost.net>,
"Thomas Huth" <thuth@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 4/4] hw/isa/piix: Unify PIIX-ISA QOM type names using qdev aliases
Date: Fri, 10 Feb 2023 17:57:54 +0100 [thread overview]
Message-ID: <20230210165754.34342-5-philmd@linaro.org> (raw)
In-Reply-To: <20230210165754.34342-1-philmd@linaro.org>
Unify PIIX ISA (PCI function #0) as:
pci-piix3 -> piix-isa (abstract base class)
PIIX3 -> piix3-isa (PIIX3 implementation)
PIIX3-xen -> piix3-isa-xen (PIIX3 implementation with Xen extensions)
piix4-isa -> piix4-isa (PIIX4 implementation)
Alias previous names in the QDevAlias table.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/southbridge/piix.h | 6 +++---
softmmu/qdev-monitor.c | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index 71a82ef266..cce65e8f44 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -58,9 +58,9 @@ struct PIIX3State {
MemoryRegion rcr_mem;
};
-#define TYPE_PIIX_ISA "pci-piix3"
-#define TYPE_PIIX3_ISA "PIIX3"
-#define TYPE_PIIX3_ISA_XEN "PIIX3-xen"
+#define TYPE_PIIX_ISA "piix-isa"
+#define TYPE_PIIX3_ISA "piix3-isa"
+#define TYPE_PIIX3_ISA_XEN "piix3-isa-xen"
#define TYPE_PIIX4_ISA "piix4-isa"
OBJECT_DECLARE_SIMPLE_TYPE(PIIX3State, PIIX3_ISA)
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index b8d2c4dadd..820e7f52ad 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -72,6 +72,9 @@ static const QDevAlias qdev_alias_table[] = {
{ "ES1370", "es1370" }, /* -soundhw name */
{ "ich9-ahci", "ahci" },
{ "lsi53c895a", "lsi" },
+ { "piix-isa", "pci-piix3" },
+ { "piix3-isa", "PIIX3" },
+ { "piix3-isa-xen", "PIIX3-xen" },
{ "virtio-9p-device", "virtio-9p", QEMU_ARCH_VIRTIO_MMIO },
{ "virtio-9p-ccw", "virtio-9p", QEMU_ARCH_VIRTIO_CCW },
{ "virtio-9p-pci", "virtio-9p", QEMU_ARCH_VIRTIO_PCI },
--
2.38.1
next prev parent reply other threads:[~2023-02-10 16:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 16:57 [PATCH 0/4] hw/isa/piix: Housekeeping QOM names / macros Philippe Mathieu-Daudé
2023-02-10 16:57 ` [PATCH 1/4] hw/southbridge/piix: Use OBJECT_DECLARE_SIMPLE_TYPE() macro Philippe Mathieu-Daudé
2023-02-28 21:35 ` Bernhard Beschow
2023-02-28 22:28 ` Philippe Mathieu-Daudé
2023-02-10 16:57 ` [PATCH 2/4] hw/isa/piix: Batch register QOM types using DEFINE_TYPES() macro Philippe Mathieu-Daudé
2023-02-10 16:57 ` [PATCH 3/4] hw/isa/piix: Unify QOM type name of PIIX ISA function Philippe Mathieu-Daudé
2023-02-28 21:55 ` Bernhard Beschow
2023-02-28 22:33 ` Philippe Mathieu-Daudé
2023-02-10 16:57 ` Philippe Mathieu-Daudé [this message]
2023-02-28 13:35 ` [PATCH 0/4] hw/isa/piix: Housekeeping QOM names / macros Philippe Mathieu-Daudé
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=20230210165754.34342-5-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=eduardo@habkost.net \
--cc=hpoussin@reactos.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).