Add pvpanic device to deal with guest panic event
v17 cover Add pvpanic device to deal with guest panic event
This series introduces a new simulated device, pvpanic, to notify qemu when guest panic event happens.
Along with this series, there are two patches to add seabios ACPI driver and kernel ACPI driver for the device, respectively.
Tested with:
- qemu(kvm)/qemu(tcg)
- qemu piix/q35
- default ioport/custom ioport
Changes from v16:
- create pvpanic device by default
- change the way using fw-cfg in pvpanic suggested by Paolo
v16: http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg05297.html
Hu Tao (6):
add a new runstate: RUN_STATE_GUEST_PANICKED add a new qevent: QEVENT_GUEST_PANICKED introduce a new qom device to deal with panicked event
pvpanic: pass configurable ioport to seabios
pvpanic: create pvpanic device by default
pvpanic: add document of pvpanic
QMP/qmp-events.txt | 14 ++++ docs/specs/pvpanic.txt | 37 ++++++++++ hw/Makefile.objs | 1 + hw/fw_cfg.c | 8 ++- hw/fw_cfg.h | 2 + hw/i386/pc_piix.c | 2 + hw/i386/pc_q35.c | 1 + hw/pc.h | 4 ++ hw/pvpanic.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++ include/monitor/monitor.h | 1 + include/sysemu/sysemu.h | 1 + monitor.c | 1 + qapi-schema.json | 5 +- qmp.c | 3 +- vl.c | 15 +++- 15 files changed, 261 insertions(+), 6 deletions(-) create mode 100644 docs/specs/pvpanic.txt create mode 100644 hw/pvpanic.c
Signature · 1 line
1.8.1.4
PATCH v17 1/6 add a new runstate: RUN_STATE_GUEST_PANICKED
The guest will be in this state when it is panicked.
--- include/sysemu/sysemu.h | 1 + qapi-schema.json | 5 ++++- qmp.c | 3 +-- vl.c | 13 +++++++++++-- 4 files changed, 17 insertions(+), 5 deletions(-)
include/sysemu/sysemu.h +1 -0
@@ -22,6 +22,7 @@ int qemu_uuid_parse(const char *str, uint8_t *uuid);bool runstate_check (RunState state);void runstate_set (RunState new_state);int runstate_is_running (void ); +bool runstate_needs_reset (void );typedef struct vm_change_state_entry VMChangeStateEntry ;typedef void VMChangeStateHandler (void *opaque,int running,RunState state);
qapi-schema.json +4 -1
@@ -174,11 +174,14 @@ # @suspended: guest is suspended (ACPI S3) # # @watchdog: the watchdog action is configured to pause and has been triggered +# +# @guest-panicked: guest has been panicked as a result of guest OS panic ## { 'enum': 'RunState', 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', - 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog' ] } + 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog', + 'guest-panicked' ] } ## # @SnapshotInfo
qmp.c +1 -2
@@ -149,8 +149,7 @@ void qmp_cont(Error **errp) {Error *local_err =NULL ; -if (runstate_check (RUN_STATE_INTERNAL_ERROR ) || -runstate_check (RUN_STATE_SHUTDOWN )) { +if (runstate_needs_reset ()) {error_set (errp,QERR_RESET_REQUIRED );return ; }else if (runstate_check (RUN_STATE_SUSPENDED )) {
vl.c +11 -2
@@ -596,6 +596,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_RUNNING, RUN_STATE_SAVE_VM }, { RUN_STATE_RUNNING, RUN_STATE_SHUTDOWN }, { RUN_STATE_RUNNING, RUN_STATE_WATCHDOG }, + { RUN_STATE_RUNNING, RUN_STATE_GUEST_PANICKED }, { RUN_STATE_SAVE_VM, RUN_STATE_RUNNING },
@@ -610,6 +611,8 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, + { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, + { RUN_STATE_MAX, RUN_STATE_MAX }, };
@@ -651,6 +654,13 @@ int runstate_is_running(void)return runstate_check (RUN_STATE_RUNNING ); } +bool runstate_needs_reset (void ) +{ +return runstate_check (RUN_STATE_INTERNAL_ERROR ) || +runstate_check (RUN_STATE_SHUTDOWN ) || +runstate_check (RUN_STATE_GUEST_PANICKED ); +} +StatusInfo *qmp_query_status (Error **errp) {StatusInfo *info =g_malloc0 (sizeof (*info));
@@ -2007,8 +2017,7 @@ static bool main_loop_should_exit(void)cpu_synchronize_all_states ();qemu_system_reset (VMRESET_REPORT );resume_all_vcpus (); -if (runstate_check (RUN_STATE_INTERNAL_ERROR ) || -runstate_check (RUN_STATE_SHUTDOWN )) { +if (runstate_needs_reset ()) {runstate_set (RUN_STATE_PAUSED ); } }
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH v17 1/6] add a new runstate: RUN_STATE_GUEST_PANICKED
Quoted 4 lines · Hu Tao
The guest will be in this state when it is panicked.
Signed-off-by Wen Congyang <[email protected]>Signed-off-by Hu Tao <[email protected]>
This actually broken virsh dump without --memory-only:
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
(virsh dump without memory-only falls back to migrate "exec: cat > dumpfile")
Christian
PATCH 1/1 vl: new runstate transition: RUN_STATE_GUEST_PANICKED -> RUN_STATE_FINISH_MIGRATE
Quoted 6 lines · Christian Borntraeger
Quoted 4 lines · Hu Tao
The guest will be in this state when it is panicked.
Signed-off-by Wen Congyang <[email protected]>Signed-off-by Hu Tao <[email protected]>
Quoted 8 lines
This actually broken virsh dump without --memory-only:
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
(virsh dump without memory-only falls back to migrate "exec: cat > dumpfile")
Christian
This patch should fix the problem:
Quoted 1 line
From
d470feefe3d320c43c1fb2eb43457a99b96cdc98Mon Sep 17 00:00:00 2001
From: Hu Tao <[email protected]>
Date: Fri, 17 May 2013 15:39:07 +0800
Subject: [PATCH] vl: new runstate transition: RUN_STATE_GUEST_PANICKED ->
RUN_STATE_FINISH_MIGRATE
This fixes a problem that after guest panic happens, virsh dump without --memory-only fails:
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
--- vl.c | 1 + 1 file changed, 1 insertion(+)
vl.c +1 -0
@@ -609,6 +609,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, + { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_MAX, RUN_STATE_MAX }, };
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH for-1.5] vl: new runstate transition: RUN_STATE_GUEST_PANICKED -> RUN_STATE_FINISH_MIGRATE
Il 17/05/2013 09:43, Hu Tao ha scritto:
Quoted 24 lines · Christian Borntraeger
Quoted 6 lines · Hu Tao
Quoted 4 lines
The guest will be in this state when it is panicked.
Signed-off-by Wen Congyang <[email protected]>Signed-off-by Hu Tao <[email protected]>Quoted 8 lines
This actually broken virsh dump without --memory-only:
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
(virsh dump without memory-only falls back to migrate "exec: cat > dumpfile")
Christian
This patch should fix the problem:
From
d470feefe3d320c43c1fb2eb43457a99b96cdc98Mon Sep 17 00:00:00 2001
From: Hu Tao <[email protected]>
Date: Fri, 17 May 2013 15:39:07 +0800
Subject: [PATCH] vl: new runstate transition:RUN_STATE_GUEST_PANICKED->
RUN_STATE_FINISH_MIGRATE
Quoted 7 lines
This fixes a problem that after guest panic happens, virsh dump without --memory-only fails:
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
Reported-by Christian Borntraeger <[email protected]>Signed-off-by Hu Tao <[email protected]>
Adding qemu-stable, but perhaps we can get this into 1.5 as well.
Paolo
Quoted 17 lines
--- vl.c | 1 + 1 file changed, 1 insertion(+)vl.c +1
-0@@ -609,6 +609,7 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, + { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE }, { RUN_STATE_MAX, RUN_STATE_MAX }, };
Re: [Qemu-devel] [PATCH] vl: new runstate transition: RUN_STATE_GUEST_PANICKED -> RUN_STATE_FINISH_MIGRATE
In reply to Hu TaoQuoted 4 lines · Hu Tao
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
Reported-by Christian Borntraeger <[email protected]>Signed-off-by Hu Tao <[email protected]>
Re: [Qemu-devel] [PATCH v17 1/6] add a new runstate: RUN_STATE_GUEST_PANICKED
In reply to Christian BorntraegerQuoted 6 lines · Christian Borntraeger
Quoted 4 lines · Hu Tao
The guest will be in this state when it is panicked.
Signed-off-by Wen Congyang <[email protected]>Signed-off-by Hu Tao <[email protected]>
Quoted 8 lines
This actually broken virsh dump without --memory-only:
ERROR: invalid runstate transition: 'guest-panicked' -> 'finish-migrate'
(virsh dump without memory-only falls back to migrate "exec: cat > dumpfile")
Christian
See also
http://lists.nongnu.org/archive/html/qemu-devel/2013-03/msg03399.html
Should've dug deeper then.
PATCH v17 2/6 add a new qevent: QEVENT_GUEST_PANICKED
In reply to Hu TaoThis event will be emited when qemu detects guest panic.
--- QMP/qmp-events.txt | 14 ++++++++++++++ include/monitor/monitor.h | 1 + monitor.c | 1 + 3 files changed, 16 insertions(+)
QMP/qmp-events.txt +14 -0
@@ -446,3 +446,17 @@ Example: Note: If action is "reset", "shutdown", or "pause" the WATCHDOG event is followed respectively by the RESET, SHUTDOWN, or STOP events. + +GUEST_PANICKED +-------------- + +Emitted when guest OS panic is detected. + +Data: + +- "action": Action that has been taken (json-string, currently always "pause"). + +Example: + +{ "event": "GUEST_PANICKED", + "data": { "action": "pause" } }
include/monitor/monitor.h +1 -0
@@ -46,6 +46,7 @@ typedef enum MonitorEvent {QEVENT_WAKEUP ,QEVENT_BALLOON_CHANGE ,QEVENT_SPICE_MIGRATE_COMPLETED , + QEVENT_GUEST_PANICKED,/* Add to 'monitor_event_names' array in monitor.c when * defining new events here */
monitor.c +1 -0
@@ -484,6 +484,7 @@ static const char *monitor_event_names[] = { [QEVENT_WAKEUP] = "WAKEUP", [QEVENT_BALLOON_CHANGE] = "BALLOON_CHANGE", [QEVENT_SPICE_MIGRATE_COMPLETED] = "SPICE_MIGRATE_COMPLETED", + [QEVENT_GUEST_PANICKED ] ="GUEST_PANICKED" , };QEMU_BUILD_BUG_ON (ARRAY_SIZE (monitor_event_names) !=QEVENT_MAX )
Signature · 1 line
1.8.1.4
PATCH v17 3/6 introduce a new qom device to deal with panicked event
In reply to Hu Taopvpanic device is used to send guest panic event from guest to qemu.
When guest panic happens, pvpanic device driver will write a event number to IO port 0x505(which is the IO port occupied by pvpanic device, by default). On receiving the event, pvpanic device will pause guest cpu(s), and send a qmp event QEVENT_GUEST_PANICKED.
--- hw/Makefile.objs | 1 + hw/pvpanic.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 hw/pvpanic.c
hw/Makefile.objs +1 -0
@@ -216,4 +216,5 @@ obj-$(CONFIG_KVM) += ivshmem.o obj-$(CONFIG_LINUX) += vfio_pci.o endif +common-obj-y += pvpanic.o endif
hw/pvpanic.c new file +116 -0
116 lines not on this page · raw message
Signature · 1 line
1.8.1.4
PATCH v17 4/6 pvpanic: pass configurable ioport to seabios
In reply to Hu TaoThis lets seabios patch the corresponding SSDT entry.
--- hw/fw_cfg.c | 8 +++++++- hw/fw_cfg.h | 2 ++ hw/pvpanic.c | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-)
hw/fw_cfg.c +7 -1
@@ -489,11 +489,17 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, dev =qdev_create (NULL ,"fw_cfg" );qdev_prop_set_uint32 (dev,"ctl_iobase" , ctl_port);qdev_prop_set_uint32 (dev,"data_iobase" , data_port); -qdev_init_nofail (dev); d =SYS_BUS_DEVICE (dev); s =DO_UPCAST (FWCfgState, busdev.qdev, dev); +if (!object_resolve_path ("/machine/fw_cfg" ,NULL )) { +object_property_add_child (qdev_get_machine (),"fw_cfg" ,OBJECT (s), +NULL ); + } + +qdev_init_nofail (dev); +if (ctl_addr) {sysbus_mmio_map (d,0 , ctl_addr); }
hw/fw_cfg.h +2 -0
@@ -1,6 +1,8 @@#ifndef FW_CFG_H #define FW_CFG_H +#include "exec/hwaddr.h" +#define FW_CFG_SIGNATURE 0x00#define FW_CFG_ID 0x01#define FW_CFG_UUID 0x02
hw/pvpanic.c +14 -0
@@ -18,6 +18,8 @@#include <sysemu/sysemu.h> #include <sysemu/kvm.h> +#include "hw/fw_cfg.h" +/* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0
@@ -79,10 +81,22 @@ static const MemoryRegionOps pvpanic_ops = {static int pvpanic_isa_initfn (ISADevice *dev) {PVPanicState *s =ISA_PVPANIC_DEVICE (dev); +static bool port_configured; +void *fw_cfg;memory_region_init_io (&s->io, &pvpanic_ops, s,"pvpanic" ,1 );isa_register_ioport (dev, &s->io, s->ioport); +if (!port_configured) { + fw_cfg =object_resolve_path ("/machine/fw_cfg" ,NULL ); +if (fw_cfg) { +fw_cfg_add_file (fw_cfg,"etc/pvpanic-port" , +g_memdup (&s->ioport,sizeof (s->ioport)), +sizeof (s->ioport)); + port_configured = true; + } + } +return 0 ; }
Signature · 1 line
1.8.1.4
PATCH v17 5/6 pvpanic: create pvpanic device by default
In reply to Hu TaoAlso parse command line options for ioport and set it accordingly.
--- hw/i386/pc_piix.c | 2 ++ hw/i386/pc_q35.c | 1 + hw/pc.h | 4 ++++ hw/pvpanic.c | 42 ++++++++++++++++++++++++++++++++++++++++++ vl.c | 2 ++ 5 files changed, 51 insertions(+)
hw/i386/pc_piix.c +2 -0
@@ -217,6 +217,8 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) {pc_pci_device_init (pci_bus); } + +pvpanic_init (isa_bus); }static void pc_init_pci (QEMUMachineInitArgs *args)
hw/i386/pc_q35.c +1 -0
@@ -204,6 +204,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)pc_vga_init (isa_bus, host_bus);audio_init (isa_bus, host_bus);pc_nic_init (isa_bus, host_bus); +pvpanic_init (isa_bus);if (pci_enabled) {pc_pci_device_init (host_bus); }
hw/pc.h +4 -0
@@ -178,6 +178,10 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)/* pc_sysfw.c */ void pc_system_firmware_init (MemoryRegion *rom_memory); +/* pvpanic.c */ +int pvpanic_init (ISABus *bus); +int pvpanic_ioport (QemuOpts *opts,void *opaque); +/* e820 types */ #define E820_RAM 1#define E820_RESERVED 2
hw/pvpanic.c +42 -0
66 lines not on this page · raw message
vl.c +2 -0
@@ -4302,6 +4302,8 @@ int main(int argc, char **argv, char **envp)exit (i ==1 ?1 :0 ); } +qemu_opts_foreach (qemu_find_opts ("device" ), pvpanic_ioport,NULL ,0 ); +if (machine->compat_props) {qdev_prop_register_global_list (machine->compat_props); }
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH v17 5/6] pvpanic: create pvpanic device by default
Il 05/04/2013 08:36, Hu Tao ha scritto:
Quoted 2 lines
Also parse command line options for ioport and set it accordingly.
This does not do the correct thing for versioned machine types like "-M pc-1.4". Also, adding stuff to vl.c is really something you cannot do.
Please don't be afraid to ask!
See the attached patch, untested. Feel free to take it with my S-o-b line.
Patches 1-4 and 6 are okay.
Paolo
Quoted 137 lines
Signed-off-by Hu Tao <[email protected]>--- hw/i386/pc_piix.c | 2 ++ hw/i386/pc_q35.c | 1 + hw/pc.h | 4 ++++ hw/pvpanic.c | 42 ++++++++++++++++++++++++++++++++++++++++++ vl.c | 2 ++ 5 files changed, 51 insertions(+)hw/i386/pc_piix.c +2
-0@@ -217,6 +217,8 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) {pc_pci_device_init (pci_bus); } + +pvpanic_init (isa_bus); }static void pc_init_pci (QEMUMachineInitArgs *args)hw/i386/pc_q35.c +1
-0@@ -204,6 +204,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)pc_vga_init (isa_bus, host_bus);audio_init (isa_bus, host_bus);pc_nic_init (isa_bus, host_bus); +pvpanic_init (isa_bus);if (pci_enabled) {pc_pci_device_init (host_bus); }hw/pc.h +4
-0@@ -178,6 +178,10 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)/* pc_sysfw.c */ void pc_system_firmware_init (MemoryRegion *rom_memory); +/* pvpanic.c */ +int pvpanic_init (ISABus *bus); +int pvpanic_ioport (QemuOpts *opts,void *opaque); +/* e820 types */ #define E820_RAM 1#define E820_RESERVED 2hw/pvpanic.c +42
-0@@ -19,6 +19,8 @@#include <sysemu/kvm.h> #include "hw/fw_cfg.h" +#include "hw/pc.h" +#include "qapi/string-input-visitor.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0@@ -57,6 +59,36 @@ typedef struct PVPanicState {uint16_t ioport; } PVPanicState; +static uint16_t ioport; + +static int set_ioport (const char *name,const char *value,void *opaque) +{ +StringInputVisitor *mi; + +if (strcmp (name,"ioport" ) ==0 ) { + mi =string_input_visitor_new (value); +visit_type_uint16 (string_input_get_visitor (mi), &ioport,"ioport" , +NULL ); +string_input_visitor_cleanup (mi); + } + +return 0 ; +} + +int pvpanic_ioport (QemuOpts *opts,void *opaque) +{ +const char *driver; + + driver =qemu_opt_get (opts,"driver" ); +if (!driver ||strcmp (driver,"pvpanic" )) { +return 0 ; + } + +qemu_opt_foreach (opts, set_ioport,NULL ,0 ); + +return 0 ; +} +/* return supported events on read */ static uint64_t pvpanic_ioport_read (void *opaque,hwaddr addr,unsigned size) {@@ -84,6 +116,10 @@ static int pvpanic_isa_initfn(ISADevice *dev)static bool port_configured;void *fw_cfg; +if (ioport) { + s->ioport = ioport; + } +memory_region_init_io (&s->io, &pvpanic_ops, s,"pvpanic" ,1 );isa_register_ioport (dev, &s->io, s->ioport);@@ -115,6 +151,12 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data) dc->props = pvpanic_isa_properties; } +int pvpanic_init (ISABus *bus) +{ +isa_create_simple (bus,TYPE_ISA_PVPANIC_DEVICE ); +return 0 ; +} +static TypeInfo pvpanic_isa_info = { .name =TYPE_ISA_PVPANIC_DEVICE , .parent =TYPE_ISA_DEVICE ,vl.c +2
-0@@ -4302,6 +4302,8 @@ int main(int argc, char **argv, char **envp)exit (i ==1 ?1 :0 ); } +qemu_opts_foreach (qemu_find_opts ("device" ), pvpanic_ioport,NULL ,0 ); +if (machine->compat_props) {qdev_prop_register_global_list (machine->compat_props); }
Re: [Qemu-devel] [PATCH v17 5/6] pvpanic: create pvpanic device by default
Quoted 9 lines · Paolo Bonzini
Il 05/04/2013 08:36, Hu Tao ha scritto:
Quoted 2 lines
Also parse command line options for ioport and set it accordingly.
This does not do the correct thing for versioned machine types like "-M pc-1.4". Also, adding stuff to
vl.cis really something you cannot do.
Please don't be afraid to ask!See the attached patch, untested. Feel free to take it with my S-o-b line.
Thanks. But you forgot the attachment?
Quoted 142 lines
Patches 1-4 and 6 are okay.
Paolo
Quoted 137 lines
Signed-off-by Hu Tao <[email protected]>--- hw/i386/pc_piix.c | 2 ++ hw/i386/pc_q35.c | 1 + hw/pc.h | 4 ++++ hw/pvpanic.c | 42 ++++++++++++++++++++++++++++++++++++++++++ vl.c | 2 ++ 5 files changed, 51 insertions(+)hw/i386/pc_piix.c +2
-0@@ -217,6 +217,8 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) {pc_pci_device_init (pci_bus); } + +pvpanic_init (isa_bus); }static void pc_init_pci (QEMUMachineInitArgs *args)hw/i386/pc_q35.c +1
-0@@ -204,6 +204,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)pc_vga_init (isa_bus, host_bus);audio_init (isa_bus, host_bus);pc_nic_init (isa_bus, host_bus); +pvpanic_init (isa_bus);if (pci_enabled) {pc_pci_device_init (host_bus); }hw/pc.h +4
-0@@ -178,6 +178,10 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)/* pc_sysfw.c */ void pc_system_firmware_init (MemoryRegion *rom_memory); +/* pvpanic.c */ +int pvpanic_init (ISABus *bus); +int pvpanic_ioport (QemuOpts *opts,void *opaque); +/* e820 types */ #define E820_RAM 1#define E820_RESERVED 2hw/pvpanic.c +42
-0@@ -19,6 +19,8 @@#include <sysemu/kvm.h> #include "hw/fw_cfg.h" +#include "hw/pc.h" +#include "qapi/string-input-visitor.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0@@ -57,6 +59,36 @@ typedef struct PVPanicState {uint16_t ioport; } PVPanicState; +static uint16_t ioport; + +static int set_ioport (const char *name,const char *value,void *opaque) +{ +StringInputVisitor *mi; + +if (strcmp (name,"ioport" ) ==0 ) { + mi =string_input_visitor_new (value); +visit_type_uint16 (string_input_get_visitor (mi), &ioport,"ioport" , +NULL ); +string_input_visitor_cleanup (mi); + } + +return 0 ; +} + +int pvpanic_ioport (QemuOpts *opts,void *opaque) +{ +const char *driver; + + driver =qemu_opt_get (opts,"driver" ); +if (!driver ||strcmp (driver,"pvpanic" )) { +return 0 ; + } + +qemu_opt_foreach (opts, set_ioport,NULL ,0 ); + +return 0 ; +} +/* return supported events on read */ static uint64_t pvpanic_ioport_read (void *opaque,hwaddr addr,unsigned size) {@@ -84,6 +116,10 @@ static int pvpanic_isa_initfn(ISADevice *dev)static bool port_configured;void *fw_cfg; +if (ioport) { + s->ioport = ioport; + } +memory_region_init_io (&s->io, &pvpanic_ops, s,"pvpanic" ,1 );isa_register_ioport (dev, &s->io, s->ioport);@@ -115,6 +151,12 @@ static void pvpanic_isa_class_init(ObjectClass *klass, void *data) dc->props = pvpanic_isa_properties; } +int pvpanic_init (ISABus *bus) +{ +isa_create_simple (bus,TYPE_ISA_PVPANIC_DEVICE ); +return 0 ; +} +static TypeInfo pvpanic_isa_info = { .name =TYPE_ISA_PVPANIC_DEVICE , .parent =TYPE_ISA_DEVICE ,vl.c +2
-0@@ -4302,6 +4302,8 @@ int main(int argc, char **argv, char **envp)exit (i ==1 ?1 :0 ); } +qemu_opts_foreach (qemu_find_opts ("device" ), pvpanic_ioport,NULL ,0 ); +if (machine->compat_props) {qdev_prop_register_global_list (machine->compat_props); }
PATCH 1/1 pvpanic: create pvpanic by default for machine 1.5
In reply to Hu Tao--- hw/i386/pc_piix.c | 16 ++++++++++++++-- hw/i386/pc_q35.c | 15 ++++++++++++++- hw/pc.h | 3 +++ hw/pvpanic.c | 7 +++++++ 4 files changed, 38 insertions(+), 3 deletions(-)
hw/i386/pc_piix.c +14 -2
@@ -54,6 +54,8 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };static const int ide_iobase2[MAX_IDE_BUS ] = {0x3f6 ,0x376 };static const int ide_irq[MAX_IDE_BUS ] = {14 ,15 }; +static bool has_pvpanic = true; +/* PC hardware initialisation */ static void pc_init1(MemoryRegion *system_memory, MemoryRegion *system_io,
@@ -217,6 +219,10 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) {pc_pci_device_init (pci_bus); } + +if (has_pvpanic) { +pvpanic_init (isa_bus); + } }static void pc_init_pci (QEMUMachineInitArgs *args)
@@ -234,10 +240,16 @@ static void pc_init_pci(QEMUMachineInitArgs *args) initrd_filename, cpu_model, 1, 1); } +static void pc_init_pci_1_4 (QEMUMachineInitArgs *args) +{ + has_pvpanic = false; +pc_init_pci (args); +} +static void pc_init_pci_1_3 (QEMUMachineInitArgs *args) {enable_compat_apic_id_mode (); -pc_init_pci (args); +pc_init_pci_1_4 (args); }/* PC machine init function for pc-0.14 to pc-1.2 */
@@ -308,7 +320,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = {static QEMUMachine pc_i440fx_machine_v1_4 = { .name ="pc-i440fx-1.4" , .desc ="Standard PC (i440FX + PIIX, 1996)" , - .init = pc_init_pci, + .init = pc_init_pci_1_4, .max_cpus =255 , .compat_props = (GlobalProperty []) {PC_COMPAT_1_4 ,
hw/i386/pc_q35.c +14 -1
@@ -45,6 +45,8 @@/* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 +static bool has_pvpanic = true; +/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE) * BIOS will read it and start S3 resume at POST Entry */ static void pc_cmos_set_s3_resume (void *opaque,int irq,int level)
@@ -207,8 +209,19 @@ static void pc_q35_init(QEMUMachineInitArgs *args)if (pci_enabled) {pc_pci_device_init (host_bus); } + +if (has_pvpanic) { +pvpanic_init (isa_bus); + } +} + +static void pc_q35_init_1_4 (QEMUMachineInitArgs *args) +{ + has_pvpanic = false; +pc_q35_init (args); } +static QEMUMachine pc_q35_machine_v1_5 = { .name ="pc-q35-1.5" , .alias ="q35" ,
@@ -221,7 +234,7 @@ static QEMUMachine pc_q35_machine_v1_5 = {static QEMUMachine pc_q35_machine_v1_4 = { .name ="pc-q35-1.4" , .desc ="Standard PC (Q35 + ICH9, 2009)" , - .init = pc_q35_init, + .init = pc_q35_init_1_4, .max_cpus =255 , .compat_props = (GlobalProperty []) {PC_COMPAT_1_4 ,
hw/pc.h +3 -0
@@ -178,6 +178,9 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)/* pc_sysfw.c */ void pc_system_firmware_init (MemoryRegion *rom_memory); +/* pvpanic.c */ +int pvpanic_init (ISABus *bus); +/* e820 types */ #define E820_RAM 1#define E820_RESERVED 2
hw/pvpanic.c +7 -0
@@ -19,6 +19,7 @@#include <sysemu/kvm.h> #include "hw/fw_cfg.h" +#include "hw/pc.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0
@@ -100,6 +101,12 @@ static int pvpanic_isa_initfn(ISADevice *dev)return 0 ; } +int pvpanic_init (ISABus *bus) +{ +isa_create_simple (bus,TYPE_ISA_PVPANIC_DEVICE ); +return 0 ; +} +static Property pvpanic_isa_properties[] = {DEFINE_PROP_UINT16 ("ioport" , PVPanicState, ioport,0x505 ),DEFINE_PROP_END_OF_LIST (),
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH] pvpanic: create pvpanic by default for machine 1.5
Il 09/04/2013 11:06, Hu Tao ha scritto:
Quoted 2 lines
Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Hu Tao <[email protected]>
Thanks, seems like we're good.
Please resubmit, the new position for pvpanic.c should be in hw/misc.
Paolo
Quoted 140 lines
--- hw/i386/pc_piix.c | 16 ++++++++++++++-- hw/i386/pc_q35.c | 15 ++++++++++++++- hw/pc.h | 3 +++ hw/pvpanic.c | 7 +++++++ 4 files changed, 38 insertions(+), 3 deletions(-)hw/i386/pc_piix.c +14
-2@@ -54,6 +54,8 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };static const int ide_iobase2[MAX_IDE_BUS ] = {0x3f6 ,0x376 };static const int ide_irq[MAX_IDE_BUS ] = {14 ,15 }; +static bool has_pvpanic = true; +/* PC hardware initialisation */ static void pc_init1(MemoryRegion *system_memory, MemoryRegion *system_io,@@ -217,6 +219,10 @@ static void pc_init1(MemoryRegion *system_memory,if (pci_enabled) {pc_pci_device_init (pci_bus); } + +if (has_pvpanic) { +pvpanic_init (isa_bus); + } }static void pc_init_pci (QEMUMachineInitArgs *args)@@ -234,10 +240,16 @@ static void pc_init_pci(QEMUMachineInitArgs *args) initrd_filename, cpu_model, 1, 1); } +static void pc_init_pci_1_4 (QEMUMachineInitArgs *args) +{ + has_pvpanic = false; +pc_init_pci (args); +} +static void pc_init_pci_1_3 (QEMUMachineInitArgs *args) {enable_compat_apic_id_mode (); -pc_init_pci (args); +pc_init_pci_1_4 (args); }/* PC machine init function for pc-0.14 to pc-1.2 */ @@ -308,7 +320,7 @@ static QEMUMachine pc_i440fx_machine_v1_5 = {static QEMUMachine pc_i440fx_machine_v1_4 = { .name ="pc-i440fx-1.4" , .desc ="Standard PC (i440FX + PIIX, 1996)" , - .init = pc_init_pci, + .init = pc_init_pci_1_4, .max_cpus =255 , .compat_props = (GlobalProperty []) {PC_COMPAT_1_4 ,hw/i386/pc_q35.c +14
-1@@ -45,6 +45,8 @@/* ICH9 AHCI has 6 ports */ #define MAX_SATA_PORTS 6 +static bool has_pvpanic = true; +/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE) * BIOS will read it and start S3 resume at POST Entry */ static void pc_cmos_set_s3_resume (void *opaque,int irq,int level)@@ -207,8 +209,19 @@ static void pc_q35_init(QEMUMachineInitArgs *args)if (pci_enabled) {pc_pci_device_init (host_bus); } + +if (has_pvpanic) { +pvpanic_init (isa_bus); + } +} + +static void pc_q35_init_1_4 (QEMUMachineInitArgs *args) +{ + has_pvpanic = false; +pc_q35_init (args); } +static QEMUMachine pc_q35_machine_v1_5 = { .name ="pc-q35-1.5" , .alias ="q35" ,@@ -221,7 +234,7 @@ static QEMUMachine pc_q35_machine_v1_5 = {static QEMUMachine pc_q35_machine_v1_4 = { .name ="pc-q35-1.4" , .desc ="Standard PC (Q35 + ICH9, 2009)" , - .init = pc_q35_init, + .init = pc_q35_init_1_4, .max_cpus =255 , .compat_props = (GlobalProperty []) {PC_COMPAT_1_4 ,hw/pc.h +3
-0@@ -178,6 +178,9 @@ static inline bool isa_ne2000_init(ISABus *bus, int base, int irq, NICInfo *nd)/* pc_sysfw.c */ void pc_system_firmware_init (MemoryRegion *rom_memory); +/* pvpanic.c */ +int pvpanic_init (ISABus *bus); +/* e820 types */ #define E820_RAM 1#define E820_RESERVED 2hw/pvpanic.c +7
-0@@ -19,6 +19,7 @@#include <sysemu/kvm.h> #include "hw/fw_cfg.h" +#include "hw/pc.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0@@ -100,6 +101,12 @@ static int pvpanic_isa_initfn(ISADevice *dev)return 0 ; } +int pvpanic_init (ISABus *bus) +{ +isa_create_simple (bus,TYPE_ISA_PVPANIC_DEVICE ); +return 0 ; +} +static Property pvpanic_isa_properties[] = {DEFINE_PROP_UINT16 ("ioport" , PVPanicState, ioport,0x505 ),DEFINE_PROP_END_OF_LIST (),
PATCH v17 6/6 pvpanic: add document of pvpanic
In reply to Hu Tao--- docs/specs/pvpanic.txt | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 docs/specs/pvpanic.txt
docs/specs/pvpanic.txt new file +37 -0
@@ -0,0 +1,37 @@ +PVPANIC DEVICE +============== + +pvpanic device is a simulated ISA device, through which a guest panic +event is sent to qemu, and a QMP event is generated. This allows +management apps (e.g. libvirt) to be notified and respond to the event. + +The management app has the option of waiting for GUEST_PANICKED events, +and/or polling for guest-panicked RunState, to learn when the pvpanic +device has fired a panic event. + +ISA Interface +------------- + +pvpanic uses port 0x505 to receive a panic event from the guest. On +write, bit 0 is set to indicate guest panic has happened. On read, bit +0 is set to indicate guest panic notification is supported. Remaining +bits are reserved, and should be written as 0, and ignored on read. + +ACPI Interface +-------------- + +pvpanic device is defined with ACPI ID "QEMU0001". Custom methods: + +RDPT: To determine whether guest panic notification is supported. +Arguments: None +Return: Returns a byte, bit 0 set to indicate guest panic + notification is supported. Other bits are reserved and + should be ignored. + +WRPT: To send a guest panic event +Arguments: Arg0 is a byte, with bit 0 set to indicate guest panic has + happened. Other bits are reserved and should be cleared. +Return: None + +The ACPI device will automatically refer to the right port in case it +is modified.
Signature · 1 line
1.8.1.4
PATCH v17 1/1 pvpanic: pvpanic device driver
In reply to Hu Taopvpanic device is a qemu simulated device through which guest panic event is sent to host.
---
ref: http://lists.nongnu.org/archive/html/qemu-devel/2013-04/msg01028.html
drivers/platform/x86/Kconfig | 7 +++ drivers/platform/x86/Makefile | 2 + drivers/platform/x86/pvpanic.c | 115 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 drivers/platform/x86/pvpanic.c
drivers/platform/x86/Kconfig +7 -0
@@ -781,4 +781,11 @@ config APPLE_GMUX graphics as well as the backlight. Currently only backlight control is supported by the driver. +config PVPANIC + tristate "pvpanic device support" + depends on ACPI + ---help--- + This driver provides support for pvpanic device, which is a qemu + simulated device through which guest panic event is sent to host. + endif # X86_PLATFORM_DEVICES
drivers/platform/x86/Makefile +2 -0
@@ -51,3 +51,5 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_SAMSUNG_Q10) += samsung-q10.o obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o + +obj-$(CONFIG_PVPANIC) += pvpanic.o
drivers/platform/x86/pvpanic.c new file +115 -0
115 lines not on this page · raw message
Signature · 1 line
1.8.1.4
Re: [PATCH v17] pvpanic: pvpanic device driver
Il 05/04/2013 09:10, Hu Tao ha scritto:
Quoted 4 lines
pvpanic device is a qemu simulated device through which guest panic event is sent to host.
Signed-off-by Hu Tao <[email protected]>
Matthew, it would be nice to include this in 3.10.
The implementation of the device in QEMU is final, the only thing that needs a respin is how it is enabled by default.
Paolo
Quoted 158 lines
---
ref: http://lists.nongnu.org/archive/html/qemu-devel/2013-04/msg01028.html
drivers/platform/x86/Kconfig | 7 +++ drivers/platform/x86/Makefile | 2 + drivers/platform/x86/pvpanic.c | 115 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 drivers/platform/x86/pvpanic.cdrivers/platform/x86/Kconfig +7
-0@@ -781,4 +781,11 @@ config APPLE_GMUX graphics as well as the backlight. Currently only backlight control is supported by the driver. +config PVPANIC + tristate "pvpanic device support" + depends on ACPI + ---help--- + This driver provides support for pvpanic device, which is a qemu + simulated device through which guest panic event is sent to host. + endif # X86_PLATFORM_DEVICESdrivers/platform/x86/Makefile +2
-0@@ -51,3 +51,5 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_SAMSUNG_Q10) += samsung-q10.o obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o + +obj-$(CONFIG_PVPANIC) += pvpanic.odrivers/platform/x86/pvpanic.c new file +115
-0@@ -0,0 +1,115 @@ +/* +* pvpanic.c - pvpanic Device Support +* +* Copyright (C) 2013 Fujitsu. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/types.h> +#include <acpi/acpi_bus.h> +#include <acpi/acpi_drivers.h> + +MODULE_AUTHOR ("Hu Tao <[email protected]>" ); +MODULE_DESCRIPTION ("pvpanic device driver" ); +MODULE_LICENSE ("GPL" ); + +static int pvpanic_add (struct acpi_device *device); +static int pvpanic_remove (struct acpi_device *device); + +static const struct acpi_device_id pvpanic_device_ids[] = { + {"QEMU0001" ,0 }, + {"" ,0 }, +}; +MODULE_DEVICE_TABLE (acpi, pvpanic_device_ids); + +#define PVPANIC_PANICKED (1 << 0) + +static acpi_handle handle; + +static struct acpi_driver pvpanic_driver = { + .name ="pvpanic" , + .class ="QEMU" , + .ids = pvpanic_device_ids, + .ops = { + .add = pvpanic_add, + .remove = pvpanic_remove, + }, + .owner =THIS_MODULE , +}; + +static void +pvpanic_send_event (unsigned int event) +{ +union acpi_object arg; +struct acpi_object_list arg_list; + +if (!handle) +return ; + + arg.type =ACPI_TYPE_INTEGER ; + arg.integer.value = event; + + arg_list.count =1 ; + arg_list.pointer = &arg; + +acpi_evaluate_object (handle,"WRPT" , &arg_list,NULL ); +} + +static int +pvpanic_panic_notify (struct notifier_block *nb,unsigned long code, +void *unused) +{ +pvpanic_send_event (PVPANIC_PANICKED ); +return NOTIFY_DONE ; +} + +static struct notifier_block pvpanic_panic_nb = { + .notifier_call = pvpanic_panic_notify, +}; + +static int pvpanic_add (struct acpi_device *device) +{ +acpi_status status; +u64 ret; + + status =acpi_evaluate_integer (device->handle,"_STA" ,NULL , + &ret); + +if (ACPI_FAILURE (status) || (ret &0x0B ) !=0x0B ) +return -ENODEV ; + + handle = device->handle; +atomic_notifier_chain_register (&panic_notifier_list, + &pvpanic_panic_nb); + +return 0 ; +} + +static int pvpanic_remove (struct acpi_device *device) +{ + +atomic_notifier_chain_unregister (&panic_notifier_list, + &pvpanic_panic_nb); + handle =NULL ; +return 0 ; +} + +module_acpi_driver (pvpanic_driver);
Re: [PATCH v17] pvpanic: pvpanic device driver
In reply to Hu TaoIl 05/04/2013 09:10, Hu Tao ha scritto:
Quoted 4 lines
pvpanic device is a qemu simulated device through which guest panic event is sent to host.
Signed-off-by Hu Tao <[email protected]>
Ping. This will be in QEMU 1.5, is this on track for the 3.10 kernel?
Thanks,
Paolo
Quoted 158 lines
---
ref: http://lists.nongnu.org/archive/html/qemu-devel/2013-04/msg01028.html
drivers/platform/x86/Kconfig | 7 +++ drivers/platform/x86/Makefile | 2 + drivers/platform/x86/pvpanic.c | 115 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 drivers/platform/x86/pvpanic.cdrivers/platform/x86/Kconfig +7
-0@@ -781,4 +781,11 @@ config APPLE_GMUX graphics as well as the backlight. Currently only backlight control is supported by the driver. +config PVPANIC + tristate "pvpanic device support" + depends on ACPI + ---help--- + This driver provides support for pvpanic device, which is a qemu + simulated device through which guest panic event is sent to host. + endif # X86_PLATFORM_DEVICESdrivers/platform/x86/Makefile +2
-0@@ -51,3 +51,5 @@ obj-$(CONFIG_INTEL_OAKTRAIL) += intel_oaktrail.o obj-$(CONFIG_SAMSUNG_Q10) += samsung-q10.o obj-$(CONFIG_APPLE_GMUX) += apple-gmux.o obj-$(CONFIG_CHROMEOS_LAPTOP) += chromeos_laptop.o + +obj-$(CONFIG_PVPANIC) += pvpanic.odrivers/platform/x86/pvpanic.c new file +115
-0@@ -0,0 +1,115 @@ +/* +* pvpanic.c - pvpanic Device Support +* +* Copyright (C) 2013 Fujitsu. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/init.h> +#include <linux/types.h> +#include <acpi/acpi_bus.h> +#include <acpi/acpi_drivers.h> + +MODULE_AUTHOR ("Hu Tao <[email protected]>" ); +MODULE_DESCRIPTION ("pvpanic device driver" ); +MODULE_LICENSE ("GPL" ); + +static int pvpanic_add (struct acpi_device *device); +static int pvpanic_remove (struct acpi_device *device); + +static const struct acpi_device_id pvpanic_device_ids[] = { + {"QEMU0001" ,0 }, + {"" ,0 }, +}; +MODULE_DEVICE_TABLE (acpi, pvpanic_device_ids); + +#define PVPANIC_PANICKED (1 << 0) + +static acpi_handle handle; + +static struct acpi_driver pvpanic_driver = { + .name ="pvpanic" , + .class ="QEMU" , + .ids = pvpanic_device_ids, + .ops = { + .add = pvpanic_add, + .remove = pvpanic_remove, + }, + .owner =THIS_MODULE , +}; + +static void +pvpanic_send_event (unsigned int event) +{ +union acpi_object arg; +struct acpi_object_list arg_list; + +if (!handle) +return ; + + arg.type =ACPI_TYPE_INTEGER ; + arg.integer.value = event; + + arg_list.count =1 ; + arg_list.pointer = &arg; + +acpi_evaluate_object (handle,"WRPT" , &arg_list,NULL ); +} + +static int +pvpanic_panic_notify (struct notifier_block *nb,unsigned long code, +void *unused) +{ +pvpanic_send_event (PVPANIC_PANICKED ); +return NOTIFY_DONE ; +} + +static struct notifier_block pvpanic_panic_nb = { + .notifier_call = pvpanic_panic_notify, +}; + +static int pvpanic_add (struct acpi_device *device) +{ +acpi_status status; +u64 ret; + + status =acpi_evaluate_integer (device->handle,"_STA" ,NULL , + &ret); + +if (ACPI_FAILURE (status) || (ret &0x0B ) !=0x0B ) +return -ENODEV ; + + handle = device->handle; +atomic_notifier_chain_register (&panic_notifier_list, + &pvpanic_panic_nb); + +return 0 ; +} + +static int pvpanic_remove (struct acpi_device *device) +{ + +atomic_notifier_chain_unregister (&panic_notifier_list, + &pvpanic_panic_nb); + handle =NULL ; +return 0 ; +} + +module_acpi_driver (pvpanic_driver);
PATCH v17 1/1 Add pvpanic device driver
In reply to Hu Taopvpanic device is used to notify host(qemu) when guest panic happens.
---
No change from v16. qemu patches at:
http://lists.nongnu.org/archive/html/qemu-devel/2013-04/msg01028.html
src/acpi.c | 3 +++ src/ssdt-misc.dsl | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)
src/acpi.c +3 -0
@@ -534,6 +534,9 @@ build_ssdt(void) ssdt_ptr[acpi_pci64_valid[0 ]] =0 ; } +int pvpanic_port =romfile_loadint ("etc/pvpanic-port" ,0x0 ); + *(u16 *)(ssdt_ptr + *ssdt_isa_pest) = pvpanic_port; + ssdt_ptr +=sizeof (ssdp_misc_aml);// build Scope(_SB_) header
src/ssdt-misc.dsl +46 -0
50 lines not on this page · raw message
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [PATCH v17] Add pvpanic device driver
Il 05/04/2013 09:17, Hu Tao ha scritto:
Quoted 9 lines
pvpanic device is used to notify host(qemu) when guest panic happens.
Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Hu Tao <[email protected]>---
No change from v16. qemu patches at:
http://lists.nongnu.org/archive/html/qemu-devel/2013-04/msg01028.html
Ping. The QEMU parts will be committed shortly.
Paolo
Re: [Qemu-devel] [PATCH v17] Add pvpanic device driver
Quoted 7 lines · Paolo Bonzini
Il 05/04/2013 09:17, Hu Tao ha scritto:
Quoted 6 lines
pvpanic device is used to notify host(qemu) when guest panic happens.
Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Hu Tao <[email protected]>---
Quoted 5 lines
Quoted 3 lines
No change from v16. qemu patches at:
http://lists.nongnu.org/archive/html/qemu-devel/2013-04/msg01028.html
Ping. The QEMU parts will be committed shortly.
Thanks. I pushed this patch to SeaBIOS head.
-Kevin
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
In reply to Hu Taosrc/ssdt-misc.dsl DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) · line 89
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct outl().
Thanks,
Laszlo
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
Quoted 11 lines · Laszlo Ersek
src/ssdt-misc.dsl DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) · line 89
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }
Quoted 4 lines
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct
outl().
An old version calls WRPT but is buggy, so you see the outl version. This patch is in seabios before the outl version. If you think these methods are needless, feel free to send a patch.
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
Quoted 12 lines · Hu Tao
Quoted 11 lines · Laszlo Ersek
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }
Quoted 8 lines
Quoted 4 lines
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct
outl().An old version calls WRPT but is buggy, so you see the outl version. This patch is in seabios before the outl version. If you think these methods are needless, feel free to send a patch.
I mean v19 by outl verson. Sorry for confusing.
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
In reply to Hu TaoQuoted 12 lines · Hu Tao
Quoted 11 lines · Laszlo Ersek
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }
Quoted 8 lines
Quoted 4 lines
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct
outl().An old version calls WRPT but is buggy, so you see the outl version. This patch is in seabios before the outl version. If you think these methods are needless, feel free to send a patch.
Oh no, that's not what I meant! I'm just rounding up backport candidates :)
Thanks!
Laszlo
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
In reply to Hu Tao(Not sure why the CC list has grown this huge, but I'm adding Drew for good mesaure.)
Quoted 12 lines · Hu Tao
Quoted 11 lines · Laszlo Ersek
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }
Quoted 8 lines
Quoted 4 lines
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct
outl().An old version calls WRPT but is buggy, so you see the outl version. This patch is in seabios before the outl version. If you think these methods are needless, feel free to send a patch.
After Drew located the guest kernel commit for me,
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=8b10acd7
I can see this SeaBIOS patch *is* necessary -- even though the RDPT / WRPT methods are not used for port access, the port number itself is available from ACPI (\_SB.PCI0.ISA.PEVT._CRS, identified by the "QEMU0001" HID) to the kernel.
Hu, can you (and are you willing to) relicense this commit (seabios commit e9725dd7) under the 2-clause BSDL so I can port it to OVMF?
(Actually I'm somewhat confused because the first S-o-b is from Paolo. Since I share an employer with Paolo, getting permission from Paolo would be either quite easy or even unnecessary. Anyway it's better to ask!)
Thanks,
Laszlo
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
Il 15/05/2013 18:25, Laszlo Ersek ha scritto:
Quoted 34 lines
(Not sure why the CC list has grown this huge, but I'm adding Drew for good mesaure.)
Quoted 12 lines · Hu Tao
Quoted 11 lines · Laszlo Ersek
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }Quoted 8 lines
Quoted 4 lines
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct
outl().An old version calls WRPT but is buggy, so you see the outl version. This patch is in seabios before the outl version. If you think these methods are needless, feel free to send a patch.
After Drew located the guest kernel commit for me,
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=8b10acd7
I can see this SeaBIOS patch *is* necessary -- even though the RDPT / WRPT methods are not used for port access, the port number itself is available from ACPI (\_SB.PCI0.ISA.PEVT._CRS, identified by the "QEMU0001" HID) to the kernel.
Quoted 6 lines
Hu, can you (and are you willing to) relicense this commit (seabios commit
e9725dd7) under the 2-clause BSDL so I can port it to OVMF?(Actually I'm somewhat confused because the first S-o-b is from Paolo. Since I share an employer with Paolo, getting permission from Paolo would be either quite easy or even unnecessary. Anyway it's better to ask!)
I and Hu did half of the patch each. :)
But I think it's simpler to avoid OVMF and wait for the time when QEMU will produce the ACPI tables.
Paolo
Re: [Qemu-devel] [SeaBIOS] [PATCH v17] Add pvpanic device driver
Quoted 38 lines · Paolo Bonzini
Il 15/05/2013 18:25, Laszlo Ersek ha scritto:
Quoted 37 lines
(Not sure why the CC list has grown this huge, but I'm adding Drew for good mesaure.)
Quoted 12 lines · Hu Tao
Quoted 11 lines · Laszlo Ersek
Quoted 8 lines · Hu Tao
src/ssdt-misc.dsl +8
-0+ Method(RDPT, 0, NotSerialized) { + Store(PEPT, Local0) + Return (Local0) + } + + Method(WRPT, 1, NotSerialized) { + Store(Arg0, PEPT) + }Quoted 8 lines
Quoted 4 lines
Please excuse my asking, I haven't been following this -- who's supposed to call these methods? The latest guest kernel patch I managed to find ([PATCH v7] kvm: notify host when the guest is panicked -- probably obsolete by now) appears to do a direct
outl().An old version calls WRPT but is buggy, so you see the outl version. This patch is in seabios before the outl version. If you think these methods are needless, feel free to send a patch.
After Drew located the guest kernel commit for me,
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commitdiff;h=8b10acd7
I can see this SeaBIOS patch *is* necessary -- even though the RDPT / WRPT methods are not used for port access, the port number itself is available from ACPI (\_SB.PCI0.ISA.PEVT._CRS, identified by the "QEMU0001" HID) to the kernel.
Hu, can you (and are you willing to) relicense this commit (seabios commit
e9725dd7) under the 2-clause BSDL so I can port it to OVMF?
Quoted 8 lines
Quoted 3 lines
(Actually I'm somewhat confused because the first S-o-b is from Paolo. Since I share an employer with Paolo, getting permission from Paolo would be either quite easy or even unnecessary. Anyway it's better to ask!)
I and Hu did half of the patch each. :)
But I think it's simpler to avoid OVMF and wait for the time when QEMU will produce the ACPI tables.
That's fine by me; thanks.
Laszlo
Re: [Qemu-devel] [PATCH v17] Add pvpanic device driver
In reply to Hu TaoQuoted 4 lines · Hu Tao
pvpanic device is used to notify host(qemu) when guest panic happens.
Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Hu Tao <[email protected]>
Another question: are you planning to provide libvirt support? Currently I see the guest as paused after a crash. Since there is a crashed state in libvirt it might make sense to use that.
Christian
Re: [Qemu-devel] [PATCH v17] Add pvpanic device driver
Quoted 9 lines · Christian Borntraeger
Quoted 4 lines · Hu Tao
pvpanic device is used to notify host(qemu) when guest panic happens.
Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Hu Tao <[email protected]>Another question: are you planning to provide libvirt support? Currently I see the guest as paused after a crash. Since there is a crashed state in libvirt it might make sense to use that.
Yep, patch for libvirt is in progress.
RFC PATCH 1/1 Wire up disabled wait a panicked event on s390
In reply to Hu TaoOn s390 the disabled wait state indicates a state of attention. For example Linux uses that state after a panic. Lets put the system into panicked state.
An alternative implementation would be to state disabled-wait <address> instead of pause in the action field. (e.g. z/OS, z/VM and other classic OSes use the address of the disabled wait to indicate an error code).
--- target-s390x/kvm.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
target-s390x/kvm.c +14 -3
@@ -34,6 +34,8 @@#include "sysemu/kvm.h" #include "cpu.h" #include "sysemu/device_tree.h" +#include "qapi/qmp/qjson.h" +#include "monitor/monitor.h" /* #define DEBUG_KVM */
@@ -705,9 +707,18 @@ static int handle_intercept(S390CPU *cpu) r =handle_instruction (cpu, run);break ;case ICPT_WAITPSW : -if (s390_del_running_cpu (cpu) ==0 && -is_special_wait_psw (cs)) { -qemu_system_shutdown_request (); +/* disabled wait, since enabled wait is handled in kernel */ +if (s390_del_running_cpu (cpu) ==0 ) { +if (is_special_wait_psw (cs)) { +qemu_system_shutdown_request (); + }else { +QObject *data; + + data =qobject_from_jsonf ("{ 'action': %s }" ,"pause" ); +monitor_protocol_event (QEVENT_GUEST_PANICKED , data); +qobject_decref (data); +vm_stop (RUN_STATE_GUEST_PANICKED ); + } } r =EXCP_HALTED ;break ;
Re: [Qemu-devel] [PATCH] [RFC] Wire up disabled wait a panicked event on s390
Quoted 35 lines · On Fri, 05 Apr 2013 10:42:38 +0200 Christian Borntraeger…
On s390 the disabled wait state indicates a state of attention. For example Linux uses that state after a panic. Lets put the system into panicked state.
An alternative implementation would be to state disabled-wait <address> instead of pause in the action field. (e.g. z/OS, z/VM and other classic OSes use the address of the disabled wait to indicate an error code).
Signed-off-by Christian Borntraeger <[email protected]>--- target-s390x/kvm.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)target-s390x/kvm.c +3
-3@@ -34,6 +34,8 @@#include "sysemu/kvm.h" #include "cpu.h" #include "sysemu/device_tree.h" +#include "qapi/qmp/qjson.h" +#include "monitor/monitor.h" /* #define DEBUG_KVM */ @@ -705,9 +707,18 @@ static int handle_intercept(S390CPU *cpu) r =handle_instruction (cpu, run);break ;case ICPT_WAITPSW : -if (s390_del_running_cpu (cpu) ==0 && -is_special_wait_psw (cs)) { -qemu_system_shutdown_request (); +/* disabled wait, since enabled wait is handled in kernel */
target-s390x/kvm.c static int handle_intercept(S390CPU *cpu) · line 720
Quoted 10 lines
target-s390x/kvm.c +10
-0+if (s390_del_running_cpu (cpu) ==0 ) { +if (is_special_wait_psw (cs)) { +qemu_system_shutdown_request (); + }else { +QObject *data; + + data =qobject_from_jsonf ("{ 'action': %s }" ,"pause" ); +monitor_protocol_event (QEVENT_GUEST_PANICKED , data); +qobject_decref (data); +vm_stop (RUN_STATE_GUEST_PANICKED );
This is on top of the pvpanic device, right?
Seems good to me, although I don't remember the exact semantics of the new event. Also, I think you could move this code to a function and share it with the pvpanic device.
Quoted 5 lines
target-s390x/kvm.c +1
-0+ } } r =EXCP_HALTED ;break ;