Skip to content

Commit

Permalink
*: Add missing includes of qemu/error-report.h
Browse files Browse the repository at this point in the history
This had been pulled in via qemu/plugin.h from hw/core/cpu.h,
but that will be removed.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230310195252.210956-5-richard.henderson@linaro.org>
[AJB: add various additional cases shown by CI]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230315174331.2959-15-alex.bennee@linaro.org>
Reviewed-by: Emilio Cota <cota@braap.org>
  • Loading branch information
rth7680 authored and stsquad committed Mar 22, 2023
1 parent e8956e0 commit cc37d98
Show file tree
Hide file tree
Showing 48 changed files with 58 additions and 1 deletion.
2 changes: 1 addition & 1 deletion accel/accel-softmmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "qemu/accel.h"
#include "hw/boards.h"
#include "sysemu/cpus.h"

#include "qemu/error-report.h"
#include "accel-softmmu.h"

int accel_init_machine(AccelState *accel, MachineState *ms)
Expand Down
1 change: 1 addition & 0 deletions block/monitor/block-hmp-cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
#include "qemu/option.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
#include "monitor/hmp.h"
Expand Down
1 change: 1 addition & 0 deletions dump/dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "qapi/qapi-commands-dump.h"
#include "qapi/qapi-events-dump.h"
#include "qapi/qmp/qerror.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/misc/vmcoreinfo.h"
#include "migration/blocker.h"
Expand Down
1 change: 1 addition & 0 deletions dump/win_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "qemu/osdep.h"
#include "sysemu/dump.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
#include "exec/cpu-defs.h"
#include "hw/core/cpu.h"
Expand Down
1 change: 1 addition & 0 deletions gdbstub/gdbstub.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "exec/gdbstub.h"
#include "gdbstub/syscalls.h"
Expand Down
2 changes: 2 additions & 0 deletions hw/arm/collie.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include "exec/address-spaces.h"
#include "cpu.h"
#include "qom/object.h"
#include "qemu/error-report.h"


#define RAM_SIZE (512 * MiB)
#define FLASH_SIZE (32 * MiB)
Expand Down
1 change: 1 addition & 0 deletions hw/arm/cubieboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-a10.h"
Expand Down
2 changes: 2 additions & 0 deletions hw/arm/musicpal.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include "qemu/cutils.h"
#include "qom/object.h"
#include "hw/net/mv88w8618_eth.h"
#include "qemu/error-report.h"


#define MP_MISC_BASE 0x80002000
#define MP_MISC_SIZE 0x00001000
Expand Down
2 changes: 2 additions & 0 deletions hw/arm/npcm7xx_boards.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
#include "sysemu/block-backend.h"
#include "qemu/error-report.h"


#define NPCM7XX_POWER_ON_STRAPS_DEFAULT ( \
NPCM7XX_PWRON_STRAP_SPI0F18 | \
Expand Down
2 changes: 2 additions & 0 deletions hw/arm/nseries.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
#include "hw/loader.h"
#include "hw/sysbus.h"
#include "qemu/log.h"
#include "qemu/error-report.h"


