From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186810; cv=none; d=zohomail.com; s=zohoarc; b=h2gShhbU5M6hTHXlBBsI3Nxq7KzATfAjjSxndQeoEE9duyqe9veSY9f8Gb00u4jcRocrUhFQx+yHGiN9EXApS1ER8hh7V0ASk7/TZbB9lWGm1mHuWz0GbQ3MYOHQuRxgJtlHi/5ie4XjorirZvMrObT2Ly0BTH+dSkLtN7eCGlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186810; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RPMU2zr9TR04LmCM9OPdmbHyHaCicE1yfbutRvFC1eQ=; b=bRkw3f51qJzoae3IEykig0LpvDGc7U12Fa+2Qv3+irE3+4EROcwulurfavTCC4M6wdBGOVRr52tIyRv6+o4wyU9qaMa3c+ViYurGfsr6o/Jm74OopXUSdKHhpkaRm7eSnqQvDXlXoq7lpAejCl7BqhEhS8z7caII2qRkhTd6T54= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711186809905381.1700842632397; Sat, 23 Mar 2024 02:40:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqW-0001p7-1K; Sat, 23 Mar 2024 05:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqR-0001na-Ow for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:19 -0400 Received: from todd.t-8ch.de ([2a01:4f8:c010:41de::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqO-0006wM-Nb for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186751; bh=uufTV8TpGpBVhBEfcJEZsdO3Xr0Dea7cMALYaoyDQJM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=U42e40gikS4YQY3kcQPWYb8bQUOJBOjkeBgHCBv8bvjjj3/d54aaq+aYjS0o27JLH yc3Wpg9VRtEgFT3Q7qDXXPlSA/BBWbfKgdlDsbG/PhEN5zsonQeC6bdCD1LiSW594I ZuVjSoscdMTGqHnJczkUQjeVRFZxXq+lO5NTEIJE= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:06 +0100 Subject: [PATCH v7 1/7] hw/misc/pvpanic: centralize definition of supported events MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-1-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=3183; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=uufTV8TpGpBVhBEfcJEZsdO3Xr0Dea7cMALYaoyDQJM=; b=LyBNg7kuqeUBOgcF3vx3nFuh/w91sulwULugt8AWZJCjQsqZydYSLk/4G9s/b0pHMmycsJYqm fxS5wInW1CfCaf+WnUx/ol1SHbsz17TgC5f5viwUuddEvP5lIs3GfsJ X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a01:4f8:c010:41de::1; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186812805100012 The different components of pvpanic duplicate the list of supported events. Move it to the shared header file to minimize changes when new events are added. Reviewed-by: Thomas Huth Reviewed-by: Cornelia Huck Signed-off-by: Thomas Wei=C3=9Fschuh --- hw/misc/pvpanic-isa.c | 3 +-- hw/misc/pvpanic-pci.c | 3 +-- hw/misc/pvpanic.c | 3 +-- include/hw/misc/pvpanic.h | 4 ++++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c index ccec50f61bbd..9a923b786907 100644 --- a/hw/misc/pvpanic-isa.c +++ b/hw/misc/pvpanic-isa.c @@ -21,7 +21,6 @@ #include "hw/misc/pvpanic.h" #include "qom/object.h" #include "hw/isa/isa.h" -#include "standard-headers/linux/pvpanic.h" #include "hw/acpi/acpi_aml_interface.h" =20 OBJECT_DECLARE_SIMPLE_TYPE(PVPanicISAState, PVPANIC_ISA_DEVICE) @@ -102,7 +101,7 @@ static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, A= ml *scope) static Property pvpanic_isa_properties[] =3D { DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicISAState, ioport, 0x505= ), DEFINE_PROP_UINT8("events", PVPanicISAState, pvpanic.events, - PVPANIC_PANICKED | PVPANIC_CRASH_LOADED), + PVPANIC_EVENTS), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c index 83be95d0d249..603c5c7600da 100644 --- a/hw/misc/pvpanic-pci.c +++ b/hw/misc/pvpanic-pci.c @@ -21,7 +21,6 @@ #include "hw/misc/pvpanic.h" #include "qom/object.h" #include "hw/pci/pci_device.h" -#include "standard-headers/linux/pvpanic.h" =20 OBJECT_DECLARE_SIMPLE_TYPE(PVPanicPCIState, PVPANIC_PCI_DEVICE) =20 @@ -55,7 +54,7 @@ static void pvpanic_pci_realizefn(PCIDevice *dev, Error *= *errp) =20 static Property pvpanic_pci_properties[] =3D { DEFINE_PROP_UINT8("events", PVPanicPCIState, pvpanic.events, - PVPANIC_PANICKED | PVPANIC_CRASH_LOADED), + PVPANIC_EVENTS), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 1540e9091a45..a4982cc5928e 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -21,13 +21,12 @@ #include "hw/qdev-properties.h" #include "hw/misc/pvpanic.h" #include "qom/object.h" -#include "standard-headers/linux/pvpanic.h" =20 static void handle_event(int event) { static bool logged; =20 - if (event & ~(PVPANIC_PANICKED | PVPANIC_CRASH_LOADED) && !logged) { + if (event & ~PVPANIC_EVENTS && !logged) { qemu_log_mask(LOG_GUEST_ERROR, "pvpanic: unknown event %#x.\n", ev= ent); logged =3D true; } diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index fab94165d03d..947468b81b1a 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -18,6 +18,10 @@ #include "exec/memory.h" #include "qom/object.h" =20 +#include "standard-headers/linux/pvpanic.h" + +#define PVPANIC_EVENTS (PVPANIC_PANICKED | PVPANIC_CRASH_LOADED) + #define TYPE_PVPANIC_ISA_DEVICE "pvpanic" #define TYPE_PVPANIC_PCI_DEVICE "pvpanic-pci" =20 --=20 2.44.0 From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186851; cv=none; d=zohomail.com; s=zohoarc; b=lJ9u9VlMqgBpyR/4bFjFaNLuBBhE6Tw9ASnVYwA1JuThUOzFn/iyFYZ/1O2WFC2ByaEzCI6SXNrgASPlcYbUCNdwJpL8DFUXni2EYAr+hyQKNr8G0sxBdtWRp6aTzoMXjxVZ9bJN+RwoWZvWsLW/Os3yvzGp+4Ri2D/ijQrC5Ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186851; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/OYeWEHgxDG0FNHQQ6YAdt5op4iAGL+AbWxnc124vhE=; b=E3l7fo6zo+KkZFzYCqJydWJtwj7+oTXJZ1Kvw5wP51GkfMUOMUJw81K8KGoylZqQaQoOl5vnptRGKT2KniYyJbkhxI6PtzKhCvakeL+2sCE/1LnpYqleomxdfs+RA3khYaSQW2cW6Qs+NE7mOjfBHQZQl4vZkk7fiWJw1xtmD+4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711186851007329.77019014354664; Sat, 23 Mar 2024 02:40:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqT-0001oK-03; Sat, 23 Mar 2024 05:39:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqQ-0001nO-DC for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:18 -0400 Received: from todd.t-8ch.de ([159.69.126.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqO-0006wL-7p for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186751; bh=+Sw9fy0FVqUDlfcuJVUl76n4Vf/NYbXMngMBVQi3upM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Y3uD8/KnUb/6XKWAiiQsKMWLX7W4Zc2r9E1kn4Rvkn4wSvMajaJ+RO3sGOhE8xdfs KzSc/mSjhGJeA+iGJyZNk52ptg1nyEHZ6HCQ0ZzfBUU4k0ZCCZUEdDwuOjs7/APnH8 AiOYFLxUWz1uaYoVPoEV+hTxzqQKda5QNanfybac= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:07 +0100 Subject: [PATCH v7 2/7] tests/qtest/pvpanic: use centralized definition of supported events MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-2-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=2303; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=+Sw9fy0FVqUDlfcuJVUl76n4Vf/NYbXMngMBVQi3upM=; b=18qmOKGjqZLNyxcQw7R5Brqa05Ni7EDNfQmYmtuMDaaN66ZJlgCrdn/+SrRRlA46td7koPW8O 5enHwU6Sr0GCpq+zq6gAMTPgo3oIUGTWXSv5e8DlAtvMl2BRJ4czv1u X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.69.126.157; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186851414100001 Avoid the necessity to update all tests when new events are added to the device. Acked-by: Thomas Huth Reviewed-by: Cornelia Huck Signed-off-by: Thomas Wei=C3=9Fschuh --- tests/qtest/pvpanic-pci-test.c | 5 +++-- tests/qtest/pvpanic-test.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/qtest/pvpanic-pci-test.c b/tests/qtest/pvpanic-pci-test.c index 2c05b376ba72..b372caf41dc0 100644 --- a/tests/qtest/pvpanic-pci-test.c +++ b/tests/qtest/pvpanic-pci-test.c @@ -16,6 +16,7 @@ #include "qapi/qmp/qdict.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" +#include "hw/misc/pvpanic.h" #include "hw/pci/pci_regs.h" =20 static void test_panic_nopause(void) @@ -34,7 +35,7 @@ static void test_panic_nopause(void) bar =3D qpci_iomap(dev, 0, NULL); =20 qpci_memread(dev, bar, 0, &val, sizeof(val)); - g_assert_cmpuint(val, =3D=3D, 3); + g_assert_cmpuint(val, =3D=3D, PVPANIC_EVENTS); =20 val =3D 1; qpci_memwrite(dev, bar, 0, &val, sizeof(val)); @@ -67,7 +68,7 @@ static void test_panic(void) bar =3D qpci_iomap(dev, 0, NULL); =20 qpci_memread(dev, bar, 0, &val, sizeof(val)); - g_assert_cmpuint(val, =3D=3D, 3); + g_assert_cmpuint(val, =3D=3D, PVPANIC_EVENTS); =20 val =3D 1; qpci_memwrite(dev, bar, 0, &val, sizeof(val)); diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c index 78f1cf8186b0..ccc603472f5d 100644 --- a/tests/qtest/pvpanic-test.c +++ b/tests/qtest/pvpanic-test.c @@ -10,6 +10,7 @@ #include "qemu/osdep.h" #include "libqtest.h" #include "qapi/qmp/qdict.h" +#include "hw/misc/pvpanic.h" =20 static void test_panic_nopause(void) { @@ -20,7 +21,7 @@ static void test_panic_nopause(void) qts =3D qtest_init("-device pvpanic -action panic=3Dnone"); =20 val =3D qtest_inb(qts, 0x505); - g_assert_cmpuint(val, =3D=3D, 3); + g_assert_cmpuint(val, =3D=3D, PVPANIC_EVENTS); =20 qtest_outb(qts, 0x505, 0x1); =20 @@ -43,7 +44,7 @@ static void test_panic(void) qts =3D qtest_init("-device pvpanic -action panic=3Dpause"); =20 val =3D qtest_inb(qts, 0x505); - g_assert_cmpuint(val, =3D=3D, 3); + g_assert_cmpuint(val, =3D=3D, PVPANIC_EVENTS); =20 qtest_outb(qts, 0x505, 0x1); =20 --=20 2.44.0 From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186826; cv=none; d=zohomail.com; s=zohoarc; b=EXCCprrou3wS8FK2JhiSYmlmIRjAnSRVUcG0kQyrdeLOzWwtrNVA2MdNlBHF6V1FyX3xEOgP5J68xH7oyyLSB/XKXWRrr+4kCb4nyb198UpcaEib6cnLV3uwxK9y0+Qm+FUuzB8sKiruhpkqv9ne2eagCSBvUbcVfmMlTrx9Ovo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186826; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RRTbh70wbxq1EnwxYCx0LPApBrwXoi9/2c1MD+CXj8w=; b=Up/yzPbdEqqcokNgNC3lorMsZZfOTwJ/nlOGG2olV7Zo3w21SlrAvx4Sk3LGcLGSC5/MkeKUtDfSeq431C2qAtMBTtD92qFduN+oKb/X8aL1RuU0g2/k3+QsRPhd79XXsrrsuSAokuyJr/rOS8EubUMx/2jmMKRW/PlIqyTib3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711186826078542.9993035878055; Sat, 23 Mar 2024 02:40:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqT-0001oa-Ni; Sat, 23 Mar 2024 05:39:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqR-0001nY-Ht for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:19 -0400 Received: from todd.t-8ch.de ([159.69.126.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqO-0006wK-Lk for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186751; bh=fMsU+/qeHEJsWGtnvX3wRLIgPDqabVyVlyBbSHyCcpg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=m7CO9D2yeAAoErp1A7NPZbfReq6T7iqclEAblvMPESpD+6S8Z989AQTnnqxusIRgZ pHKNMqbwxRzlXq0Zz4yPE8hF1/pPDFWmK5AlZx9/oIwIoVOiLB+HgPdUaHL74jSvBV /fGBLn7tQEug34vZrlN5Xx1fv5EefWydaENZORys= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:08 +0100 Subject: [PATCH v7 3/7] hw/misc/pvpanic: add local definition for PVPANIC_SHUTDOWN MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-3-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=1026; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=fMsU+/qeHEJsWGtnvX3wRLIgPDqabVyVlyBbSHyCcpg=; b=SyMh2GJ0akgrK4hK9M08UQmS2qmIv8fNyVaZNszYU0zsBcdsn4hd6YxRydVbfeNla+Smgm0VN rtXw3pHbsm1BWbbC0Xb/4HQc+/AzCg9+f0NhalYSD/zowtzMyWyIV0b X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.69.126.157; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186827462100001 PVPANIC_* defines are imported from the kernel via standard-header/pvpanic.h. For that the kernel needs to pick up the changes from qemu docs/specs/pvpanic.rst which takes time. The actual value of the define is known as the authoritative source comes from the qemu tree in docs/specs/pvpanic.rst, where it was added in commit 73279cecca03 ("docs/specs/pvpanic: document shutdown event"). Signed-off-by: Thomas Wei=C3=9Fschuh --- include/hw/misc/pvpanic.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index 947468b81b1a..926aa64838f9 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -20,6 +20,11 @@ =20 #include "standard-headers/linux/pvpanic.h" =20 +#ifdef PVPANIC_SHUTDOWN +#error PVPANIC_SHUTDOWN is already defined +#endif +#define PVPANIC_SHUTDOWN (1 << 2) + #define PVPANIC_EVENTS (PVPANIC_PANICKED | PVPANIC_CRASH_LOADED) =20 #define TYPE_PVPANIC_ISA_DEVICE "pvpanic" --=20 2.44.0 From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186810; cv=none; d=zohomail.com; s=zohoarc; b=d+gS1rqWDL3xXYiBNFxxpyqgtsUq1ISrCRDfXLvYdPZbrdB1equ5OzUZjag8h3JemRPBx8NlF0CX1k011VLXaud5zikwpyHQAZlX7GvqyXVlPpHNo4+I0UCBPRHWYSpJDneDrdmmlyA4JV+tL9FD2LO01jQ+8Z5+XkB1chuivbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186810; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Z/5vrk69HCqJZBOjKh69UQa3/0b3u9hd1jsk1gFgjKY=; b=CpDUw7wHnPu7ykNJ11CSCG1jgnBvFjRDG1tt50sVDSz35A7YMQVY5mH1OP3pRGxZwdEvuwiKfdZtr96OAPYZY6Mpq2nTVa2v/tCsUjYTs+YtU7jv+vNv04crAZVOSgObFmOwtRmwaauL5oy2utRw2tDnRokFrCVbM6Mz8ULcu60= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711186809927263.4739073238551; Sat, 23 Mar 2024 02:40:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqT-0001oL-01; Sat, 23 Mar 2024 05:39:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqQ-0001nQ-Gn for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:19 -0400 Received: from todd.t-8ch.de ([2a01:4f8:c010:41de::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqO-0006wN-4G for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186751; bh=8Mxc4ZqehxvEcK8jW0SvLuqPpFPY4SIXY878owFy0XA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=USu8nySJST4u9iw97dEzx1YLql6dXBqgTXPeVLdUpnH3U+TYmpw8HEjtJPzORM6YR wzflmLlSEngnoWdmxDBx8vo2ZqOWTUC5ieuBhGDK+crNU24qXfyiUlVijjjwovxhp/ MxDwx7EeF5Pa86ShmIHtaTzt5jGpF0jb+xGooBMI= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:09 +0100 Subject: [PATCH v7 4/7] hw/misc/pvpanic: add support for normal shutdowns MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-4-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=2470; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=8Mxc4ZqehxvEcK8jW0SvLuqPpFPY4SIXY878owFy0XA=; b=fT0kumyEESrJ8bUNJePRunlO5tJaYXRS/mQlKa0Kkx7oO83R2Ax0I/iQzbntH8FR5fSK1ajmu L24ZrOpZzcLD2/zHlHCCIAeFZ70JXMBKAe7eUoCZ2SfLhiwBeGeEAzr X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a01:4f8:c010:41de::1; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186812803100011 Shutdown requests are normally hardware dependent. By extending pvpanic to also handle shutdown requests, guests can submit such requests with an easily implementable and cross-platform mechanism. Acked-by: Cornelia Huck Signed-off-by: Thomas Wei=C3=9Fschuh --- hw/misc/pvpanic.c | 5 +++++ include/hw/misc/pvpanic.h | 2 +- include/sysemu/runstate.h | 1 + system/runstate.c | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index a4982cc5928e..0e9505451a7a 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -40,6 +40,11 @@ static void handle_event(int event) qemu_system_guest_crashloaded(NULL); return; } + + if (event & PVPANIC_SHUTDOWN) { + qemu_system_guest_pvshutdown(); + return; + } } =20 /* return supported events on read */ diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index 926aa64838f9..9ffb08bf08bf 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -25,7 +25,7 @@ #endif #define PVPANIC_SHUTDOWN (1 << 2) =20 -#define PVPANIC_EVENTS (PVPANIC_PANICKED | PVPANIC_CRASH_LOADED) +#define PVPANIC_EVENTS (PVPANIC_PANICKED | PVPANIC_CRASH_LOADED | PVPANIC_= SHUTDOWN) =20 #define TYPE_PVPANIC_ISA_DEVICE "pvpanic" #define TYPE_PVPANIC_PCI_DEVICE "pvpanic-pci" diff --git a/include/sysemu/runstate.h b/include/sysemu/runstate.h index 0117d243c4ed..e210a37abf0f 100644 --- a/include/sysemu/runstate.h +++ b/include/sysemu/runstate.h @@ -104,6 +104,7 @@ void qemu_system_killed(int signal, pid_t pid); void qemu_system_reset(ShutdownCause reason); void qemu_system_guest_panicked(GuestPanicInformation *info); void qemu_system_guest_crashloaded(GuestPanicInformation *info); +void qemu_system_guest_pvshutdown(void); bool qemu_system_dump_in_progress(void); =20 #endif diff --git a/system/runstate.c b/system/runstate.c index d6ab860ecaa7..572499513034 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -572,6 +572,11 @@ void qemu_system_guest_crashloaded(GuestPanicInformati= on *info) qapi_free_GuestPanicInformation(info); } =20 +void qemu_system_guest_pvshutdown(void) +{ + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); +} + void qemu_system_reset_request(ShutdownCause reason) { if (reboot_action =3D=3D REBOOT_ACTION_SHUTDOWN && --=20 2.44.0 From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186835; cv=none; d=zohomail.com; s=zohoarc; b=aWGHq2B1tKVML4tUhdb/blx2ZxoCVAppgXlHTDQpTAIS8QUD10E18X2ZsXAFyhK8wghWDX10cz9Wh8tzDax9jczAaXXT1GgHAcQ4oseIUG89lcyAou/WsAFClNNIZWe0swlxIpCuXETzddMB+NTVa5eHBy3QqcH5uScwznV/ywg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186835; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=y1fWqB6PzQvtbUUzX2u4fVzvPmI8Eyf+NSgS+zlsb+Y=; b=eUfoW+EpKiHspIW4ChgNDlhmqB/iC+k7AW11XjNLEyXzG00qoUsrwMmQFog1FtWtszB0u+tDLg31fB0Yg5dpgvGoH6OVrShXBhQAOIUVmHVIQZFRb+yif2/BtBHlgQvVviQ3/jwWSrzsPUqvNdNRXonByoKv+42CRskOX/vTdBA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171118683535432.85768320668444; Sat, 23 Mar 2024 02:40:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqW-0001p8-Ms; Sat, 23 Mar 2024 05:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqT-0001od-Os for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:21 -0400 Received: from todd.t-8ch.de ([159.69.126.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqR-0006wt-D4 for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186752; bh=2JLoEvBr8ShBIMBQWSMVVUm8Hdn8BucAfAqSpnJ4aaU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qGk4iF2sOnHSxjOUJpfkqMbP+avEYYomBCBAd/jj9BpyBDhnRWM9YdNpTJ1lNbLkO uHku3W91sTtg52k/JLVdT0jjvlCA1HWFhLY68CxDx1818vJJov37pAMVOesqjhMzDf XYIGG4AtbNDOljjK4pSKQySZqpSJl/KBlEMMFHKs= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:10 +0100 Subject: [PATCH v7 5/7] pvpanic: Emit GUEST_PVSHUTDOWN QMP event on pvpanic shutdown signal MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-5-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=1650; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=k19zzq4mYJdN2OE0/Y1gHo14BiZIj+kA8x0gNif0H+w=; b=EfZXFDRHp7rEy6qYhqvdUMa+5OnG3Nwum5c5ETrvRogCcZ0YgnfTtdpNCDuxPVQeIEFxZ525G bhGKt3Q6iOpBbXhSU0eQcjOxpvGTmvzTHieTF0rmMq0rFFIbDzg3X9Y X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.69.126.157; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186837448100003 From: Alejandro Jimenez Emit a QMP event on receiving a PVPANIC_SHUTDOWN event. Even though a typic= al SHUTDOWN event will be sent, it will be indistinguishable from a shutdown originating from other cases (e.g. KVM exit due to KVM_SYSTEM_EVENT_SHUTDOW= N) that also issue the guest-shutdown cause. A management layer application can detect the new GUEST_PVSHUTDOWN event to determine if the guest is using the pvpanic interface to request shutdowns. Signed-off-by: Alejandro Jimenez --- qapi/run-state.json | 14 ++++++++++++++ system/runstate.c | 1 + 2 files changed, 15 insertions(+) diff --git a/qapi/run-state.json b/qapi/run-state.json index 789fc34559ad..888a11e62011 100644 --- a/qapi/run-state.json +++ b/qapi/run-state.json @@ -455,6 +455,20 @@ { 'event': 'GUEST_CRASHLOADED', 'data': { 'action': 'GuestPanicAction', '*info': 'GuestPanicInformation'= } } =20 +## +# @GUEST_PVSHUTDOWN: +# +# Emitted when guest submits a shutdown request via pvpanic interface +# +# Since: 9.0 +# +# Example: +# +# <- { "event": "GUEST_PVSHUTDOWN", +# "timestamp": { "seconds": 1648245259, "microseconds": 893771 } } +## +{ 'event': 'GUEST_PVSHUTDOWN' } + ## # @GuestPanicAction: # diff --git a/system/runstate.c b/system/runstate.c index 572499513034..02b0a1f8b9d0 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -574,6 +574,7 @@ void qemu_system_guest_crashloaded(GuestPanicInformatio= n *info) =20 void qemu_system_guest_pvshutdown(void) { + qapi_event_send_guest_pvshutdown(); qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); } =20 --=20 2.44.0 From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186836; cv=none; d=zohomail.com; s=zohoarc; b=CQEsuFcZGRv8b9x3bM/8N2KpuS4sXxEk06pqirjgMqiTZ2RoZgVDT8orMYV8CQpOIqvwJRU6VMRnYDbQKCud68SjHWYzNRoH5BJo9pxzp8cBtTKZhqx8yzj4iB+ToBoHofKGNoA84xeZtCyMwq9lJpDNp2f25N4/uYoEnDV/AYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186836; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0wyOO/bzdi86KzEdPIbOUFgDOBsCJU0k+sISrTq9jqw=; b=oFcpKWF/OROuLjp6X83YNcUb/btqQAkehJCezxydgAPQvbkNvTcF+mXHTeI0BBdYDaRsrSKx80STmtXFZTyif0HMjjRD28kWbfiXjfVJr/431n7q1rOH2GM2gFJW64Lnml7ECU4ToagycnWc2LzBNCjilknzm5bacEZFaCVnj50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711186836645381.5914415212029; Sat, 23 Mar 2024 02:40:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqX-0001pt-J6; Sat, 23 Mar 2024 05:39:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqT-0001oe-P7 for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:21 -0400 Received: from todd.t-8ch.de ([2a01:4f8:c010:41de::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqR-0006wx-EZ for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186752; bh=/KvE0ibIDZCzGsU2xL4WmYohrL85WVD01hFgWCYQCBY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=VeRhsNVD7HpSPKWc7iW6mgkdyxtgbGtM2dcsy7VGdUZ/ipi78FlH1ypj+sxhcRZ0z wmqIur8kqujCZmxUsGUqriYkc7QKuqnnPfrp4aPP9yaZg+cAWavBJSwfo9qSCGwXbg GLf3uAmv7Q38jS2k00t6xgCVy7jClufal92fm0bc= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:11 +0100 Subject: [PATCH v7 6/7] tests/qtest/pvpanic: add tests for pvshutdown event MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-6-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=3527; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=/KvE0ibIDZCzGsU2xL4WmYohrL85WVD01hFgWCYQCBY=; b=+7AH+MDS+anmZlwSe57HRj0fTK9rBppdx2XEBUEsMTc3QisbKFHbLSsLa/Q2Giw9Q4cwvRFmV fGwYQtpwi7WDti/DOsE27dqfSBocAZy4VWhrxD5rPtygdRnTJY30idQ X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a01:4f8:c010:41de::1; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186837605100005 Validate that a shutdown via the pvpanic device emits the correct QMP events. Signed-off-by: Thomas Wei=C3=9Fschuh Reviewed-by: Thomas Huth --- tests/qtest/pvpanic-pci-test.c | 39 +++++++++++++++++++++++++++++++++++++++ tests/qtest/pvpanic-test.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/tests/qtest/pvpanic-pci-test.c b/tests/qtest/pvpanic-pci-test.c index b372caf41dc0..dc021c2fdf77 100644 --- a/tests/qtest/pvpanic-pci-test.c +++ b/tests/qtest/pvpanic-pci-test.c @@ -85,11 +85,50 @@ static void test_panic(void) qtest_quit(qts); } =20 +static void test_pvshutdown(void) +{ + uint8_t val; + QDict *response, *data; + QTestState *qts; + QPCIBus *pcibus; + QPCIDevice *dev; + QPCIBar bar; + + qts =3D qtest_init("-device pvpanic-pci,addr=3D04.0"); + pcibus =3D qpci_new_pc(qts, NULL); + dev =3D qpci_device_find(pcibus, QPCI_DEVFN(0x4, 0x0)); + qpci_device_enable(dev); + bar =3D qpci_iomap(dev, 0, NULL); + + qpci_memread(dev, bar, 0, &val, sizeof(val)); + g_assert_cmpuint(val, =3D=3D, PVPANIC_EVENTS); + + val =3D PVPANIC_SHUTDOWN; + qpci_memwrite(dev, bar, 0, &val, sizeof(val)); + + response =3D qtest_qmp_eventwait_ref(qts, "GUEST_PVSHUTDOWN"); + qobject_unref(response); + + response =3D qtest_qmp_eventwait_ref(qts, "SHUTDOWN"); + g_assert(qdict_haskey(response, "data")); + data =3D qdict_get_qdict(response, "data"); + g_assert(qdict_haskey(data, "guest")); + g_assert(qdict_get_bool(data, "guest")); + g_assert(qdict_haskey(data, "reason")); + g_assert_cmpstr(qdict_get_str(data, "reason"), =3D=3D, "guest-shutdown= "); + qobject_unref(response); + + g_free(dev); + qpci_free_pc(pcibus); + qtest_quit(qts); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); qtest_add_func("/pvpanic-pci/panic", test_panic); qtest_add_func("/pvpanic-pci/panic-nopause", test_panic_nopause); + qtest_add_func("/pvpanic-pci/pvshutdown", test_pvshutdown); =20 return g_test_run(); } diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c index ccc603472f5d..d49d2ba9313e 100644 --- a/tests/qtest/pvpanic-test.c +++ b/tests/qtest/pvpanic-test.c @@ -58,11 +58,40 @@ static void test_panic(void) qtest_quit(qts); } =20 +static void test_pvshutdown(void) +{ + uint8_t val; + QDict *response, *data; + QTestState *qts; + + qts =3D qtest_init("-device pvpanic"); + + val =3D qtest_inb(qts, 0x505); + g_assert_cmpuint(val, =3D=3D, PVPANIC_EVENTS); + + qtest_outb(qts, 0x505, PVPANIC_SHUTDOWN); + + response =3D qtest_qmp_eventwait_ref(qts, "GUEST_PVSHUTDOWN"); + qobject_unref(response); + + response =3D qtest_qmp_eventwait_ref(qts, "SHUTDOWN"); + g_assert(qdict_haskey(response, "data")); + data =3D qdict_get_qdict(response, "data"); + g_assert(qdict_haskey(data, "guest")); + g_assert(qdict_get_bool(data, "guest")); + g_assert(qdict_haskey(data, "reason")); + g_assert_cmpstr(qdict_get_str(data, "reason"), =3D=3D, "guest-shutdown= "); + qobject_unref(response); + + qtest_quit(qts); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); qtest_add_func("/pvpanic/panic", test_panic); qtest_add_func("/pvpanic/panic-nopause", test_panic_nopause); + qtest_add_func("/pvpanic/pvshutdown", test_pvshutdown); =20 return g_test_run(); } --=20 2.44.0 From nobody Fri May 10 21:03:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1711186810; cv=none; d=zohomail.com; s=zohoarc; b=W7jQs6HQpVx7aeSKilIhcAzLRsD4KmPaG4yo7H2x7XOKcRpKll5VXquz2Jb0bT/DKPCzoLglDpTZJsf0TSuPhY9qyOnuUyDsj47hgtveFRDdGeeS9KU+QknvWRV/uUlH0qZMFWhnuoZu+1ekIYBSgp8o7PUQhojwLOyT5FpbZ3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711186810; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LoDWgCQLbup5v4S7ThGybuh+ZSenN3/2KzhhwS0Yw50=; b=X5JOg7LzKwxkxXz3iDE17xa5YPxvbYHgltTVrhzmUmiLLy9Ju1qa8HlFnPI5AmSTAo/Bm2NGiFrOIznc6KELN9kltED93fj8/aQ3EJtdkWWXv3ylUMjUwJ12eaeHr+BcK96JoHDkFeVA9v/e0mfJt8rlo94OUNkEqjn29TDaYMA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171118680980551.609769606370264; Sat, 23 Mar 2024 02:40:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnxqV-0001p6-UH; Sat, 23 Mar 2024 05:39:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqT-0001ob-Mu for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:21 -0400 Received: from todd.t-8ch.de ([159.69.126.157]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnxqR-0006wz-F3 for qemu-devel@nongnu.org; Sat, 23 Mar 2024 05:39:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1711186752; bh=COeUxPMaD1DVJx8UC71ryN/Nb2YKVJ3r+rLd91PtcjA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=cvinKVltPhKKv+fZktQLD2C1ljdHhNlI7CnvNkF3cwSbCLphfC0aAFir7GZbAX+uS BHAfwK4IK4K/Y2RxYHjXmd8/2XPKPy6XY9E/X6OaCmloicF0lzV01cNJtsmQT2P3tW Yymu29akSx+fH6RfwZtGXVf1uqP73plYA0Kof7Gg= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sat, 23 Mar 2024 10:39:12 +0100 Subject: [PATCH v7 7/7] Revert "docs/specs/pvpanic: mark shutdown event as not implemented" MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240323-pvpanic-shutdown-v7-7-4ac1fd546d6f@t-8ch.de> References: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> In-Reply-To: <20240323-pvpanic-shutdown-v7-0-4ac1fd546d6f@t-8ch.de> To: "Michael S. Tsirkin" , Cornelia Huck , Paolo Bonzini , Thomas Huth , Laurent Vivier Cc: qemu-devel@nongnu.org, Alejandro Jimenez , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711186751; l=758; i=thomas@t-8ch.de; s=20221212; h=from:subject:message-id; bh=COeUxPMaD1DVJx8UC71ryN/Nb2YKVJ3r+rLd91PtcjA=; b=Ykda+L0OHk09gNPbJIZ/IR4GO4R/ZIVEWt6/d4vNdH5eSU2bQtLU6at44FcFWdM2XmB682X6q Hi8P/uAy7OcCb/jDkqtzBC0ZMVu9zSxqvxPTSDDR+caCl4jMECJUAHj X-Developer-Key: i=thomas@t-8ch.de; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=159.69.126.157; envelope-from=thomas@t-8ch.de; helo=todd.t-8ch.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @t-8ch.de) X-ZM-MESSAGEID: 1711186812494100002 The missing functionality has been implemented now. This reverts commit e739d1935c461d0668057e9dbba9d06f728d29ec. Signed-off-by: Thomas Wei=C3=9Fschuh --- docs/specs/pvpanic.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/specs/pvpanic.rst b/docs/specs/pvpanic.rst index b0f27860ec3b..61a80480edb8 100644 --- a/docs/specs/pvpanic.rst +++ b/docs/specs/pvpanic.rst @@ -29,7 +29,7 @@ bit 1 a guest panic has happened and will be handled by the guest; the host should record it or report it, but should not affect the execution of the guest. -bit 2 (to be implemented) +bit 2 a regular guest shutdown has happened and should be processed by the host =20 PCI Interface --=20 2.44.0