*** BLURB HERE *** Eric Blake (1): qemu: detect -machine mem-merge capability Osier Yang (1): qemu: New XML to disable memory merge at guest startup docs/formatdomain.html.in | 13 +++++--- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 20 ++++++++---- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 37 ++++++++++++++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 +++++++++++++ tests/qemuargv2xmltest.c | 2 ++ .../qemuxml2argv-nosharepages.args | 4 +++ .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 31 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 12 files changed, 128 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml -- 1.8.1.4 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list