| Message ID | 20240107-pvpanic-shutdown-v4-2-81500a7e4081@t-8ch.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/misc/pvpanic: add support for normal shutdowns | expand |
On 07/01/2024 15.05, Thomas Weißschuh wrote: > 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. > > Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> > --- > hw/misc/pvpanic-isa.c | 2 +- > hw/misc/pvpanic-pci.c | 2 +- > hw/misc/pvpanic.c | 2 +- > include/hw/misc/pvpanic.h | 1 + > 4 files changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On Sun, Jan 07 2024, Thomas Weißschuh <thomas@t-8ch.de> wrote: > 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. > > Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> > --- > hw/misc/pvpanic-isa.c | 2 +- > hw/misc/pvpanic-pci.c | 2 +- > hw/misc/pvpanic.c | 2 +- > include/hw/misc/pvpanic.h | 1 + > 4 files changed, 4 insertions(+), 3 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/misc/pvpanic-isa.c b/hw/misc/pvpanic-isa.c index ef438a31fbe9..9a923b786907 100644 --- a/hw/misc/pvpanic-isa.c +++ b/hw/misc/pvpanic-isa.c @@ -101,7 +101,7 @@ static void build_pvpanic_isa_aml(AcpiDevAmlIf *adev, Aml *scope) static Property pvpanic_isa_properties[] = { 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(), }; diff --git a/hw/misc/pvpanic-pci.c b/hw/misc/pvpanic-pci.c index 01e269b55284..be4063121e1d 100644 --- a/hw/misc/pvpanic-pci.c +++ b/hw/misc/pvpanic-pci.c @@ -54,7 +54,7 @@ static void pvpanic_pci_realizefn(PCIDevice *dev, Error **errp) static Property pvpanic_pci_properties[] = { DEFINE_PROP_UINT8("events", PVPanicPCIState, pvpanic.events, - PVPANIC_PANICKED | PVPANIC_CRASH_LOADED), + PVPANIC_EVENTS), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 4915ef256e74..a4982cc5928e 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -26,7 +26,7 @@ static void handle_event(int event) { static bool logged; - if (event & ~(PVPANIC_PANICKED | PVPANIC_CRASH_LOADED) && !logged) { + if (event & ~PVPANIC_EVENTS && !logged) { qemu_log_mask(LOG_GUEST_ERROR, "pvpanic: unknown event %#x.\n", event); logged = true; } diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h index dffca827f77a..48f2ec4c86a1 100644 --- a/include/hw/misc/pvpanic.h +++ b/include/hw/misc/pvpanic.h @@ -20,6 +20,7 @@ #define PVPANIC_PANICKED (1 << 0) #define PVPANIC_CRASH_LOADED (1 << 1) +#define PVPANIC_EVENTS (PVPANIC_PANICKED | PVPANIC_CRASH_LOADED) #define TYPE_PVPANIC_ISA_DEVICE "pvpanic" #define TYPE_PVPANIC_PCI_DEVICE "pvpanic-pci"
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. Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> --- hw/misc/pvpanic-isa.c | 2 +- hw/misc/pvpanic-pci.c | 2 +- hw/misc/pvpanic.c | 2 +- include/hw/misc/pvpanic.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-)