Commit f16bbb9b authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/kvm: move KVM declarations and stubs to separate files 



Let's do it just like the other architectures. Introduce kvm-stub.c
for stubs and kvm_s390x.h for the declarations.

Change license to GPL2+ and keep copyright notice.

As we are dropping the sysemu/kvm.h include from cpu.h, fix up includes.

Suggested-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-18-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 5e7164c5

hw/intc/s390_flic_kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "cpu.h"

#include "kvm_s390x.h"

#include <sys/ioctl.h>

#include "qemu/error-report.h"

#include "qapi/error.h"

hw/s390x/s390-stattrib-kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "sysemu/kvm.h"

#include "exec/ram_addr.h"

#include "cpu.h"

#include "kvm_s390x.h"



Object *kvm_s390_stattrib_create(void)

{

include/hw/s390x/css.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "hw/s390x/adapter.h"

#include "hw/s390x/s390_flic.h"

#include "hw/s390x/ioinst.h"

#include "sysemu/kvm.h"



/* Channel subsystem constants. */

#define MAX_DEVNO 65535

target/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o 
obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o

obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o

obj-$(CONFIG_KVM) += kvm.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o



# build and run feature list generator

feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/

target/s390x/cpu.c

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include "qapi/error.h"

#include "cpu.h"

#include "internal.h"

#include "kvm_s390x.h"

#include "sysemu/kvm.h"

#include "qemu-common.h"

#include "qemu/cutils.h"

#include "qemu/timer.h"