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=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 5573DC76196 for ; Sat, 20 Jul 2019 15:20:16 +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 28C142084C for ; Sat, 20 Jul 2019 15:20:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DlEbn/CH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28C142084C 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]:51618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hor9g-0002Oi-V9 for qemu-devel@archiver.kernel.org; Sat, 20 Jul 2019 11:20:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39894) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hor8W-0006Ar-60 for qemu-devel@nongnu.org; Sat, 20 Jul 2019 11:19:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hor8V-00089Z-AI for qemu-devel@nongnu.org; Sat, 20 Jul 2019 11:19:00 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42937) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hor8V-00089A-4C for qemu-devel@nongnu.org; Sat, 20 Jul 2019 11:18:59 -0400 Received: by mail-wr1-x434.google.com with SMTP id x1so20022969wrr.9 for ; Sat, 20 Jul 2019 08:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1o9UgFGkc03JEexjlaP2KvbGOgKiLs/glyHI3+FA/V0=; b=DlEbn/CH51FGSdv1Hj9C3oYJIHxKPqCXEEjvwM0Df7ZQtTxpEqyE+XkKh2axeQaqty si4zvG0e0RPHIdmKNuGAPoqgNjrLRhyb4U/gRQt8kZ0ZFo5T5guIovRFSdl17qBBUI5A /9HBSGwrJA3KqonFhytK1UFnP/o9/75+Giy737veQJs+NCzJMwrVZiz4ojNZSv2Itc01 60zRZi3eP/wJxOPCp9ELCmVhG4+qy+8SNi0AJ7LEt4zCROMOIiv+LZMwSvE4jH0B6UBt z2f/ObiQ2Ylf1oxWtreE6iHf38HSNSfAf/1XvFRpAjuG5GR2voDBWAcGPjKe8xGKTWBU /pWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1o9UgFGkc03JEexjlaP2KvbGOgKiLs/glyHI3+FA/V0=; b=HKXaooaDGhaJsiAS0+wCIMCMmW5FoLQYIExz8JPTaP4OrSRiPycrald+GQu7lugaes sVqBK+MrYKFiuIr3f3+GwdBE1UWCsbJmBPvkrw97v73TDsSv1oA9Vxrj0x6Wp3g9vWJS 9rGjMMVy5a77+NE8NSM8BbLnNqJdSqV/Sz3lrt9fIZzEIt1asYqpEKR9+eDBVId9b7ZA Y39TjWKycZ++N42JSm88vcDKkmbJz1PNCfDkXDkmWjVPOFZvcc+OybmPmqaTefNwFJgk L9gdLpfVqbvQ+MiGegNqk3sn4lPrOhtIQEXnfs9MKdYhthVy4mbpwafxJe6Hn4hWh5B7 Etvg== X-Gm-Message-State: APjAAAUeDmi8QG7VOYnUa/EuX3Du+Hf82G3zhb+tyjnhBRUPIh5kaXYT edfKXjbOw8ZqME2mES6/B4rqnYr3cK8= X-Google-Smtp-Source: APXvYqwv1hYKhP1/Yi4OeAzStmcxU3DoaIwUbkKWTIfczdTEX9LssZ9EkZAbNl6QVzhy8i9dyNj/+g== X-Received: by 2002:adf:eb49:: with SMTP id u9mr59220683wrn.215.1563635937934; Sat, 20 Jul 2019 08:18:57 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6468:f312:8501:6b03:f18c:74f8]) by smtp.gmail.com with ESMTPSA id 4sm77517291wro.78.2019.07.20.08.18.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 20 Jul 2019 08:18:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 20 Jul 2019 17:18:43 +0200 Message-Id: <20190720151846.7450-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190720151846.7450-1-pbonzini@redhat.com> References: <20190720151846.7450-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 09/12] qmp: don't emit the RESET event on wakeup 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: Cornelia Huck , Nicholas Piggin Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Nicholas Piggin Commit 1405819637f53 ("qmp: don't emit the RESET event on wakeup from S3") changed system wakeup to avoid calling qapi_event_send_reset. Commit 76ed4b18debfe ("s390/ipl: fix ipl with -no-reboot") appears to have inadvertently broken that logic. Acked-by: Cornelia Huck Signed-off-by: Nicholas Piggin Message-Id: <20190718103951.10027-2-npiggin@gmail.com> Signed-off-by: Paolo Bonzini --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index a5808f9..cefe5a3 100644 --- a/vl.c +++ b/vl.c @@ -1550,7 +1550,7 @@ void qemu_system_reset(ShutdownCause reason) } else { qemu_devices_reset(); } - if (reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { + if (reason && reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { qapi_event_send_reset(shutdown_caused_by_guest(reason), reason); } cpu_synchronize_all_post_reset(); -- 1.8.3.1