[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH 10/11] hw/arm/virt: remove VirtGuestInfo
From: |
Andrew Jones |
Subject: |
Re: [Qemu-arm] [PATCH 10/11] hw/arm/virt: remove VirtGuestInfo |
Date: |
Thu, 15 Dec 2016 17:27:48 +0100 |
User-agent: |
Mutt/1.6.0.1 (2016-04-01) |
On Thu, Dec 15, 2016 at 03:59:35PM +0100, Igor Mammedov wrote:
> On Tue, 13 Dec 2016 22:45:21 +0100
> Andrew Jones <address@hidden> wrote:
>
> > 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>
> > ---
> > hw/arm/virt-acpi-build.c | 7 +++----
> > hw/arm/virt.c | 18 +++++++-----------
> > include/hw/arm/virt.h | 6 +-----
> > 3 files changed, 11 insertions(+), 20 deletions(-)
> >
> > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> > index 137781646bec..0e6caf5f1083 100644
> > --- a/hw/arm/virt-acpi-build.c
> > +++ b/hw/arm/virt-acpi-build.c
> > @@ -826,11 +826,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;
> > }
> > @@ -855,8 +854,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 2cb2e5b4f52a..348e23ff663c 100644
> > --- a/hw/arm/virt.c
> > +++ b/hw/arm/virt.c
> > @@ -914,15 +914,14 @@ static void create_flash(const VirtMachineState *vms,
> > }
> > }
> >
> > -static void create_fw_cfg(const VirtMachineState *vms, AddressSpace *as)
> > +static void create_fw_cfg(VirtMachineState *vms, AddressSpace *as)
> > {
> > hwaddr base = vms->memmap[VIRT_FW_CFG].base;
> > hwaddr size = vms->memmap[VIRT_FW_CFG].size;
> > - FWCfgState *fw_cfg;
> > char *nodename;
> >
> > - fw_cfg = fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as);
> > - fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, (uint16_t)vms->smp_cpus);
> > + vms->fw_cfg = fw_cfg_init_mem_wide(base + 8, base, 8, base + 16, as);
> > + fw_cfg_add_i16(vms->fw_cfg, FW_CFG_NB_CPUS, (uint16_t)vms->smp_cpus);
> >
> > nodename = g_strdup_printf("/address@hidden" PRIx64, base);
> > qemu_fdt_add_subnode(vms->fdt, nodename);
> > @@ -1158,12 +1157,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;
> > }
> >
> > @@ -1178,9 +1176,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);
> > }
> > }
> > @@ -1205,7 +1203,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;
> > @@ -1414,9 +1411,8 @@ static void machvirt_init(MachineState *machine)
> > create_virtio_devices(vms, pic);
> >
> > create_fw_cfg(vms, &address_space_memory);
>
> above would look clearer as:
> vms->fw_cfg = create_fw_cfg(vms, &address_space_memory);
Agreed, only none of the other create_* functions in this
file have return values... Anyway, I'm fine either way.
Thanks,
drew
>
> > - rom_set_fw(fw_cfg_find());
> > + 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 52b35478223e..ece3260bfeb5 100644
> > --- a/include/hw/arm/virt.h
> > +++ b/include/hw/arm/virt.h
> > @@ -81,10 +81,6 @@ typedef struct MemMapEntry {
> > hwaddr size;
> > } MemMapEntry;
> >
> > -typedef struct VirtGuestInfo {
> > - FWCfgState *fw_cfg;
> > -} VirtGuestInfo;
> > -
> > typedef struct {
> > MachineClass parent;
> > bool disallow_affinity_adjustment;
> > @@ -95,8 +91,8 @@ typedef struct {
> >
> > typedef struct {
> > MachineState parent;
> > - VirtGuestInfo acpi_guest_info;
> > Notifier machine_done;
> > + FWCfgState *fw_cfg;
> > bool secure;
> > bool highmem;
> > bool virt;
>
- [Qemu-arm] [PATCH 06/11] hw/arm/virt: move VirtMachineState/Class to virt.h, (continued)
- [Qemu-arm] [PATCH 08/11] hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo, Andrew Jones, 2016/12/13
- [Qemu-arm] [PATCH 10/11] hw/arm/virt: remove VirtGuestInfo, Andrew Jones, 2016/12/13
- [Qemu-arm] [PATCH 09/11] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState, Andrew Jones, 2016/12/13
- [Qemu-arm] [PATCH 11/11] hw/arm/virt-acpi-build: Don't incorrectly claim architectural timer to be edge-triggered, Andrew Jones, 2016/12/13
- Re: [Qemu-arm] [PATCH 00/11] Remove VirtGuestInfo, Michael S. Tsirkin, 2016/12/15