From af1f60a4022664b0169f9d10a3f7d732e8571617 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 9 Jan 2017 11:40:23 +0000 Subject: 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 Acked-by: Michael S. Tsirkin Message-id: 20170102200153.28864-14-drjones@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'include/hw/arm') 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; -- cgit v1.2.3-55-g7522