From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 31 Jan 2013 07:12:18 +0000 (+0200)
Subject: Allow XBZRLE decoding without enabling the capability
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1b1fdfeae68c61786a474b02601fbba6040fc5a4;p=qemu.git

Allow XBZRLE decoding without enabling the capability

Before this fix we couldn't load a guest from
XBZRLE compressed file.

For example:
The user activated the XBZRLE capability
The user run migrate -d "exec:gzip -c > vm.gz"
The user won't be able to load vm.gz and get an error.

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/arch_init.c b/arch_init.c
index dada6ded1a..8da868b988 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -851,9 +851,6 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
 
             qemu_get_buffer(f, host, TARGET_PAGE_SIZE);
         } else if (flags & RAM_SAVE_FLAG_XBZRLE) {
-            if (!migrate_use_xbzrle()) {
-                return -EINVAL;
-            }
             void *host = host_from_stream_offset(f, addr, flags);
             if (!host) {
                 return -EINVAL;