Skip to content
Snippets Groups Projects
  • Denis V. Lunev's avatar
    f6f4620c
    qemu-nbd: Restore "qemu-nbd -v --fork" output · f6f4620c
    Denis V. Lunev authored
    
    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: default avatarKevin Wolf <kwolf@redhat.com>
    Signed-off-by: default avatarDenis 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: 5c56dd27 ("qemu-nbd: fix regression with qemu-nbd --fork run over ssh")
    Message-ID: <20230906093210.339585-7-den@openvz.org>
    Reviewed-by: default avatarEric Blake <eblake@redhat.com>
    Tested-by: default avatarEric Blake <eblake@redhat.com>
    [eblake: fix build by avoiding stderr as struct member name]
    Signed-off-by: default avatarEric Blake <eblake@redhat.com>
    f6f4620c
    History
    qemu-nbd: Restore "qemu-nbd -v --fork" output
    Denis V. Lunev authored
    
    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: default avatarKevin Wolf <kwolf@redhat.com>
    Signed-off-by: default avatarDenis 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: 5c56dd27 ("qemu-nbd: fix regression with qemu-nbd --fork run over ssh")
    Message-ID: <20230906093210.339585-7-den@openvz.org>
    Reviewed-by: default avatarEric Blake <eblake@redhat.com>
    Tested-by: default avatarEric Blake <eblake@redhat.com>
    [eblake: fix build by avoiding stderr as struct member name]
    Signed-off-by: default avatarEric Blake <eblake@redhat.com>