ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Denis V. Lunev 2023-09-06 11:32:07 +02:00 committed by Eric Blake
parent b2cecdfee3
commit 2eb7c2abe0
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qemu-nbd.c
View File

@ -259,6 +259,16 @@ struct NbdClientOpts {
bool verbose; 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 #if HAVE_NBD_DEVICE
static void *show_parts(void *arg) static void *show_parts(void *arg)
{ {
@ -322,12 +332,7 @@ static void *nbd_client_thread(void *arg)
fprintf(stderr, "NBD device %s is now connected to %s\n", fprintf(stderr, "NBD device %s is now connected to %s\n",
opts->device, opts->srcpath); opts->device, opts->srcpath);
} else { } else {
/* Close stderr so that the qemu-nbd process exits. */ nbd_client_release_pipe();
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
error_report("Could not release pipe to parent: %s",
strerror(errno));
exit(EXIT_FAILURE);
}
} }
if (nbd_client(fd) < 0) { if (nbd_client(fd) < 0) {
@ -1176,11 +1181,7 @@ int main(int argc, char **argv)
} }
if (opts.fork_process) { if (opts.fork_process) {
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) { nbd_client_release_pipe();
error_report("Could not release pipe to parent: %s",
strerror(errno));
exit(EXIT_FAILURE);
}
} }
state = RUNNING; state = RUNNING;