[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/8] hw/s390x: fix build for virtio-9p-ccw
From: |
Cornelia Huck |
Subject: |
[PULL 3/8] hw/s390x: fix build for virtio-9p-ccw |
Date: |
Fri, 5 Mar 2021 16:55:12 +0100 |
From: Halil Pasic <pasic@linux.ibm.com>
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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
index 2a7818d94b94..91495b563146 100644
--- a/hw/s390x/meson.build
+++ b/hw/s390x/meson.build
@@ -40,7 +40,9 @@ 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'))
+if have_virtfs
+ virtio_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-ccw-9p.c'))
+endif
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)
--
2.26.2
- [PULL 0/8] s390x update, Cornelia Huck, 2021/03/05
- [PULL 1/8] s390x/cpu_model: disallow unpack for --only-migratable, Cornelia Huck, 2021/03/05
- [PULL 3/8] hw/s390x: fix build for virtio-9p-ccw,
Cornelia Huck <=
- [PULL 2/8] target/s390x/arch_dump: Fix warning for the name field in the PT_NOTE section, Cornelia Huck, 2021/03/05
- [PULL 4/8] s390x/pci: restore missing Query PCI Function CLP data, Cornelia Huck, 2021/03/05
- [PULL 5/8] virtio-ccw: commands on revision-less devices, Cornelia Huck, 2021/03/05
- [PULL 7/8] vfio-ccw: Do not read region ret_code after write, Cornelia Huck, 2021/03/05
- [PULL 8/8] target/s390x/kvm: Simplify debug code, Cornelia Huck, 2021/03/05
- [PULL 6/8] css: SCHIB measurement block origin must be aligned, Cornelia Huck, 2021/03/05
- Re: [PULL 0/8] s390x update, Peter Maydell, 2021/03/05