Cleanup internal WHPX headers

[PATCH 1/2] whpx: rename whp-dispatch to whpx-internal.h

Posted by Paolo Bonzini 4 years, 9 months ago

Rename the file in preparation for moving more implementation-internal
definitions to it.  The build is still broken though.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target/i386/whpx/whpx-all.c                          | 5 +----
 target/i386/whpx/whpx-apic.c                         | 2 +-
 target/i386/whpx/whpx-cpus.c                         | 4 +---
 target/i386/whpx/{whp-dispatch.h => whpx-internal.h} | 6 +++---
 4 files changed, 6 insertions(+), 11 deletions(-)
 rename target/i386/whpx/{whp-dispatch.h => whpx-internal.h} (98%)

diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 3b824fc9d7..12f79e2cd6 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -26,13 +26,10 @@
 #include "qapi/qapi-types-common.h"
 #include "qapi/qapi-visit-common.h"
 #include "migration/blocker.h"
-#include "whp-dispatch.h"
 #include <winerror.h>
 
 #include "whpx-cpus.h"
-
-#include <WinHvPlatform.h>
-#include <WinHvEmulation.h>
+#include "whpx-internal.h"
 
 #define HYPERV_APIC_BUS_FREQUENCY      (200000000ULL)
 
diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
index b127a3cb8a..1d330bf749 100644
--- a/target/i386/whpx/whpx-apic.c
+++ b/target/i386/whpx/whpx-apic.c
@@ -18,7 +18,7 @@
 #include "hw/pci/msi.h"
 #include "sysemu/hw_accel.h"
 #include "sysemu/whpx.h"
-#include "whp-dispatch.h"
+#include "whpx-internal.h"
 
 static void whpx_put_apic_state(APICCommonState *s,
                                 struct whpx_lapic_state *kapic)
diff --git a/target/i386/whpx/whpx-cpus.c b/target/i386/whpx/whpx-cpus.c
index d9bd5a2d36..f7e69881a3 100644
--- a/target/i386/whpx/whpx-cpus.c
+++ b/target/i386/whpx/whpx-cpus.c
@@ -15,11 +15,9 @@
 #include "qemu/guest-random.h"
 
 #include "sysemu/whpx.h"
+#include "whpx-internal.h"
 #include "whpx-cpus.h"
 
-#include <WinHvPlatform.h>
-#include <WinHvEmulation.h>
-
 static void *whpx_cpu_thread_fn(void *arg)
 {
     CPUState *cpu = arg;
diff --git a/target/i386/whpx/whp-dispatch.h b/target/i386/whpx/whpx-internal.h
similarity index 98%
rename from target/i386/whpx/whp-dispatch.h
rename to target/i386/whpx/whpx-internal.h
index cef5d848bd..e0a9ea1dce 100644
--- a/target/i386/whpx/whp-dispatch.h
+++ b/target/i386/whpx/whpx-internal.h
@@ -1,5 +1,5 @@
-#ifndef WHP_DISPATCH_H
-#define WHP_DISPATCH_H
+#ifndef WHP_INTERNAL_H
+#define WHP_INTERNAL_H
 
 #include <windows.h>
 #include <WinHvPlatform.h>
@@ -72,4 +72,4 @@ typedef enum WHPFunctionList {
     WINHV_PLATFORM_FNS_SUPPLEMENTAL
 } WHPFunctionList;
 
-#endif /* WHP_DISPATCH_H */
+#endif /* WHP_INTERNAL_H */
-- 
2.26.2

Re: [PATCH 1/2] whpx: rename whp-dispatch to whpx-internal.h

Posted by Marc-André Lureau 4 years, 9 months ago

On Sat, Dec 19, 2020 at 1:06 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Rename the file in preparation for moving more implementation-internal
> definitions to it.  The build is still broken though.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

---
>  target/i386/whpx/whpx-all.c                          | 5 +----
>  target/i386/whpx/whpx-apic.c                         | 2 +-
>  target/i386/whpx/whpx-cpus.c                         | 4 +---
>  target/i386/whpx/{whp-dispatch.h => whpx-internal.h} | 6 +++---
>  4 files changed, 6 insertions(+), 11 deletions(-)
>  rename target/i386/whpx/{whp-dispatch.h => whpx-internal.h} (98%)
>
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index 3b824fc9d7..12f79e2cd6 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -26,13 +26,10 @@
>  #include "qapi/qapi-types-common.h"
>  #include "qapi/qapi-visit-common.h"
>  #include "migration/blocker.h"
> -#include "whp-dispatch.h"
>  #include <winerror.h>
>
>  #include "whpx-cpus.h"
> -
> -#include <WinHvPlatform.h>
> -#include <WinHvEmulation.h>
> +#include "whpx-internal.h"
>
>  #define HYPERV_APIC_BUS_FREQUENCY      (200000000ULL)
>
> diff --git a/target/i386/whpx/whpx-apic.c b/target/i386/whpx/whpx-apic.c
> index b127a3cb8a..1d330bf749 100644
> --- a/target/i386/whpx/whpx-apic.c
> +++ b/target/i386/whpx/whpx-apic.c
> @@ -18,7 +18,7 @@
>  #include "hw/pci/msi.h"
>  #include "sysemu/hw_accel.h"
>  #include "sysemu/whpx.h"
> -#include "whp-dispatch.h"
> +#include "whpx-internal.h"
>
>  static void whpx_put_apic_state(APICCommonState *s,
>                                  struct whpx_lapic_state *kapic)
> diff --git a/target/i386/whpx/whpx-cpus.c b/target/i386/whpx/whpx-cpus.c
> index d9bd5a2d36..f7e69881a3 100644
> --- a/target/i386/whpx/whpx-cpus.c
> +++ b/target/i386/whpx/whpx-cpus.c
> @@ -15,11 +15,9 @@
>  #include "qemu/guest-random.h"
>
>  #include "sysemu/whpx.h"
> +#include "whpx-internal.h"
>  #include "whpx-cpus.h"
>
> -#include <WinHvPlatform.h>
> -#include <WinHvEmulation.h>
> -
>  static void *whpx_cpu_thread_fn(void *arg)
>  {
>      CPUState *cpu = arg;
> diff --git a/target/i386/whpx/whp-dispatch.h
> b/target/i386/whpx/whpx-internal.h
> similarity index 98%
> rename from target/i386/whpx/whp-dispatch.h
> rename to target/i386/whpx/whpx-internal.h
> index cef5d848bd..e0a9ea1dce 100644
> --- a/target/i386/whpx/whp-dispatch.h
> +++ b/target/i386/whpx/whpx-internal.h
> @@ -1,5 +1,5 @@
> -#ifndef WHP_DISPATCH_H
> -#define WHP_DISPATCH_H
> +#ifndef WHP_INTERNAL_H
> +#define WHP_INTERNAL_H
>
>  #include <windows.h>
>  #include <WinHvPlatform.h>
> @@ -72,4 +72,4 @@ typedef enum WHPFunctionList {
>      WINHV_PLATFORM_FNS_SUPPLEMENTAL
>  } WHPFunctionList;
>
> -#endif /* WHP_DISPATCH_H */
> +#endif /* WHP_INTERNAL_H */
> --
> 2.26.2
>
>
>

[PATCH 1/2] whpx: rename whp-dispatch to whpx-internal.h
[PATCH 2/2] whpx: move internal definitions to whpx-internal.h