mirror of https://github.com/proxmox/mirror_qemu
qemu-nbd: move srcpath into struct NbdClientOpts
We pass other parameters into nbd_client_thread() in this way. This patch
makes the code more consistent.
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-4-den@openvz.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
[eblake: Note that this also cleans up a -Wshadow issue, first
introduced in e5b815b0
]
Signed-off-by: Eric Blake <eblake@redhat.com>
master
parent
3484f6769c
commit
b18d72d723
17
qemu-nbd.c
17
qemu-nbd.c
|
@ -73,7 +73,6 @@
|
||||||
|
|
||||||
#define MBR_SIZE 512
|
#define MBR_SIZE 512
|
||||||
|
|
||||||
static char *srcpath;
|
|
||||||
static SocketAddress *saddr;
|
static SocketAddress *saddr;
|
||||||
static int persistent = 0;
|
static int persistent = 0;
|
||||||
static enum { RUNNING, TERMINATE, TERMINATED } state;
|
static enum { RUNNING, TERMINATE, TERMINATED } state;
|
||||||
|
@ -255,6 +254,7 @@ static int qemu_nbd_client_list(SocketAddress *saddr, QCryptoTLSCreds *tls,
|
||||||
|
|
||||||
struct NbdClientOpts {
|
struct NbdClientOpts {
|
||||||
char *device;
|
char *device;
|
||||||
|
char *srcpath;
|
||||||
bool fork_process;
|
bool fork_process;
|
||||||
bool verbose;
|
bool verbose;
|
||||||
};
|
};
|
||||||
|
@ -320,7 +320,7 @@ static void *nbd_client_thread(void *arg)
|
||||||
|
|
||||||
if (opts->verbose && !opts->fork_process) {
|
if (opts->verbose && !opts->fork_process) {
|
||||||
fprintf(stderr, "NBD device %s is now connected to %s\n",
|
fprintf(stderr, "NBD device %s is now connected to %s\n",
|
||||||
opts->device, srcpath);
|
opts->device, opts->srcpath);
|
||||||
} else {
|
} else {
|
||||||
/* Close stderr so that the qemu-nbd process exits. */
|
/* Close stderr so that the qemu-nbd process exits. */
|
||||||
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
|
if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0) {
|
||||||
|
@ -590,6 +590,7 @@ int main(int argc, char **argv)
|
||||||
.fork_process = false,
|
.fork_process = false,
|
||||||
.verbose = false,
|
.verbose = false,
|
||||||
.device = NULL,
|
.device = NULL,
|
||||||
|
.srcpath = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef CONFIG_POSIX
|
#ifdef CONFIG_POSIX
|
||||||
|
@ -1059,19 +1060,19 @@ int main(int argc, char **argv)
|
||||||
bdrv_init();
|
bdrv_init();
|
||||||
atexit(qemu_nbd_shutdown);
|
atexit(qemu_nbd_shutdown);
|
||||||
|
|
||||||
srcpath = argv[optind];
|
opts.srcpath = argv[optind];
|
||||||
if (imageOpts) {
|
if (imageOpts) {
|
||||||
QemuOpts *opts;
|
QemuOpts *o;
|
||||||
if (fmt) {
|
if (fmt) {
|
||||||
error_report("--image-opts and -f are mutually exclusive");
|
error_report("--image-opts and -f are mutually exclusive");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
opts = qemu_opts_parse_noisily(&file_opts, srcpath, true);
|
o = qemu_opts_parse_noisily(&file_opts, opts.srcpath, true);
|
||||||
if (!opts) {
|
if (!o) {
|
||||||
qemu_opts_reset(&file_opts);
|
qemu_opts_reset(&file_opts);
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
options = qemu_opts_to_qdict(opts, NULL);
|
options = qemu_opts_to_qdict(o, NULL);
|
||||||
qemu_opts_reset(&file_opts);
|
qemu_opts_reset(&file_opts);
|
||||||
blk = blk_new_open(NULL, NULL, options, flags, &local_err);
|
blk = blk_new_open(NULL, NULL, options, flags, &local_err);
|
||||||
} else {
|
} else {
|
||||||
|
@ -1079,7 +1080,7 @@ int main(int argc, char **argv)
|
||||||
options = qdict_new();
|
options = qdict_new();
|
||||||
qdict_put_str(options, "driver", fmt);
|
qdict_put_str(options, "driver", fmt);
|
||||||
}
|
}
|
||||||
blk = blk_new_open(srcpath, NULL, options, flags, &local_err);
|
blk = blk_new_open(opts.srcpath, NULL, options, flags, &local_err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!blk) {
|
if (!blk) {
|
||||||
|
|
Loading…
Reference in New Issue