[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/21] hw/arm/virt: pass VirtMachineState instead of
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 15/21] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo |
Date: |
Mon, 9 Jan 2017 11:53:38 +0000 |
From: Andrew Jones <address@hidden>
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 <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
include/hw/arm/virt.h | 2 +-
hw/arm/virt-acpi-build.c | 3 ++-
hw/arm/virt.c | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 91dbd69..b1eed52 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 */
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 4fd52da..ac507d6 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 8556ff2..2201517 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)
--
2.7.4
- [Qemu-devel] [PULL 18/21] hw/arm/virt: remove VirtGuestInfo, (continued)
- [Qemu-devel] [PULL 18/21] hw/arm/virt: remove VirtGuestInfo, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 20/21] m25p80: don't let rogue SPI controllers cause buffer overruns, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 21/21] hw/ssi/imx_spi.c: Remove MSGDATA register support, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 19/21] hw/arm/virt-acpi-build: Don't incorrectly claim architectural timer to be edge-triggered, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 17/21] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 14/21] hw/arm/virt: move VirtMachineState/Class to virt.h, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 12/21] hw/arm/virt: eliminate struct VirtGuestInfoState, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 11/21] hw/arm/virt: use VirtMachineState.gic_version, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 09/21] hw/arm/virt-acpi-build: fadt: improve flag naming, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 07/21] hw/arm/virt-acpi-build: name GIC CPU Interface Structure appropriately, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 15/21] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo,
Peter Maydell <=
- [Qemu-devel] [PULL 05/21] hw/arm/virt: Don't incorrectly claim architectural timer to be edge-triggered, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 16/21] hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 10/21] hw/arm/virt: parameter passing cleanups, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 13/21] hw/arm/virt: remove include/hw/arm/virt-acpi-build.h, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 08/21] hw/arm/virt-acpi-build: gtdt: improve flag naming, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 03/21] hw/arm/virt: Merge VirtBoardInfo and VirtMachineState, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 04/21] hw/arm/virt: Rename 'vbi' variables to 'vms', Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 06/21] hw/arm/virt-acpi-build: add all missing cpu_to_le's, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 01/21] i2c: Allow I2C devices to NAK start events, Peter Maydell, 2017/01/09
- [Qemu-devel] [PULL 02/21] hw/char: QOM'ify exynos4210_uart.c, Peter Maydell, 2017/01/09