mbox series

[v3,0/8] Misc hw/ide legacy clean up

Message ID cover.1584457537.git.balaton@eik.bme.hu
Headers show
Series Misc hw/ide legacy clean up | expand

Message

BALATON Zoltan March 17, 2020, 3:05 p.m. UTC
Avoid problems from reassigning variable in piix4_create and fix
compilation problem with mips_r4k

BALATON Zoltan (8):
  hw/ide: Get rid of piix3_init functions
  hw/isa/piix4.c: Introduce variable to store devfn
  hw/ide: Get rid of piix4_init function
  hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
  hw/ide/pci.c: Coding style update to fix checkpatch errors
  hw/ide: Do ide_drive_get() within pci_ide_create_devs()
  hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
  hw/ide: Remove unneeded inclusion of hw/ide.h

 hw/alpha/dp264.c              | 13 +++----------
 hw/hppa/hppa_sys.h            |  1 -
 hw/hppa/machine.c             |  1 -
 hw/i386/pc_piix.c             | 18 +++++++++---------
 hw/ide/ahci_internal.h        |  1 +
 hw/ide/pci.c                  | 11 +++++++----
 hw/ide/piix.c                 | 31 +------------------------------
 hw/isa/piix4.c                | 23 ++++++++++-------------
 hw/mips/mips_fulong2e.c       |  5 +----
 hw/mips/mips_malta.c          |  2 +-
 hw/mips/mips_r4k.c            |  1 +
 hw/ppc/mac_newworld.c         |  1 -
 hw/ppc/mac_oldworld.c         |  1 -
 hw/ppc/prep.c                 |  1 -
 hw/sparc64/sun4u.c            |  6 +-----
 include/hw/ide.h              |  6 ------
 include/hw/ide/internal.h     |  2 ++
 include/hw/ide/pci.h          |  3 ++-
 include/hw/misc/macio/macio.h |  1 +
 include/hw/southbridge/piix.h |  3 +--
 20 files changed, 41 insertions(+), 90 deletions(-)

Comments

John Snow March 17, 2020, 5:53 p.m. UTC | #1
On 3/17/20 11:05 AM, BALATON Zoltan wrote:
> Avoid problems from reassigning variable in piix4_create and fix
> compilation problem with mips_r4k
> 
> BALATON Zoltan (8):
>   hw/ide: Get rid of piix3_init functions
>   hw/isa/piix4.c: Introduce variable to store devfn
>   hw/ide: Get rid of piix4_init function
>   hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
>   hw/ide/pci.c: Coding style update to fix checkpatch errors
>   hw/ide: Do ide_drive_get() within pci_ide_create_devs()
>   hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
>   hw/ide: Remove unneeded inclusion of hw/ide.h
> 
>  hw/alpha/dp264.c              | 13 +++----------
>  hw/hppa/hppa_sys.h            |  1 -
>  hw/hppa/machine.c             |  1 -
>  hw/i386/pc_piix.c             | 18 +++++++++---------
>  hw/ide/ahci_internal.h        |  1 +
>  hw/ide/pci.c                  | 11 +++++++----
>  hw/ide/piix.c                 | 31 +------------------------------
>  hw/isa/piix4.c                | 23 ++++++++++-------------
>  hw/mips/mips_fulong2e.c       |  5 +----
>  hw/mips/mips_malta.c          |  2 +-
>  hw/mips/mips_r4k.c            |  1 +
>  hw/ppc/mac_newworld.c         |  1 -
>  hw/ppc/mac_oldworld.c         |  1 -
>  hw/ppc/prep.c                 |  1 -
>  hw/sparc64/sun4u.c            |  6 +-----
>  include/hw/ide.h              |  6 ------
>  include/hw/ide/internal.h     |  2 ++
>  include/hw/ide/pci.h          |  3 ++-
>  include/hw/misc/macio/macio.h |  1 +
>  include/hw/southbridge/piix.h |  3 +--
>  20 files changed, 41 insertions(+), 90 deletions(-)
> 

