Make hw/s390x configurable and add new CONFIG_* to the default-configs/s390x*-softmmu.mak. This will be used to enable/disable vfio-ccw.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> Message-Id: <20190123065618.3520-10-yang.zh...@intel.com> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- default-configs/s390x-softmmu.mak | 1 + hw/s390x/Makefile.objs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 5eef375..8bb7e43 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -8,3 +8,4 @@ CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y CONFIG_VFIO_AP=$(CONFIG_LINUX) +CONFIG_S390_CCW_VIRTIO=y diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index ca68806..a884aae 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -1,3 +1,4 @@ +ifeq ($(CONFIG_S390_CCW_VIRTIO),y) obj-y += s390-virtio-hcall.o obj-y += sclp.o obj-y += event-facility.o @@ -33,3 +34,4 @@ obj-$(CONFIG_KVM) += s390-stattrib-kvm.o obj-y += s390-ccw.o obj-y += ap-device.o obj-y += ap-bridge.o +endif -- 1.8.3.1
