summaryrefslogtreecommitdiff
path: root/qemu-config.c
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2012-09-05 16:50:16 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2012-09-17 10:18:47 -0500
commit8490fc78e708eaaaa20f06b5efe190bfeabe0064 (patch)
tree1c47c68f353c5d2e55a3446ba80d5b470aa46678 /qemu-config.c
parent89c33337fd21930de671a6e34793e8b1ee257e2e (diff)
add -machine mem-merge=on|off option
It allows to disable memory merge support (KSM on Linux), which is enabled by default otherwise. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-config.c')
-rw-r--r--qemu-config.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index eba977ebca..12eafbb4f5 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -615,6 +615,10 @@ static QemuOptsList qemu_machine_opts = {
.name = "dump-guest-core",
.type = QEMU_OPT_BOOL,
.help = "Include guest memory in a core dump",
+ }, {
+ .name = "mem-merge",
+ .type = QEMU_OPT_BOOL,
+ .help = "enable/disable memory merge support",
},
{ /* End of list */ }
},