| Message ID | 20230302224058.43315-19-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/ide: Untangle ISA/PCI abuses of ide_init_ioport() | expand |
On 02/03/2023 22:40, Philippe Mathieu-Daudé wrote: > 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 }, Same comment here re: naming: I completely agree that the existing name is confusing, however I don't find the replacements that less confusing either :/ ATB, Mark.
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 },
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(-)