From patchwork Fri Oct 4 15:17:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11174909 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DFE79139A for ; Fri, 4 Oct 2019 15:18:33 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB6B2207FF for ; Fri, 4 Oct 2019 15:18:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="Qo7PykfT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB6B2207FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iGPKg-0001SS-BB; Fri, 04 Oct 2019 15:17:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iGPKe-0001Rd-Vo for xen-devel@lists.xenproject.org; Fri, 04 Oct 2019 15:17:25 +0000 X-Inumbo-ID: 0b1329eb-e6ba-11e9-975c-12813bfff9fa Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0b1329eb-e6ba-11e9-975c-12813bfff9fa; Fri, 04 Oct 2019 15:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570202234; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=HRB5b7geXl0cLryQ01TGg4wgRxl1O1KItPxzaHTS6Ls=; b=Qo7PykfTjyDVM6mEX0oK0BS+hvhpzcA2Y8IrnLq2Xj6G96upRba96gsn 8LEsg7IFhUHTbQDAT78ojf3jpyEoaFdoxhZCBw8RHkY2hGYkFk3PHdhUm VjjhZACaJWUBkmbUROse3Go5XacCa0jmQl/VEwkxt6PU7I8DfRy4GQwdX E=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ~all" Received-SPF: None (esa6.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa6.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 3kOk2xwCB4FGemIvcnINEKaDg8/UWtPMXLOPrHtmuKrTkJygbe5oBiHzK+Q0rM5K+ciyqxjcui nXqcssJTpf3VCWYONox512KX8kNMjo3RQBufcG+AoPCM+OwxQ7oRbI6xvjpJpqyhlo7gEmdhF2 1caUD9cQwBpt73VR8WACgCoISAZRN+pNMy/Lszoxkg4sIT/Iuv6uwe02sdKwwpf0oUgAt5NUAI JHJcVpZ/xxfsoLSh91qN3/pTfPbVd/x+ogRjUsmyEYaXaRCaSgENC0DgD4Bj+uAWKigk6nVsIW gf0= X-SBRS: 2.7 X-MesageID: 6779129 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,256,1566878400"; d="scan'208";a="6779129" From: Ian Jackson To: Date: Fri, 4 Oct 2019 16:17:03 +0100 Message-ID: <20191004151707.24844-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191004151707.24844-1-ian.jackson@eu.citrix.com> References: <20191004151707.24844-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [XEN PATCH for-4.13 2/6] xl: Pass libxl_domain_config to freemem(), instead of b_info X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" We are going to change the libxl API in a moment and this change will make it simpler. Signed-off-by: Ian Jackson Reviewed-by: Anthony PERARD --- tools/xl/xl_vmcontrol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index b20582e15b..d33c6b38c9 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -314,7 +314,7 @@ static int domain_wait_event(uint32_t domid, libxl_event **event_r) * Returns true in case there is already, or we manage to free it, enough * memory, but also if autoballoon is false. */ -static bool freemem(uint32_t domid, libxl_domain_build_info *b_info) +static bool freemem(uint32_t domid, libxl_domain_config *d_config) { int rc, retries = 3; uint64_t need_memkb, free_memkb; @@ -322,7 +322,7 @@ static bool freemem(uint32_t domid, libxl_domain_build_info *b_info) if (!autoballoon) return true; - rc = libxl_domain_need_memory(ctx, b_info, &need_memkb); + rc = libxl_domain_need_memory(ctx, &d_config->b_info, &need_memkb); if (rc < 0) return false; @@ -879,7 +879,7 @@ start: goto error_out; if (domid_soft_reset == INVALID_DOMID) { - if (!freemem(domid, &d_config.b_info)) { + if (!freemem(domid, &d_config)) { fprintf(stderr, "failed to free memory for the domain\n"); ret = ERROR_FAIL; goto error_out;