On 01/06/2018 12:37 PM, Hervé Poussineau wrote:
> Other piix4 parts are already named piix4-ide and piix4-usb-uhci.
>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> Acked-by: Michael S. Tsirkin <m...@redhat.com>
> Acked-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Hervé Poussineau <hpous...@reactos.org>
> ---
> 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 159a27d2d9..1447d41934 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"
can this be a migration issue?
> +
> #endif
>
