From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72E03C433ED for ; Tue, 11 May 2021 16:59:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 DB7E6610C9 for ; Tue, 11 May 2021 16:59:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB7E6610C9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lgVjW-0001Iz-U7 for qemu-devel@archiver.kernel.org; Tue, 11 May 2021 12:59:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgVhy-0006mr-Ih for qemu-devel@nongnu.org; Tue, 11 May 2021 12:58:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20250) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lgVhw-0006EZ-JE for qemu-devel@nongnu.org; Tue, 11 May 2021 12:58:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620752287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dnZeaySzVCwK3AfCZrVrj92eHbrQZHJp4jZiCDKGJpw=; b=cOX/uMQ1DEnFNSanmyTKHHscfKmeQ67jZGozOhj6NJXbMPo3KOhwZXPMi5GpyDEmrs8FpK eZwKz0tBOLpOZG911Pby3ox/eI7X5hnZYV4b/mLEo1lqAvkvxYQPOxQKuRanITjp8TVmFc BwcZdHQ2zeE8NMNhWEGaIVBmaG7NDzs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-_UlbILvAMr-NUiVeduRLYw-1; Tue, 11 May 2021 12:58:05 -0400 X-MC-Unique: _UlbILvAMr-NUiVeduRLYw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A895B107ACCA; Tue, 11 May 2021 16:58:04 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-102.ams2.redhat.com [10.36.114.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0C00BE160; Tue, 11 May 2021 16:58:02 +0000 (UTC) Date: Tue, 11 May 2021 18:58:01 +0200 From: Kevin Wolf To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Subject: Re: [PATCH] hmp: Fix loadvm to resume the VM on success instead of failure Message-ID: References: <20210511163151.45167-1-kwolf@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.699, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-stable@nongnu.org, yama@redhat.com, dgilbert@redhat.com, qemu-block@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 11.05.2021 um 18:49 hat Daniel P. Berrangé geschrieben: > On Tue, May 11, 2021 at 06:31:51PM +0200, Kevin Wolf wrote: > > Commit f61fe11aa6f broke hmp_loadvm() by adding an incorrect negation > > when converting from 0/-errno return values to a bool value. The result > > is that loadvm resumes the VM now if it failed and keeps it stopped if > > it failed. Fix it to restore the old behaviour and do it the other way > > around. > > > > Fixes: f61fe11aa6f7f8f0ffe4ddaa56a8108f3ab57854 > > Cc: qemu-stable@nongnu.org > > Reported-by: Yanhui Ma > > Signed-off-by: Kevin Wolf > > --- > > monitor/hmp-cmds.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > > index 0ad5b77477..cc15d9b6ee 100644 > > --- a/monitor/hmp-cmds.c > > +++ b/monitor/hmp-cmds.c > > @@ -1133,7 +1133,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict) > > > > vm_stop(RUN_STATE_RESTORE_VM); > > > > - if (!load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) { > > + if (load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) { > > vm_start(); > > } > > hmp_handle_error(mon, err); > > Paolo had sent a different fix here: > > https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg01093.html Hm... I missed that patch, but doesn't it just generalise the buggy HMP code instead of fixing it? That is, we still resume the VM on failure rather than on success? > As with my feedback there, I think we should be adding test coverage > when fixing this. How about this: > [...] Yes, this looks good. Kevin