* [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide
@ 2024-02-23 14:26 BALATON Zoltan
2024-02-23 16:59 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: BALATON Zoltan @ 2024-02-23 14:26 UTC (permalink / raw)
To: qemu-devel, qemu-block; +Cc: John Snow, Thomas Huth, philmd
Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
replace them with newly added public header to allow moving internal.h
into hw/ide to really stop exposing it.
Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/arm/sbsa-ref.c | 2 +-
{include/hw => hw}/ide/internal.h | 0
include/hw/misc/macio/macio.h | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename {include/hw => hw}/ide/internal.h (100%)
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 5d3a574664..f027622a75 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -36,7 +36,7 @@
#include "hw/arm/smmuv3.h"
#include "hw/block/flash.h"
#include "hw/boards.h"
-#include "hw/ide/internal.h"
+#include "hw/ide/ide-bus.h"
#include "hw/ide/ahci_internal.h"
#include "hw/ide/ahci-sysbus.h"
#include "hw/intc/arm_gicv3_common.h"
diff --git a/include/hw/ide/internal.h b/hw/ide/internal.h
similarity index 100%
rename from include/hw/ide/internal.h
rename to hw/ide/internal.h
diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
index 86df2c2b60..2b54da6b31 100644
--- a/include/hw/misc/macio/macio.h
+++ b/include/hw/misc/macio/macio.h
@@ -28,7 +28,7 @@
#include "hw/char/escc.h"
#include "hw/pci/pci_device.h"
-#include "hw/ide/internal.h"
+#include "hw/ide/ide-bus.h"
#include "hw/intc/heathrow_pic.h"
#include "hw/misc/macio/cuda.h"
#include "hw/misc/macio/gpio.h"
--
2.30.9
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide
2024-02-23 14:26 [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide BALATON Zoltan
@ 2024-02-23 16:59 ` Philippe Mathieu-Daudé
2024-02-23 19:19 ` Thomas Huth
2024-02-25 16:57 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-02-23 16:59 UTC (permalink / raw)
To: BALATON Zoltan, qemu-devel, qemu-block; +Cc: John Snow, Thomas Huth
On 23/2/24 15:26, BALATON Zoltan wrote:
> Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
> replace them with newly added public header to allow moving internal.h
> into hw/ide to really stop exposing it.
>
> Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> hw/arm/sbsa-ref.c | 2 +-
> {include/hw => hw}/ide/internal.h | 0
> include/hw/misc/macio/macio.h | 2 +-
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename {include/hw => hw}/ide/internal.h (100%)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide
2024-02-23 14:26 [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide BALATON Zoltan
2024-02-23 16:59 ` Philippe Mathieu-Daudé
@ 2024-02-23 19:19 ` Thomas Huth
2024-02-25 16:57 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Huth @ 2024-02-23 19:19 UTC (permalink / raw)
To: BALATON Zoltan, qemu-devel, qemu-block; +Cc: John Snow, philmd
On 23/02/2024 15.26, BALATON Zoltan wrote:
> Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
> replace them with newly added public header to allow moving internal.h
> into hw/ide to really stop exposing it.
>
> Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> hw/arm/sbsa-ref.c | 2 +-
> {include/hw => hw}/ide/internal.h | 0
> include/hw/misc/macio/macio.h | 2 +-
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename {include/hw => hw}/ide/internal.h (100%)
>
> diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
> index 5d3a574664..f027622a75 100644
> --- a/hw/arm/sbsa-ref.c
> +++ b/hw/arm/sbsa-ref.c
> @@ -36,7 +36,7 @@
> #include "hw/arm/smmuv3.h"
> #include "hw/block/flash.h"
> #include "hw/boards.h"
> -#include "hw/ide/internal.h"
> +#include "hw/ide/ide-bus.h"
> #include "hw/ide/ahci_internal.h"
> #include "hw/ide/ahci-sysbus.h"
> #include "hw/intc/arm_gicv3_common.h"
> diff --git a/include/hw/ide/internal.h b/hw/ide/internal.h
> similarity index 100%
> rename from include/hw/ide/internal.h
> rename to hw/ide/internal.h
> diff --git a/include/hw/misc/macio/macio.h b/include/hw/misc/macio/macio.h
> index 86df2c2b60..2b54da6b31 100644
> --- a/include/hw/misc/macio/macio.h
> +++ b/include/hw/misc/macio/macio.h
> @@ -28,7 +28,7 @@
>
> #include "hw/char/escc.h"
> #include "hw/pci/pci_device.h"
> -#include "hw/ide/internal.h"
> +#include "hw/ide/ide-bus.h"
> #include "hw/intc/heathrow_pic.h"
> #include "hw/misc/macio/cuda.h"
> #include "hw/misc/macio/gpio.h"
Oh, I was sure that I got them all ... thanks for double checking!
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide
2024-02-23 14:26 [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide BALATON Zoltan
2024-02-23 16:59 ` Philippe Mathieu-Daudé
2024-02-23 19:19 ` Thomas Huth
@ 2024-02-25 16:57 ` Philippe Mathieu-Daudé
2024-02-25 17:08 ` BALATON Zoltan
2 siblings, 1 reply; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-02-25 16:57 UTC (permalink / raw)
To: BALATON Zoltan, qemu-devel, qemu-block; +Cc: John Snow, Thomas Huth
On 23/2/24 15:26, BALATON Zoltan wrote:
> Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
> replace them with newly added public header to allow moving internal.h
> into hw/ide to really stop exposing it.
>
> Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> hw/arm/sbsa-ref.c | 2 +-
> {include/hw => hw}/ide/internal.h | 0
> include/hw/misc/macio/macio.h | 2 +-
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename {include/hw => hw}/ide/internal.h (100%)
>
> diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
> index 5d3a574664..f027622a75 100644
> --- a/hw/arm/sbsa-ref.c
> +++ b/hw/arm/sbsa-ref.c
> @@ -36,7 +36,7 @@
> #include "hw/arm/smmuv3.h"
> #include "hw/block/flash.h"
> #include "hw/boards.h"
> -#include "hw/ide/internal.h"
> +#include "hw/ide/ide-bus.h"
> #include "hw/ide/ahci_internal.h"
Unrelated, but what about this one ^?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide
2024-02-25 16:57 ` Philippe Mathieu-Daudé
@ 2024-02-25 17:08 ` BALATON Zoltan
2024-02-25 17:19 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 6+ messages in thread
From: BALATON Zoltan @ 2024-02-25 17:08 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, qemu-block, John Snow, Thomas Huth
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
On Sun, 25 Feb 2024, Philippe Mathieu-Daudé wrote:
> On 23/2/24 15:26, BALATON Zoltan wrote:
>> Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
>> replace them with newly added public header to allow moving internal.h
>> into hw/ide to really stop exposing it.
>>
>> Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>> ---
>> hw/arm/sbsa-ref.c | 2 +-
>> {include/hw => hw}/ide/internal.h | 0
>> include/hw/misc/macio/macio.h | 2 +-
>> 3 files changed, 2 insertions(+), 2 deletions(-)
>> rename {include/hw => hw}/ide/internal.h (100%)
>>
>> diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
>> index 5d3a574664..f027622a75 100644
>> --- a/hw/arm/sbsa-ref.c
>> +++ b/hw/arm/sbsa-ref.c
>> @@ -36,7 +36,7 @@
>> #include "hw/arm/smmuv3.h"
>> #include "hw/block/flash.h"
>> #include "hw/boards.h"
>> -#include "hw/ide/internal.h"
>> +#include "hw/ide/ide-bus.h"
>> #include "hw/ide/ahci_internal.h"
>
> Unrelated, but what about this one ^?
The ahci_internal.h is in hw/ide not in include/hw/ide so how does that
even work? I don't care about AHCI so not interested to anything about
that personally.
Regards,
BALATON Zoltan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide
2024-02-25 17:08 ` BALATON Zoltan
@ 2024-02-25 17:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 6+ messages in thread
From: Philippe Mathieu-Daudé @ 2024-02-25 17:19 UTC (permalink / raw)
To: BALATON Zoltan; +Cc: qemu-devel, qemu-block, John Snow, Thomas Huth
On 25/2/24 18:08, BALATON Zoltan wrote:
> On Sun, 25 Feb 2024, Philippe Mathieu-Daudé wrote:
>> On 23/2/24 15:26, BALATON Zoltan wrote:
>>> Remove last two includes of hw/ide/intarnal.h outside of hw/ide and
>>> replace them with newly added public header to allow moving internal.h
>>> into hw/ide to really stop exposing it.
>>>
>>> Fixes: a11f439a0e (hw/ide: Stop exposing internal.h to non-IDE files)
>>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>>> ---
>>> hw/arm/sbsa-ref.c | 2 +-
>>> {include/hw => hw}/ide/internal.h | 0
>>> include/hw/misc/macio/macio.h | 2 +-
>>> 3 files changed, 2 insertions(+), 2 deletions(-)
>>> rename {include/hw => hw}/ide/internal.h (100%)
>>>
>>> diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
>>> index 5d3a574664..f027622a75 100644
>>> --- a/hw/arm/sbsa-ref.c
>>> +++ b/hw/arm/sbsa-ref.c
>>> @@ -36,7 +36,7 @@
>>> #include "hw/arm/smmuv3.h"
>>> #include "hw/block/flash.h"
>>> #include "hw/boards.h"
>>> -#include "hw/ide/internal.h"
>>> +#include "hw/ide/ide-bus.h"
>>> #include "hw/ide/ahci_internal.h"
>>
>> Unrelated, but what about this one ^?
>
> The ahci_internal.h is in hw/ide not in include/hw/ide so how does that
> even work? I don't care about AHCI so not interested to anything about
> that personally.
No worries, done:
https://lore.kernel.org/qemu-devel/20240225171637.4709-2-philmd@linaro.org/
>
> Regards,
> BALATON Zoltan
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-25 17:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-23 14:26 [PATCH] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide BALATON Zoltan
2024-02-23 16:59 ` Philippe Mathieu-Daudé
2024-02-23 19:19 ` Thomas Huth
2024-02-25 16:57 ` Philippe Mathieu-Daudé
2024-02-25 17:08 ` BALATON Zoltan
2024-02-25 17:19 ` Philippe Mathieu-Daudé
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).