From patchwork Thu Jan 31 07:12:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 217117 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7A62B2C029B for ; Thu, 31 Jan 2013 18:48:17 +1100 (EST) Received: from localhost ([::1]:35980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0oJL-0001U4-4R for incoming@patchwork.ozlabs.org; Thu, 31 Jan 2013 02:11:51 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0oIj-0000DI-8N for qemu-devel@nongnu.org; Thu, 31 Jan 2013 02:11:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U0oIh-0002cv-Kt for qemu-devel@nongnu.org; Thu, 31 Jan 2013 02:11:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0oIh-0002c9-DF for qemu-devel@nongnu.org; Thu, 31 Jan 2013 02:11:11 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0V7BAjR001549 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 Jan 2013 02:11:10 -0500 Received: from dhcp-1-120.tlv.redhat.com (vpn-200-81.tlv.redhat.com [10.35.200.81]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0V7AwLt016032; Thu, 31 Jan 2013 02:11:08 -0500 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 31 Jan 2013 09:12:18 +0200 Message-Id: <1359616339-11621-5-git-send-email-owasserm@redhat.com> In-Reply-To: <1359616339-11621-1-git-send-email-owasserm@redhat.com> References: <1359616339-11621-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, quintela@redhat.com, lcapitulino@redhat.com, Orit Wasserman , pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v3 4/5] Allow XBZRLE decoding without enabling the capability X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reviewed-by: Paolo Bonzini Reviewed-by: Eric Blake --- arch_init.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch_init.c b/arch_init.c index dada6de..8da868b 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;