|
@@ -170,6 +170,14 @@ static void host_memory_backend_set_merge(Object *obj, bool value, Error **errp)
|
|
{
|
|
{
|
|
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
|
|
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
|
|
|
|
|
|
|
|
+ if (QEMU_MADV_MERGEABLE == QEMU_MADV_INVALID) {
|
|
|
|
+ if (value) {
|
|
|
|
+ error_setg(errp, "Memory merging is not supported on this host");
|
|
|
|
+ }
|
|
|
|
+ assert(!backend->merge);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (!host_memory_backend_mr_inited(backend)) {
|
|
if (!host_memory_backend_mr_inited(backend)) {
|
|
backend->merge = value;
|
|
backend->merge = value;
|
|
return;
|
|
return;
|
|
@@ -196,6 +204,14 @@ static void host_memory_backend_set_dump(Object *obj, bool value, Error **errp)
|
|
{
|
|
{
|
|
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
|
|
HostMemoryBackend *backend = MEMORY_BACKEND(obj);
|
|
|
|
|
|
|
|
+ if (QEMU_MADV_DONTDUMP == QEMU_MADV_INVALID) {
|
|
|
|
+ if (!value) {
|
|
|
|
+ error_setg(errp, "Dumping guest memory cannot be disabled on this host");
|
|
|
|
+ }
|
|
|
|
+ assert(backend->dump);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (!host_memory_backend_mr_inited(backend)) {
|
|
if (!host_memory_backend_mr_inited(backend)) {
|
|
backend->dump = value;
|
|
backend->dump = value;
|
|
return;
|
|
return;
|