hw/arm/virt: remove include/hw/arm/virt-acpi-build.h
include/hw/arm/virt-acpi-build.h is only used for VirtGuestInfo, which doesn't even necessarily have to be ACPI specific. Move VirtGuestInfo to include/hw/arm/virt.h, allowing us to remove include/hw/arm/virt-acpi-build.h, and to prepare for even more code motion. 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-9-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:
parent
054f4dc961
commit
d05fdab46d
|
@ -508,7 +508,6 @@ M: Shannon Zhao <shannon.zhao@linaro.org>
|
||||||
L: qemu-arm@nongnu.org
|
L: qemu-arm@nongnu.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: hw/arm/virt-acpi-build.c
|
F: hw/arm/virt-acpi-build.c
|
||||||
F: include/hw/arm/virt-acpi-build.h
|
|
||||||
|
|
||||||
STM32F205
|
STM32F205
|
||||||
M: Alistair Francis <alistair@alistair23.me>
|
M: Alistair Francis <alistair@alistair23.me>
|
||||||
|
@ -885,7 +884,6 @@ F: hw/acpi/*
|
||||||
F: hw/smbios/*
|
F: hw/smbios/*
|
||||||
F: hw/i386/acpi-build.[hc]
|
F: hw/i386/acpi-build.[hc]
|
||||||
F: hw/arm/virt-acpi-build.c
|
F: hw/arm/virt-acpi-build.c
|
||||||
F: include/hw/arm/virt-acpi-build.h
|
|
||||||
|
|
||||||
ppc4xx
|
ppc4xx
|
||||||
M: Alexander Graf <agraf@suse.de>
|
M: Alexander Graf <agraf@suse.de>
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "hw/arm/virt-acpi-build.h"
|
|
||||||
#include "qemu/bitmap.h"
|
#include "qemu/bitmap.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "qom/cpu.h"
|
#include "qom/cpu.h"
|
||||||
|
@ -43,6 +42,7 @@
|
||||||
#include "hw/acpi/aml-build.h"
|
#include "hw/acpi/aml-build.h"
|
||||||
#include "hw/pci/pcie_host.h"
|
#include "hw/pci/pcie_host.h"
|
||||||
#include "hw/pci/pci.h"
|
#include "hw/pci/pci.h"
|
||||||
|
#include "hw/arm/virt.h"
|
||||||
#include "sysemu/numa.h"
|
#include "sysemu/numa.h"
|
||||||
#include "kvm_arm.h"
|
#include "kvm_arm.h"
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,6 @@
|
||||||
#include "qemu/bitops.h"
|
#include "qemu/bitops.h"
|
||||||
#include "qemu/error-report.h"
|
#include "qemu/error-report.h"
|
||||||
#include "hw/pci-host/gpex.h"
|
#include "hw/pci-host/gpex.h"
|
||||||
#include "hw/arm/virt-acpi-build.h"
|
|
||||||
#include "hw/arm/sysbus-fdt.h"
|
#include "hw/arm/sysbus-fdt.h"
|
||||||
#include "hw/platform-bus.h"
|
#include "hw/platform-bus.h"
|
||||||
#include "hw/arm/fdt.h"
|
#include "hw/arm/fdt.h"
|
||||||
|
|
|
@ -1,39 +0,0 @@
|
||||||
/*
|
|
||||||
*
|
|
||||||
* Copyright (c) 2015 HUAWEI TECHNOLOGIES CO.,LTD.
|
|
||||||
*
|
|
||||||
* Author: Shannon Zhao <zhaoshenglong@huawei.com>
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU General Public License,
|
|
||||||
* version 2 or later, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef QEMU_VIRT_ACPI_BUILD_H
|
|
||||||
#define QEMU_VIRT_ACPI_BUILD_H
|
|
||||||
|
|
||||||
#include "qemu-common.h"
|
|
||||||
#include "hw/arm/virt.h"
|
|
||||||
#include "qemu/notify.h"
|
|
||||||
|
|
||||||
typedef struct VirtGuestInfo {
|
|
||||||
int smp_cpus;
|
|
||||||
FWCfgState *fw_cfg;
|
|
||||||
const MemMapEntry *memmap;
|
|
||||||
const int *irqmap;
|
|
||||||
bool use_highmem;
|
|
||||||
int gic_version;
|
|
||||||
bool no_its;
|
|
||||||
} VirtGuestInfo;
|
|
||||||
|
|
||||||
void virt_acpi_setup(VirtGuestInfo *guest_info);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "exec/hwaddr.h"
|
#include "exec/hwaddr.h"
|
||||||
|
#include "qemu/notify.h"
|
||||||
|
|
||||||
#define NUM_GICV2M_SPIS 64
|
#define NUM_GICV2M_SPIS 64
|
||||||
#define NUM_VIRTIO_TRANSPORTS 32
|
#define NUM_VIRTIO_TRANSPORTS 32
|
||||||
|
@ -74,5 +75,16 @@ typedef struct MemMapEntry {
|
||||||
hwaddr size;
|
hwaddr size;
|
||||||
} MemMapEntry;
|
} MemMapEntry;
|
||||||
|
|
||||||
|
typedef struct VirtGuestInfo {
|
||||||
|
int smp_cpus;
|
||||||
|
FWCfgState *fw_cfg;
|
||||||
|
const MemMapEntry *memmap;
|
||||||
|
const int *irqmap;
|
||||||
|
bool use_highmem;
|
||||||
|
int gic_version;
|
||||||
|
bool no_its;
|
||||||
|
} VirtGuestInfo;
|
||||||
|
|
||||||
#endif
|
void virt_acpi_setup(VirtGuestInfo *guest_info);
|
||||||
|
|
||||||
|
#endif /* QEMU_ARM_VIRT_H */
|
||||||
|
|
Loading…
Reference in a new issue