OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

piix4: Rename PIIX4 object to piix4-isa

Browse Source 
Other piix4 parts are already named piix4-ide and piix4-usb-uhci.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Message-Id: <20171216090228.28505-15-hpoussin@reactos.org>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Esteban Bosse <estebanbosse@gmail.com>
[PMD: rebased]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Hervé Poussineau 2018-01-06 16:37:29 +01:00 committed by Philippe Mathieu-Daudé
parent fc531e7cab
commit 9b74b190d6
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/isa/piix4.c
View File

@ -45,7 +45,6 @@ typedef struct PIIX4State {
uint8_t rcr; uint8_t rcr;
} PIIX4State; } PIIX4State;
#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
#define PIIX4_PCI_DEVICE(obj) \ #define PIIX4_PCI_DEVICE(obj) \
OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE) OBJECT_CHECK(PIIX4State, (obj), TYPE_PIIX4_PCI_DEVICE)

2
hw/mips/mips_malta.c
View File

@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine)
ide_drive_get(hd, ARRAY_SIZE(hd)); ide_drive_get(hd, ARRAY_SIZE(hd));
pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),
true, "PIIX4"); true, TYPE_PIIX4_PCI_DEVICE);
dev = DEVICE(pci); dev = DEVICE(pci);
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0")); isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
piix4_devfn = pci->devfn; piix4_devfn = pci->devfn;

2
include/hw/isa/isa.h
View File

@ -147,4 +147,6 @@ static inline ISABus *isa_bus_from_device(ISADevice *d)
return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); return ISA_BUS(qdev_get_parent_bus(DEVICE(d)));
} }
#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
#endif #endif