Passed local testing. Pushed to gitlab and pending further tests.

Track here: https://gitlab.com/jsnow/qemu/pipelines/127143307
BALATON Zoltan March 17, 2020, 6:34 p.m. UTC | #2
On Tue, 17 Mar 2020, John Snow wrote:
> On 3/17/20 11:05 AM, BALATON Zoltan wrote:
>> Avoid problems from reassigning variable in piix4_create and fix
>> compilation problem with mips_r4k
>>
>> BALATON Zoltan (8):
>>   hw/ide: Get rid of piix3_init functions
>>   hw/isa/piix4.c: Introduce variable to store devfn
>>   hw/ide: Get rid of piix4_init function
>>   hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
>>   hw/ide/pci.c: Coding style update to fix checkpatch errors
>>   hw/ide: Do ide_drive_get() within pci_ide_create_devs()
>>   hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
>>   hw/ide: Remove unneeded inclusion of hw/ide.h
>>
>>  hw/alpha/dp264.c              | 13 +++----------
>>  hw/hppa/hppa_sys.h            |  1 -
>>  hw/hppa/machine.c             |  1 -
>>  hw/i386/pc_piix.c             | 18 +++++++++---------
>>  hw/ide/ahci_internal.h        |  1 +
>>  hw/ide/pci.c                  | 11 +++++++----
>>  hw/ide/piix.c                 | 31 +------------------------------
>>  hw/isa/piix4.c                | 23 ++++++++++-------------
>>  hw/mips/mips_fulong2e.c       |  5 +----
>>  hw/mips/mips_malta.c          |  2 +-
>>  hw/mips/mips_r4k.c            |  1 +
>>  hw/ppc/mac_newworld.c         |  1 -
>>  hw/ppc/mac_oldworld.c         |  1 -
>>  hw/ppc/prep.c                 |  1 -
>>  hw/sparc64/sun4u.c            |  6 +-----
>>  include/hw/ide.h              |  6 ------
>>  include/hw/ide/internal.h     |  2 ++
>>  include/hw/ide/pci.h          |  3 ++-
>>  include/hw/misc/macio/macio.h |  1 +
>>  include/hw/southbridge/piix.h |  3 +--
>>  20 files changed, 41 insertions(+), 90 deletions(-)
>>
>
> Passed local testing. Pushed to gitlab and pending further tests.
>
> Track here: https://gitlab.com/jsnow/qemu/pipelines/127143307

These tests don't seem to compile mips64el-softmmu target so probably miss 
some of these which are only used on those boards. (E.g. I could not find 
hw/ide/via.c mentioned in any of the logs.)

