diff options
| author | Orit Wasserman <owasserm@redhat.com> | 2013-01-31 09:12:18 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2013-02-01 08:32:21 +0100 |
| commit | 1b1fdfeae68c61786a474b02601fbba6040fc5a4 (patch) | |
| tree | 135c562456536c968d0568bd0f1059138dadc873 | |
| parent | dbca1b3773185af0413e750f26d04b0110cff107 (diff) | |
| download | focaccia-qemu-1b1fdfeae68c61786a474b02601fbba6040fc5a4.tar.gz focaccia-qemu-1b1fdfeae68c61786a474b02601fbba6040fc5a4.zip | |
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>
| -rw-r--r-- | arch_init.c | 3 |
1 files changed, 0 insertions, 3 deletions
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; |