[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/21] pvpanic: initialization cleanup
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 09/21] pvpanic: initialization cleanup |
Date: |
Thu, 20 Jun 2013 16:10:35 +0300 |
Avoid use of static variables: PC systems
initialize pvpanic device through pvpanic_init,
so we can simply create the fw_cfg file at that point.
This also makes it possible to skip device
creation completely if fw_cfg is not there, e.g. for xen -
so the ports it reserves are not discoverable by guests.
Also, make pvpanic_init void since callers ignore return
status anyway.
Cc: Stefano Stabellini <address@hidden>
Cc: Laszlo Ersek <address@hidden>
Cc: Paul Durrant <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/misc/pvpanic.c | 30 ++++++++++++++++--------------
include/hw/i386/pc.h | 2 +-
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index 060099b..83ed226 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -97,26 +97,28 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error
**errp)
{
ISADevice *d = ISA_DEVICE(dev);
PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
- static bool port_configured;
- FWCfgState *fw_cfg;
isa_register_ioport(d, &s->io, s->ioport);
+}
- if (!port_configured) {
- fw_cfg = fw_cfg_find();
- 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;
- }
- }
+static void pvpanic_fw_cfg(ISADevice *dev, FWCfgState *fw_cfg)
+{
+ PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
+
+ fw_cfg_add_file(fw_cfg, "etc/pvpanic-port",
+ g_memdup(&s->ioport, sizeof(s->ioport)),
+ sizeof(s->ioport));
}
-int pvpanic_init(ISABus *bus)
+void pvpanic_init(ISABus *bus)
{
- isa_create_simple(bus, TYPE_ISA_PVPANIC_DEVICE);
- return 0;
+ 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[] = {
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index ba9ba1a..458eded 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -196,7 +196,7 @@ static inline bool isa_ne2000_init(ISABus *bus, int base,
int irq, NICInfo *nd)
void pc_system_firmware_init(MemoryRegion *rom_memory);
/* pvpanic.c */
-int pvpanic_init(ISABus *bus);
+void pvpanic_init(ISABus *bus);
/* e820 types */
#define E820_RAM 1
--
MST
- [Qemu-devel] [PULL 00/21] pci,net,misc enhancements, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 01/21] range: add Range structure, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 03/21] pc: pass PCI hole ranges to Guests, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 04/21] pc_piix: cleanup init compat handling, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 05/21] e1000: cleanup process_tx_desc, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 06/21] kvm: zero-initialize KVM_SET_GSI_ROUTING input, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 07/21] kvm: skip system call when msi route is unchanged, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 08/21] MAINTAINERS: s/Marcelo/Paolo/, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 09/21] pvpanic: initialization cleanup,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/21] pvpanic: fix fwcfg for big endian hosts, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 13/21] pci: Move pci_read_devaddr to pci-hotplug-old.c, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 14/21] pci: Abolish pci_find_root_bus(), Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 15/21] pci: Use helper to find device's root bus in pci_find_domain(), Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 16/21] pci: Replace pci_find_domain() with more general pci_root_bus_path(), Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 17/21] pci: Add root bus argument to pci_get_bus_devfn(), Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 19/21] pci: Simpler implementation of primary PCI bus, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 20/21] pci: Remove domain from PCIHostBus, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 21/21] pci: Fold host_buses list into PCIHostState functionality, Michael S. Tsirkin, 2013/06/20
- [Qemu-devel] [PULL 18/21] pci: Add root bus parameter to pci_nic_init(), Michael S. Tsirkin, 2013/06/20