That is the only function that we need from exec.c, and having to
include the whole sysemu.h for this.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
/me leans to be less sloppy with copyright notices
thanks Dave
---
exec.c | 1 +
include/exec/target_page.h | 19 +++++++++++++++++++
include/sysemu/sysemu.h | 1 -
migration/migration.c | 1 +
migration/postcopy-ram.c | 1 +
migration/savevm.c | 1 +
6 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 include/exec/target_page.h
diff --git a/exec.c b/exec.c
index 96e3ac9..de2961b 100644
--- a/exec.c
+++ b/exec.c
@@ -24,6 +24,7 @@
#include "qemu/cutils.h"
#include "cpu.h"
#include "exec/exec-all.h"
+#include "exec/target_page.h"
#include "tcg.h"
#include "hw/qdev-core.h"
#if !defined(CONFIG_USER_ONLY)
diff --git a/include/exec/target_page.h b/include/exec/target_page.h
new file mode 100644
index 0000000..626eda8
--- /dev/null
+++ b/include/exec/target_page.h
@@ -0,0 +1,19 @@
+/*
+ * Target page sizes and friends for non target files
+ *
+ * Copyright (c) 2017 Red Hat Inc
+ *
+ * Authors:
+ * David Alan Gilbert <dgilbert@redhat.com>
+ * Juan Quintela <quintela@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef EXEC_TARGET_PAGE_H
+#define EXEC_TARGET_PAGE_H
+
+size_t qemu_target_page_size(void);
+
+#endif
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 765358e..ed8fe3b 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -67,7 +67,6 @@ int qemu_reset_requested_get(void);
void qemu_system_killed(int signal, pid_t pid);
void qemu_system_reset(bool report);
void qemu_system_guest_panicked(GuestPanicInformation *info);
-size_t qemu_target_page_size(void);
void qemu_add_exit_notifier(Notifier *notify);
void qemu_remove_exit_notifier(Notifier *notify);
diff --git a/migration/migration.c b/migration/migration.c
index 9fe474b..ad29e53 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -37,6 +37,7 @@
#include "qom/cpu.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
+#include "exec/target_page.h"
#include "io/channel-buffer.h"
#include "io/channel-tls.h"
#include "migration/colo.h"
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 0e2a996..a37620d 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -19,6 +19,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
+#include "exec/target_page.h"
#include "migration/migration.h"
#include "migration/qemu-file.h"
#include "postcopy-ram.h"
diff --git a/migration/savevm.c b/migration/savevm.c
index 8565103..8763700 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -43,6 +43,7 @@
#include "qemu/queue.h"
#include "sysemu/cpus.h"
#include "exec/memory.h"
+#include "exec/target_page.h"
#include "qmp-commands.h"
#include "trace.h"
#include "qemu/bitops.h"
--
2.9.3
* Juan Quintela (quintela@redhat.com) wrote: > That is the only function that we need from exec.c, and having to > include the whole sysemu.h for this. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > --- > > /me leans to be less sloppy with copyright notices > thanks Dave > --- > exec.c | 1 + > include/exec/target_page.h | 19 +++++++++++++++++++ > include/sysemu/sysemu.h | 1 - > migration/migration.c | 1 + > migration/postcopy-ram.c | 1 + > migration/savevm.c | 1 + > 6 files changed, 23 insertions(+), 1 deletion(-) > create mode 100644 include/exec/target_page.h > > diff --git a/exec.c b/exec.c > index 96e3ac9..de2961b 100644 > --- a/exec.c > +++ b/exec.c > @@ -24,6 +24,7 @@ > #include "qemu/cutils.h" > #include "cpu.h" > #include "exec/exec-all.h" > +#include "exec/target_page.h" > #include "tcg.h" > #include "hw/qdev-core.h" > #if !defined(CONFIG_USER_ONLY) > diff --git a/include/exec/target_page.h b/include/exec/target_page.h > new file mode 100644 > index 0000000..626eda8 > --- /dev/null > +++ b/include/exec/target_page.h > @@ -0,0 +1,19 @@ > +/* > + * Target page sizes and friends for non target files > + * > + * Copyright (c) 2017 Red Hat Inc > + * > + * Authors: > + * David Alan Gilbert <dgilbert@redhat.com> > + * Juan Quintela <quintela@redhat.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > + > +#ifndef EXEC_TARGET_PAGE_H > +#define EXEC_TARGET_PAGE_H > + > +size_t qemu_target_page_size(void); > + > +#endif > diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h > index 765358e..ed8fe3b 100644 > --- a/include/sysemu/sysemu.h > +++ b/include/sysemu/sysemu.h > @@ -67,7 +67,6 @@ int qemu_reset_requested_get(void); > void qemu_system_killed(int signal, pid_t pid); > void qemu_system_reset(bool report); > void qemu_system_guest_panicked(GuestPanicInformation *info); > -size_t qemu_target_page_size(void); > > void qemu_add_exit_notifier(Notifier *notify); > void qemu_remove_exit_notifier(Notifier *notify); > diff --git a/migration/migration.c b/migration/migration.c > index 9fe474b..ad29e53 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -37,6 +37,7 @@ > #include "qom/cpu.h" > #include "exec/memory.h" > #include "exec/address-spaces.h" > +#include "exec/target_page.h" > #include "io/channel-buffer.h" > #include "io/channel-tls.h" > #include "migration/colo.h" > diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c > index 0e2a996..a37620d 100644 > --- a/migration/postcopy-ram.c > +++ b/migration/postcopy-ram.c > @@ -19,6 +19,7 @@ > #include "qemu/osdep.h" > > #include "qemu-common.h" > +#include "exec/target_page.h" > #include "migration/migration.h" > #include "migration/qemu-file.h" > #include "postcopy-ram.h" > diff --git a/migration/savevm.c b/migration/savevm.c > index 8565103..8763700 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -43,6 +43,7 @@ > #include "qemu/queue.h" > #include "sysemu/cpus.h" > #include "exec/memory.h" > +#include "exec/target_page.h" > #include "qmp-commands.h" > #include "trace.h" > #include "qemu/bitops.h" > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
© 2016 - 2026 Red Hat, Inc.