]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
Allow XBZRLE decoding without enabling the capability
authorOrit Wasserman <owasserm@redhat.com>
Thu, 31 Jan 2013 07:12:18 +0000 (09:12 +0200)
committerJuan Quintela <quintela@redhat.com>
Fri, 1 Feb 2013 07:32:21 +0000 (08:32 +0100)
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>
arch_init.c

index dada6ded1aa7a53dedc373fe4d043b2cc75fe4c5..8da868b98838c957a0980236e786bf5b89101da5 100644 (file)
@@ -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;