[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 15/16] piix4: rename PIIX4 object to piix4-isa
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH v3 15/16] piix4: rename PIIX4 object to piix4-isa |
Date: |
Fri, 29 Dec 2017 15:29:21 +0100 |
Other piix4 parts are already named piix4-ide and piix4-usb-uhci.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
---
hw/isa/piix4.c | 1 -
hw/mips/mips_malta.c | 2 +-
include/hw/isa/isa.h | 3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index c6691a6914..8e99087c21 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -52,7 +52,6 @@ typedef struct PIIX4State {
uint8_t rcr;
} PIIX4State;
-#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
#define PIIX4_PCI_DEVICE(obj) \
OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE)
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 3d304a6e0a..93ec013ea2 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1178,7 +1178,7 @@ void mips_malta_init(MachineState *machine)
ide_drive_get(hd, ARRAY_SIZE(hd));
pci = pci_create_multifunction(pci_bus, PCI_DEVFN(10, 0),
- true, "PIIX4");
+ true, TYPE_PIIX4_PCI_DEVICE);
dev = DEVICE(pci);
/* Floppy */
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 95593408ef..1f47692447 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -153,4 +153,7 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)
/* i8257.c */
void DMA_init(ISABus *bus, int high_page_enable);
+
+#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
+
#endif
--
2.11.0
- [Qemu-devel] [PATCH v3 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, (continued)
- [Qemu-devel] [PATCH v3 07/16] piix4: add a i8259 interrupt controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 06/16] piix4: add Reset Control Register, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 13/16] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 01/16] fdc: move object structures to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 08/16] piix4: add a i8257 dma controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 03/16] mc146818rtc: move structure to header file, Hervé Poussineau, 2017/12/29
- [Qemu-devel] [PATCH v3 15/16] piix4: rename PIIX4 object to piix4-isa,
Hervé Poussineau <=