From patchwork Thu Jan 28 10:58:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 8149241 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3F68F9FBF9 for ; Thu, 28 Jan 2016 11:00:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75D7F2035B for ; Thu, 28 Jan 2016 11:00:55 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD7AA20160 for ; Thu, 28 Jan 2016 11:00:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aOkHX-00061k-Qt; Thu, 28 Jan 2016 10:58:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aOkHX-00061Z-7M for xen-devel@lists.xen.org; Thu, 28 Jan 2016 10:58:31 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 7B/D5-17089-654F9A65; Thu, 28 Jan 2016 10:58:30 +0000 X-Env-Sender: vkuznets@redhat.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1453978708!18448864!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTQwNjQ=\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11962 invoked from network); 28 Jan 2016 10:58:29 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-6.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Jan 2016 10:58:29 -0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 459638DFE9; Thu, 28 Jan 2016 10:58:28 +0000 (UTC) Received: from vitty.brq.redhat.com (vitty.brq.redhat.com [10.34.26.3]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0SAwQT4004358; Thu, 28 Jan 2016 05:58:26 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xen.org Date: Thu, 28 Jan 2016 11:58:25 +0100 Message-Id: <1453978705-13504-1-git-send-email-vkuznets@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Cc: Wei Liu , Ian Jackson , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH] xl: don't free additional memory on soft reset X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We don't need to free anything extra from Dom0 in order to perform soft reset. It can also fail soft reset if it happens that we don't have this memory (which we don't need) available. Signed-off-by: Vitaly Kuznetsov Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 25507c7..20704d2 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2867,11 +2867,13 @@ start: if (rc < 0) goto error_out; - ret = freemem(domid, &d_config.b_info); - if (ret < 0) { - fprintf(stderr, "failed to free memory for the domain\n"); - ret = ERROR_FAIL; - goto error_out; + if (domid_soft_reset == INVALID_DOMID) { + ret = freemem(domid, &d_config.b_info); + if (ret < 0) { + fprintf(stderr, "failed to free memory for the domain\n"); + ret = ERROR_FAIL; + goto error_out; + } } libxl_asyncprogress_how autoconnect_console_how_buf;