* [Qemu-devel] [PATCH for-2.12] hw/ide: Remove duplicated definitions from ahci_internal.h
@ 2017-11-30 19:12 Thomas Huth
2017-12-05 1:29 ` John Snow
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Huth @ 2017-11-30 19:12 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, qemu-trivial, John Snow
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 <thuth@redhat.com>
---
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 */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.12] hw/ide: Remove duplicated definitions from ahci_internal.h
2017-11-30 19:12 [Qemu-devel] [PATCH for-2.12] hw/ide: Remove duplicated definitions from ahci_internal.h Thomas Huth
@ 2017-12-05 1:29 ` John Snow
0 siblings, 0 replies; 2+ messages in thread
From: John Snow @ 2017-12-05 1:29 UTC (permalink / raw)
To: Thomas Huth, qemu-devel; +Cc: qemu-trivial, qemu-block
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 <thuth@redhat.com>
> ---
> 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?
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-12-05 1:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-30 19:12 [Qemu-devel] [PATCH for-2.12] hw/ide: Remove duplicated definitions from ahci_internal.h Thomas Huth
2017-12-05 1:29 ` John Snow
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).