Browse Source

accel: Rename 'hw/core/accel-cpu.h' -> 'accel/accel-cpu-target.h'

AccelCPUClass is for accelerator to initialize target specific
features of a vCPU. Not really related to hardware emulation,
rename "hw/core/accel-cpu.h" as "accel/accel-cpu-target.h"
(using the explicit -target suffix).

More importantly, target specific header often access the
target specific definitions which are in each target/FOO/cpu.h
header, usually included generically as "cpu.h" relative to
target/FOO/. However, there is already a "cpu.h" in hw/core/
which takes precedence. This change allows "accel-cpu-target.h"
to include a target "cpu.h".

Mechanical change doing:

 $  git mv include/hw/core/accel-cpu.h \
           include/accel/accel-cpu-target.h
 $  sed -i -e 's,hw/core/accel-cpu.h,accel/accel-cpu-target.h,' \
   $(git grep -l hw/core/accel-cpu.h)

and renaming header guard 'ACCEL_CPU_TARGET_H'.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250123234415.59850-12-philmd@linaro.org>
pull/291/head
Philippe Mathieu-Daudé 1 year ago
parent
commit
b12a0f8566
  1. 2
      MAINTAINERS
  2. 2
      accel/accel-target.c
  3. 2
      cpu-target.c
  4. 4
      include/accel/accel-cpu-target.h
  5. 2
      target/i386/hvf/hvf-cpu.c
  6. 2
      target/i386/kvm/kvm-cpu.c
  7. 2
      target/i386/tcg/tcg-cpu.c
  8. 2
      target/ppc/kvm.c
  9. 2
      target/riscv/kvm/kvm-cpu.c
  10. 2
      target/riscv/tcg/tcg-cpu.c

2
MAINTAINERS

@ -499,7 +499,7 @@ R: Paolo Bonzini <pbonzini@redhat.com>
S: Maintained
F: include/qemu/accel.h
F: include/system/accel-*.h
F: include/hw/core/accel-cpu.h
F: include/accel/accel-cpu-target.h
F: accel/accel-*.c
F: accel/Makefile.objs
F: accel/stubs/Makefile.objs

2
accel/accel-target.c

@ -27,7 +27,7 @@
#include "qemu/accel.h"
#include "cpu.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#ifndef CONFIG_USER_ONLY
#include "accel-system.h"

2
cpu-target.c

@ -44,7 +44,7 @@
#include "exec/tb-flush.h"
#include "exec/translation-block.h"
#include "exec/log.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#include "trace/trace-root.h"
#include "qemu/accel.h"

4
include/hw/core/accel-cpu.h → include/accel/accel-cpu-target.h

@ -8,8 +8,8 @@
* See the COPYING file in the top-level directory.
*/
#ifndef ACCEL_CPU_H
#define ACCEL_CPU_H
#ifndef ACCEL_CPU_TARGET_H
#define ACCEL_CPU_TARGET_H
/*
* This header is used to define new accelerator-specific target-specific

2
target/i386/hvf/hvf-cpu.c

@ -14,7 +14,7 @@
#include "system/system.h"
#include "hw/boards.h"
#include "system/hvf.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#include "hvf-i386.h"
static void hvf_cpu_max_instance_init(X86CPU *cpu)

2
target/i386/kvm/kvm-cpu.c

@ -15,7 +15,7 @@
#include "hw/boards.h"
#include "kvm_i386.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
static void kvm_set_guest_phys_bits(CPUState *cs)
{

2
target/i386/tcg/tcg-cpu.c

@ -21,7 +21,7 @@
#include "cpu.h"
#include "helper-tcg.h"
#include "qemu/accel.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#include "exec/translation-block.h"
#include "tcg-cpu.h"

2
target/ppc/kvm.c

@ -49,7 +49,7 @@
#include "elf.h"
#include "system/kvm_int.h"
#include "system/kvm.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#include CONFIG_DEVICES

2
target/riscv/kvm/kvm-cpu.c

@ -32,7 +32,7 @@
#include "system/kvm_int.h"
#include "cpu.h"
#include "trace.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#include "hw/pci/pci.h"
#include "exec/memattrs.h"
#include "exec/address-spaces.h"

2
target/riscv/tcg/tcg-cpu.c

@ -30,7 +30,7 @@
#include "qemu/accel.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
#include "hw/core/accel-cpu.h"
#include "accel/accel-cpu-target.h"
#include "accel/tcg/cpu-ops.h"
#include "tcg/tcg.h"
#ifndef CONFIG_USER_ONLY

Loading…
Cancel
Save