diff options
| author | Bernhard Beschow | 2022-06-03 20:50:35 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2022-06-11 11:44:50 +0200 |
| commit | 3963e1398e1b0cbcc0fb21b2cce387ba7f48de5f (patch) | |
| tree | 4ddaf68e97efa6b45c864a5158f684b3fb630a0e | |
| parent | hw/acpi/piix4: remove unused piix4_pm_initfn() function (diff) | |
| download | qemu-3963e1398e1b0cbcc0fb21b2cce387ba7f48de5f.tar.gz qemu-3963e1398e1b0cbcc0fb21b2cce387ba7f48de5f.tar.xz qemu-3963e1398e1b0cbcc0fb21b2cce387ba7f48de5f.zip | |
hw/southbridge/piix: Aggregate all PIIX southbridge type names
TYPE_PIIX3_PCI_DEVICE resides there as already, so add the remaining
ones, too.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220603185045.143789-2-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rw-r--r-- | hw/isa/piix3.c | 3 | ||||
| -rw-r--r-- | include/hw/isa/isa.h | 2 | ||||
| -rw-r--r-- | include/hw/southbridge/piix.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index bfccd666d4..c92b36c4f2 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -36,9 +36,6 @@ #define XEN_PIIX_NUM_PIRQS 128ULL -#define TYPE_PIIX3_DEVICE "PIIX3" -#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" - static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq) { qemu_set_irq(piix3->pic[pic_irq], diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 6f9380007d..6c8a8a92cb 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -129,6 +129,4 @@ static inline ISABus *isa_bus_from_device(ISADevice *d) return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); } -#define TYPE_PIIX4_PCI_DEVICE "piix4-isa" - #endif diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 976b4da582..3b97186f75 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -64,6 +64,10 @@ typedef struct PIIXState PIIX3State; DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE, TYPE_PIIX3_PCI_DEVICE) +#define TYPE_PIIX3_DEVICE "PIIX3" +#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" +#define TYPE_PIIX4_PCI_DEVICE "piix4-isa" + PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus); DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus); |