hw/s390x: Move KVM specific PV from hw/ to target/s390x/kvm/
PATCH v2 1/1 hw/s390x: Move KVM specific PV from hw/ to target/s390x/kvm/
Protected Virtualization (PV) is not a real hardware device:
it is a feature of the firmware on s390x that is exposed to userspace via the KVM interface.
Move the pv.c/pv.h files to target/s390x/kvm/ to make this clearer.
Suggested-by Thomas Huth <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
---
v1: https://lore.kernel.org/qemu-devel/[email protected]/
---
MAINTAINERS | 2 --
{include/hw/s390x => target/s390x/kvm}/pv.h | 0
hw/s390x/ipl.c | 2 +-
hw/s390x/s390-pci-kvm.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 2 +-
hw/s390x/tod-kvm.c | 2 +-
target/s390x/arch_dump.c | 2 +-
target/s390x/cpu-sysemu.c | 2 +-
target/s390x/cpu_features.c | 2 +-
target/s390x/cpu_models.c | 2 +-
target/s390x/diag.c | 2 +-
target/s390x/helper.c | 2 +-
target/s390x/ioinst.c | 2 +-
target/s390x/kvm/kvm.c | 2 +-
{hw/s390x => target/s390x/kvm}/pv.c | 2 +-
hw/s390x/meson.build | 1 -
target/s390x/kvm/meson.build | 1 +
17 files changed, 14 insertions(+), 16 deletions(-)
rename {include/hw/s390x => target/s390x/kvm}/pv.h (100%)
rename {hw/s390x => target/s390x/kvm}/pv.c (99%)MAINTAINERS +0 -2
@@ -451,8 +451,6 @@ S: Supported F: target/s390x/kvm/ F: target/s390x/machine.c F: target/s390x/sigp.c -F: hw/s390x/pv.c -F: include/hw/s390x/pv.h F: gdb-xml/s390*.xml T: git https://github.com/borntraeger/qemu.git s390-next L: [email protected]
target/s390x/kvm/pv.h renamed from include/hw/s390x/pv.h +0 -0
hw/s390x/ipl.c +1 -1
@@ -26,7 +26,7 @@#include "hw/s390x/vfio-ccw.h" #include "hw/s390x/css.h" #include "hw/s390x/ebcdic.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #include "hw/scsi/scsi.h" #include "hw/virtio/virtio-net.h" #include "ipl.h"
hw/s390x/s390-pci-kvm.c +1 -1
@@ -14,7 +14,7 @@#include <linux/kvm.h> #include "kvm/kvm_s390x.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #include "hw/s390x/s390-pci-bus.h" #include "hw/s390x/s390-pci-kvm.h" #include "hw/s390x/s390-pci-inst.h"
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -42,7 +42,7 @@#include "hw/s390x/tod.h" #include "sysemu/sysemu.h" #include "sysemu/cpus.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #include "migration/blocker.h" #include "qapi/visitor.h"
hw/s390x/tod-kvm.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/module.h" #include "sysemu/runstate.h" #include "hw/s390x/tod.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #include "kvm/kvm_s390x.h" static void kvm_s390_get_tod_raw (S390TOD *tod,Error **errp)
target/s390x/arch_dump.c +1 -1
@@ -17,8 +17,8 @@#include "s390x-internal.h" #include "elf.h" #include "sysemu/dump.h" -#include "hw/s390x/pv.h" #include "kvm/kvm_s390x.h" +#include "target/s390x/kvm/pv.h" struct S390xUserRegsStruct {uint64_t psw[2 ];
target/s390x/cpu-sysemu.c +1 -1
@@ -33,7 +33,7 @@#include "qapi/qapi-visit-run-state.h" #include "sysemu/hw_accel.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h"
target/s390x/cpu_features.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/module.h" #include "cpu_features.h" #ifndef CONFIG_USER_ONLY -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #endif #define DEF_FEAT (_FEAT, _NAME, _TYPE, _BIT, _DESC) \
target/s390x/cpu_models.c +1 -1
@@ -24,7 +24,7 @@#include "qemu/qemu-print.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #endif #define CPUDEF_INIT (_type, _gen, _ec_ga, _mha_pow, _hmfai, _name, _desc) \
target/s390x/diag.c +1 -1
@@ -19,9 +19,9 @@#include "sysemu/cpus.h" #include "hw/s390x/ipl.h" #include "hw/s390x/s390-virtio-ccw.h" -#include "hw/s390x/pv.h" #include "sysemu/kvm.h" #include "kvm/kvm_s390x.h" +#include "target/s390x/kvm/pv.h" #include "qemu/error-report.h"
target/s390x/helper.c +1 -1
@@ -24,7 +24,7 @@#include "gdbstub/helpers.h" #include "qemu/timer.h" #include "hw/s390x/ioinst.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h"
target/s390x/ioinst.c +1 -1
@@ -16,7 +16,7 @@#include "hw/s390x/ioinst.h" #include "trace.h" #include "hw/s390x/s390-pci-bus.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" /* All I/O instructions but chsc use the s format */ static uint64_t get_address_from_regs(CPUS390XState *env, uint32_t ipb,
target/s390x/kvm/kvm.c +1 -1
@@ -50,7 +50,7 @@#include "exec/memattrs.h" #include "hw/s390x/s390-virtio-ccw.h" #include "hw/s390x/s390-virtio-hcall.h" -#include "hw/s390x/pv.h" +#include "target/s390x/kvm/pv.h" #ifndef DEBUG_KVM #define DEBUG_KVM 0
target/s390x/kvm/pv.c renamed from hw/s390x/pv.c +1 -1
@@ -21,9 +21,9 @@#include "qom/object_interfaces.h" #include "exec/confidential-guest-support.h" #include "hw/s390x/ipl.h" -#include "hw/s390x/pv.h" #include "hw/s390x/sclp.h" #include "target/s390x/kvm/kvm_s390x.h" +#include "target/s390x/kvm/pv.h" static bool info_valid;static struct kvm_s390_pv_info_vm info_vm;
hw/s390x/meson.build +0 -1
@@ -22,7 +22,6 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( 'tod-kvm.c', 's390-skeys-kvm.c', 's390-stattrib-kvm.c', - 'pv.c', 's390-pci-kvm.c', )) s390x_ss.add(when: 'CONFIG_TCG', if_true: files(
target/s390x/kvm/meson.build +1 -0
@@ -1,5 +1,6 @@ s390x_ss.add(when: 'CONFIG_KVM', if_true: files( + 'pv.c', 'kvm.c' ), if_false: files( 'stubs.c'
Signature · 1 line
2.38.1