Re: [Qemu-trivial] [Qemu-devel] [PATCH for-2.12] hw/ide: Remove duplicated definitions from ahci_internal.h

[John Snow]

On 11/30/2017 02:12 PM, Thomas Huth wrote:
> The same definitions can also be found in include/hw/ide/ahci.h
> so let's remove these #defines from ahci_internal.h.
> 
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>  hw/ide/ahci_internal.h | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
> index ce2e818..1080a34 100644
> --- a/hw/ide/ahci_internal.h
> +++ b/hw/ide/ahci_internal.h
> @@ -375,11 +375,4 @@ void ahci_uninit(AHCIState *s);
>  
>  void ahci_reset(AHCIState *s);
>  
> -#define TYPE_SYSBUS_AHCI "sysbus-ahci"
> -#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), 
> TYPE_SYSBUS_AHCI)
> -
> -#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
> -#define ALLWINNER_AHCI(obj) OBJECT_CHECK(AllwinnerAHCIState, (obj), \
> -                       TYPE_ALLWINNER_AHCI)
> -
>  #endif /* HW_IDE_AHCI_H */
> 

Whoops, looks like I got a little carried away with my split and didn't
quite finish the job :(

Sadly, TYPE_ICH9_AHCI is also duplicated ... and used outside of the
core layer. Would you like to do v2 or shall I?