From da4f09a7dce6878b6fd27a0fb70d08701551df17 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 9 Jan 2017 11:40:22 +0000 Subject: hw/arm/virt-acpi-build: remove redundant members from VirtGuestInfo Now that we pass VirtMachineState, and guest-info is just part of that state, we can remove all the redundant members and access the VirtMachineState directly. Signed-off-by: Andrew Jones Reviewed-by: Igor Mammedov Acked-by: Michael S. Tsirkin Message-id: 20170102200153.28864-12-drjones@redhat.com Signed-off-by: Peter Maydell --- hw/arm/virt.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'hw/arm/virt.c') diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 2201517de0..6832b8befc 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1372,13 +1372,7 @@ static void machvirt_init(MachineState *machine) create_fw_cfg(vms, &address_space_memory); rom_set_fw(fw_cfg_find()); - guest_info->smp_cpus = smp_cpus; guest_info->fw_cfg = fw_cfg_find(); - guest_info->memmap = vms->memmap; - guest_info->irqmap = vms->irqmap; - guest_info->use_highmem = vms->highmem; - guest_info->gic_version = vms->gic_version; - guest_info->no_its = vmc->no_its; vms->machine_done.notify = virt_machine_done; qemu_add_machine_init_done_notifier(&vms->machine_done); -- cgit 1.4.1