[PULL v2 0/6] Misc fixes for QEMU 5.2-rc2

[PULL v2 0/6] Misc fixes for QEMU 5.2-rc2

[Paolo Bonzini]

The following changes since commit 3493c36f0371777c62d1d72b205b0eb6117e2156:

  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (2020-11-06 13:43:28 +0000)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to b1b0393c3c58c0e96c7c44e2e98baa252d6c6813:

  pvpanic: Advertise the PVPANIC_CRASHLOADED event support (2020-11-11 03:59:05 -0500)

----------------------------------------------------------------
Bug fixes

----------------------------------------------------------------
Greg Kurz (1):
      Makefile: No echoing for 'make help V=1'

Pankaj Gupta (1):
      physmem: improve ram size error messages

Paolo Bonzini (2):
      fix make clean/distclean
      pvpanic: Advertise the PVPANIC_CRASHLOADED event support

Pavel Dovgalyuk (1):
      replay: remove some dead code

Thomas Huth (1):
      meson: Clarify the confusing vhost-user vs. vhost-kernel output

 Makefile                   | 8 ++++----
 hw/core/machine.c          | 1 +
 hw/misc/pvpanic.c          | 5 ++++-
 meson.build                | 3 ++-
 replay/replay-debugging.c  | 3 ---
 softmmu/physmem.c          | 6 +++---
 tests/qtest/pvpanic-test.c | 2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)
-- 
2.26.2

[PULL 6/6] pvpanic: Advertise the PVPANIC_CRASHLOADED event support

[Paolo Bonzini]

Advertise both types of events as supported when the guest OS
queries the pvpanic device.  Currently only PVPANIC_PANICKED is
exposed; PVPANIC_CRASHLOADED must also be advertised, but only on
new machine types.

Fixes: 7dc58deea79a ("pvpanic: implement crashloaded event handling")
Reported-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/core/machine.c          | 1 +
 hw/misc/pvpanic.c          | 5 ++++-
 tests/qtest/pvpanic-test.c | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 98b87f76cb..d0408049b5 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -35,6 +35,7 @@ GlobalProperty hw_compat_5_1[] = {
     { "virtio-blk-device", "num-queues", "1"},
     { "virtio-scsi-device", "num_queues", "1"},
     { "nvme", "use-intel-id", "on"},
+    { "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */
 };
 const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1);
 
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 598d5471a4..35d6797831 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -61,12 +61,14 @@ struct PVPanicState {
 
     MemoryRegion io;
     uint16_t ioport;
+    uint8_t events;
 };
 
 /* return supported events on read */
 static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned size)
 {
-    return PVPANIC_PANICKED;
+    PVPanicState *pvp = opaque;
+    return pvp->events;
 }
 
 static void pvpanic_ioport_write(void *opaque, hwaddr addr, uint64_t val,
@@ -112,6 +114,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
 
 static Property pvpanic_isa_properties[] = {
     DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
+    DEFINE_PROP_UINT8("events", PVPanicState, events, PVPANIC_PANICKED | PVPANIC_CRASHLOADED),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c
index 0657de797f..016b32ebee 100644
--- a/tests/qtest/pvpanic-test.c
+++ b/tests/qtest/pvpanic-test.c
@@ -20,7 +20,7 @@ static void test_panic(void)
     qts = qtest_init("-device pvpanic");
 
     val = qtest_inb(qts, 0x505);
-    g_assert_cmpuint(val, ==, 1);
+    g_assert_cmpuint(val, ==, 3);
 
     qtest_outb(qts, 0x505, 0x1);
 
-- 
2.26.2

Re: [PULL v2 0/6] Misc fixes for QEMU 5.2-rc2

[Peter Maydell]

On Wed, 11 Nov 2020 at 14:51, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 3493c36f0371777c62d1d72b205b0eb6117e2156:
>
>   Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (2020-11-06 13:43:28 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to b1b0393c3c58c0e96c7c44e2e98baa252d6c6813:
>
>   pvpanic: Advertise the PVPANIC_CRASHLOADED event support (2020-11-11 03:59:05 -0500)
>
> ----------------------------------------------------------------
> Bug fixes
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM