From nobody Fri May 3 10:58:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1613744057; cv=none; d=zohomail.com; s=zohoarc; b=XfBo3AIvzd6eSlmMyy7m271EvEyHI3fuES7ET1Hjel0JIhboa8gyZpQGqLVF2NbcrAKOeWRv66ray1YMz/0+8lqEnCSe4zPSDuIsRQZQqq9680ODaJNmbLZcoWyS2BDdr2/hpsPrC3I4HcR4AiznxEc6sSTVOHqawIIyX3ShVxM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613744057; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=m9LvAwR4BamUvVwgeaJtp/lMusRaDgmJHEvq2QOW/hM=; b=hb36km3Gn9BF4yGYEFr0RyeqOYeiDRy/a8HAx7BXvw5SL5K79C3DJgDKX+H7O526rHOUfGzZRrJlQOlZpPAIiu9LR/H3J2XA05SsSt8YPyvd+saBS/7vgokl03DzbTr02eujOBusFHQARk5iB1Q3eNyWPA6JSc15a/3LMNOflao= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16137440573071023.1210874129457; Fri, 19 Feb 2021 06:14:17 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.86887.163404 (Exim 4.92) (envelope-from ) id 1lD6XS-0000x8-Ml; Fri, 19 Feb 2021 14:13:46 +0000 Received: by outflank-mailman (output) from mailman id 86887.163404; Fri, 19 Feb 2021 14:13:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lD6XS-0000x1-Jq; Fri, 19 Feb 2021 14:13:46 +0000 Received: by outflank-mailman (input) for mailman id 86887; Fri, 19 Feb 2021 14:13:45 +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.92) (envelope-from ) id 1lD6XR-0000ww-9D for xen-devel@lists.xenproject.org; Fri, 19 Feb 2021 14:13:45 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2cacaf6f-74c1-4b44-90c4-9ccb488c96e0; Fri, 19 Feb 2021 14:13:44 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 1B8CDABAE; Fri, 19 Feb 2021 14:13:43 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2cacaf6f-74c1-4b44-90c4-9ccb488c96e0 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1613744023; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m9LvAwR4BamUvVwgeaJtp/lMusRaDgmJHEvq2QOW/hM=; b=cAK+uYSmkCA7h8hxcrzuToVJDOK+x2eSDT8qYT/xICl3nynXtvsMtE/VoVBwMCN/pukKoW Cx0r5Fw4KU0aeeSwBGXO1VFClxuMjhl4gcxJvnymsjrh3NrefuKEl9iK57O+PCMUA7vA05 Y1vcGcFOmJqmqeofXt/K/yHQjpej8Jk= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu , Anthony PERARD , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH-for-4.15] tools/libs/light: fix xl save -c handling Date: Fri, 19 Feb 2021 15:13:37 +0100 Message-Id: <20210219141337.6934-1-jgross@suse.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) libxl_domain_resume() won't work correctly for the case it was called due to a "xl save -c" command, i.e. to continue the suspended domain. The information to do that is not saved in libxl__dm_resume_state for non-HVM domains. Fixes: 6298f0eb8f443 ("libxl: Re-introduce libxl__domain_resume") Reported-by: Marek Marczykowski-G=C3=B3recki Signed-off-by: Juergen Gross Acked-by: Wei Liu Reviewed-by: Jan Beulich --- tools/libs/light/libxl_dom_suspend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/libs/light/libxl_dom_suspend.c b/tools/libs/light/libxl_= dom_suspend.c index 25d1571895..f7823bbc8f 100644 --- a/tools/libs/light/libxl_dom_suspend.c +++ b/tools/libs/light/libxl_dom_suspend.c @@ -630,12 +630,13 @@ void libxl__domain_resume(libxl__egc *egc, goto out; } =20 + dmrs->suspend_cancel =3D suspend_cancel; + if (type !=3D LIBXL_DOMAIN_TYPE_HVM) { rc =3D 0; goto out; } =20 - dmrs->suspend_cancel =3D suspend_cancel; dmrs->dm_resumed_callback =3D domain_resume_done; libxl__dm_resume(egc, dmrs); /* must be last */ return; --=20 2.26.2