ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pvpanic: Advertise the PVPANIC_CRASHLOADED event support 

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: 7dc58deea7 ("pvpanic: implement crashloaded event handling")
Reported-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-11-09 08:53:04 -05:00
parent a3a929083b
commit b1b0393c3c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/core/machine.c
View File

@ -35,6 +35,7 @@ GlobalProperty hw_compat_5_1[] = {
{ "virtio-blk-device", "num-queues", "1"}, { "virtio-blk-device", "num-queues", "1"},
{ "virtio-scsi-device", "num_queues", "1"}, { "virtio-scsi-device", "num_queues", "1"},
{ "nvme", "use-intel-id", "on"}, { "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); const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1);

5
hw/misc/pvpanic.c
View File

@ -61,12 +61,14 @@ struct PVPanicState {
MemoryRegion io; MemoryRegion io;
uint16_t ioport; uint16_t ioport;
uint8_t events;
}; };
/* return supported events on read */ /* return supported events on read */
static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned size) 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, 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[] = { static Property pvpanic_isa_properties[] = {
DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
DEFINE_PROP_UINT8("events", PVPanicState, events, PVPANIC_PANICKED | PVPANIC_CRASHLOADED),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

2
tests/qtest/pvpanic-test.c
View File

@ -20,7 +20,7 @@ static void test_panic(void)
qts = qtest_init("-device pvpanic"); qts = qtest_init("-device pvpanic");
val = qtest_inb(qts, 0x505); val = qtest_inb(qts, 0x505);
g_assert_cmpuint(val, ==, 1); g_assert_cmpuint(val, ==, 3);
qtest_outb(qts, 0x505, 0x1); qtest_outb(qts, 0x505, 0x1);