hw/arm/virt: remove VirtGuestInfo

by moving VirtGuestInfo.fw_cfg to VirtMachineState. This is the
mach-virt equivalent of "pc: Move PcGuestInfo.fw_cfg to
PCMachineState" and "pc: Eliminate PcGuestInfo struct" combined.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 20170102200153.28864-14-drjones@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andrew Jones 2017-01-09 11:40:23 +00:00 committed by Peter Maydell
parent 4dad9e7478
commit af1f60a402
3 changed files with 11 additions and 18 deletions

View file

@ -77,10 +77,6 @@ typedef struct MemMapEntry {
hwaddr size;
} MemMapEntry;
typedef struct VirtGuestInfo {
FWCfgState *fw_cfg;
} VirtGuestInfo;
typedef struct {
MachineClass parent;
bool disallow_affinity_adjustment;
@ -91,8 +87,8 @@ typedef struct {
typedef struct {
MachineState parent;
VirtGuestInfo acpi_guest_info;
Notifier machine_done;
FWCfgState *fw_cfg;
bool secure;
bool highmem;
int32_t gic_version;