From patchwork Fri Nov 15 07:04:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 11245275 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 32E526C1 for ; Fri, 15 Nov 2019 07:05:36 +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 180692073B for ; Fri, 15 Nov 2019 07:05:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 180692073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.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 1iVVeV-0008Ou-KK; Fri, 15 Nov 2019 07:04:19 +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 1iVVeV-0008Op-0k for xen-devel@lists.xenproject.org; Fri, 15 Nov 2019 07:04:19 +0000 X-Inumbo-ID: 22f0072d-0776-11ea-a25f-12813bfff9fa Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 22f0072d-0776-11ea-a25f-12813bfff9fa; Fri, 15 Nov 2019 07:04:17 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id CBF64AD77; Fri, 15 Nov 2019 07:04:16 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Fri, 15 Nov 2019 08:04:14 +0100 Message-Id: <20191115070414.3862-1-jgross@suse.com> X-Mailer: git-send-email 2.16.4 Subject: [Xen-devel] [PATCH for-4.13] libxl: fix device model timeout in libxl__dm_resume() 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: Juergen Gross , Anthony PERARD , Ian Jackson , Wei Liu MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" libxl__dm_resume() is using a wrong timeout for the start of the device model. Instead of 60 seconds the timeout is set to 60 milliseconds. Reported-by: Roman Shaposhnik Fixes: 6298f0eb8f4437 ("libxl: Re-introduce libxl__domain_resume") Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxl/libxl_dom_suspend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspend.c index 248dbc33e3..35ae337261 100644 --- a/tools/libxl/libxl_dom_suspend.c +++ b/tools/libxl/libxl_dom_suspend.c @@ -515,7 +515,7 @@ void libxl__dm_resume(libxl__egc *egc, rc = libxl__ev_time_register_rel(dmrs->ao, &dmrs->time, dm_resume_timeout, - LIBXL_DEVICE_MODEL_START_TIMEOUT); + LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000); if (rc) goto out; switch (libxl__device_model_version_running(gc, domid)) {