Regards,
BALATON Zoltan
John Snow March 17, 2020, 7:09 p.m. UTC | #3
On 3/17/20 2:34 PM, BALATON Zoltan wrote:
> On Tue, 17 Mar 2020, John Snow wrote:
>> On 3/17/20 11:05 AM, BALATON Zoltan wrote:
>>> Avoid problems from reassigning variable in piix4_create and fix
>>> compilation problem with mips_r4k
>>>
>>> BALATON Zoltan (8):
>>>   hw/ide: Get rid of piix3_init functions
>>>   hw/isa/piix4.c: Introduce variable to store devfn
>>>   hw/ide: Get rid of piix4_init function
>>>   hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
>>>   hw/ide/pci.c: Coding style update to fix checkpatch errors
>>>   hw/ide: Do ide_drive_get() within pci_ide_create_devs()
>>>   hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
>>>   hw/ide: Remove unneeded inclusion of hw/ide.h
>>>
>>>  hw/alpha/dp264.c              | 13 +++----------
>>>  hw/hppa/hppa_sys.h            |  1 -
>>>  hw/hppa/machine.c             |  1 -
>>>  hw/i386/pc_piix.c             | 18 +++++++++---------
>>>  hw/ide/ahci_internal.h        |  1 +
>>>  hw/ide/pci.c                  | 11 +++++++----
>>>  hw/ide/piix.c                 | 31 +------------------------------
>>>  hw/isa/piix4.c                | 23 ++++++++++-------------
>>>  hw/mips/mips_fulong2e.c       |  5 +----
>>>  hw/mips/mips_malta.c          |  2 +-
>>>  hw/mips/mips_r4k.c            |  1 +
>>>  hw/ppc/mac_newworld.c         |  1 -
>>>  hw/ppc/mac_oldworld.c         |  1 -
>>>  hw/ppc/prep.c                 |  1 -
>>>  hw/sparc64/sun4u.c            |  6 +-----
>>>  include/hw/ide.h              |  6 ------
>>>  include/hw/ide/internal.h     |  2 ++
>>>  include/hw/ide/pci.h          |  3 ++-
>>>  include/hw/misc/macio/macio.h |  1 +
>>>  include/hw/southbridge/piix.h |  3 +--
>>>  20 files changed, 41 insertions(+), 90 deletions(-)
>>>
>>
>> Passed local testing. Pushed to gitlab and pending further tests.
>>
>> Track here: https://gitlab.com/jsnow/qemu/pipelines/127143307
> 
> These tests don't seem to compile mips64el-softmmu target so probably
> miss some of these which are only used on those boards. (E.g. I could
> not find hw/ide/via.c mentioned in any of the logs.)
> 
> Regards,
> BALATON Zoltan
> 

Nope, probably not! I ran what I could locally, but anything further I
am going to be relying on your testing during RC.

--js
John Snow March 17, 2020, 11:21 p.m. UTC | #4
On 3/17/20 11:05 AM, BALATON Zoltan wrote:
> Avoid problems from reassigning variable in piix4_create and fix
> compilation problem with mips_r4k
> 
> BALATON Zoltan (8):
>   hw/ide: Get rid of piix3_init functions
>   hw/isa/piix4.c: Introduce variable to store devfn
>   hw/ide: Get rid of piix4_init function
>   hw/ide: Remove now unneded #include "hw/pci/pci.h" from hw/ide.h
>   hw/ide/pci.c: Coding style update to fix checkpatch errors
>   hw/ide: Do ide_drive_get() within pci_ide_create_devs()
>   hw/ide: Move MAX_IDE_DEVS define to hw/ide/internal.h
>   hw/ide: Remove unneeded inclusion of hw/ide.h
> 
>  hw/alpha/dp264.c              | 13 +++----------
>  hw/hppa/hppa_sys.h            |  1 -
>  hw/hppa/machine.c             |  1 -
>  hw/i386/pc_piix.c             | 18 +++++++++---------
>  hw/ide/ahci_internal.h        |  1 +
>  hw/ide/pci.c                  | 11 +++++++----
>  hw/ide/piix.c                 | 31 +------------------------------
>  hw/isa/piix4.c                | 23 ++++++++++-------------
>  hw/mips/mips_fulong2e.c       |  5 +----
>  hw/mips/mips_malta.c          |  2 +-
>  hw/mips/mips_r4k.c            |  1 +
>  hw/ppc/mac_newworld.c         |  1 -
>  hw/ppc/mac_oldworld.c         |  1 -
>  hw/ppc/prep.c                 |  1 -
>  hw/sparc64/sun4u.c            |  6 +-----
>  include/hw/ide.h              |  6 ------
>  include/hw/ide/internal.h     |  2 ++
>  include/hw/ide/pci.h          |  3 ++-
>  include/hw/misc/macio/macio.h |  1 +
>  include/hw/southbridge/piix.h |  3 +--
>  20 files changed, 41 insertions(+), 90 deletions(-)
> 

Thanks, applied to my IDE tree:

https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git

--js