[v1] hw/misc/pvpanic: add support for normal shutdowns

[PATCH RFC 2/3] tests/qtest/pvanic: use centralized definition of supported events

Posted by Thomas Weißschuh 2 years, 3 months ago

Avoid the necessity to update all tests when new events are added
to the device.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
 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"
 
 static void test_panic_nopause(void)
@@ -34,7 +35,7 @@ static void test_panic_nopause(void)
     bar = qpci_iomap(dev, 0, NULL);
 
     qpci_memread(dev, bar, 0, &val, sizeof(val));
-    g_assert_cmpuint(val, ==, 3);
+    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
 
     val = 1;
     qpci_memwrite(dev, bar, 0, &val, sizeof(val));
@@ -67,7 +68,7 @@ static void test_panic(void)
     bar = qpci_iomap(dev, 0, NULL);
 
     qpci_memread(dev, bar, 0, &val, sizeof(val));
-    g_assert_cmpuint(val, ==, 3);
+    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
 
     val = 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"
 
 static void test_panic_nopause(void)
 {
@@ -20,7 +21,7 @@ static void test_panic_nopause(void)
     qts = qtest_init("-device pvpanic -action panic=none");
 
     val = qtest_inb(qts, 0x505);
-    g_assert_cmpuint(val, ==, 3);
+    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
 
     qtest_outb(qts, 0x505, 0x1);
 
@@ -43,7 +44,7 @@ static void test_panic(void)
     qts = qtest_init("-device pvpanic -action panic=pause");
 
     val = qtest_inb(qts, 0x505);
-    g_assert_cmpuint(val, ==, 3);
+    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
 
     qtest_outb(qts, 0x505, 0x1);
 

-- 
2.42.0

Re: [PATCH RFC 2/3] tests/qtest/pvanic: use centralized definition of supported events

Posted by Marc-André Lureau 2 years, 3 months ago

On Sat, Nov 4, 2023 at 3:26 PM Thomas Weißschuh <thomas@t-8ch.de> wrote:
>
> Avoid the necessity to update all tests when new events are added
> to the device.
>
> Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>

In the title: pvanic -> pvpanic.

> ---
>  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"
>
>  static void test_panic_nopause(void)
> @@ -34,7 +35,7 @@ static void test_panic_nopause(void)
>      bar = qpci_iomap(dev, 0, NULL);
>
>      qpci_memread(dev, bar, 0, &val, sizeof(val));
> -    g_assert_cmpuint(val, ==, 3);
> +    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
>
>      val = 1;
>      qpci_memwrite(dev, bar, 0, &val, sizeof(val));
> @@ -67,7 +68,7 @@ static void test_panic(void)
>      bar = qpci_iomap(dev, 0, NULL);
>
>      qpci_memread(dev, bar, 0, &val, sizeof(val));
> -    g_assert_cmpuint(val, ==, 3);
> +    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
>
>      val = 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"
>
>  static void test_panic_nopause(void)
>  {
> @@ -20,7 +21,7 @@ static void test_panic_nopause(void)
>      qts = qtest_init("-device pvpanic -action panic=none");
>
>      val = qtest_inb(qts, 0x505);
> -    g_assert_cmpuint(val, ==, 3);
> +    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
>
>      qtest_outb(qts, 0x505, 0x1);
>
> @@ -43,7 +44,7 @@ static void test_panic(void)
>      qts = qtest_init("-device pvpanic -action panic=pause");
>
>      val = qtest_inb(qts, 0x505);
> -    g_assert_cmpuint(val, ==, 3);
> +    g_assert_cmpuint(val, ==, PVPANIC_EVENTS);
>
>      qtest_outb(qts, 0x505, 0x1);
>
>
> --
> 2.42.0
>
>


-- 
Marc-André Lureau

Re: [PATCH RFC 2/3] tests/qtest/pvanic: use centralized definition of supported events

Posted by Thomas Huth 2 years, 3 months ago

On 04/11/2023 12.25, Thomas Weißschuh wrote:
> Avoid the necessity to update all tests when new events are added
> to the device.
> 
> Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
> ---
>   tests/qtest/pvpanic-pci-test.c | 5 +++--
>   tests/qtest/pvpanic-test.c     | 5 +++--
>   2 files changed, 6 insertions(+), 4 deletions(-)

FWIW:
Acked-by: Thomas Huth <thuth@redhat.com>