[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 13/16] hw/arm/virt: remove VirtGuestInfo
From: |
Andrew Jones |
Subject: |
[Qemu-arm] [PATCH v2 13/16] hw/arm/virt: remove VirtGuestInfo |
Date: |
Mon, 2 Jan 2017 21:01:50 +0100 |
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 <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
---
hw/arm/virt-acpi-build.c | 7 +++----
hw/arm/virt.c | 16 +++++++---------
include/hw/arm/virt.h | 6 +-----
3 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 0b9c2c0d0a3b..aa800d2a9657 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -825,11 +825,10 @@ static const VMStateDescription vmstate_virt_acpi_build =
{
void virt_acpi_setup(VirtMachineState *vms)
{
- VirtGuestInfo *guest_info = &vms->acpi_guest_info;
AcpiBuildTables tables;
AcpiBuildState *build_state;
- if (!guest_info->fw_cfg) {
+ if (!vms->fw_cfg) {
trace_virt_acpi_setup();
return;
}
@@ -854,8 +853,8 @@ void virt_acpi_setup(VirtMachineState *vms)
acpi_add_rom_blob(build_state, tables.linker->cmd_blob,
"etc/table-loader", 0);
- fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE,
- tables.tcpalog->data, acpi_data_len(tables.tcpalog));
+ fw_cfg_add_file(vms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, tables.tcpalog->data,
+ acpi_data_len(tables.tcpalog));
build_state->rsdp_mr = acpi_add_rom_blob(build_state, tables.rsdp,
ACPI_BUILD_RSDP_FILE, 0);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 909d87fbff57..709da403a6fc 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -913,7 +913,7 @@ static void create_flash(const VirtMachineState *vms,
}
}
-static void create_fw_cfg(const VirtMachineState *vms, AddressSpace *as)
+static FWCfgState *create_fw_cfg(const VirtMachineState *vms, AddressSpace *as)
{
hwaddr base = vms->memmap[VIRT_FW_CFG].base;
hwaddr size = vms->memmap[VIRT_FW_CFG].size;
@@ -930,6 +930,7 @@ static void create_fw_cfg(const VirtMachineState *vms,
AddressSpace *as)
qemu_fdt_setprop_sized_cells(vms->fdt, nodename, "reg",
2, base, 2, size);
g_free(nodename);
+ return fw_cfg;
}
static void create_pcie_irq_map(const VirtMachineState *vms,
@@ -1157,12 +1158,11 @@ static void *machvirt_dtb(const struct arm_boot_info
*binfo, int *fdt_size)
static void virt_build_smbios(VirtMachineState *vms)
{
- 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";
- if (!fw_cfg) {
+ if (!vms->fw_cfg) {
return;
}
@@ -1177,9 +1177,9 @@ static void virt_build_smbios(VirtMachineState *vms)
&smbios_anchor, &smbios_anchor_len);
if (smbios_anchor) {
- fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-tables",
+ fw_cfg_add_file(vms->fw_cfg, "etc/smbios/smbios-tables",
smbios_tables, smbios_tables_len);
- fw_cfg_add_file(fw_cfg, "etc/smbios/smbios-anchor",
+ fw_cfg_add_file(vms->fw_cfg, "etc/smbios/smbios-anchor",
smbios_anchor, smbios_anchor_len);
}
}
@@ -1204,7 +1204,6 @@ static void machvirt_init(MachineState *machine)
int n, virt_max_cpus;
MemoryRegion *ram = g_new(MemoryRegion, 1);
const char *cpu_model = machine->cpu_model;
- VirtGuestInfo *guest_info = &vms->acpi_guest_info;
char **cpustr;
ObjectClass *oc;
const char *typename;
@@ -1412,10 +1411,9 @@ static void machvirt_init(MachineState *machine)
*/
create_virtio_devices(vms, pic);
- create_fw_cfg(vms, &address_space_memory);
- rom_set_fw(fw_cfg_find());
+ vms->fw_cfg = create_fw_cfg(vms, &address_space_memory);
+ rom_set_fw(vms->fw_cfg);
- guest_info->fw_cfg = fw_cfg_find();
vms->machine_done.notify = virt_machine_done;
qemu_add_machine_init_done_notifier(&vms->machine_done);
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 23f11776a557..8f67794d4e65 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -79,10 +79,6 @@ typedef struct MemMapEntry {
hwaddr size;
} MemMapEntry;
-typedef struct VirtGuestInfo {
- FWCfgState *fw_cfg;
-} VirtGuestInfo;
-
typedef struct {
MachineClass parent;
bool disallow_affinity_adjustment;
@@ -93,8 +89,8 @@ typedef struct {
typedef struct {
MachineState parent;
- VirtGuestInfo acpi_guest_info;
Notifier machine_done;
+ FWCfgState *fw_cfg;
bool secure;
bool highmem;
bool virt;
--
2.9.3
- [Qemu-arm] [PATCH v2 03/16] hw/arm/virt-acpi-build: gtdt: improve flag naming, (continued)
- [Qemu-arm] [PATCH v2 03/16] hw/arm/virt-acpi-build: gtdt: improve flag naming, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 04/16] hw/arm/virt-acpi-build: fadt: improve flag naming, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 05/16] hw/arm/virt: parameter passing cleanups, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 06/16] hw/arm/virt: use VirtMachineState.gic_version, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 07/16] hw/arm/virt: eliminate struct VirtGuestInfoState, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 08/16] hw/arm/virt: remove include/hw/arm/virt-acpi-build.h, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 10/16] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 09/16] hw/arm/virt: move VirtMachineState/Class to virt.h, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 12/16] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 11/16] hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 13/16] hw/arm/virt: remove VirtGuestInfo,
Andrew Jones <=
- [Qemu-arm] [PATCH v2 15/16] hw/arm/virt-acpi-build: use SMC if booting in EL2, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 14/16] hw/arm/virt-acpi-build: Don't incorrectly claim architectural timer to be edge-triggered, Andrew Jones, 2017/01/02
- [Qemu-arm] [PATCH v2 16/16] hw/arm/virt-acpi-build: madt: add vgic maint irq, Andrew Jones, 2017/01/02
- Re: [Qemu-arm] [PATCH v2 00/16] Remove VirtGuestInfo, Peter Maydell, 2017/01/06