* Juan Quintela (quint...@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 <quint...@redhat.com> > --- > exec.c | 1 + > include/exec/target_page.h | 20 ++++++++++++++++++++ > include/sysemu/sysemu.h | 1 - > migration/migration.c | 1 + > migration/postcopy-ram.c | 1 + > migration/savevm.c | 1 + > 6 files changed, 24 insertions(+), 1 deletion(-) > create mode 100644 include/exec/target_page.h > > diff --git a/exec.c b/exec.c > index eac6085..e9a201a 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..0961591 > --- /dev/null > +++ b/include/exec/target_page.h > @@ -0,0 +1,20 @@ > + > + /* > + * QEMU exec target page sizes > + * > + * Copyright IBM, Corp. 2008 > + * > + * Authors: > + * Anthony Liguori <aligu...@us.ibm.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2. See > + * the COPYING file in the top-level directory.
Hmm, no. > + */ > + > +#ifndef EXEC_TARGET_PAGE_H > +#define EXEC_TARGET_PAGE_H > + > +size_t qemu_target_page_size(void); We have *one* line from sysemu.h here, lets look at the history of it; a certain Juan Quintela in commit 20afaed two months ago changed it from qemu_target_page_bits to qemu_target_page_size; which you're about to add back. But that one line came from you. Before that rename, it came from my 038629a6992403269 in late 2015. So either way, it's certainly not a 2008 copyright authored by Anthony. sysemu.h doesn't have a copyright header and LICENSE says that's gplv2 or later (which may or may not be correct given the age of sysemu.h) Dave > +#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 75a728a..4429a8c 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 64f09e1..82f719a 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 / dgilb...@redhat.com / Manchester, UK
