From patchwork Mon Mar 20 18:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 9634869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 385D760132 for ; Mon, 20 Mar 2017 18:05:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F93726CF9 for ; Mon, 20 Mar 2017 18:05:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 241AE27B2F; Mon, 20 Mar 2017 18:05:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B78E926E73 for ; Mon, 20 Mar 2017 18:05:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq1eJ-0004pt-TO; Mon, 20 Mar 2017 18:03:19 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cq1eH-0004pF-Q1 for xen-devel@lists.xen.org; Mon, 20 Mar 2017 18:03:17 +0000 Received: from [85.158.143.35] by server-7.bemta-6.messagelabs.com id C8/B0-04817-56910D85; Mon, 20 Mar 2017 18:03:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsVysWW7jG6K5IU Ig3mTBC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozFU86yFzznqtiw4wdrA+NRji5GLg4hgdlM EpNPrWXrYuTkYBGwl/iz/j4TiM0oUCZxbtZFKDtXonHJFiaIGjuJm0vXs0I0r2aUuPX5JSNIg k1AR+L701PMILaIgLTEtc+XweLMAt4SH478YwexhQVcJOa1zYEapCpx72oTUA0HB6+AuUTbdW uQMKeAhcSJp01g9wgBhScvWAE2UkJAW+JC+yMWCLuPUeL3XvEJjAILGBlWMaoXpxaVpRbpGuk lFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgQGFQMQ7GBc9tfpEKMkB5OSKO/T2+cj hPiS8lMqMxKLM+KLSnNSiw8xynBwKEnwrhG5ECEkWJSanlqRlpkDDG+YtAQHj5IIL48oUJq3u CAxtzgzHSJ1ilFRSpx3OkifAEgiozQPrg0WU5cYZaWEeRmBDhHiKUgtys0sQZV/xSjOwagkzP tTGGgKT2ZeCdz0V0CLmYAWL7txBmRxSSJCSqqBceIHyYWC2ctknqxTvHWgLXRvi/+SmZ+9P4U u2VYem7+8+ynbd4YEXvXc54EnN1juNPT/ePdf6tTc3Ua/65uWP5Hz3u3QfIlH563iTp8zVR/f zz3bKTPz8v5XderlC/nEtGWyb+icSr6pMEWw6vG/5O1C96ceqDKcpc9/oVy7spifZY+V94VjU 5RYijMSDbWYi4oTAWciSrWkAgAA X-Env-Sender: vkuznets@redhat.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1490032994!55287883!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: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5027 invoked from network); 20 Mar 2017 18:03:16 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-5.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Mar 2017 18:03:16 -0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 848727E9DD; Mon, 20 Mar 2017 18:03:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 848727E9DD DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 848727E9DD Received: from vitty.brq.redhat.com (vitty.brq.redhat.com [10.34.26.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E92078C2D; Mon, 20 Mar 2017 18:03:14 +0000 (UTC) From: Vitaly Kuznetsov To: xen-devel@lists.xen.org Date: Mon, 20 Mar 2017 19:03:10 +0100 Message-Id: <20170320180311.5091-2-vkuznets@redhat.com> In-Reply-To: <20170320180311.5091-1-vkuznets@redhat.com> References: <20170320180311.5091-1-vkuznets@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 20 Mar 2017 18:03:15 +0000 (UTC) Cc: Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH 1/2] libxl: don't try to rename dm save file for PVH X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Guests with LIBXL_DEVICE_MODEL_VERSION_NONE don't have a device model running so there is no save file to rename. Signed-off-by: Vitaly Kuznetsov Acked-by: Wei Liu --- tools/libxl/libxl_create.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 25389e1..95fd96b 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1664,12 +1664,16 @@ static void domain_soft_reset_cb(libxl__egc *egc, goto error; } - savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d", dds->domid); - restorefile = GCSPRINTF(LIBXL_DEVICE_MODEL_RESTORE_FILE".%d", dds->domid); - rc = rename(savefile, restorefile); - if (rc) { - LOGD(ERROR, dds->domid, "failed to rename dm save file."); - goto error; + if (cdcs->dcs.guest_config->b_info.device_model_version != + LIBXL_DEVICE_MODEL_VERSION_NONE) { + savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d", dds->domid); + restorefile = GCSPRINTF(LIBXL_DEVICE_MODEL_RESTORE_FILE".%d", + dds->domid); + rc = rename(savefile, restorefile); + if (rc) { + LOGD(ERROR, dds->domid, "failed to rename dm save file."); + goto error; + } } initiate_domain_create(egc, &cdcs->dcs);