[v1] piix4: cleanup and improvements

[Qemu-devel] [PATCH v2 14/15] piix4: rename PIIX4 object to piix4-isa

Posted by Hervé Poussineau 7 years, 10 months ago

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

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/isa/piix4.c       | 2 +-
 hw/mips/mips_malta.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index dc7146ee14..8bf260594f 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -52,7 +52,7 @@ typedef struct PIIX4State {
     uint8_t rcr;
 } PIIX4State;
 
-#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
+#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
 #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..28d91c9668 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, "piix4-isa");
     dev = DEVICE(pci);
 
     /* Floppy */
-- 
2.11.0

Re: [Qemu-devel] [PATCH v2 14/15] piix4: rename PIIX4 object to piix4-isa

Posted by Philippe Mathieu-Daudé 7 years, 10 months ago

Hi Hervé,

On 12/16/2017 06:30 PM, Hervé Poussineau wrote:
> Other piix4 parts are already named piix4-ide and piix4-usb-uhci.
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/isa/piix4.c       | 2 +-
>  hw/mips/mips_malta.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index dc7146ee14..8bf260594f 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -52,7 +52,7 @@ typedef struct PIIX4State {
>      uint8_t rcr;
>  } PIIX4State;
>  
> -#define TYPE_PIIX4_PCI_DEVICE "PIIX4"
> +#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
>  #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..28d91c9668 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, "piix4-isa");

Can you use TYPE_PIIX4_PCI_DEVICE instead?

Then:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>      dev = DEVICE(pci);
>  
>      /* Floppy */
>