[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-is
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-isa |
Date: |
Sun, 7 Jan 2018 13:38:20 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 |
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é <address@hidden>
> Acked-by: Michael S. Tsirkin <address@hidden>
> Acked-by: Paolo Bonzini <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 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
>
- [Qemu-devel] [PATCH v4 01/16] fdc: move object structures to header file, (continued)
- [Qemu-devel] [PATCH v4 01/16] fdc: move object structures to header file, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 05/16] piix4: rename some variables in realize function, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 09/16] piix4: add a i8254 pit controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 04/16] mc146818rtc: always register rtc to rtc list, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 11/16] piix4: add a floppy controller, 1 parallel port and 2 serial ports, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 13/16] piix4: add a speaker as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 12/16] piix4: add a mc146818rtc controller as specified in datasheet, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-isa, Hervé Poussineau, 2018/01/06
- Re: [Qemu-devel] [PATCH v4 15/16] piix4: rename PIIX4 object to piix4-isa,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 14/16] piix4: convert reset function to QOM, Hervé Poussineau, 2018/01/06
- [Qemu-devel] [PATCH v4 16/16] piix4: we can now instanciate a PIIX4 with -device, Hervé Poussineau, 2018/01/06
- Re: [Qemu-devel] [PATCH v4 00/16] piix4: cleanup and improvements, Philippe Mathieu-Daudé, 2018/01/07