ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andrew Jones 2017-01-09 11:40:22 +00:00 committed by Peter Maydell
parent a72d436387
commit e9a8e474fb
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/arm/virt-acpi-build.c
View File

@ -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; AcpiBuildTables tables;
AcpiBuildState *build_state; AcpiBuildState *build_state;

8
hw/arm/virt.c
View File

@ -1131,9 +1131,9 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size)
return board->fdt; 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; uint8_t *smbios_tables, *smbios_anchor;
size_t smbios_tables_len, smbios_anchor_len; size_t smbios_tables_len, smbios_anchor_len;
const char *product = "QEMU Virtual Machine"; const char *product = "QEMU Virtual Machine";
@ -1166,8 +1166,8 @@ void virt_machine_done(Notifier *notifier, void *data)
VirtMachineState *vms = container_of(notifier, VirtMachineState, VirtMachineState *vms = container_of(notifier, VirtMachineState,
machine_done); machine_done);
virt_acpi_setup(&vms->acpi_guest_info); virt_acpi_setup(vms);
virt_build_smbios(&vms->acpi_guest_info); virt_build_smbios(vms);
} }
static void machvirt_init(MachineState *machine) static void machvirt_init(MachineState *machine)

2
include/hw/arm/virt.h
View File

@ -122,6 +122,6 @@ typedef struct {
#define VIRT_MACHINE_CLASS(klass) \ #define VIRT_MACHINE_CLASS(klass) \
OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE) 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 */ #endif /* QEMU_ARM_VIRT_H */