hw/s390x: fix build for virtio-9p-ccw
commit24056cbfd577fd219d55c03f69df66e6351456e7
authorHalil Pasic <pasic@linux.ibm.com>
Thu, 18 Feb 2021 03:40:59 +0000 (18 04:40 +0100)
committerCornelia Huck <cohuck@redhat.com>
Thu, 4 Mar 2021 10:23:35 +0000 (4 11:23 +0100)
tree8938bc7c097c4bcce2855932136cb67b714b5781
parentea1b90b4fcb1230b2c85f3fd4ee09a84ddca7a6f
hw/s390x: fix build for virtio-9p-ccw

Commit  2c44220d05 ("meson: convert hw/arch*"), which migrated the old
Makefile.objs to meson.build  accidentally excluded virtio-ccw-9p.c and
thus the virtio-9p-ccw device from the build (and potentially also
included the file virtio-ccw-blk.c twice in the source set). And since
CONFIG_VIRTFS can't be used the way it was used here (see commit
2c9dce0196 ("meson: do not use CONFIG_VIRTFS")), the preconditions have
to be written differently.

Let's fix this!

Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
Fixes: 2c44220d05 ("meson: convert hw/arch*")
Reported-by: Jakob Naucke <jakob.naucke@ibm.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210218034059.1096078-1-pasic@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
hw/s390x/meson.build