From 1f08d3fe2b08289b3cae10dc91a96b793272801b Mon Sep 17 00:00:00 2001 Message-Id: <1f08d3fe2b08289b3cae10dc91a96b793272801b.1387298827.git.minovotn@redhat.com> In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com> From: "Michael S. Tsirkin" Date: Tue, 17 Dec 2013 15:18:54 +0100 Subject: [PATCH 43/56] pvpanic: add API to access io port RH-Author: Michael S. Tsirkin Message-id: <1387293161-4085-44-git-send-email-mst@redhat.com> Patchwork-id: 56349 O-Subject: [PATCH qemu-kvm RHEL7.0 v2 43/57] pvpanic: add API to access io port Bugzilla: 1034876 RH-Acked-by: Igor Mammedov RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Laszlo Ersek Add API to find pvpanic device and get its io port. Will be used to fill in guest info structure. Reviewed-by: Gerd Hoffmann Tested-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Tested-by: Igor Mammedov Signed-off-by: Michael S. Tsirkin (cherry picked from commit 309cd62d6b2628b4f0e2850b42011077f40956c7) Conflicts: include/hw/i386/pc.h --- include/hw/i386/pc.h | 1 + hw/misc/pvpanic.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) Signed-off-by: Michal Novotny --- hw/misc/pvpanic.c | 14 +++++++++++++- include/hw/i386/pc.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 1838bc7..1377fde 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -19,6 +19,7 @@ #include "qemu/log.h" #include "hw/nvram/fw_cfg.h" +#include "hw/i386/pc.h" /* The bit of supported pv event */ #define PVPANIC_F_PANICKED 0 @@ -107,8 +108,19 @@ static int pvpanic_isa_initfn(ISADevice *dev) return 0; } +#define PVPANIC_IOPORT_PROP "ioport" + +uint16_t pvpanic_port(void) +{ + Object *o = object_resolve_path_type("", TYPE_ISA_PVPANIC_DEVICE, NULL); + if (!o) { + return 0; + } + return object_property_get_int(o, PVPANIC_IOPORT_PROP, NULL); +} + static Property pvpanic_isa_properties[] = { - DEFINE_PROP_UINT16("ioport", PVPanicState, ioport, 0x505), + DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index d78e45b..8793715 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -231,6 +231,7 @@ void pc_system_firmware_init(MemoryRegion *rom_memory); /* pvpanic.c */ void pvpanic_init(ISABus *bus); +uint16_t pvpanic_port(void); /* e820 types */ #define E820_RAM 1 -- 1.7.11.7