diff options
author | Andrew Jones <drjones@redhat.com> | 2017-01-09 11:40:23 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-09 11:40:23 +0000 |
commit | af1f60a4022664b0169f9d10a3f7d732e8571617 (patch) | |
tree | 141ff81f6dd292278297ebe95b7074411f6500b1 /include | |
parent | 4dad9e7478ec9614f7c1cbe2ff5c5f5101acd6e2 (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/hw/arm/virt.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index d200542d0d..eb1c63d688 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -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; |