[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 05/20] piix4: Rename PIIX4 object to piix4-isa
From: |
Esteban Bosse |
Subject: |
Re: [PATCH v2 05/20] piix4: Rename PIIX4 object to piix4-isa |
Date: |
Tue, 22 Oct 2019 10:57:12 +0200 |
User-agent: |
Evolution 3.30.5-1.1 |
El vie, 18-10-2019 a las 15:47 +0200, Philippe Mathieu-Daudé escribió:
> From: Hervé Poussineau <address@hidden>
>
> 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>
> Message-Id: <address@hidden>
> Reviewed-by: Aleksandar Markovic <address@hidden>
> [PMD: rebased]
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/isa/piix4.c | 1 -
> hw/mips/mips_malta.c | 2 +-
> include/hw/isa/isa.h | 2 ++
> 3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index 9c37c85ae2..ac9383a658 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -45,7 +45,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 7d25ab6c23..e499b7a6bb 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -1414,7 +1414,7 @@ void mips_malta_init(MachineState *machine)
> ide_drive_get(hd, ARRAY_SIZE(hd));
>
> pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),
> - true, "PIIX4");
> + true,
> TYPE_PIIX4_PCI_DEVICE);
> dev = DEVICE(pci);
> isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
> piix4_devfn = pci->devfn;
> diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
> index 018ada4f6f..79f703fd6c 100644
> --- a/include/hw/isa/isa.h
> +++ b/include/hw/isa/isa.h
> @@ -147,4 +147,6 @@ 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
Reviewed-by: Esteban Bosse <address@hidden>
- Re: [PATCH v2 02/20] piix4: Add the Reset Control Register, (continued)
- [PATCH v2 03/20] piix4: Add a i8259 Interrupt Controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 04/20] Revert "irq: introduce qemu_irq_proxy()", Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 05/20] piix4: Rename PIIX4 object to piix4-isa, Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 06/20] piix4: Add a i8257 DMA Controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 07/20] piix4: Add a i8254 PIT Controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 08/20] piix4: Add a MC146818 RTC Controller as specified in datasheet, Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 09/20] hw/mips/mips_malta: Create IDE hard drive array dynamically, Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 10/20] hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create(), Philippe Mathieu-Daudé, 2019/10/18
- [PATCH v2 11/20] hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c, Philippe Mathieu-Daudé, 2019/10/18