* [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test
@ 2021-08-11 9:47 Thomas Huth
2021-08-11 10:06 ` Alexander Bulekov
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Thomas Huth @ 2021-08-11 9:47 UTC (permalink / raw)
To: qemu-devel, Kevin Wolf, Coiby Xu
Cc: peter.maydell, qemu-block, alex.bennee, Raphael Norwitz, alxndr,
Stefan Hajnoczi, Paolo Bonzini, philmd
vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
currently hangs. So make sure that we build the daemon before running
the tests.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
storage-daemon/meson.build | 8 ++++----
tests/qtest/meson.build | 7 +++++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 68852f3d25..49c9d2eac9 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -6,8 +6,8 @@ subdir('qapi')
if have_tools
qsd_ss = qsd_ss.apply(config_host, strict: false)
- executable('qemu-storage-daemon',
- qsd_ss.sources(),
- dependencies: qsd_ss.dependencies(),
- install: true)
+ qsd = executable('qemu-storage-daemon',
+ qsd_ss.sources(),
+ dependencies: qsd_ss.dependencies(),
+ install: true)
endif
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index e22a0792c5..2bc3efd49f 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -276,8 +276,11 @@ foreach dir : target_dirs
endif
qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vmstate-daemon.sh')
qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base)
- qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', './storage-daemon/qemu-storage-daemon')
-
+ if have_tools and have_vhost_user_blk_server
+ qtest_env.set('QTEST_QEMU_STORAGE_DAEMON_BINARY', './storage-daemon/qemu-storage-daemon')
+ test_deps += [qsd]
+ endif
+
foreach test : target_qtests
# Executables are shared across targets, declare them only the first time we
# encounter them
--
2.27.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test
2021-08-11 9:47 [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test Thomas Huth
@ 2021-08-11 10:06 ` Alexander Bulekov
2021-08-11 11:06 ` Peter Maydell
2021-08-12 10:53 ` Daniel P. Berrangé
2 siblings, 0 replies; 5+ messages in thread
From: Alexander Bulekov @ 2021-08-11 10:06 UTC (permalink / raw)
To: Thomas Huth
Cc: Kevin Wolf, peter.maydell, qemu-block, alex.bennee, qemu-devel,
Coiby Xu, Raphael Norwitz, Stefan Hajnoczi, Paolo Bonzini,
philmd
On 210811 1147, Thomas Huth wrote:
> vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
> currently hangs. So make sure that we build the daemon before running
> the tests.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
Tested-by: Alexander Bulekov <alxndr@bu.edu>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test
2021-08-11 9:47 [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test Thomas Huth
2021-08-11 10:06 ` Alexander Bulekov
@ 2021-08-11 11:06 ` Peter Maydell
2021-08-12 10:53 ` Daniel P. Berrangé
2 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2021-08-11 11:06 UTC (permalink / raw)
To: Thomas Huth
Cc: Kevin Wolf, Qemu-block, Alex Bennée, QEMU Developers,
Coiby Xu, Raphael Norwitz, Alexander Bulekov, Stefan Hajnoczi,
Paolo Bonzini, Philippe Mathieu-Daudé
On Wed, 11 Aug 2021 at 10:47, Thomas Huth <thuth@redhat.com> wrote:
>
> vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
typo: 'daemon'
> currently hangs. So make sure that we build the daemon before running
> the tests.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test
2021-08-11 9:47 [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test Thomas Huth
2021-08-11 10:06 ` Alexander Bulekov
2021-08-11 11:06 ` Peter Maydell
@ 2021-08-12 10:53 ` Daniel P. Berrangé
2021-08-12 11:07 ` Peter Maydell
2 siblings, 1 reply; 5+ messages in thread
From: Daniel P. Berrangé @ 2021-08-12 10:53 UTC (permalink / raw)
To: Thomas Huth
Cc: Kevin Wolf, peter.maydell, qemu-block, philmd, qemu-devel,
Coiby Xu, Raphael Norwitz, alxndr, Stefan Hajnoczi,
Paolo Bonzini, alex.bennee
On Wed, Aug 11, 2021 at 11:47:05AM +0200, Thomas Huth wrote:
> vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
> currently hangs. So make sure that we build the daemon before running
> the tests.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> storage-daemon/meson.build | 8 ++++----
> tests/qtest/meson.build | 7 +++++--
> 2 files changed, 9 insertions(+), 6 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
IIUC, this is the fix for the oss-fuzz test that hangs
https://lists.gnu.org/archive/html/qemu-devel/2021-08/msg01850.html
can we get this fix into 6.1, so that hopefully now we get
a clean CI pipeline for the release.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test
2021-08-12 10:53 ` Daniel P. Berrangé
@ 2021-08-12 11:07 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2021-08-12 11:07 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: Kevin Wolf, Thomas Huth, Qemu-block, Philippe Mathieu-Daudé,
QEMU Developers, Coiby Xu, Raphael Norwitz, Alexander Bulekov,
Stefan Hajnoczi, Paolo Bonzini, Alex Bennée
On Thu, 12 Aug 2021 at 11:53, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Wed, Aug 11, 2021 at 11:47:05AM +0200, Thomas Huth wrote:
> > vhost-user-blk-test needs the qemu-storage-deamon, otherwise it
> > currently hangs. So make sure that we build the daemon before running
> > the tests.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> > storage-daemon/meson.build | 8 ++++----
> > tests/qtest/meson.build | 7 +++++--
> > 2 files changed, 9 insertions(+), 6 deletions(-)
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
>
> IIUC, this is the fix for the oss-fuzz test that hangs
>
> https://lists.gnu.org/archive/html/qemu-devel/2021-08/msg01850.html
>
> can we get this fix into 6.1, so that hopefully now we get
> a clean CI pipeline for the release.
Only if we need an rc4 anyway; I'm not going to roll rc4 just
for tests fixes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-08-12 11:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-11 9:47 [PATCH] storage-daemon: Add missing build dependency to the vhost-user-blk-test Thomas Huth
2021-08-11 10:06 ` Alexander Bulekov
2021-08-11 11:06 ` Peter Maydell
2021-08-12 10:53 ` Daniel P. Berrangé
2021-08-12 11:07 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.