Skip to content

Commit

Permalink
qemu-nbd: pass structure into nbd_client_thread instead of plain char*
Browse files Browse the repository at this point in the history
We are going to pass additional flag inside next patch.

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
CC: <qemu-stable@nongnu.org>
Message-ID: <20230717145544.194786-2-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
(cherry picked from commit 03b6762)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
Denis V. Lunev authored and Michael Tokarev committed Jul 31, 2023
1 parent f90a8b9 commit feb0814
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions qemu-nbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,13 @@ static void *show_parts(void *arg)
return NULL;
}

struct NbdClientOpts {
char *device;
};

static void *nbd_client_thread(void *arg)
{
char *device = arg;
struct NbdClientOpts *opts = arg;
NBDExportInfo info = { .request_sizes = false, .name = g_strdup("") };
QIOChannelSocket *sioc;
int fd = -1;
Expand All @@ -298,10 +302,10 @@ static void *nbd_client_thread(void *arg)
goto out;
}

fd = open(device, O_RDWR);
fd = open(opts->device, O_RDWR);
if (fd < 0) {
/* Linux-only, we can use %m in printf. */
error_report("Failed to open %s: %m", device);
error_report("Failed to open %s: %m", opts->device);
goto out;
}

Expand All @@ -311,11 +315,11 @@ static void *nbd_client_thread(void *arg)
}

/* update partition table */
pthread_create(&show_parts_thread, NULL, show_parts, device);
pthread_create(&show_parts_thread, NULL, show_parts, opts->device);

if (verbose) {
fprintf(stderr, "NBD device %s is now connected to %s\n",
device, srcpath);
opts->device, srcpath);
} else {
/* Close stderr so that the qemu-nbd process exits. */
dup2(STDOUT_FILENO, STDERR_FILENO);
Expand Down Expand Up @@ -1121,8 +1125,11 @@ int main(int argc, char **argv)
if (device) {
#if HAVE_NBD_DEVICE
int ret;
struct NbdClientOpts opts = {
.device = device,
};

ret = pthread_create(&client_thread, NULL, nbd_client_thread, device);
ret = pthread_create(&client_thread, NULL, nbd_client_thread, &opts);
if (ret != 0) {
error_report("Failed to create client thread: %s", strerror(ret));
exit(EXIT_FAILURE);
Expand Down

0 comments on commit feb0814

Please sign in to comment.