[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [Qemu-devel] [PATCH v2] hw/ide: Remove duplicated def
From: |
John Snow |
Subject: |
Re: [Qemu-trivial] [Qemu-devel] [PATCH v2] hw/ide: Remove duplicated definitions from ahci_internal.h |
Date: |
Fri, 8 Dec 2017 15:07:58 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 12/05/2017 02:10 AM, 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>
> ---
> v2: Also remove TYPE_ICH9_AHCI as suggested by John
>
> hw/ide/ahci_internal.h | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
> index ce2e818..e3e3ed2 100644
> --- a/hw/ide/ahci_internal.h
> +++ b/hw/ide/ahci_internal.h
> @@ -311,11 +311,6 @@ struct AHCIPCIState {
> AHCIState ahci;
> };
>
> -#define TYPE_ICH9_AHCI "ich9-ahci"
> -
> -#define ICH_AHCI(obj) \
> - OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)
> -
> extern const VMStateDescription vmstate_ahci;
>
> #define VMSTATE_AHCI(_field, _state) { \
> @@ -375,11 +370,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 */
>
With edits:
Thanks, applied to my IDE tree:
https://github.com/jnsnow/qemu/commits/ide
https://github.com/jnsnow/qemu.git
--js
(PR will be sent when 2.12 opens; there's time to fiddle with it.)