2021-02-24 15:16:12 +01:00
|
|
|
From: Halil Pasic <pasic@linux.ibm.com>
|
|
|
|
|
Date: Thu, 18 Feb 2021 04:40:59 +0100
|
|
|
|
|
Subject: hw/s390x: fix build for virtio-9p-ccw
|
|
|
|
|
|
2021-03-09 23:50:50 +01:00
|
|
|
Git-commit: 24056cbfd577fd219d55c03f69df66e6351456e7
|
2021-02-24 15:16:12 +01:00
|
|
|
References: bsc#1182496
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
[BR: back out the part which depends on the have_virtfs change]
|
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
|
|
|
---
|
|
|
|
|
hw/s390x/meson.build | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
|
|
|
|
|
index 2a7818d94b94d3832c0e944ecc42..e53b7a69930a27dd030994ab6a54 100644
|
|
|
|
|
--- a/hw/s390x/meson.build
|
|
|
|
|
+++ b/hw/s390x/meson.build
|
|
|
|
|
@@ -40,7 +40,7 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-ccw-net.c'))
|
|
|
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-ccw-rng.c'))
|
|
|
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-ccw-scsi.c'))
|
|
|
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ccw-serial.c'))
|
|
|
|
|
-virtio_ss.add(when: ['CONFIG_VIRTIO_9P', 'CONFIG_VIRTFS'], if_true: files('virtio-ccw-blk.c'))
|
|
|
|
|
+virtio_ss.add(when: ['CONFIG_VIRTIO_9P', 'CONFIG_VIRTFS'], if_true: files('virtio-ccw-9p.c'))
|
|
|
|
|
virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.c'))
|
|
|
|
|
virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs-ccw.c'))
|
|
|
|
|
s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss)
|
