This includes some pci enhancements: Better support for systems with multiple PCI root buses FW cfg interface for more robust pci programming in BIOS Minor fixes/cleanups for fw cfg and cross-version migration - because of dependencies with other patches Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) iQEcBAABAgAGBQJR2ctmAAoJECgfDbjSjVRpQpAH/Rk00yLrQ2R5ScNa8AL9LeaJ gVFndBmmuRz4gdhyATx6lzR98ic32iTr0+YR5mL51btgmM5a0bEd/SIu34nXriWj PsM0wdXfo/oEygdttxhvzJOH17tohRV9xg2WA2d8BEwDzrDyqoQ4J0VJlHlG7u3W nq4KVDVUpLNQFKG8ZgJ2vW0WMw/mBSj2rluhQUALhcuvChphtvAFZ2rsSfJr6bzD aBELrtIvfLvPGN/0WVeYs9qlp4EE03H3X6gN61QvV3/YElxubKUV5XyMDOX2dW3D 2j0NQi84LYHn0SFap2r/Kgm47/F6Q56SFk5lrgZrg60mhQTwocw7PfL8CGxjXRI= =gxxc -----END PGP SIGNATURE----- Merge remote-tracking branch 'mst/tags/for_anthony' into staging pci,misc enhancements This includes some pci enhancements: Better support for systems with multiple PCI root buses FW cfg interface for more robust pci programming in BIOS Minor fixes/cleanups for fw cfg and cross-version migration - because of dependencies with other patches Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Sun 07 Jul 2013 03:11:18 PM CDT using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By David Gibson (10) and others # Via Michael S. Tsirkin * mst/tags/for_anthony: pci: Fold host_buses list into PCIHostState functionality pci: Remove domain from PCIHostBus pci: Simpler implementation of primary PCI bus pci: Add root bus parameter to pci_nic_init() pci: Add root bus argument to pci_get_bus_devfn() pci: Replace pci_find_domain() with more general pci_root_bus_path() pci: Use helper to find device's root bus in pci_find_domain() pci: Abolish pci_find_root_bus() pci: Move pci_read_devaddr to pci-hotplug-old.c pci: Cleanup configuration for pci-hotplug.c pvpanic: fix fwcfg for big endian hosts pvpanic: initialization cleanup MAINTAINERS: s/Marcelo/Paolo/ e1000: cleanup process_tx_desc pc_piix: cleanup init compat handling pc: pass PCI hole ranges to Guests pci: store PCI hole ranges in guestinfo structure range: add Range structure Message-id: 1373228271-31223-1-git-send-email-mst@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
153 lines
3.6 KiB
C
153 lines
3.6 KiB
C
/*
|
|
* QEMU simulated pvpanic device.
|
|
*
|
|
* Copyright Fujitsu, Corp. 2013
|
|
*
|
|
* Authors:
|
|
* Wen Congyang <wency@cn.fujitsu.com>
|
|
* Hu Tao <hutao@cn.fujitsu.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qapi/qmp/qobject.h"
|
|
#include "qapi/qmp/qjson.h"
|
|
#include "monitor/monitor.h"
|
|
#include "sysemu/sysemu.h"
|
|
#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
|
|
|
|
/* The pv event value */
|
|
#define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
|
|
|
|
#define TYPE_ISA_PVPANIC_DEVICE "pvpanic"
|
|
#define ISA_PVPANIC_DEVICE(obj) \
|
|
OBJECT_CHECK(PVPanicState, (obj), TYPE_ISA_PVPANIC_DEVICE)
|
|
|
|
static void panicked_mon_event(const char *action)
|
|
{
|
|
QObject *data;
|
|
|
|
data = qobject_from_jsonf("{ 'action': %s }", action);
|
|
monitor_protocol_event(QEVENT_GUEST_PANICKED, data);
|
|
qobject_decref(data);
|
|
}
|
|
|
|
static void handle_event(int event)
|
|
{
|
|
static bool logged;
|
|
|
|
if (event & ~PVPANIC_PANICKED && !logged) {
|
|
qemu_log_mask(LOG_GUEST_ERROR, "pvpanic: unknown event %#x.\n", event);
|
|
logged = true;
|
|
}
|
|
|
|
if (event & PVPANIC_PANICKED) {
|
|
panicked_mon_event("pause");
|
|
vm_stop(RUN_STATE_GUEST_PANICKED);
|
|
return;
|
|
}
|
|
}
|
|
|
|
#include "hw/isa/isa.h"
|
|
|
|
typedef struct PVPanicState {
|
|
ISADevice parent_obj;
|
|
|
|
MemoryRegion io;
|
|
uint16_t ioport;
|
|
} PVPanicState;
|
|
|
|
/* return supported events on read */
|
|
static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned size)
|
|
{
|
|
return PVPANIC_PANICKED;
|
|
}
|
|
|
|
static void pvpanic_ioport_write(void *opaque, hwaddr addr, uint64_t val,
|
|
unsigned size)
|
|
{
|
|
handle_event(val);
|
|
}
|
|
|
|
static const MemoryRegionOps pvpanic_ops = {
|
|
.read = pvpanic_ioport_read,
|
|
.write = pvpanic_ioport_write,
|
|
.impl = {
|
|
.min_access_size = 1,
|
|
.max_access_size = 1,
|
|
},
|
|
};
|
|
|
|
static void pvpanic_isa_initfn(Object *obj)
|
|
{
|
|
PVPanicState *s = ISA_PVPANIC_DEVICE(obj);
|
|
|
|
memory_region_init_io(&s->io, OBJECT(s), &pvpanic_ops, s, "pvpanic", 1);
|
|
}
|
|
|
|
static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
ISADevice *d = ISA_DEVICE(dev);
|
|
PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
|
|
|
|
isa_register_ioport(d, &s->io, s->ioport);
|
|
}
|
|
|
|
static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg)
|
|
{
|
|
PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
|
|
uint16_t *pvpanic_port = g_malloc(sizeof(*pvpanic_port));
|
|
*pvpanic_port = cpu_to_le16(s->ioport);
|
|
|
|
fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", pvpanic_port,
|
|
sizeof(*pvpanic_port));
|
|
}
|
|
|
|
void pvpanic_init(ISABus *bus)
|
|
{
|
|
ISADevice *dev;
|
|
FWCfgState *fw_cfg = fw_cfg_find();
|
|
if (!fw_cfg) {
|
|
return;
|
|
}
|
|
dev = isa_create_simple (bus, TYPE_ISA_PVPANIC_DEVICE);
|
|
pvpanic_fw_cfg(dev, fw_cfg);
|
|
}
|
|
|
|
static Property pvpanic_isa_properties[] = {
|
|
DEFINE_PROP_UINT16("ioport", PVPanicState, ioport, 0x505),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void pvpanic_isa_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->realize = pvpanic_isa_realizefn;
|
|
dc->no_user = 1;
|
|
dc->props = pvpanic_isa_properties;
|
|
}
|
|
|
|
static TypeInfo pvpanic_isa_info = {
|
|
.name = TYPE_ISA_PVPANIC_DEVICE,
|
|
.parent = TYPE_ISA_DEVICE,
|
|
.instance_size = sizeof(PVPanicState),
|
|
.instance_init = pvpanic_isa_initfn,
|
|
.class_init = pvpanic_isa_class_init,
|
|
};
|
|
|
|
static void pvpanic_register_types(void)
|
|
{
|
|
type_register_static(&pvpanic_isa_info);
|
|
}
|
|
|
|
type_init(pvpanic_register_types)
|