Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
qemu-nbd: invent nbd_client_release_pipe() helper
Move the code from main() and nbd_client_thread() into the specific
helper. This code is going to be grown.

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-ID: <20230906093210.339585-6-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
  • Loading branch information
Denis V. Lunev authored and ebblake committed Sep 8, 2023
1 parent b2cecdf commit 2eb7c2a
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions qemu-nbd.c
Expand Up @@ -259,6 +259,16 @@ struct NbdClientOpts {
bool verbose;
};

static void nbd_client_release_pipe(void)
{
/* Close stderr so that the qemu-nbd process exits. */
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
error_report("Could not release pipe to parent: %s",
strerror(errno));
exit(EXIT_FAILURE);
}
}

#if HAVE_NBD_DEVICE
static void *show_parts(void *arg)
{
Expand Down Expand Up @@ -322,12 +332,7 @@ static void *nbd_client_thread(void *arg)
fprintf(stderr, "NBD device %s is now connected to %s\n",
opts->device, opts->srcpath);
} else {
/* Close stderr so that the qemu-nbd process exits. */
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
error_report("Could not release pipe to parent: %s",
strerror(errno));
exit(EXIT_FAILURE);
}
nbd_client_release_pipe();
}

if (nbd_client(fd) < 0) {
Expand Down Expand Up @@ -1176,11 +1181,7 @@ int main(int argc, char **argv)
}

if (opts.fork_process) {
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
error_report("Could not release pipe to parent: %s",
strerror(errno));
exit(EXIT_FAILURE);
}
nbd_client_release_pipe();
}

state = RUNNING;
Expand Down

0 comments on commit 2eb7c2a

Please sign in to comment.