/* Nokia N8x0 support */
struct n800_s {
Expand Down
2 changes: 2 additions & 0 deletions hw/arm/omap_sx1.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include "exec/address-spaces.h"
#include "cpu.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"


/*****************************************************************************/
/* Siemens SX1 Cellphone V1 */
Expand Down
1 change: 1 addition & 0 deletions hw/arm/orangepi.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qemu/units.h"
#include "exec/address-spaces.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
#include "hw/arm/allwinner-h3.h"
Expand Down
2 changes: 2 additions & 0 deletions hw/arm/palm.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
#include "cpu.h"
#include "qemu/cutils.h"
#include "qom/object.h"
#include "qemu/error-report.h"


static uint64_t static_read(void *opaque, hwaddr offset, unsigned size)
{
Expand Down
1 change: 1 addition & 0 deletions hw/core/loader.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

#include "qemu/osdep.h"
#include "qemu/datadir.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
#include "qapi/type-helpers.h"
Expand Down
2 changes: 2 additions & 0 deletions hw/core/machine-smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include "qemu/osdep.h"
#include "hw/boards.h"
#include "qapi/error.h"
#include "qemu/error-report.h"


/*
* Report information of a machine's supported CPU topology hierarchy.
Expand Down
1 change: 1 addition & 0 deletions hw/i386/kvm/xen_evtchn.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "qemu/lockable.h"
#include "qemu/main-loop.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "monitor/monitor.h"
#include "monitor/hmp.h"
#include "qapi/error.h"
Expand Down
1 change: 1 addition & 0 deletions hw/i386/kvm/xen_xenstore.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "qemu/module.h"
#include "qemu/main-loop.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qom/object.h"
#include "migration/vmstate.h"
Expand Down
1 change: 1 addition & 0 deletions hw/i386/sgx.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "monitor/monitor.h"
#include "monitor/hmp-target.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/qapi-commands-misc-target.h"
#include "exec/address-spaces.h"
#include "sysemu/hw_accel.h"
Expand Down
1 change: 1 addition & 0 deletions hw/intc/apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
#include "qemu/osdep.h"
#include "qemu/thread.h"
#include "qemu/error-report.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic.h"
#include "hw/intc/ioapic.h"
Expand Down
1 change: 1 addition & 0 deletions hw/loongarch/acpi-build.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/bitmap.h"
#include "hw/pci/pci.h"
#include "hw/core/cpu.h"
Expand Down
2 changes: 2 additions & 0 deletions hw/loongarch/virt.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
#include "sysemu/tpm.h"
#include "sysemu/block-backend.h"
#include "hw/block/flash.h"
#include "qemu/error-report.h"


static void virt_flash_create(LoongArchMachineState *lams)
{
Expand Down
1 change: 1 addition & 0 deletions hw/m68k/next-cube.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "hw/block/fdc.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "ui/console.h"
#include "target/m68k/cpu.h"
#include "migration/vmstate.h"
Expand Down
1 change: 1 addition & 0 deletions hw/m68k/q800.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#include "hw/block/swim.h"
#include "net/net.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
#include "sysemu/runstate.h"
#include "sysemu/reset.h"
Expand Down
1 change: 1 addition & 0 deletions hw/m68k/virt.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "bootinfo.h"
#include "net/net.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/qtest.h"
#include "sysemu/runstate.h"
#include "sysemu/reset.h"
Expand Down
1 change: 1 addition & 0 deletions hw/mem/memory-device.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "hw/mem/memory-device.h"
#include "qapi/error.h"
#include "hw/boards.h"
Expand Down
1 change: 1 addition & 0 deletions hw/mem/sparse-mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/error-report.h"

#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
Expand Down
1 change: 1 addition & 0 deletions hw/openrisc/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "sysemu/device_tree.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
#include "qemu/error-report.h"

#include <libfdt.h>

Expand Down
1 change: 1 addition & 0 deletions hw/ppc/ppc4xx_sdram.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "exec/address-spaces.h" /* get_system_memory() */
#include "hw/irq.h"
#include "hw/qdev-properties.h"
Expand Down
2 changes: 2 additions & 0 deletions hw/ppc/spapr_softmmu.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/memalign.h"
#include "qemu/error-report.h"
#include "cpu.h"
#include "helper_regs.h"
#include "hw/ppc/spapr.h"
#include "mmu-hash64.h"
#include "mmu-book3s-v3.h"


static inline bool valid_ptex(PowerPCCPU *cpu, target_ulong ptex)
{
/*
Expand Down
1 change: 1 addition & 0 deletions hw/riscv/opentitan.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "qemu/cutils.h"
#include "hw/riscv/opentitan.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
#include "hw/misc/unimp.h"
#include "hw/riscv/boot.h"
Expand Down
1 change: 1 addition & 0 deletions hw/riscv/shakti_c.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "hw/boards.h"
#include "hw/riscv/shakti_c.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/intc/sifive_plic.h"
#include "hw/intc/riscv_aclint.h"
#include "sysemu/sysemu.h"
Expand Down
1 change: 1 addition & 0 deletions hw/riscv/virt-acpi-build.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "hw/acpi/aml-build.h"
#include "hw/acpi/utils.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/reset.h"
#include "migration/vmstate.h"
#include "hw/riscv/virt.h"
Expand Down
1 change: 1 addition & 0 deletions hw/vfio/display.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/vfio.h>
#include <sys/ioctl.h>

#include "qemu/error-report.h"
#include "hw/display/edid.h"
#include "ui/console.h"
#include "qapi/error.h"
Expand Down
1 change: 1 addition & 0 deletions hw/vfio/igd.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "hw/hw.h"
#include "hw/nvram/fw_cfg.h"
Expand Down
1 change: 1 addition & 0 deletions hw/vfio/migration.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "qemu/main-loop.h"
#include "qemu/cutils.h"
#include "qemu/units.h"
#include "qemu/error-report.h"
#include <linux/vfio.h>
#include <sys/ioctl.h>

Expand Down
1 change: 1 addition & 0 deletions linux-user/elfload.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "qemu/units.h"
#include "qemu/selfmap.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "target_signal.h"
#include "accel/tcg/debuginfo.h"

Expand Down
1 change: 1 addition & 0 deletions migration/dirtyrate.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include <zlib.h>
#include "qapi/error.h"
#include "cpu.h"
Expand Down
1 change: 1 addition & 0 deletions migration/exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "channel.h"
#include "exec.h"
#include "migration.h"
Expand Down
1 change: 1 addition & 0 deletions target/i386/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "kvm/kvm_i386.h"
#include "sev.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/qapi-visit-machine.h"
#include "qapi/qmp/qerror.h"
#include "standard-headers/asm-x86/kvm_para.h"
Expand Down
1 change: 1 addition & 0 deletions target/i386/host-cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "cpu.h"
#include "host-cpu.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"

/* Note: Only safe for use on x86(-64) hosts */
Expand Down
1 change: 1 addition & 0 deletions target/i386/kvm/xen-emu.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/error-report.h"
#include "hw/xen/xen.h"
#include "sysemu/kvm_int.h"
#include "sysemu/kvm_xen.h"
Expand Down
1 change: 1 addition & 0 deletions target/i386/sev.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "qemu/base64.h"
#include "qemu/module.h"
#include "qemu/uuid.h"
#include "qemu/error-report.h"
#include "crypto/hash.h"
#include "sysemu/kvm.h"
#include "sev.h"
Expand Down
1 change: 1 addition & 0 deletions target/i386/whpx/whpx-apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* See the COPYING file in the top-level directory.
*/
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "cpu.h"
#include "hw/i386/apic_internal.h"
#include "hw/i386/apic-msidef.h"
Expand Down
1 change: 1 addition & 0 deletions target/mips/cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/qemu-print.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "cpu.h"
#include "internal.h"
Expand Down
1 change: 1 addition & 0 deletions target/s390x/cpu-sysemu.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/

#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "cpu.h"
#include "s390x-internal.h"
Expand Down
1 change: 1 addition & 0 deletions target/s390x/cpu_models.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "sysemu/kvm.h"
#include "sysemu/tcg.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
#include "qemu/hw-version.h"
Expand Down
2 changes: 2 additions & 0 deletions target/s390x/diag.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "hw/s390x/pv.h"
#include "sysemu/kvm.h"
#include "kvm/kvm_s390x.h"
#include "qemu/error-report.h"


int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
{
Expand Down
Loading

0 comments on commit cc37d98

Please sign in to comment.