From patchwork Thu Jan 30 18:08:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 315420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E9DB82C00C8 for ; Fri, 31 Jan 2014 05:09:06 +1100 (EST) Received: from localhost ([::1]:51606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8w2v-0007k3-Rd for incoming@patchwork.ozlabs.org; Thu, 30 Jan 2014 13:09:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8w2O-0007ZL-Jz for qemu-devel@nongnu.org; Thu, 30 Jan 2014 13:08:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8w2H-0007bv-CY for qemu-devel@nongnu.org; Thu, 30 Jan 2014 13:08:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8w2H-0007bo-4K for qemu-devel@nongnu.org; Thu, 30 Jan 2014 13:08:21 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0UI8HEZ021198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 Jan 2014 13:08:17 -0500 Received: from dhcp-1-120.tlv.redhat.com (ovpn-116-40.ams2.redhat.com [10.36.116.40]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0UI83uU015008; Thu, 30 Jan 2014 13:08:15 -0500 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 30 Jan 2014 20:08:36 +0200 Message-Id: <1391105318-23247-5-git-send-email-owasserm@redhat.com> In-Reply-To: <1391105318-23247-1-git-send-email-owasserm@redhat.com> References: <1391105318-23247-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, Orit Wasserman , dgilbert@redhat.com, anthony@codemonkey.ws, quintela@redhat.com Subject: [Qemu-devel] [PATCH v2 4/6] XBZRLE cache size should not be larger than guest memory size 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 Signed-off-by: Orit Wasserman Reviewed-by: Dr. David Alan Gilbert --- migration.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/migration.c b/migration.c index 46a7305..25add6f 100644 --- a/migration.c +++ b/migration.c @@ -479,6 +479,13 @@ void qmp_migrate_set_cache_size(int64_t value, Error **errp) return; } + /* Cache should not be larger than guest ram size */ + if (value > ram_bytes_total()) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size", + "exceeds guest ram size "); + return; + } + new_size = xbzrle_cache_resize(value); if (new_size < 0) { error_set(errp, QERR_INVALID_PARAMETER_VALUE, "cache size",