]> xenbits.xensource.com Git - qemu-xen.git/commit
qemu-nbd: Restore "qemu-nbd -v --fork" output
authorDenis V. Lunev <den@openvz.org>
Wed, 6 Sep 2023 09:32:08 +0000 (11:32 +0200)
committerEric Blake <eblake@redhat.com>
Fri, 8 Sep 2023 12:20:58 +0000 (07:20 -0500)
commitf6f4620cbbe03fbdbddddd9c325ab3ea0dad33c6
treefdf2f4752f9874eb5e70dcf88f02d18eae768939
parent2eb7c2abe0b85a945549e91cb794d214c0905403
qemu-nbd: Restore "qemu-nbd -v --fork" output

Closing stderr earlier is good for daemonized qemu-nbd under ssh
earlier, but breaks the case where -v is being used to track what is
happening in the server, as in iotest 233.

When we know we are verbose, we should preserve original stderr and
restore it once the setup stage is done. This commit restores the
original behavior with -v option. In this case original output
inside the test is kept intact.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
CC: Hanna Reitz <hreitz@redhat.com>
CC: Mike Maslenkin <mike.maslenkin@gmail.com>
Fixes: 5c56dd27a2 ("qemu-nbd: fix regression with qemu-nbd --fork run over ssh")
Message-ID: <20230906093210.339585-7-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
[eblake: fix build by avoiding stderr as struct member name]
Signed-off-by: Eric Blake <eblake@redhat.com>
qemu-nbd.c