From 05871c72be699d14c169968b9080e3a784389cd3 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 25 Jan 2024 16:34:00 +0000 Subject: [PATCH] hyperv: Clean up includes This commit was created with scripts/clean-includes: ./scripts/clean-includes --git hyperv hw/hyperv/*.[ch] All .c should include qemu/osdep.h first. The 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. Signed-off-by: Peter Maydell Reviewed-by: Zhao Liu Reviewed-by: Richard Henderson Signed-off-by: Michael Tokarev --- hw/hyperv/hv-balloon-internal.h | 1 - hw/hyperv/hv-balloon-our_range_memslots.c | 1 + hw/hyperv/hv-balloon-our_range_memslots.h | 1 - hw/hyperv/hv-balloon-page_range_tree.c | 1 + hw/hyperv/hv-balloon-page_range_tree.h | 1 - hw/hyperv/hv-balloon.c | 1 + 6 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/hyperv/hv-balloon-internal.h b/hw/hyperv/hv-balloon-internal.h index 164c2e5825..ee53a28a26 100644 --- a/hw/hyperv/hv-balloon-internal.h +++ b/hw/hyperv/hv-balloon-internal.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_INTERNAL_H #define HW_HYPERV_HV_BALLOON_INTERNAL_H -#include "qemu/osdep.h" #define HV_BALLOON_PFN_SHIFT 12 #define HV_BALLOON_PAGE_SIZE (1 << HV_BALLOON_PFN_SHIFT) diff --git a/hw/hyperv/hv-balloon-our_range_memslots.c b/hw/hyperv/hv-balloon-our_range_memslots.c index 99bae870f3..1505a395cf 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.c +++ b/hw/hyperv/hv-balloon-our_range_memslots.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-our_range_memslots.h" #include "trace.h" diff --git a/hw/hyperv/hv-balloon-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h index b6f592d34b..df3b686bc7 100644 --- a/hw/hyperv/hv-balloon-our_range_memslots.h +++ b/hw/hyperv/hv-balloon-our_range_memslots.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H #define HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H -#include "qemu/osdep.h" #include "exec/memory.h" #include "qom/object.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.c b/hw/hyperv/hv-balloon-page_range_tree.c index e178d8b413..dfb14852f4 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.c +++ b/hw/hyperv/hv-balloon-page_range_tree.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "hv-balloon-page_range_tree.h" diff --git a/hw/hyperv/hv-balloon-page_range_tree.h b/hw/hyperv/hv-balloon-page_range_tree.h index 07a9ae0da6..333772b86d 100644 --- a/hw/hyperv/hv-balloon-page_range_tree.h +++ b/hw/hyperv/hv-balloon-page_range_tree.h @@ -10,7 +10,6 @@ #ifndef HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H #define HW_HYPERV_HV_BALLOON_PAGE_RANGE_TREE_H -#include "qemu/osdep.h" /* PageRange */ typedef struct PageRange { diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c index 66f297c1d7..0238365712 100644 --- a/hw/hyperv/hv-balloon.c +++ b/hw/hyperv/hv-balloon.c @@ -7,6 +7,7 @@ * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "hv-balloon-internal.h" #include "exec/address-spaces.h"