summaryrefslogtreecommitdiffstats
path: root/exec.c
diff options
context:
space:
mode:
authorStefan Hajnoczi2017-05-19 17:36:51 +0200
committerStefan Hajnoczi2017-05-19 17:43:46 +0200
commit14c1f7deb43ec0e1a7f2eabfe652bfad1124392d (patch)
treece122bd7827f2bcc9120e28fb1bf63b498f18fd4 /exec.c
parentMerge remote-tracking branch 'dgilbert/tags/pull-hmp-20170517' into staging (diff)
parentmigration: Make savevm.c target independent (diff)
downloadqemu-14c1f7deb43ec0e1a7f2eabfe652bfad1124392d.tar.gz
qemu-14c1f7deb43ec0e1a7f2eabfe652bfad1124392d.tar.xz
qemu-14c1f7deb43ec0e1a7f2eabfe652bfad1124392d.zip
Merge remote-tracking branch 'quintela/tags/migration/20170518' into staging
migration/next for 20170518 # gpg: Signature made Thu 18 May 2017 06:23:26 PM BST # gpg: using RSA key 0xF487EF185872D723 # gpg: Good signature from "Juan Quintela <quintela@redhat.com>" # gpg: aka "Juan Quintela <quintela@trasno.org>" # Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723 * quintela/tags/migration/20170518: migration: Make savevm.c target independent exec: Create include for target_page_size() migration: migration.h was not needed migration: Remove vmstate.h from migration.h migration: Remove qemu-file.h from vmstate.h migration: Split vmstate-types.c from vmstate.c migration: Move qjson.h to migration/ migration: Remove migration.h from colo.h migration: Export qemu-file-channel.c functions in its own file migration: Split migration/channel.c for channel operations migration: Create migration/xbzrle.h block migration: Allow compile time disable migration: Remove old MigrationParams migration: Remove use of old MigrationParams migration: Create block capability hmp: Use visitor api for hmp_migrate_set_parameter() postcopy: Require RAMBlocks that are whole pages migration: Fix non-multiple of page size migration Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'exec.c')
-rw-r--r--exec.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/exec.c b/exec.c
index 96e3ac98e1..ff16f04f2b 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)
@@ -3443,6 +3444,15 @@ size_t qemu_target_page_size(void)
return TARGET_PAGE_SIZE;
}
+int qemu_target_page_bits(void)
+{
+ return TARGET_PAGE_BITS;
+}
+
+int qemu_target_page_bits_min(void)
+{
+ return TARGET_PAGE_BITS_MIN;
+}
#endif
/*