* [PATCH v5 01/20] scripts/clean-includes: Fully skip / ignore files
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 02/20] scripts/clean-includes: Don't claim duplicate headers found when not Markus Armbruster
` (18 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv, Eric Blake
When clean-includes claims to skip or ignore a file, only the part
that sanitizes use of qemu/osdep.h skips the file. The part that
looks for duplicate #include does not, and neither does committing to
Git.
The latter can get unrelated stuff included in the commit, but only if
you run clean-includes in a dirty tree, which is unwise. Messed up
when we added skipping in commit fd3e39a40c "scripts/clean-includes:
Enhance to handle header files".
The former can cause bogus reports for --check-dup-head. Added in
commit d66253e46a "scripts/clean-includes: added duplicate #include
check", duplicating the prior mistake.
Fix the script to fully skip files.
Fixes: fd3e39a40ca2 ("scripts/clean-includes: Enhance to handle header files")
Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include check")
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/clean-includes | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/clean-includes b/scripts/clean-includes
index d37bd4f692..86944f27fc 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -111,6 +111,7 @@ cat >"$COCCIFILE" <<EOT
)
EOT
+files=
for f in "$@"; do
case "$f" in
*.c.inc)
@@ -144,6 +145,7 @@ for f in "$@"; do
continue
;;
esac
+ files="$files $f"
if [ "$MODE" = "c" ]; then
# First, use Coccinelle to add qemu/osdep.h before the first existing include
@@ -174,8 +176,8 @@ for f in "$@"; do
done
-if [ "$DUPHEAD" = "yes" ]; then
- egrep "^[[:space:]]*#[[:space:]]*include" "$@" | tr -d '[:blank:]' \
+if [ "$DUPHEAD" = "yes" ] && [ -n "$files" ]; then
+ egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \
| sort | uniq -c | awk '{if ($1 > 1) print $0}'
if [ $? -eq 0 ]; then
echo "Found duplicate header file includes. Please check the above files manually."
@@ -184,7 +186,7 @@ if [ "$DUPHEAD" = "yes" ]; then
fi
if [ "$GIT" = "yes" ]; then
- git add -- "$@"
+ git add -- $files
git commit --signoff -F - <<EOF
$GITSUBJ: Clean up includes
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 02/20] scripts/clean-includes: Don't claim duplicate headers found when not
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 01/20] scripts/clean-includes: Fully skip / ignore files Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 03/20] scripts/clean-includes: Skip symbolic links Markus Armbruster
` (17 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv, Eric Blake
When running with --check-dup-head, the script always claims it "Found
duplicate header file includes." Fix to do it only when it actually
found some.
Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include check")
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/clean-includes | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 86944f27fc..8e8420d785 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -177,9 +177,8 @@ for f in "$@"; do
done
if [ "$DUPHEAD" = "yes" ] && [ -n "$files" ]; then
- egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \
- | sort | uniq -c | awk '{if ($1 > 1) print $0}'
- if [ $? -eq 0 ]; then
+ if egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \
+ | sort | uniq -c | grep -v '^ *1 '; then
echo "Found duplicate header file includes. Please check the above files manually."
exit 1
fi
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 03/20] scripts/clean-includes: Skip symbolic links
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 01/20] scripts/clean-includes: Fully skip / ignore files Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 02/20] scripts/clean-includes: Don't claim duplicate headers found when not Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message Markus Armbruster
` (16 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv, Eric Blake
When a symbolic link points to a file that needs cleaning, the script
replaces the link with a cleaned regular file. Not wanted; skip them.
We have a few symbolic links under subprojects/libvduse/ and
subprojects/libvhost-user/.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/clean-includes | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 8e8420d785..f0466a6262 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -113,6 +113,10 @@ EOT
files=
for f in "$@"; do
+ if [ -L "$f" ]; then
+ echo "SKIPPING $f (symbolic link)"
+ continue
+ fi
case "$f" in
*.c.inc)
# These aren't standalone C source files
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (2 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 03/20] scripts/clean-includes: Skip symbolic links Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 14:12 ` Juan Quintela
2023-01-30 13:21 ` [PATCH v5 05/20] bsd-user: Clean up includes Markus Armbruster
` (15 subsequent siblings)
19 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
The script drops #include "qemu/osdep.h" from headers. Mention it in
the commit message it uses for --git.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/clean-includes | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/clean-includes b/scripts/clean-includes
index f0466a6262..f9722c3aec 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
git commit --signoff -F - <<EOF
$GITSUBJ: Clean up includes
-Clean up includes so that osdep.h is included first and headers
-which it implies are not included manually.
+Clean up includes so that qemu/osdep.h is included first in .c, and
+not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-01-30 13:21 ` [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message Markus Armbruster
@ 2023-01-30 14:12 ` Juan Quintela
2023-02-01 12:49 ` Markus Armbruster
0 siblings, 1 reply; 28+ messages in thread
From: Juan Quintela @ 2023-01-30 14:12 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Markus Armbruster <armbru@redhat.com> wrote:
> The script drops #include "qemu/osdep.h" from headers. Mention it in
> the commit message it uses for --git.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> scripts/clean-includes | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/clean-includes b/scripts/clean-includes
> index f0466a6262..f9722c3aec 100755
> --- a/scripts/clean-includes
> +++ b/scripts/clean-includes
> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
> git commit --signoff -F - <<EOF
> $GITSUBJ: Clean up includes
>
> -Clean up includes so that osdep.h is included first and headers
> -which it implies are not included manually.
> +Clean up includes so that qemu/osdep.h is included first in .c, and
> +not in .h, and headers which it implies are not included manually.
I give a tree.
Clean up includes so qemu/osdep.h is never used in .h files. It makes
sure that qemu/osdep.h is only used in .c files. Once there, it assures
that .h files already included in qemu/osdep.h are not included a second
time on the .c file.
What do you think?
And yes, not using "include" the "include files" is .... interesting/confusing/....
Anyways, if you preffer old text or net one.
Reviewed-by: Juan Quintela <quintela@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-01-30 14:12 ` Juan Quintela
@ 2023-02-01 12:49 ` Markus Armbruster
2023-02-01 13:14 ` Juan Quintela
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2023-02-01 12:49 UTC (permalink / raw)
To: Juan Quintela
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Juan Quintela <quintela@redhat.com> writes:
> Markus Armbruster <armbru@redhat.com> wrote:
>> The script drops #include "qemu/osdep.h" from headers. Mention it in
>> the commit message it uses for --git.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>> scripts/clean-includes | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/scripts/clean-includes b/scripts/clean-includes
>> index f0466a6262..f9722c3aec 100755
>> --- a/scripts/clean-includes
>> +++ b/scripts/clean-includes
>> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
>> git commit --signoff -F - <<EOF
>> $GITSUBJ: Clean up includes
>>
>> -Clean up includes so that osdep.h is included first and headers
>> -which it implies are not included manually.
>> +Clean up includes so that qemu/osdep.h is included first in .c, and
>> +not in .h, and headers which it implies are not included manually.
>
> I give a tree.
>
> Clean up includes so qemu/osdep.h is never used in .h files. It makes
> sure that qemu/osdep.h is only used in .c files. Once there, it assures
> that .h files already included in qemu/osdep.h are not included a second
> time on the .c file.
>
> What do you think?
Neglects to mention qemu/osdep.h goes first in .c.
> And yes, not using "include" the "include files" is .... interesting/confusing/....
>
>
> Anyways, if you preffer old text or net one.
>
> Reviewed-by: Juan Quintela <quintela@redhat.com>
Thanks!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-02-01 12:49 ` Markus Armbruster
@ 2023-02-01 13:14 ` Juan Quintela
2023-02-01 13:44 ` Markus Armbruster
0 siblings, 1 reply; 28+ messages in thread
From: Juan Quintela @ 2023-02-01 13:14 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Markus Armbruster <armbru@redhat.com> wrote:
> Juan Quintela <quintela@redhat.com> writes:
>
>> Markus Armbruster <armbru@redhat.com> wrote:
>>> The script drops #include "qemu/osdep.h" from headers. Mention it in
>>> the commit message it uses for --git.
>>>
>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>> ---
>>> scripts/clean-includes | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/scripts/clean-includes b/scripts/clean-includes
>>> index f0466a6262..f9722c3aec 100755
>>> --- a/scripts/clean-includes
>>> +++ b/scripts/clean-includes
>>> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
>>> git commit --signoff -F - <<EOF
>>> $GITSUBJ: Clean up includes
>>>
>>> -Clean up includes so that osdep.h is included first and headers
>>> -which it implies are not included manually.
>>> +Clean up includes so that qemu/osdep.h is included first in .c, and
>>> +not in .h, and headers which it implies are not included manually.
>>
>> I give a tree.
>>
>> Clean up includes so qemu/osdep.h is never used in .h files. It makes
>> sure that qemu/osdep.h is only used in .c files. Once there, it assures
>> that .h files already included in qemu/osdep.h are not included a second
>> time on the .c file.
>>
>> What do you think?
>
> Neglects to mention qemu/osdep.h goes first in .c.
/me tries again
What about:
The file qemu/osdep.h should only be included in .c files. And it has
to be the first included file.
This script does several things:
- Remove qemu/osdep.h from .h files.
- If qemu/osdep.h is included in a .c file it is moved to the first
included position if it is anywhere else.
- Remove from .c files all include files that are already present in
qemu/osdep.h.
Later, Juan.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-02-01 13:14 ` Juan Quintela
@ 2023-02-01 13:44 ` Markus Armbruster
2023-02-01 14:54 ` Juan Quintela
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2023-02-01 13:44 UTC (permalink / raw)
To: Juan Quintela
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Juan Quintela <quintela@redhat.com> writes:
> Markus Armbruster <armbru@redhat.com> wrote:
>> Juan Quintela <quintela@redhat.com> writes:
>>
>>> Markus Armbruster <armbru@redhat.com> wrote:
>>>> The script drops #include "qemu/osdep.h" from headers. Mention it in
>>>> the commit message it uses for --git.
>>>>
>>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>>> ---
>>>> scripts/clean-includes | 4 ++--
>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/scripts/clean-includes b/scripts/clean-includes
>>>> index f0466a6262..f9722c3aec 100755
>>>> --- a/scripts/clean-includes
>>>> +++ b/scripts/clean-includes
>>>> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
>>>> git commit --signoff -F - <<EOF
>>>> $GITSUBJ: Clean up includes
>>>>
>>>> -Clean up includes so that osdep.h is included first and headers
>>>> -which it implies are not included manually.
>>>> +Clean up includes so that qemu/osdep.h is included first in .c, and
>>>> +not in .h, and headers which it implies are not included manually.
>>>
>>> I give a tree.
>>>
>>> Clean up includes so qemu/osdep.h is never used in .h files. It makes
>>> sure that qemu/osdep.h is only used in .c files. Once there, it assures
>>> that .h files already included in qemu/osdep.h are not included a second
>>> time on the .c file.
>>>
>>> What do you think?
>>
>> Neglects to mention qemu/osdep.h goes first in .c.
>
> /me tries again
>
> What about:
>
> The file qemu/osdep.h should only be included in .c files. And it has
> to be the first included file.
Suggest "has to be included first."
> This script does several things:
> - Remove qemu/osdep.h from .h files.
Correct. Could say "inclusion of qemu/osdep.h"
> - If qemu/osdep.h is included in a .c file it is moved to the first
> included position if it is anywhere else.
Not quite. The script ensures all the .c include it, and include it
first.
> - Remove from .c files all include files that are already present in
> qemu/osdep.h.
They're removed from .h, too.
Sure you want to continue wordsmithing? ;)
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-02-01 13:44 ` Markus Armbruster
@ 2023-02-01 14:54 ` Juan Quintela
2023-02-02 9:00 ` Markus Armbruster
0 siblings, 1 reply; 28+ messages in thread
From: Juan Quintela @ 2023-02-01 14:54 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Markus Armbruster <armbru@redhat.com> wrote:
> Juan Quintela <quintela@redhat.com> writes:
>
>> Markus Armbruster <armbru@redhat.com> wrote:
>>> Juan Quintela <quintela@redhat.com> writes:
>>>
>>>> Markus Armbruster <armbru@redhat.com> wrote:
>>>>> The script drops #include "qemu/osdep.h" from headers. Mention it in
>>>>> the commit message it uses for --git.
>>>>>
>>>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>>>> ---
>>>>> scripts/clean-includes | 4 ++--
>>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/scripts/clean-includes b/scripts/clean-includes
>>>>> index f0466a6262..f9722c3aec 100755
>>>>> --- a/scripts/clean-includes
>>>>> +++ b/scripts/clean-includes
>>>>> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
>>>>> git commit --signoff -F - <<EOF
>>>>> $GITSUBJ: Clean up includes
>>>>>
>>>>> -Clean up includes so that osdep.h is included first and headers
>>>>> -which it implies are not included manually.
>>>>> +Clean up includes so that qemu/osdep.h is included first in .c, and
>>>>> +not in .h, and headers which it implies are not included manually.
>>>>
>>>> I give a tree.
>>>>
>>>> Clean up includes so qemu/osdep.h is never used in .h files. It makes
>>>> sure that qemu/osdep.h is only used in .c files. Once there, it assures
>>>> that .h files already included in qemu/osdep.h are not included a second
>>>> time on the .c file.
>>>>
>>>> What do you think?
>>>
>>> Neglects to mention qemu/osdep.h goes first in .c.
>>
>> /me tries again
>>
>> What about:
>>
>> The file qemu/osdep.h should only be included in .c files. And it has
>> to be the first included file.
>
> Suggest "has to be included first."
Ok to this change.
>
>> This script does several things:
>> - Remove qemu/osdep.h from .h files.
>
> Correct. Could say "inclusion of qemu/osdep.h"
I try to minimize whatever word that "includes" "includ*" (pun intended).
>> - If qemu/osdep.h is included in a .c file it is moved to the first
>> included position if it is anywhere else.
>
> Not quite. The script ensures all the .c include it, and include it
> first.
Oh, then it is easier.
- It ensures that qemu/osdep.h is the first included file in all .c files.
>> - Remove from .h files all include files that are already present in
>> qemu/osdep.h.
>
> They're removed from .h, too.
Ah, didn't know this bit.
> Sure you want to continue wordsmithing? ;)
Yeap, I *hate* error messages that I can't parse (or have to read it ten
times before I understand them).
So, we end with:
The file qemu/osdep.h should only be included in .c files. And it has
to be included first.
This script does three things:
- Remove qemu/osdep.h from .h files.
- It ensures that qemu/osdep.h is the first included file in all .c files.
- Include files contained in qemu/osdep.h are removed form all .c and .h
files.
Is this better?
Later, Juan.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-02-01 14:54 ` Juan Quintela
@ 2023-02-02 9:00 ` Markus Armbruster
2023-02-02 10:54 ` Juan Quintela
0 siblings, 1 reply; 28+ messages in thread
From: Markus Armbruster @ 2023-02-02 9:00 UTC (permalink / raw)
To: Juan Quintela
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Juan Quintela <quintela@redhat.com> writes:
> Markus Armbruster <armbru@redhat.com> wrote:
>> Juan Quintela <quintela@redhat.com> writes:
>>
>>> Markus Armbruster <armbru@redhat.com> wrote:
>>>> Juan Quintela <quintela@redhat.com> writes:
>>>>
>>>>> Markus Armbruster <armbru@redhat.com> wrote:
>>>>>> The script drops #include "qemu/osdep.h" from headers. Mention it in
>>>>>> the commit message it uses for --git.
>>>>>>
>>>>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>>>>> ---
>>>>>> scripts/clean-includes | 4 ++--
>>>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git a/scripts/clean-includes b/scripts/clean-includes
>>>>>> index f0466a6262..f9722c3aec 100755
>>>>>> --- a/scripts/clean-includes
>>>>>> +++ b/scripts/clean-includes
>>>>>> @@ -193,8 +193,8 @@ if [ "$GIT" = "yes" ]; then
>>>>>> git commit --signoff -F - <<EOF
>>>>>> $GITSUBJ: Clean up includes
>>>>>>
>>>>>> -Clean up includes so that osdep.h is included first and headers
>>>>>> -which it implies are not included manually.
>>>>>> +Clean up includes so that qemu/osdep.h is included first in .c, and
>>>>>> +not in .h, and headers which it implies are not included manually.
>>>>>
>>>>> I give a tree.
>>>>>
>>>>> Clean up includes so qemu/osdep.h is never used in .h files. It makes
>>>>> sure that qemu/osdep.h is only used in .c files. Once there, it assures
>>>>> that .h files already included in qemu/osdep.h are not included a second
>>>>> time on the .c file.
>>>>>
>>>>> What do you think?
>>>>
>>>> Neglects to mention qemu/osdep.h goes first in .c.
>>>
>>> /me tries again
>>>
>>> What about:
>>>
>>> The file qemu/osdep.h should only be included in .c files. And it has
>>> to be the first included file.
>>
>> Suggest "has to be included first."
>
> Ok to this change.
>
>>
>>> This script does several things:
>>> - Remove qemu/osdep.h from .h files.
>>
>> Correct. Could say "inclusion of qemu/osdep.h"
>
> I try to minimize whatever word that "includes" "includ*" (pun intended).
>
>>> - If qemu/osdep.h is included in a .c file it is moved to the first
>>> included position if it is anywhere else.
>>
>> Not quite. The script ensures all the .c include it, and include it
>> first.
>
> Oh, then it is easier.
>
> - It ensures that qemu/osdep.h is the first included file in all .c files.
>
>>> - Remove from .h files all include files that are already present in
>>> qemu/osdep.h.
>>
>> They're removed from .h, too.
>
> Ah, didn't know this bit.
>
>> Sure you want to continue wordsmithing? ;)
>
> Yeap, I *hate* error messages that I can't parse (or have to read it ten
> times before I understand them).
>
> So, we end with:
>
> The file qemu/osdep.h should only be included in .c files. And it has
> to be included first.
>
> This script does three things:
> - Remove qemu/osdep.h from .h files.
> - It ensures that qemu/osdep.h is the first included file in all .c files.
> - Include files contained in qemu/osdep.h are removed form all .c and .h
> files.
>
> Is this better?
It's less terse. Fine with me. The mix of passive and active voice
feels a bit awkward, though. Another try:
All .c should include qemu/osdep.h first. This script performs three
related cleanups:
* Ensure .c files include qemu/osdep.h first.
* Including it in a .h is redundant, since the .c already includes
it. Drop such inclusions.
* Likewise, including headers qemu/osdep.h includes is redundant.
Drop these, too.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message
2023-02-02 9:00 ` Markus Armbruster
@ 2023-02-02 10:54 ` Juan Quintela
0 siblings, 0 replies; 28+ messages in thread
From: Juan Quintela @ 2023-02-02 10:54 UTC (permalink / raw)
To: Markus Armbruster
Cc: qemu-devel, richard.henderson, pbonzini, kwolf, hreitz, imp,
kevans, berrange, groug, qemu_oss, mst, philmd, peter.maydell,
alistair, jasowang, jonathan.cameron, kbastian, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Markus Armbruster <armbru@redhat.com> wrote:
> It's less terse. Fine with me. The mix of passive and active voice
> feels a bit awkward, though. Another try:
>
> All .c should include qemu/osdep.h first. This script performs three
> related cleanups:
>
> * Ensure .c files include qemu/osdep.h first.
> * Including it in a .h is redundant, since the .c already includes
> it. Drop such inclusions.
> * Likewise, including headers qemu/osdep.h includes is redundant.
> Drop these, too.
Perfect, thanks.
Reviewed-by: Juan Quintela <quintela@redhat.com>
or whatever you want it O:-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v5 05/20] bsd-user: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (3 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 04/20] scripts/clean-includes: Improve --git commit message Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 06/20] crypto: " Markus Armbruster
` (14 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
bsd-user/bsd-proc.h | 4 ----
bsd-user/qemu.h | 1 -
bsd-user/arm/signal.c | 1 +
bsd-user/arm/target_arch_cpu.c | 2 ++
bsd-user/freebsd/os-sys.c | 1 +
bsd-user/i386/signal.c | 1 +
bsd-user/i386/target_arch_cpu.c | 3 +--
bsd-user/main.c | 4 +---
bsd-user/strace.c | 1 -
bsd-user/x86_64/signal.c | 1 +
bsd-user/x86_64/target_arch_cpu.c | 3 +--
11 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h
index 68b66e571d..a1061bffb8 100644
--- a/bsd-user/bsd-proc.h
+++ b/bsd-user/bsd-proc.h
@@ -20,11 +20,7 @@
#ifndef BSD_PROC_H_
#define BSD_PROC_H_
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/resource.h>
-#include <unistd.h>
/* exit(2) */
static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1)
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index be6105385e..0ceecfb6df 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -17,7 +17,6 @@
#ifndef QEMU_H
#define QEMU_H
-#include "qemu/osdep.h"
#include "cpu.h"
#include "qemu/units.h"
#include "exec/cpu_ldst.h"
diff --git a/bsd-user/arm/signal.c b/bsd-user/arm/signal.c
index 2b1dd745d1..9734407543 100644
--- a/bsd-user/arm/signal.c
+++ b/bsd-user/arm/signal.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu.h"
/*
diff --git a/bsd-user/arm/target_arch_cpu.c b/bsd-user/arm/target_arch_cpu.c
index 02bf9149d5..fe38ae2210 100644
--- a/bsd-user/arm/target_arch_cpu.c
+++ b/bsd-user/arm/target_arch_cpu.c
@@ -16,6 +16,8 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+
+#include "qemu/osdep.h"
#include "target_arch.h"
void target_cpu_set_tls(CPUARMState *env, target_ulong newtls)
diff --git a/bsd-user/freebsd/os-sys.c b/bsd-user/freebsd/os-sys.c
index 309e27b9d6..1676ec10f8 100644
--- a/bsd-user/freebsd/os-sys.c
+++ b/bsd-user/freebsd/os-sys.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu.h"
#include "target_arch_sysarch.h"
diff --git a/bsd-user/i386/signal.c b/bsd-user/i386/signal.c
index 5dd975ce56..a3131047b8 100644
--- a/bsd-user/i386/signal.c
+++ b/bsd-user/i386/signal.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu.h"
/*
diff --git a/bsd-user/i386/target_arch_cpu.c b/bsd-user/i386/target_arch_cpu.c
index d349e45299..2a3af2ddef 100644
--- a/bsd-user/i386/target_arch_cpu.c
+++ b/bsd-user/i386/target_arch_cpu.c
@@ -17,9 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
-
#include "qemu/osdep.h"
+
#include "cpu.h"
#include "qemu.h"
#include "qemu/timer.h"
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 6f09180d65..41290e16f9 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -18,12 +18,10 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
-#include <sys/time.h>
+#include "qemu/osdep.h"
#include <sys/resource.h>
#include <sys/sysctl.h>
-#include "qemu/osdep.h"
#include "qemu/help-texts.h"
#include "qemu/units.h"
#include "qemu/accel.h"
diff --git a/bsd-user/strace.c b/bsd-user/strace.c
index a77d10dd6b..96499751eb 100644
--- a/bsd-user/strace.c
+++ b/bsd-user/strace.c
@@ -20,7 +20,6 @@
#include <sys/select.h>
#include <sys/syscall.h>
#include <sys/ioccom.h>
-#include <ctype.h>
#include "qemu.h"
diff --git a/bsd-user/x86_64/signal.c b/bsd-user/x86_64/signal.c
index c3875bc4c6..46cb865180 100644
--- a/bsd-user/x86_64/signal.c
+++ b/bsd-user/x86_64/signal.c
@@ -16,6 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+#include "qemu/osdep.h"
#include "qemu.h"
/*
diff --git a/bsd-user/x86_64/target_arch_cpu.c b/bsd-user/x86_64/target_arch_cpu.c
index be7bd10720..1d32f18907 100644
--- a/bsd-user/x86_64/target_arch_cpu.c
+++ b/bsd-user/x86_64/target_arch_cpu.c
@@ -17,9 +17,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/types.h>
-
#include "qemu/osdep.h"
+
#include "cpu.h"
#include "qemu.h"
#include "qemu/timer.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 06/20] crypto: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (4 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 05/20] bsd-user: Clean up includes Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 07/20] hw/cxl: " Markus Armbruster
` (13 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
crypto/block-luks-priv.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/crypto/block-luks-priv.h b/crypto/block-luks-priv.h
index dc2dd14e52..8fc967afcb 100644
--- a/crypto/block-luks-priv.h
+++ b/crypto/block-luks-priv.h
@@ -18,7 +18,6 @@
*
*/
-#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/bswap.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 07/20] hw/cxl: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (5 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 06/20] crypto: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 08/20] hw/input: " Markus Armbruster
` (12 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/cxl/cxl_component.h | 2 --
include/hw/cxl/cxl_host.h | 1 -
include/hw/cxl/cxl_pci.h | 1 -
3 files changed, 4 deletions(-)
diff --git a/include/hw/cxl/cxl_component.h b/include/hw/cxl/cxl_component.h
index 5dca21e95b..692d7a5507 100644
--- a/include/hw/cxl/cxl_component.h
+++ b/include/hw/cxl/cxl_component.h
@@ -15,9 +15,7 @@
#define CXL2_COMPONENT_CM_REGION_SIZE 0x1000
#define CXL2_COMPONENT_BLOCK_SIZE 0x10000
-#include "qemu/compiler.h"
#include "qemu/range.h"
-#include "qemu/typedefs.h"
#include "hw/cxl/cxl_cdat.h"
#include "hw/register.h"
#include "qapi/error.h"
diff --git a/include/hw/cxl/cxl_host.h b/include/hw/cxl/cxl_host.h
index a1b662ce40..c9bc9c7c50 100644
--- a/include/hw/cxl/cxl_host.h
+++ b/include/hw/cxl/cxl_host.h
@@ -7,7 +7,6 @@
* COPYING file in the top-level directory.
*/
-#include "qemu/osdep.h"
#include "hw/cxl/cxl.h"
#include "hw/boards.h"
diff --git a/include/hw/cxl/cxl_pci.h b/include/hw/cxl/cxl_pci.h
index 01e15ed5b4..407be95b9e 100644
--- a/include/hw/cxl/cxl_pci.h
+++ b/include/hw/cxl/cxl_pci.h
@@ -10,7 +10,6 @@
#ifndef CXL_PCI_H
#define CXL_PCI_H
-#include "qemu/compiler.h"
#define CXL_VENDOR_ID 0x1e98
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 08/20] hw/input: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (6 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 07/20] hw/cxl: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 09/20] hw/tricore: " Markus Armbruster
` (11 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/input/pl050.h | 1 -
hw/input/tsc210x.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h
index 89ec4fafc9..4cb8985f31 100644
--- a/include/hw/input/pl050.h
+++ b/include/hw/input/pl050.h
@@ -10,7 +10,6 @@
#ifndef HW_PL050_H
#define HW_PL050_H
-#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "hw/input/ps2.h"
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index fdd5ff87d9..7eae5989f7 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -20,7 +20,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/log.h"
#include "hw/hw.h"
#include "audio/audio.h"
#include "qemu/timer.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 09/20] hw/tricore: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (7 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 08/20] hw/input: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 10/20] qga: " Markus Armbruster
` (10 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/tricore/triboard.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
index 094c8bd563..4fdd2d7d97 100644
--- a/include/hw/tricore/triboard.h
+++ b/include/hw/tricore/triboard.h
@@ -18,7 +18,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/boards.h"
#include "sysemu/sysemu.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 10/20] qga: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (8 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 09/20] hw/tricore: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 11/20] migration: " Markus Armbruster
` (9 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
qga/cutils.h | 2 --
qga/commands-posix.c | 1 -
qga/cutils.c | 3 ++-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/qga/cutils.h b/qga/cutils.h
index f0f30a7d28..c1f2f4b17a 100644
--- a/qga/cutils.h
+++ b/qga/cutils.h
@@ -1,8 +1,6 @@
#ifndef CUTILS_H_
#define CUTILS_H_
-#include "qemu/osdep.h"
-
int qga_open_cloexec(const char *name, int flags, mode_t mode);
#endif /* CUTILS_H_ */
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index ebd33a643c..079689d79a 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -51,7 +51,6 @@
#else
#include <net/ethernet.h>
#endif
-#include <sys/types.h>
#ifdef CONFIG_SOLARIS
#include <sys/sockio.h>
#endif
diff --git a/qga/cutils.c b/qga/cutils.c
index b8e142ef64..b21bcf3683 100644
--- a/qga/cutils.c
+++ b/qga/cutils.c
@@ -2,8 +2,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
-#include "cutils.h"
+#include "qemu/osdep.h"
+#include "cutils.h"
#include "qapi/error.h"
/**
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 11/20] migration: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (9 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 10/20] qga: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 12/20] net: " Markus Armbruster
` (8 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
---
include/qemu/userfaultfd.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/qemu/userfaultfd.h b/include/qemu/userfaultfd.h
index 6b74f92792..55c95998e8 100644
--- a/include/qemu/userfaultfd.h
+++ b/include/qemu/userfaultfd.h
@@ -13,7 +13,6 @@
#ifndef USERFAULTFD_H
#define USERFAULTFD_H
-#include "qemu/osdep.h"
#include "exec/hwaddr.h"
#include <linux/userfaultfd.h>
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 12/20] net: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (10 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 11/20] migration: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 13/20] target/hexagon: " Markus Armbruster
` (7 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
net/vmnet_int.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/vmnet_int.h b/net/vmnet_int.h
index adf6e8c20d..d0b90594f2 100644
--- a/net/vmnet_int.h
+++ b/net/vmnet_int.h
@@ -10,7 +10,6 @@
#ifndef VMNET_INT_H
#define VMNET_INT_H
-#include "qemu/osdep.h"
#include "vmnet_int.h"
#include "clients.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 13/20] target/hexagon: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (11 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 12/20] net: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 14/20] riscv: " Markus Armbruster
` (6 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Changes to standalone programs dropped, because these intentionally
don't use qemu/osdep.h:
target/hexagon/gen_dectree_import.c
target/hexagon/gen_semantics.c
target/hexagon/idef-parser/idef-parser.h
target/hexagon/idef-parser/parser-helpers.c
target/hexagon/idef-parser/parser-helpers.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Taylor Simpson <tsimpson@quicinc.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
target/hexagon/hex_arch_types.h | 1 -
target/hexagon/mmvec/macros.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/target/hexagon/hex_arch_types.h b/target/hexagon/hex_arch_types.h
index 885f68f760..52a7f2b2f3 100644
--- a/target/hexagon/hex_arch_types.h
+++ b/target/hexagon/hex_arch_types.h
@@ -18,7 +18,6 @@
#ifndef HEXAGON_HEX_ARCH_TYPES_H
#define HEXAGON_HEX_ARCH_TYPES_H
-#include "qemu/osdep.h"
#include "mmvec/mmvec.h"
#include "qemu/int128.h"
diff --git a/target/hexagon/mmvec/macros.h b/target/hexagon/mmvec/macros.h
index 8c864e8c68..1201d778d0 100644
--- a/target/hexagon/mmvec/macros.h
+++ b/target/hexagon/mmvec/macros.h
@@ -18,7 +18,6 @@
#ifndef HEXAGON_MMVEC_MACROS_H
#define HEXAGON_MMVEC_MACROS_H
-#include "qemu/osdep.h"
#include "qemu/host-utils.h"
#include "arch.h"
#include "mmvec/system_ext_mmvec.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 14/20] riscv: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (12 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 13/20] target/hexagon: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 15/20] block: " Markus Armbruster
` (5 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv, Alistair Francis
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
target/riscv/pmu.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/target/riscv/pmu.h b/target/riscv/pmu.h
index 3004ce37b6..0c819ca983 100644
--- a/target/riscv/pmu.h
+++ b/target/riscv/pmu.h
@@ -16,7 +16,6 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "qemu/osdep.h"
#include "qemu/log.h"
#include "cpu.h"
#include "qemu/main-loop.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 15/20] block: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (13 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 14/20] riscv: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 16/20] accel: " Markus Armbruster
` (4 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv, Eric Blake
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
include/block/graph-lock.h | 1 -
include/block/write-threshold.h | 2 --
block/qapi.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/include/block/graph-lock.h b/include/block/graph-lock.h
index 3ab924d5e2..18cc14de22 100644
--- a/include/block/graph-lock.h
+++ b/include/block/graph-lock.h
@@ -20,7 +20,6 @@
#ifndef GRAPH_LOCK_H
#define GRAPH_LOCK_H
-#include "qemu/osdep.h"
#include "qemu/clang-tsa.h"
/**
diff --git a/include/block/write-threshold.h b/include/block/write-threshold.h
index f50f923e7e..63d1583887 100644
--- a/include/block/write-threshold.h
+++ b/include/block/write-threshold.h
@@ -13,8 +13,6 @@
#ifndef BLOCK_WRITE_THRESHOLD_H
#define BLOCK_WRITE_THRESHOLD_H
-#include "qemu/typedefs.h"
-
/*
* bdrv_write_threshold_set:
*
diff --git a/block/qapi.c b/block/qapi.c
index 9b4da12966..4f8df48cf4 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -40,7 +40,6 @@
#include "qapi/qmp/qstring.h"
#include "qemu/qemu-print.h"
#include "sysemu/block-backend.h"
-#include "qemu/cutils.h"
BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
BlockDriverState *bs,
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 16/20] accel: Clean up includes
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (14 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 15/20] block: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 17/20] Fix non-first inclusions of qemu/osdep.h Markus Armbruster
` (3 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Clean up includes so that qemu/osdep.h is included first in .c, and
not in .h, and headers which it implies are not included manually.
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
include/sysemu/accel-blocker.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/sysemu/accel-blocker.h b/include/sysemu/accel-blocker.h
index 72020529ef..0733783bcc 100644
--- a/include/sysemu/accel-blocker.h
+++ b/include/sysemu/accel-blocker.h
@@ -14,7 +14,6 @@
#ifndef ACCEL_BLOCKER_H
#define ACCEL_BLOCKER_H
-#include "qemu/osdep.h"
#include "sysemu/cpus.h"
extern void accel_blocker_init(void);
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 17/20] Fix non-first inclusions of qemu/osdep.h
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (15 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 16/20] accel: " Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 18/20] Don't include headers already included by qemu/osdep.h Markus Armbruster
` (2 subsequent siblings)
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
---
audio/sndioaudio.c | 2 +-
backends/hostmem-epc.c | 2 +-
block/export/vduse-blk.c | 2 +-
hw/hyperv/syndbg.c | 2 +-
util/async-teardown.c | 12 ++++--------
5 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c
index 632b0e3825..3fde01fdbd 100644
--- a/audio/sndioaudio.c
+++ b/audio/sndioaudio.c
@@ -14,9 +14,9 @@
* to recording, which is what guest systems expect.
*/
+#include "qemu/osdep.h"
#include <poll.h>
#include <sndio.h>
-#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "audio.h"
#include "trace.h"
diff --git a/backends/hostmem-epc.c b/backends/hostmem-epc.c
index 037292d267..4e162d6789 100644
--- a/backends/hostmem-epc.c
+++ b/backends/hostmem-epc.c
@@ -9,9 +9,9 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
-#include <sys/ioctl.h>
#include "qemu/osdep.h"
+#include <sys/ioctl.h>
#include "qom/object_interfaces.h"
#include "qapi/error.h"
#include "sysemu/hostmem.h"
diff --git a/block/export/vduse-blk.c b/block/export/vduse-blk.c
index 350d6fdaf0..f7ae44e3ce 100644
--- a/block/export/vduse-blk.c
+++ b/block/export/vduse-blk.c
@@ -10,9 +10,9 @@
* later. See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include <sys/eventfd.h>
-#include "qemu/osdep.h"
#include "qapi/error.h"
#include "block/export.h"
#include "qemu/error-report.h"
diff --git a/hw/hyperv/syndbg.c b/hw/hyperv/syndbg.c
index 16d04cfdc6..94fe1b534b 100644
--- a/hw/hyperv/syndbg.c
+++ b/hw/hyperv/syndbg.c
@@ -5,8 +5,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/ctype.h"
#include "qemu/osdep.h"
+#include "qemu/ctype.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/sockets.h"
diff --git a/util/async-teardown.c b/util/async-teardown.c
index 62bfce1b3c..62cdeb0f20 100644
--- a/util/async-teardown.c
+++ b/util/async-teardown.c
@@ -10,16 +10,12 @@
* option) any later version. See the COPYING file in the top-level directory.
*
*/
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/prctl.h>
-#include <signal.h>
-#include <sched.h>
-#include <unistd.h>
#include "qemu/osdep.h"
+#include <dirent.h>
+#include <sys/prctl.h>
+#include <sched.h>
+
#include "qemu/async-teardown.h"
#ifdef _SC_THREAD_STACK_MIN
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 18/20] Don't include headers already included by qemu/osdep.h
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (16 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 17/20] Fix non-first inclusions of qemu/osdep.h Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 19/20] 9p: Drop superfluous include of linux/limits.h Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 20/20] Drop duplicate #include Markus Armbruster
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
This commit was created with scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
backends/tpm/tpm_ioctl.h | 2 --
fsdev/p9array.h | 2 --
include/hw/misc/aspeed_lpc.h | 2 --
include/hw/pci/pcie_doe.h | 1 -
include/qemu/async-teardown.h | 2 --
include/qemu/dbus.h | 1 -
include/qemu/host-utils.h | 1 -
include/sysemu/event-loop-base.h | 1 -
accel/tcg/cpu-exec.c | 1 -
hw/9pfs/9p.c | 2 --
hw/display/virtio-gpu-udmabuf.c | 1 -
hw/i2c/pmbus_device.c | 1 -
hw/remote/proxy-memory-listener.c | 1 -
hw/sensor/adm1272.c | 1 -
hw/usb/dev-storage-bot.c | 1 -
hw/usb/dev-storage-classic.c | 1 -
softmmu/vl.c | 2 --
tcg/tci.c | 1 -
tests/unit/test-seccomp.c | 1 -
ui/udmabuf.c | 1 -
util/main-loop.c | 1 -
util/oslib-posix.c | 2 --
22 files changed, 29 deletions(-)
diff --git a/backends/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h
index e506ef5160..b1d31768a6 100644
--- a/backends/tpm/tpm_ioctl.h
+++ b/backends/tpm/tpm_ioctl.h
@@ -12,8 +12,6 @@
# define __USE_LINUX_IOCTL_DEFS
#endif
-#include <stdint.h>
-#include <sys/types.h>
#ifndef _WIN32
#include <sys/uio.h>
#include <sys/ioctl.h>
diff --git a/fsdev/p9array.h b/fsdev/p9array.h
index 90e83a7c7b..50a1b15fe9 100644
--- a/fsdev/p9array.h
+++ b/fsdev/p9array.h
@@ -27,8 +27,6 @@
#ifndef QEMU_P9ARRAY_H
#define QEMU_P9ARRAY_H
-#include "qemu/compiler.h"
-
/**
* P9Array provides a mechanism to access arrays in common C-style (e.g. by
* square bracket [] operator) in conjunction with reference variables that
diff --git a/include/hw/misc/aspeed_lpc.h b/include/hw/misc/aspeed_lpc.h
index fd228731d2..fa398959af 100644
--- a/include/hw/misc/aspeed_lpc.h
+++ b/include/hw/misc/aspeed_lpc.h
@@ -12,8 +12,6 @@
#include "hw/sysbus.h"
-#include <stdint.h>
-
#define TYPE_ASPEED_LPC "aspeed.lpc"
#define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LPC)
diff --git a/include/hw/pci/pcie_doe.h b/include/hw/pci/pcie_doe.h
index ba4d8b03bd..87dc17dcef 100644
--- a/include/hw/pci/pcie_doe.h
+++ b/include/hw/pci/pcie_doe.h
@@ -11,7 +11,6 @@
#define PCIE_DOE_H
#include "qemu/range.h"
-#include "qemu/typedefs.h"
#include "hw/register.h"
/*
diff --git a/include/qemu/async-teardown.h b/include/qemu/async-teardown.h
index 092e7a37e7..b281da005b 100644
--- a/include/qemu/async-teardown.h
+++ b/include/qemu/async-teardown.h
@@ -13,8 +13,6 @@
#ifndef QEMU_ASYNC_TEARDOWN_H
#define QEMU_ASYNC_TEARDOWN_H
-#include "config-host.h"
-
#ifdef CONFIG_LINUX
void init_async_teardown(void);
#endif
diff --git a/include/qemu/dbus.h b/include/qemu/dbus.h
index 08f00dfd53..81d3de8a5a 100644
--- a/include/qemu/dbus.h
+++ b/include/qemu/dbus.h
@@ -15,7 +15,6 @@
#include "qom/object.h"
#include "chardev/char.h"
#include "qemu/notify.h"
-#include "qemu/typedefs.h"
/* glib/gio 2.68 */
#define DBUS_METHOD_INVOCATION_HANDLED TRUE
diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
index 88d476161c..3ce62bf4a5 100644
--- a/include/qemu/host-utils.h
+++ b/include/qemu/host-utils.h
@@ -30,7 +30,6 @@
#ifndef HOST_UTILS_H
#define HOST_UTILS_H
-#include "qemu/compiler.h"
#include "qemu/bswap.h"
#include "qemu/int128.h"
diff --git a/include/sysemu/event-loop-base.h b/include/sysemu/event-loop-base.h
index 2748bf6ae1..a6c24f1351 100644
--- a/include/sysemu/event-loop-base.h
+++ b/include/sysemu/event-loop-base.h
@@ -14,7 +14,6 @@
#include "qom/object.h"
#include "block/aio.h"
-#include "qemu/typedefs.h"
#define TYPE_EVENT_LOOP_BASE "event-loop-base"
OBJECT_DECLARE_TYPE(EventLoopBase, EventLoopBaseClass,
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 04cd1f3092..8e0caf2fcc 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -28,7 +28,6 @@
#include "exec/exec-all.h"
#include "tcg/tcg.h"
#include "qemu/atomic.h"
-#include "qemu/compiler.h"
#include "qemu/timer.h"
#include "qemu/rcu.h"
#include "exec/log.h"
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 072cf67956..9621ec1341 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -19,8 +19,6 @@
#include "qemu/osdep.h"
#ifdef CONFIG_LINUX
#include <linux/limits.h>
-#else
-#include <limits.h>
#endif
#include <glib/gprintf.h>
#include "hw/virtio/virtio.h"
diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
index 8bdf4bac6e..847fa4c0cc 100644
--- a/hw/display/virtio-gpu-udmabuf.c
+++ b/hw/display/virtio-gpu-udmabuf.c
@@ -21,7 +21,6 @@
#include "exec/ramblock.h"
#include "sysemu/hostmem.h"
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <linux/memfd.h>
#include "qemu/memfd.h"
#include "standard-headers/linux/udmabuf.h"
diff --git a/hw/i2c/pmbus_device.c b/hw/i2c/pmbus_device.c
index 4071a88cfc..c3d6046784 100644
--- a/hw/i2c/pmbus_device.c
+++ b/hw/i2c/pmbus_device.c
@@ -8,7 +8,6 @@
#include "qemu/osdep.h"
#include <math.h>
-#include <string.h>
#include "hw/i2c/pmbus_device.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index eb9918fe72..18d96a1d04 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -8,7 +8,6 @@
#include "qemu/osdep.h"
-#include "qemu/compiler.h"
#include "qemu/int128.h"
#include "qemu/range.h"
#include "exec/memory.h"
diff --git a/hw/sensor/adm1272.c b/hw/sensor/adm1272.c
index 7310c769be..8f4a1c2cd4 100644
--- a/hw/sensor/adm1272.c
+++ b/hw/sensor/adm1272.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include <string.h>
#include "hw/i2c/pmbus_device.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
diff --git a/hw/usb/dev-storage-bot.c b/hw/usb/dev-storage-bot.c
index b24b3148c2..1e5c5c711f 100644
--- a/hw/usb/dev-storage-bot.c
+++ b/hw/usb/dev-storage-bot.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/typedefs.h"
#include "qapi/error.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
diff --git a/hw/usb/dev-storage-classic.c b/hw/usb/dev-storage-classic.c
index 00f25bade2..84d19752b5 100644
--- a/hw/usb/dev-storage-classic.c
+++ b/hw/usb/dev-storage-classic.c
@@ -8,7 +8,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/typedefs.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "hw/usb.h"
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 9177d95d4e..5355a7fe5a 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -136,8 +136,6 @@
#include "qemu/guest-random.h"
#include "qemu/keyval.h"
-#include "config-host.h"
-
#define MAX_VIRTIO_CONSOLES 1
typedef struct BlockdevOptionsQueueEntry {
diff --git a/tcg/tci.c b/tcg/tci.c
index 05a24163d3..e7ac74cab0 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -21,7 +21,6 @@
#include "exec/cpu_ldst.h"
#include "tcg/tcg-op.h"
#include "tcg/tcg-ldst.h"
-#include "qemu/compiler.h"
#include <ffi.h>
diff --git a/tests/unit/test-seccomp.c b/tests/unit/test-seccomp.c
index 3d7771e46c..f02c79cafd 100644
--- a/tests/unit/test-seccomp.c
+++ b/tests/unit/test-seccomp.c
@@ -25,7 +25,6 @@
#include "qapi/error.h"
#include "qemu/module.h"
-#include <unistd.h>
#include <sys/syscall.h>
static void test_seccomp_helper(const char *args, bool killed,
diff --git a/ui/udmabuf.c b/ui/udmabuf.c
index cebceb2610..cbf4357bb1 100644
--- a/ui/udmabuf.c
+++ b/ui/udmabuf.c
@@ -8,7 +8,6 @@
#include "qapi/error.h"
#include "ui/console.h"
-#include <fcntl.h>
#include <sys/ioctl.h>
int udmabuf_fd(void)
diff --git a/util/main-loop.c b/util/main-loop.c
index 58f776a8c9..3c0f525192 100644
--- a/util/main-loop.c
+++ b/util/main-loop.c
@@ -33,7 +33,6 @@
#include "block/thread-pool.h"
#include "qemu/error-report.h"
#include "qemu/queue.h"
-#include "qemu/compiler.h"
#include "qom/object.h"
#ifndef _WIN32
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 59a891b6a8..fd03fd32c8 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -40,7 +40,6 @@
#include "qemu/thread.h"
#include <libgen.h>
#include "qemu/cutils.h"
-#include "qemu/compiler.h"
#include "qemu/units.h"
#include "qemu/thread-context.h"
@@ -50,7 +49,6 @@
#ifdef __FreeBSD__
#include <sys/thr.h>
-#include <sys/types.h>
#include <sys/user.h>
#include <libutil.h>
#endif
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 19/20] 9p: Drop superfluous include of linux/limits.h
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (17 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 18/20] Don't include headers already included by qemu/osdep.h Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
2023-01-30 13:21 ` [PATCH v5 20/20] Drop duplicate #include Markus Armbruster
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/9pfs/9p.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 9621ec1341..aa736af380 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -17,9 +17,6 @@
*/
#include "qemu/osdep.h"
-#ifdef CONFIG_LINUX
-#include <linux/limits.h>
-#endif
#include <glib/gprintf.h>
#include "hw/virtio/virtio.h"
#include "qapi/error.h"
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH v5 20/20] Drop duplicate #include
2023-01-30 13:21 [PATCH v5 00/20] Clean up includes Markus Armbruster
` (18 preceding siblings ...)
2023-01-30 13:21 ` [PATCH v5 19/20] 9p: Drop superfluous include of linux/limits.h Markus Armbruster
@ 2023-01-30 13:21 ` Markus Armbruster
19 siblings, 0 replies; 28+ messages in thread
From: Markus Armbruster @ 2023-01-30 13:21 UTC (permalink / raw)
To: qemu-devel
Cc: richard.henderson, pbonzini, kwolf, hreitz, imp, kevans,
berrange, groug, qemu_oss, mst, philmd, peter.maydell, alistair,
jasowang, jonathan.cameron, kbastian, quintela, dgilbert,
michael.roth, kkostiuk, tsimpson, palmer, bin.meng, qemu-block,
qemu-arm, qemu-riscv
Tracked down with the help of scripts/clean-includes.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
---
include/hw/arm/fsl-imx6ul.h | 1 -
include/hw/arm/fsl-imx7.h | 1 -
backends/tpm/tpm_emulator.c | 1 -
hw/acpi/piix4.c | 1 -
hw/alpha/dp264.c | 1 -
hw/arm/virt.c | 1 -
hw/arm/xlnx-versal.c | 1 -
hw/block/pflash_cfi01.c | 1 -
hw/core/machine.c | 1 -
hw/hppa/machine.c | 1 -
hw/i386/acpi-build.c | 1 -
hw/loongarch/acpi-build.c | 1 -
hw/misc/macio/cuda.c | 1 -
hw/misc/macio/pmu.c | 1 -
hw/net/xilinx_axienet.c | 1 -
hw/ppc/ppc405_uc.c | 2 --
hw/ppc/ppc440_bamboo.c | 1 -
hw/ppc/spapr_drc.c | 1 -
hw/rdma/vmw/pvrdma_dev_ring.c | 1 -
hw/remote/machine.c | 1 -
hw/remote/remote-obj.c | 1 -
hw/rtc/mc146818rtc.c | 1 -
hw/s390x/virtio-ccw-serial.c | 1 -
migration/postcopy-ram.c | 2 --
softmmu/dirtylimit.c | 1 -
softmmu/runstate.c | 1 -
softmmu/vl.c | 1 -
target/loongarch/translate.c | 1 -
target/mips/tcg/translate.c | 1 -
target/nios2/translate.c | 2 --
tests/unit/test-cutils.c | 1 -
ui/gtk.c | 1 -
util/oslib-posix.c | 4 ----
33 files changed, 39 deletions(-)
diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index 7812e516a5..1952cb984d 100644
--- a/include/hw/arm/fsl-imx6ul.h
+++ b/include/hw/arm/fsl-imx6ul.h
@@ -30,7 +30,6 @@
#include "hw/timer/imx_gpt.h"
#include "hw/timer/imx_epit.h"
#include "hw/i2c/imx_i2c.h"
-#include "hw/gpio/imx_gpio.h"
#include "hw/sd/sdhci.h"
#include "hw/ssi/imx_spi.h"
#include "hw/net/imx_fec.h"
diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
index 4e5e071864..355bd8ea83 100644
--- a/include/hw/arm/fsl-imx7.h
+++ b/include/hw/arm/fsl-imx7.h
@@ -32,7 +32,6 @@
#include "hw/timer/imx_gpt.h"
#include "hw/timer/imx_epit.h"
#include "hw/i2c/imx_i2c.h"
-#include "hw/gpio/imx_gpio.h"
#include "hw/sd/sdhci.h"
#include "hw/ssi/imx_spi.h"
#include "hw/net/imx_fec.h"
diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c
index 67e7b212e3..d18144b92e 100644
--- a/backends/tpm/tpm_emulator.c
+++ b/backends/tpm/tpm_emulator.c
@@ -35,7 +35,6 @@
#include "sysemu/runstate.h"
#include "sysemu/tpm_backend.h"
#include "sysemu/tpm_util.h"
-#include "sysemu/runstate.h"
#include "tpm_int.h"
#include "tpm_ioctl.h"
#include "migration/blocker.h"
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 0a81f1ad93..df39f91294 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -35,7 +35,6 @@
#include "sysemu/xen.h"
#include "qapi/error.h"
#include "qemu/range.h"
-#include "hw/acpi/pcihp.h"
#include "hw/acpi/cpu_hotplug.h"
#include "hw/acpi/cpu.h"
#include "hw/hotplug.h"
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index c502c8c62a..4161f559a7 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -18,7 +18,6 @@
#include "net/net.h"
#include "qemu/cutils.h"
#include "qemu/datadir.h"
-#include "net/net.h"
static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr)
{
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ea2413a0ba..d3849d7233 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -33,7 +33,6 @@
#include "qemu/units.h"
#include "qemu/option.h"
#include "monitor/qdev.h"
-#include "qapi/error.h"
#include "hw/sysbus.h"
#include "hw/arm/boot.h"
#include "hw/arm/primecell.h"
diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 57276e1506..69b1b99e93 100644
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -22,7 +22,6 @@
#include "hw/misc/unimp.h"
#include "hw/arm/xlnx-versal.h"
#include "qemu/log.h"
-#include "hw/sysbus.h"
#define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72")
#define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f")
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 36d68c70f6..3c066e3405 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -45,7 +45,6 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/bitops.h"
-#include "qemu/error-report.h"
#include "qemu/host-utils.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 616f3a207c..67cf9f9dcd 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -39,7 +39,6 @@
#include "exec/confidential-guest-support.h"
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-pci.h"
-#include "qom/object_interfaces.h"
GlobalProperty hw_compat_7_2[] = {};
const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index de1cc7ab71..7ac68c943f 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -28,7 +28,6 @@
#include "qapi/error.h"
#include "net/net.h"
#include "qemu/log.h"
-#include "net/net.h"
#define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 127c4e2d50..14f6f75454 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -76,7 +76,6 @@
#include "hw/acpi/hmat.h"
#include "hw/acpi/viot.h"
-#include "hw/acpi/cxl.h"
#include CONFIG_DEVICES
diff --git a/hw/loongarch/acpi-build.c b/hw/loongarch/acpi-build.c
index c2b237736d..f551296a0e 100644
--- a/hw/loongarch/acpi-build.c
+++ b/hw/loongarch/acpi-build.c
@@ -22,7 +22,6 @@
/* Supported chipsets: */
#include "hw/pci-host/ls7a.h"
#include "hw/loongarch/virt.h"
-#include "hw/acpi/aml-build.h"
#include "hw/acpi/utils.h"
#include "hw/acpi/pci.h"
diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c
index 853e88bfed..29a8e5ed19 100644
--- a/hw/misc/macio/cuda.c
+++ b/hw/misc/macio/cuda.c
@@ -30,7 +30,6 @@
#include "hw/input/adb.h"
#include "hw/misc/mos6522.h"
#include "hw/misc/macio/cuda.h"
-#include "qapi/error.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
#include "sysemu/rtc.h"
diff --git a/hw/misc/macio/pmu.c b/hw/misc/macio/pmu.c
index 97ef8c771b..5a788e595a 100644
--- a/hw/misc/macio/pmu.c
+++ b/hw/misc/macio/pmu.c
@@ -36,7 +36,6 @@
#include "hw/misc/mos6522.h"
#include "hw/misc/macio/gpio.h"
#include "hw/misc/macio/pmu.h"
-#include "qapi/error.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
#include "sysemu/rtc.h"
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 7e00965323..5b19a01eaa 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -31,7 +31,6 @@
#include "net/net.h"
#include "net/checksum.h"
-#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/stream.h"
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index c973cfb04e..0cc68178ad 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -38,8 +38,6 @@
#include "sysemu/sysemu.h"
#include "exec/address-spaces.h"
#include "hw/intc/ppc-uic.h"
-#include "hw/qdev-properties.h"
-#include "qapi/error.h"
#include "trace.h"
/*****************************************************************************/
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 81d71adf34..2880c81cb1 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -13,7 +13,6 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "qemu/error-report.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "net/net.h"
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 4923435a8b..b5c400a94d 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -17,7 +17,6 @@
#include "hw/ppc/spapr_drc.h"
#include "qom/object.h"
#include "migration/vmstate.h"
-#include "qapi/error.h"
#include "qapi/qapi-events-qdev.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c
index 598e6adc5e..30ce22a5be 100644
--- a/hw/rdma/vmw/pvrdma_dev_ring.c
+++ b/hw/rdma/vmw/pvrdma_dev_ring.c
@@ -14,7 +14,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/cutils.h"
#include "hw/pci/pci.h"
#include "cpu.h"
#include "qemu/cutils.h"
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index 519f855ec1..fdc6c441bb 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -22,7 +22,6 @@
#include "hw/remote/iohub.h"
#include "hw/remote/iommu.h"
#include "hw/qdev-core.h"
-#include "hw/remote/iommu.h"
#include "hw/remote/vfio-user-obj.h"
#include "hw/pci/msi.h"
diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
index 333e5ac443..65b6f7cc86 100644
--- a/hw/remote/remote-obj.c
+++ b/hw/remote/remote-obj.c
@@ -12,7 +12,6 @@
#include "qemu/error-report.h"
#include "qemu/notify.h"
#include "qom/object_interfaces.h"
-#include "hw/qdev-core.h"
#include "io/channel.h"
#include "hw/qdev-core.h"
#include "hw/remote/machine.h"
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index bc1192b7ae..ba612a151d 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -43,7 +43,6 @@
#include "qapi/error.h"
#include "qapi/qapi-events-misc.h"
#include "qapi/visitor.h"
-#include "hw/rtc/mc146818rtc_regs.h"
//#define DEBUG_CMOS
//#define DEBUG_COALESCED
diff --git a/hw/s390x/virtio-ccw-serial.c b/hw/s390x/virtio-ccw-serial.c
index bf8057880f..8f8d2302f8 100644
--- a/hw/s390x/virtio-ccw-serial.c
+++ b/hw/s390x/virtio-ccw-serial.c
@@ -15,7 +15,6 @@
#include "hw/qdev-properties.h"
#include "hw/virtio/virtio-serial.h"
#include "virtio-ccw.h"
-#include "hw/virtio/virtio-serial.h"
#define TYPE_VIRTIO_SERIAL_CCW "virtio-serial-ccw"
OBJECT_DECLARE_SIMPLE_TYPE(VirtioSerialCcw, VIRTIO_SERIAL_CCW)
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index b9a37ef255..8b7d1af75d 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -17,7 +17,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/rcu.h"
#include "qemu/madvise.h"
#include "exec/target_page.h"
#include "migration.h"
@@ -34,7 +33,6 @@
#include "hw/boards.h"
#include "exec/ramblock.h"
#include "socket.h"
-#include "qemu-file.h"
#include "yank_functions.h"
#include "tls.h"
diff --git a/softmmu/dirtylimit.c b/softmmu/dirtylimit.c
index 12668555f2..c56f0f58c8 100644
--- a/softmmu/dirtylimit.c
+++ b/softmmu/dirtylimit.c
@@ -11,7 +11,6 @@
*/
#include "qemu/osdep.h"
-#include "qapi/error.h"
#include "qemu/main-loop.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qmp/qdict.h"
diff --git a/softmmu/runstate.c b/softmmu/runstate.c
index cab9f6fc07..f9ad88e6a7 100644
--- a/softmmu/runstate.c
+++ b/softmmu/runstate.c
@@ -41,7 +41,6 @@
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-events-run-state.h"
#include "qemu/error-report.h"
-#include "qemu/log.h"
#include "qemu/job.h"
#include "qemu/log.h"
#include "qemu/module.h"
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5355a7fe5a..b2ee3fee3f 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -129,7 +129,6 @@
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-visit-qom.h"
#include "qapi/qapi-commands-ui.h"
-#include "qapi/qmp/qdict.h"
#include "block/qdict.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/iothread.h"
diff --git a/target/loongarch/translate.c b/target/loongarch/translate.c
index 38ced69803..72a6275665 100644
--- a/target/loongarch/translate.c
+++ b/target/loongarch/translate.c
@@ -12,7 +12,6 @@
#include "exec/helper-proto.h"
#include "exec/helper-gen.h"
-#include "exec/translator.h"
#include "exec/log.h"
#include "qemu/qemu-print.h"
#include "fpu/softfloat.h"
diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
index 624e6b7786..aa12bb708a 100644
--- a/target/mips/tcg/translate.c
+++ b/target/mips/tcg/translate.c
@@ -32,7 +32,6 @@
#include "semihosting/semihost.h"
#include "trace.h"
-#include "exec/translator.h"
#include "exec/log.h"
#include "qemu/qemu-print.h"
#include "fpu_helper.h"
diff --git a/target/nios2/translate.c b/target/nios2/translate.c
index 4db8b47744..7aee65a089 100644
--- a/target/nios2/translate.c
+++ b/target/nios2/translate.c
@@ -938,8 +938,6 @@ static const char * const cr_regnames[NUM_CR_REGS] = {
};
#endif
-#include "exec/gen-icount.h"
-
/* generate intermediate code for basic block 'tb'. */
static void nios2_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
{
diff --git a/tests/unit/test-cutils.c b/tests/unit/test-cutils.c
index 2126b46391..3c4f875420 100644
--- a/tests/unit/test-cutils.c
+++ b/tests/unit/test-cutils.c
@@ -26,7 +26,6 @@
*/
#include "qemu/osdep.h"
-#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qemu/units.h"
diff --git a/ui/gtk.c b/ui/gtk.c
index 4817623c8f..7f752d8b7d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -53,7 +53,6 @@
#include <math.h>
#include "trace.h"
-#include "qemu/cutils.h"
#include "ui/input.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index fd03fd32c8..77d882e681 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -59,10 +59,6 @@
#include "qemu/mmap-alloc.h"
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#include "qemu/error-report.h"
-#endif
-
#define MAX_MEM_PREALLOC_THREAD_COUNT 16
struct MemsetThread;
--
2.39.0
^ permalink raw reply related [flat|nested] 28+ messages in thread