| Message ID | 20190131073234.18037-14-yang.zhong@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | make qemu configurable for Kconfig | expand |
On 2019-01-31 08:32, Yang Zhong wrote: > From: Paolo Bonzini <pbonzini@redhat.com> > > 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 <pbonzini@redhat.com> > --- > default-configs/s390x-softmmu.mak | 1 + > hw/s390x/Makefile.objs | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak > index 5eef375924..8bb7e438c8 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 ca68806e44..a18c471913 100644 > --- a/hw/s390x/Makefile.objs > +++ b/hw/s390x/Makefile.objs > @@ -5,7 +5,7 @@ obj-y += sclpquiesce.o > obj-y += sclpcpu.o > obj-y += ipl.o > obj-y += css.o > -obj-y += s390-virtio-ccw.o > +obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o > obj-y += 3270-ccw.o > obj-y += virtio-ccw.o > obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index 5eef375924..8bb7e438c8 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 ca68806e44..a18c471913 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -5,7 +5,7 @@ obj-y += sclpquiesce.o obj-y += sclpcpu.o obj-y += ipl.o obj-y += css.o -obj-y += s390-virtio-ccw.o +obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o obj-y += 3270-ccw.o obj-y += virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o