We are going to introduce a wide data register for fw_cfg, but only for the MMIO mapped device. The wide data register will also require the tightening of endiannesses. However we don't want to touch the I/O port mapped fw_cfg device at all. Currently QEMU provides a single fw_cfg device type that can handle both I/O port and MMIO mapping. This flexibility is not actually exploited by any board in the tree, but it renders restricting the above changes to MMIO very hard. Therefore, let's derive two classes from TYPE_FW_CFG: TYPE_FW_CFG_IO and TYPE_FW_CFG_MEM. TYPE_FW_CFG_IO incorporates the base I/O port and the related combined MemoryRegion. (NB: all boards in the tree that use the I/O port mapped flavor opt for the combined mapping; that is, when the data port overlays the high address byte of the selector port. Therefore we can drop the capability to map those I/O ports separately.) TYPE_FW_CFG_MEM incorporates the base addresses for the MMIO selector and data registers, and their respective MemoryRegions. The "realize" and "props" class members are specific to each new derived class, and become unused for the base class. The base class retains the "reset" member and the "vmsd" member, because the reset functionality and the set of migrated data are not specific to the mapping. The new functions fw_cfg_init_io() and fw_cfg_init_mem() expose the possible mappings in separation. For now fw_cfg_init() is retained as a compatibility shim that enforces the above assumptions. Signed-off-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1419250305-31062-2-git-send-email-pbonzini@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
80 lines
3 KiB
C
80 lines
3 KiB
C
#ifndef QEMU_TYPEDEFS_H
|
|
#define QEMU_TYPEDEFS_H
|
|
|
|
/* A load of opaque types so that device init declarations don't have to
|
|
pull in all the real definitions. */
|
|
struct Monitor;
|
|
|
|
/* Please keep this list in alphabetical order */
|
|
typedef struct AdapterInfo AdapterInfo;
|
|
typedef struct AddressSpace AddressSpace;
|
|
typedef struct AioContext AioContext;
|
|
typedef struct AudioState AudioState;
|
|
typedef struct BlockBackend BlockBackend;
|
|
typedef struct BlockDriverState BlockDriverState;
|
|
typedef struct BusClass BusClass;
|
|
typedef struct BusState BusState;
|
|
typedef struct CharDriverState CharDriverState;
|
|
typedef struct CompatProperty CompatProperty;
|
|
typedef struct DeviceState DeviceState;
|
|
typedef struct DisplayChangeListener DisplayChangeListener;
|
|
typedef struct DisplayState DisplayState;
|
|
typedef struct DisplaySurface DisplaySurface;
|
|
typedef struct DriveInfo DriveInfo;
|
|
typedef struct EventNotifier EventNotifier;
|
|
typedef struct FWCfgIoState FWCfgIoState;
|
|
typedef struct FWCfgMemState FWCfgMemState;
|
|
typedef struct FWCfgState FWCfgState;
|
|
typedef struct HCIInfo HCIInfo;
|
|
typedef struct I2CBus I2CBus;
|
|
typedef struct I2SCodec I2SCodec;
|
|
typedef struct ISABus ISABus;
|
|
typedef struct ISADevice ISADevice;
|
|
typedef struct MACAddr MACAddr;
|
|
typedef struct MachineClass MachineClass;
|
|
typedef struct MachineState MachineState;
|
|
typedef struct MemoryListener MemoryListener;
|
|
typedef struct MemoryMappingList MemoryMappingList;
|
|
typedef struct MemoryRegion MemoryRegion;
|
|
typedef struct MemoryRegionSection MemoryRegionSection;
|
|
typedef struct MigrationParams MigrationParams;
|
|
typedef struct Monitor Monitor;
|
|
typedef struct MouseTransformInfo MouseTransformInfo;
|
|
typedef struct MSIMessage MSIMessage;
|
|
typedef struct NetClientState NetClientState;
|
|
typedef struct NICInfo NICInfo;
|
|
typedef struct PcGuestInfo PcGuestInfo;
|
|
typedef struct PCIBridge PCIBridge;
|
|
typedef struct PCIBus PCIBus;
|
|
typedef struct PCIDevice PCIDevice;
|
|
typedef struct PCIEAERErr PCIEAERErr;
|
|
typedef struct PCIEAERLog PCIEAERLog;
|
|
typedef struct PCIEAERMsg PCIEAERMsg;
|
|
typedef struct PCIEPort PCIEPort;
|
|
typedef struct PCIESlot PCIESlot;
|
|
typedef struct PCIExpressDevice PCIExpressDevice;
|
|
typedef struct PCIExpressHost PCIExpressHost;
|
|
typedef struct PCIHostState PCIHostState;
|
|
typedef struct PCMCIACardState PCMCIACardState;
|
|
typedef struct PixelFormat PixelFormat;
|
|
typedef struct PropertyInfo PropertyInfo;
|
|
typedef struct Property Property;
|
|
typedef struct QEMUBH QEMUBH;
|
|
typedef struct QemuConsole QemuConsole;
|
|
typedef struct QEMUFile QEMUFile;
|
|
typedef struct QEMUMachine QEMUMachine;
|
|
typedef struct QEMUSGList QEMUSGList;
|
|
typedef struct QEMUSizedBuffer QEMUSizedBuffer;
|
|
typedef struct QEMUTimerListGroup QEMUTimerListGroup;
|
|
typedef struct QEMUTimer QEMUTimer;
|
|
typedef struct Range Range;
|
|
typedef struct SerialState SerialState;
|
|
typedef struct SHPCDevice SHPCDevice;
|
|
typedef struct SMBusDevice SMBusDevice;
|
|
typedef struct SSIBus SSIBus;
|
|
typedef struct uWireSlave uWireSlave;
|
|
typedef struct VirtIODevice VirtIODevice;
|
|
typedef struct Visitor Visitor;
|
|
|
|
#endif /* QEMU_TYPEDEFS_H */
|