diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-04 09:26:29 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-04 09:26:29 -0500 |
| commit | e47dccc64b6ca570e4db96fd5fdb3bef251eb559 (patch) | |
| tree | fc2730c03eff0d93d0af7c8ee2327f4f7b0d14ea /hw/misc/pvpanic.c | |
| parent | 171392406d8e230d62e5ebf4805f71460854b8ec (diff) | |
| parent | c3c4fe35be9f6c37388ba7615c6c33e8f4034438 (diff) | |
| download | qemu-e47dccc64b6ca570e4db96fd5fdb3bef251eb559.zip qemu-e47dccc64b6ca570e4db96fd5fdb3bef251eb559.tar.gz qemu-e47dccc64b6ca570e4db96fd5fdb3bef251eb559.tar.bz2 | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
pci: misc cleanups
This includes some pci-related cleanups,
and fw cfg cleanups which will be useful for on-going
pci related work.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Sun 02 Jun 2013 02:46:52 PM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found
# By Michael S. Tsirkin (8) and Laszlo Ersek (1)
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
pvpanic: use FWCfgState explicitly
fw_cfg: fw_cfg is a singleton
fw_cfg: add API to find FW cfg object
fw_cfg: move typedef to qemu/typedefs.h
refer to FWCfgState explicitly
apic: rename apic specific bitopts
firmware_abi: move to include/hw/nvram/
dec.c - move to pci-bridge
q35: set fw_name
Message-id: 1370202787-3712-1-git-send-email-mst@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/misc/pvpanic.c')
| -rw-r--r-- | hw/misc/pvpanic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 31e1b1d..910e44f 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -90,13 +90,13 @@ static int pvpanic_isa_initfn(ISADevice *dev) { PVPanicState *s = ISA_PVPANIC_DEVICE(dev); static bool port_configured; - void *fw_cfg; + FWCfgState *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); + fw_cfg = fw_cfg_find(); if (fw_cfg) { fw_cfg_add_file(fw_cfg, "etc/pvpanic-port", g_memdup(&s->ioport, sizeof(s->ioport)), |