aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Jones <drjones@redhat.com>2017-01-09 11:40:22 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-01-09 11:40:22 +0000
commite9a8e474fbdedca787623f0c55f7b6e9cb97bdfc (patch)
tree398b8846b70d6c10a742440235f6ce0f57fc9d3e
parenta72d4363875ed086acedab657d34f6fc82a7d8aa (diff)
downloadqemu-arm-e9a8e474fbdedca787623f0c55f7b6e9cb97bdfc.tar.gz
hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo
Only two functions take VirtGuestInfo parameters. Now that guest-info is part of VirtMachineState, and VirtMachineState is defined in the virt header, pass that instead. Signed-off-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Message-id: 20170102200153.28864-11-drjones@redhat.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/arm/virt-acpi-build.c3
-rw-r--r--hw/arm/virt.c8
-rw-r--r--include/hw/arm/virt.h2
3 files changed, 7 insertions, 6 deletions
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4fd52dac76..ac507d6589 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -823,8 +823,9 @@ static const VMStateDescription vmstate_virt_acpi_build = {
},
};
-void virt_acpi_setup(VirtGuestInfo *guest_info)
+void virt_acpi_setup(VirtMachineState *vms)
{
+ VirtGuestInfo *guest_info = &vms->acpi_guest_info;
AcpiBuildTables tables;
AcpiBuildState *build_state;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8556ff27c3..2201517de0 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1131,9 +1131,9 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size)
return board->fdt;
}
-static void virt_build_smbios(VirtGuestInfo *guest_info)
+static void virt_build_smbios(VirtMachineState *vms)
{
- FWCfgState *fw_cfg = guest_info->fw_cfg;
+ FWCfgState *fw_cfg = vms->acpi_guest_info.fw_cfg;
uint8_t *smbios_tables, *smbios_anchor;
size_t smbios_tables_len, smbios_anchor_len;
const char *product = "QEMU Virtual Machine";
@@ -1166,8 +1166,8 @@ void virt_machine_done(Notifier *notifier, void *data)
VirtMachineState *vms = container_of(notifier, VirtMachineState,
machine_done);
- virt_acpi_setup(&vms->acpi_guest_info);
- virt_build_smbios(&vms->acpi_guest_info);
+ virt_acpi_setup(vms);
+ virt_build_smbios(vms);
}
static void machvirt_init(MachineState *machine)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 91dbd69def..b1eed52d3b 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -122,6 +122,6 @@ typedef struct {
#define VIRT_MACHINE_CLASS(klass) \
OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE)
-void virt_acpi_setup(VirtGuestInfo *guest_info);
+void virt_acpi_setup(VirtMachineState *vms);
#endif /* QEMU_ARM_VIRT_H */