include: move target page bits declaration to page-vary.h

Since the implementation unit is page-vary.c.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220323155743.1585078-24-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h
index c22a7a742e7cf1890b9364fdc6257b65317eb7c8..ebbe9b169b8fbcd9445e429bc73d500eeefa0a97 100644 (file)
--- a/include/exec/page-vary.h
+++ b/include/exec/page-vary.h
@@ -31,4 +31,22 @@ extern bool set_preferred_target_page_bits_common(int bits);
 extern void finalize_target_page_bits_common(int min);
 #endif
 
+/**
+ * set_preferred_target_page_bits:
+ * @bits: number of bits needed to represent an address within the page
+ *
+ * Set the preferred target page size (the actual target page
+ * size may be smaller than any given CPU's preference).
+ * Returns true on success, false on failure (which can only happen
+ * if this is called after the system has already finalized its
+ * choice of page size and the requested page size is smaller than that).
+ */
+bool set_preferred_target_page_bits(int bits);
+
+/**
+ * finalize_target_page_bits:
+ * Commit the final value set by set_preferred_target_page_bits.
+ */
+void finalize_target_page_bits(void);
+
 #endif /* EXEC_PAGE_VARY_H */

diff --git a/include/qemu-common.h b/include/qemu-common.h
index ced260d08be0fa8c50227ec1ba1d2e55f664df29..bc73daecb4e918d125e956566035638898312f1c 100644 (file)
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -24,23 +24,6 @@
 int qemu_main(int argc, char **argv, char **envp);
 #endif
 
-/**
- * set_preferred_target_page_bits:
- * @bits: number of bits needed to represent an address within the page
- *
- * Set the preferred target page size (the actual target page
- * size may be smaller than any given CPU's preference).
- * Returns true on success, false on failure (which can only happen
- * if this is called after the system has already finalized its
- * choice of page size and the requested page size is smaller than that).
- */
-bool set_preferred_target_page_bits(int bits);
-
-/**
- * finalize_target_page_bits:
- * Commit the final value set by set_preferred_target_page_bits.
- */
-void finalize_target_page_bits(void);
 
 void qemu_progress_init(int enabled, float min_skip);
 void qemu_progress_end(void);

diff --git a/page-vary.c b/page-vary.c
index 057c7f181521432bb89a7067cc9ee72d0d10f646..343b4adb95a503c540eacb302b6c28e27b0f061f 100644 (file)
--- a/page-vary.c
+++ b/page-vary.c
@@ -20,7 +20,7 @@
 #define IN_PAGE_VARY 1
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "exec/page-vary.h"
 #include "exec/exec-all.h"
 
 bool set_preferred_target_page_bits(int bits)

diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index cdf0db733e579444026c3f2303da47fd8bfea4bb..657841eed0cf9e72af8a0f717d09466ba80e642d 100644 (file)
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -18,7 +18,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qemu-common.h"
+#include "exec/page-vary.h"
 #include "qapi/error.h"
 
 #include "qemu/cutils.h"

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 6f646531a0aeb6ff2dd3fc8a5cd8c01d11a9869a..46aba6a039c41cf1bb91be9c9da9a4e9a476c3ae 100644 (file)
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -27,6 +27,7 @@
 #include "qemu/datadir.h"
 #include "qemu/units.h"
 #include "exec/cpu-common.h"
+#include "exec/page-vary.h"
 #include "hw/qdev-properties.h"
 #include "qapi/compat-policy.h"
 #include "qapi/error.h"

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 0980d3390112fb983d113a470473b5fd42895080..3609de088827290f180b5b3dcf1c3c456044098b 100644 (file)
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -22,7 +22,7 @@
 #include "qemu/qemu-print.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
-#include "qemu-common.h"
+#include "exec/page-vary.h"
 #include "target/arm/idau.h"
 #include "qemu/module.h"
 #include "qapi/error.h"