2008-07-03 15:41:03 +02:00
|
|
|
/*
|
|
|
|
* QEMU Block driver for NBD
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Bull S.A.S.
|
2008-07-08 20:57:05 +02:00
|
|
|
* Author: Laurent Vivier <Laurent.Vivier@bull.net>
|
2008-07-03 15:41:03 +02:00
|
|
|
*
|
|
|
|
* Some parts:
|
|
|
|
* Copyright (C) 2007 Anthony Liguori <anthony@codemonkey.ws>
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
#include "block/nbd-client.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/uri.h"
|
2012-12-17 18:19:44 +01:00
|
|
|
#include "block/block_int.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/module.h"
|
|
|
|
#include "qemu/sockets.h"
|
2014-07-18 20:24:59 +02:00
|
|
|
#include "qapi/qmp/qdict.h"
|
2013-03-07 16:15:11 +01:00
|
|
|
#include "qapi/qmp/qjson.h"
|
|
|
|
#include "qapi/qmp/qint.h"
|
2014-07-18 20:24:59 +02:00
|
|
|
#include "qapi/qmp/qstring.h"
|
2008-07-03 15:41:03 +02:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
2010-08-25 22:48:33 +02:00
|
|
|
#define EN_OPTSTR ":exportname="
|
|
|
|
|
2008-07-03 15:41:03 +02:00
|
|
|
typedef struct BDRVNBDState {
|
2013-12-01 22:23:41 +01:00
|
|
|
NbdClientSession client;
|
2013-03-07 16:15:11 +01:00
|
|
|
QemuOpts *socket_opts;
|
2008-07-03 15:41:03 +02:00
|
|
|
} BDRVNBDState;
|
|
|
|
|
2013-03-07 16:15:11 +01:00
|
|
|
static int nbd_parse_uri(const char *filename, QDict *options)
|
2012-11-04 13:04:24 +01:00
|
|
|
{
|
|
|
|
URI *uri;
|
|
|
|
const char *p;
|
|
|
|
QueryParams *qp = NULL;
|
|
|
|
int ret = 0;
|
2013-03-07 16:15:11 +01:00
|
|
|
bool is_unix;
|
2012-11-04 13:04:24 +01:00
|
|
|
|
|
|
|
uri = uri_parse(filename);
|
|
|
|
if (!uri) {
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* transport */
|
|
|
|
if (!strcmp(uri->scheme, "nbd")) {
|
2013-03-07 16:15:11 +01:00
|
|
|
is_unix = false;
|
2012-11-04 13:04:24 +01:00
|
|
|
} else if (!strcmp(uri->scheme, "nbd+tcp")) {
|
2013-03-07 16:15:11 +01:00
|
|
|
is_unix = false;
|
2012-11-04 13:04:24 +01:00
|
|
|
} else if (!strcmp(uri->scheme, "nbd+unix")) {
|
2013-03-07 16:15:11 +01:00
|
|
|
is_unix = true;
|
2012-11-04 13:04:24 +01:00
|
|
|
} else {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = uri->path ? uri->path : "/";
|
|
|
|
p += strspn(p, "/");
|
|
|
|
if (p[0]) {
|
2013-03-07 16:15:11 +01:00
|
|
|
qdict_put(options, "export", qstring_from_str(p));
|
2012-11-04 13:04:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
qp = query_params_parse(uri->query);
|
2013-03-07 16:15:11 +01:00
|
|
|
if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) {
|
2012-11-04 13:04:24 +01:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2013-03-07 16:15:11 +01:00
|
|
|
if (is_unix) {
|
2012-11-04 13:04:24 +01:00
|
|
|
/* nbd+unix:///export?socket=path */
|
|
|
|
if (uri->server || uri->port || strcmp(qp->p[0].name, "socket")) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
2013-03-07 16:15:11 +01:00
|
|
|
qdict_put(options, "path", qstring_from_str(qp->p[0].value));
|
2012-11-04 13:04:24 +01:00
|
|
|
} else {
|
2013-06-03 17:54:56 +02:00
|
|
|
QString *host;
|
2013-03-18 16:56:05 +01:00
|
|
|
/* nbd[+tcp]://host[:port]/export */
|
2012-11-04 13:04:24 +01:00
|
|
|
if (!uri->server) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
2013-03-15 11:55:29 +01:00
|
|
|
|
2013-06-03 17:54:56 +02:00
|
|
|
/* strip braces from literal IPv6 address */
|
|
|
|
if (uri->server[0] == '[') {
|
|
|
|
host = qstring_from_substr(uri->server, 1,
|
|
|
|
strlen(uri->server) - 2);
|
|
|
|
} else {
|
|
|
|
host = qstring_from_str(uri->server);
|
|
|
|
}
|
|
|
|
|
|
|
|
qdict_put(options, "host", host);
|
2013-03-18 16:56:05 +01:00
|
|
|
if (uri->port) {
|
|
|
|
char* port_str = g_strdup_printf("%d", uri->port);
|
|
|
|
qdict_put(options, "port", qstring_from_str(port_str));
|
|
|
|
g_free(port_str);
|
|
|
|
}
|
2012-11-04 13:04:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (qp) {
|
|
|
|
query_params_free(qp);
|
|
|
|
}
|
|
|
|
uri_free(uri);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-03-15 18:47:22 +01:00
|
|
|
static void nbd_parse_filename(const char *filename, QDict *options,
|
|
|
|
Error **errp)
|
2008-07-03 15:41:03 +02:00
|
|
|
{
|
2010-08-25 22:48:33 +02:00
|
|
|
char *file;
|
2011-02-22 16:44:54 +01:00
|
|
|
char *export_name;
|
|
|
|
const char *host_spec;
|
2008-07-03 15:41:03 +02:00
|
|
|
const char *unixpath;
|
|
|
|
|
2013-03-20 19:23:23 +01:00
|
|
|
if (qdict_haskey(options, "host")
|
|
|
|
|| qdict_haskey(options, "port")
|
|
|
|
|| qdict_haskey(options, "path"))
|
|
|
|
{
|
|
|
|
error_setg(errp, "host/port/path and a file name may not be specified "
|
|
|
|
"at the same time");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-11-04 13:04:24 +01:00
|
|
|
if (strstr(filename, "://")) {
|
2013-03-15 18:47:22 +01:00
|
|
|
int ret = nbd_parse_uri(filename, options);
|
|
|
|
if (ret < 0) {
|
|
|
|
error_setg(errp, "No valid URL specified");
|
|
|
|
}
|
|
|
|
return;
|
2012-11-04 13:04:24 +01:00
|
|
|
}
|
|
|
|
|
2011-08-21 05:09:37 +02:00
|
|
|
file = g_strdup(filename);
|
2010-08-25 22:48:33 +02:00
|
|
|
|
2011-02-22 16:44:54 +01:00
|
|
|
export_name = strstr(file, EN_OPTSTR);
|
|
|
|
if (export_name) {
|
|
|
|
if (export_name[strlen(EN_OPTSTR)] == 0) {
|
2010-08-25 22:48:33 +02:00
|
|
|
goto out;
|
|
|
|
}
|
2011-02-22 16:44:54 +01:00
|
|
|
export_name[0] = 0; /* truncate 'file' */
|
|
|
|
export_name += strlen(EN_OPTSTR);
|
2013-03-07 16:15:11 +01:00
|
|
|
|
|
|
|
qdict_put(options, "export", qstring_from_str(export_name));
|
2010-08-25 22:48:33 +02:00
|
|
|
}
|
|
|
|
|
2011-02-22 16:44:54 +01:00
|
|
|
/* extract the host_spec - fail if it's not nbd:... */
|
|
|
|
if (!strstart(file, "nbd:", &host_spec)) {
|
2013-03-15 18:47:22 +01:00
|
|
|
error_setg(errp, "File name string for NBD must start with 'nbd:'");
|
2010-08-25 22:48:33 +02:00
|
|
|
goto out;
|
|
|
|
}
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2013-03-07 16:15:11 +01:00
|
|
|
if (!*host_spec) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-02-22 16:44:54 +01:00
|
|
|
/* are we a UNIX or TCP socket? */
|
|
|
|
if (strstart(host_spec, "unix:", &unixpath)) {
|
2013-03-07 16:15:11 +01:00
|
|
|
qdict_put(options, "path", qstring_from_str(unixpath));
|
2008-07-03 15:41:03 +02:00
|
|
|
} else {
|
2013-03-07 16:15:11 +01:00
|
|
|
InetSocketAddress *addr = NULL;
|
|
|
|
|
2013-03-15 18:47:22 +01:00
|
|
|
addr = inet_parse(host_spec, errp);
|
2014-04-25 16:50:33 +02:00
|
|
|
if (!addr) {
|
2013-03-15 11:55:29 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2013-03-07 16:15:11 +01:00
|
|
|
qdict_put(options, "host", qstring_from_str(addr->host));
|
|
|
|
qdict_put(options, "port", qstring_from_str(addr->port));
|
|
|
|
qapi_free_InetSocketAddress(addr);
|
|
|
|
}
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2011-02-22 16:44:54 +01:00
|
|
|
out:
|
2011-08-21 05:09:37 +02:00
|
|
|
g_free(file);
|
2013-03-07 16:15:11 +01:00
|
|
|
}
|
|
|
|
|
2014-02-17 14:43:49 +01:00
|
|
|
static void nbd_config(BDRVNBDState *s, QDict *options, char **export,
|
|
|
|
Error **errp)
|
2013-03-07 16:15:11 +01:00
|
|
|
{
|
|
|
|
Error *local_err = NULL;
|
|
|
|
|
2014-02-17 14:43:48 +01:00
|
|
|
if (qdict_haskey(options, "path") == qdict_haskey(options, "host")) {
|
|
|
|
if (qdict_haskey(options, "path")) {
|
2014-02-17 14:43:49 +01:00
|
|
|
error_setg(errp, "path and host may not be used at the same time.");
|
2014-02-17 14:43:48 +01:00
|
|
|
} else {
|
2014-02-17 14:43:49 +01:00
|
|
|
error_setg(errp, "one of path and host must be specified.");
|
2013-03-20 19:23:23 +01:00
|
|
|
}
|
2014-02-17 14:43:49 +01:00
|
|
|
return;
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
2013-03-07 16:15:11 +01:00
|
|
|
|
2014-02-17 14:43:48 +01:00
|
|
|
s->client.is_unix = qdict_haskey(options, "path");
|
2014-01-02 03:49:17 +01:00
|
|
|
s->socket_opts = qemu_opts_create(&socket_optslist, NULL, 0,
|
|
|
|
&error_abort);
|
2013-03-07 16:15:11 +01:00
|
|
|
|
|
|
|
qemu_opts_absorb_qdict(s->socket_opts, options, &local_err);
|
2014-01-30 15:07:28 +01:00
|
|
|
if (local_err) {
|
2014-02-17 14:43:49 +01:00
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
2013-03-07 16:15:11 +01:00
|
|
|
}
|
|
|
|
|
2013-03-18 16:56:05 +01:00
|
|
|
if (!qemu_opt_get(s->socket_opts, "port")) {
|
2015-02-12 16:46:36 +01:00
|
|
|
qemu_opt_set_number(s->socket_opts, "port", NBD_DEFAULT_PORT,
|
|
|
|
&error_abort);
|
2013-03-18 16:56:05 +01:00
|
|
|
}
|
|
|
|
|
2013-12-01 22:23:43 +01:00
|
|
|
*export = g_strdup(qdict_get_try_str(options, "export"));
|
|
|
|
if (*export) {
|
2013-03-07 16:15:11 +01:00
|
|
|
qdict_del(options, "export");
|
|
|
|
}
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
2010-08-25 22:48:33 +02:00
|
|
|
|
2015-02-06 22:06:16 +01:00
|
|
|
NbdClientSession *nbd_get_client_session(BlockDriverState *bs)
|
|
|
|
{
|
|
|
|
BDRVNBDState *s = bs->opaque;
|
|
|
|
return &s->client;
|
|
|
|
}
|
|
|
|
|
2014-02-17 14:43:49 +01:00
|
|
|
static int nbd_establish_connection(BlockDriverState *bs, Error **errp)
|
2011-02-22 16:44:54 +01:00
|
|
|
{
|
|
|
|
BDRVNBDState *s = bs->opaque;
|
|
|
|
int sock;
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
if (s->client.is_unix) {
|
2014-02-17 14:43:49 +01:00
|
|
|
sock = unix_connect_opts(s->socket_opts, errp, NULL, NULL);
|
2011-02-22 16:44:54 +01:00
|
|
|
} else {
|
2014-02-17 14:43:49 +01:00
|
|
|
sock = inet_connect_opts(s->socket_opts, errp, NULL, NULL);
|
2013-04-15 16:14:48 +02:00
|
|
|
if (sock >= 0) {
|
|
|
|
socket_set_nodelay(sock);
|
|
|
|
}
|
2008-07-03 15:41:03 +02:00
|
|
|
}
|
|
|
|
|
2011-02-22 16:44:54 +01:00
|
|
|
/* Failed to establish connection */
|
2012-03-07 11:05:34 +01:00
|
|
|
if (sock < 0) {
|
2011-02-22 16:44:54 +01:00
|
|
|
logout("Failed to establish connection to NBD server\n");
|
|
|
|
return -errno;
|
2010-08-25 22:48:33 +02:00
|
|
|
}
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
return sock;
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
|
|
|
|
2013-09-05 14:22:29 +02:00
|
|
|
static int nbd_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
|
Error **errp)
|
2011-02-22 16:44:54 +01:00
|
|
|
{
|
|
|
|
BDRVNBDState *s = bs->opaque;
|
2013-12-01 22:23:43 +01:00
|
|
|
char *export = NULL;
|
2013-12-01 22:23:41 +01:00
|
|
|
int result, sock;
|
2014-02-17 14:43:49 +01:00
|
|
|
Error *local_err = NULL;
|
2011-09-08 14:28:59 +02:00
|
|
|
|
2011-02-22 16:44:54 +01:00
|
|
|
/* Pop the config into our state object. Exit if invalid. */
|
2014-02-17 14:43:49 +01:00
|
|
|
nbd_config(s, options, &export, &local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return -EINVAL;
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* establish TCP connection, return error if it fails
|
|
|
|
* TODO: Configurable retry-until-timeout behaviour.
|
|
|
|
*/
|
2014-02-17 14:43:49 +01:00
|
|
|
sock = nbd_establish_connection(bs, errp);
|
2013-12-01 22:23:41 +01:00
|
|
|
if (sock < 0) {
|
2015-02-27 08:50:11 +01:00
|
|
|
g_free(export);
|
2013-12-01 22:23:41 +01:00
|
|
|
return sock;
|
2011-10-21 13:16:28 +02:00
|
|
|
}
|
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
/* NBD handshake */
|
2015-02-06 22:06:16 +01:00
|
|
|
result = nbd_client_init(bs, sock, export, errp);
|
2013-12-01 22:23:43 +01:00
|
|
|
g_free(export);
|
|
|
|
return result;
|
2011-10-20 13:16:23 +02:00
|
|
|
}
|
|
|
|
|
2011-09-10 15:06:52 +02:00
|
|
|
static int nbd_co_readv(BlockDriverState *bs, int64_t sector_num,
|
|
|
|
int nb_sectors, QEMUIOVector *qiov)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
return nbd_client_co_readv(bs, sector_num, nb_sectors, qiov);
|
2011-09-10 15:06:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int nbd_co_writev(BlockDriverState *bs, int64_t sector_num,
|
|
|
|
int nb_sectors, QEMUIOVector *qiov)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
return nbd_client_co_writev(bs, sector_num, nb_sectors, qiov);
|
2011-09-10 15:06:52 +02:00
|
|
|
}
|
|
|
|
|
2011-10-21 13:17:14 +02:00
|
|
|
static int nbd_co_flush(BlockDriverState *bs)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
return nbd_client_co_flush(bs);
|
2011-10-21 13:17:14 +02:00
|
|
|
}
|
|
|
|
|
2015-02-06 12:24:43 +01:00
|
|
|
static void nbd_refresh_limits(BlockDriverState *bs, Error **errp)
|
|
|
|
{
|
|
|
|
bs->bl.max_discard = UINT32_MAX >> BDRV_SECTOR_BITS;
|
|
|
|
bs->bl.max_transfer_length = UINT32_MAX >> BDRV_SECTOR_BITS;
|
|
|
|
}
|
|
|
|
|
2011-10-21 13:17:14 +02:00
|
|
|
static int nbd_co_discard(BlockDriverState *bs, int64_t sector_num,
|
|
|
|
int nb_sectors)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
return nbd_client_co_discard(bs, sector_num, nb_sectors);
|
2011-10-21 13:17:14 +02:00
|
|
|
}
|
|
|
|
|
2008-07-03 15:41:03 +02:00
|
|
|
static void nbd_close(BlockDriverState *bs)
|
|
|
|
{
|
2011-04-28 17:20:01 +02:00
|
|
|
BDRVNBDState *s = bs->opaque;
|
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
qemu_opts_del(s->socket_opts);
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_client_close(bs);
|
2008-07-03 15:41:03 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int64_t nbd_getlength(BlockDriverState *bs)
|
|
|
|
{
|
|
|
|
BDRVNBDState *s = bs->opaque;
|
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
return s->client.size;
|
2008-07-03 15:41:03 +02:00
|
|
|
}
|
|
|
|
|
2014-05-08 16:34:43 +02:00
|
|
|
static void nbd_detach_aio_context(BlockDriverState *bs)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_client_detach_aio_context(bs);
|
2014-05-08 16:34:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void nbd_attach_aio_context(BlockDriverState *bs,
|
|
|
|
AioContext *new_context)
|
|
|
|
{
|
2015-02-06 22:06:16 +01:00
|
|
|
nbd_client_attach_aio_context(bs, new_context);
|
2014-05-08 16:34:43 +02:00
|
|
|
}
|
|
|
|
|
2014-07-18 20:24:59 +02:00
|
|
|
static void nbd_refresh_filename(BlockDriverState *bs)
|
|
|
|
{
|
|
|
|
QDict *opts = qdict_new();
|
nbd: Fix filename generation
Export names may be used with nbd+unix, too, fix nbd_refresh_filename()
accordingly. Also, for nbd+tcp, the documented path schema is
"nbd://host[:port]/export", so use it. Furthermore, as can be seen from
that schema, the port is optional.
That makes six single cases for how the filename can be formatted; it is
not easy to generalize these cases without the resulting statement being
completely unreadable, thus there is simply one snprintf() per case.
Finally, taking the options from BDRVNBDState::socket_opts is wrong,
because those will not contain the export name. Just use
BlockDriverState::options instead.
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2014-10-08 19:55:15 +02:00
|
|
|
const char *path = qdict_get_try_str(bs->options, "path");
|
|
|
|
const char *host = qdict_get_try_str(bs->options, "host");
|
|
|
|
const char *port = qdict_get_try_str(bs->options, "port");
|
|
|
|
const char *export = qdict_get_try_str(bs->options, "export");
|
2014-07-18 20:24:59 +02:00
|
|
|
|
|
|
|
qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("nbd")));
|
|
|
|
|
nbd: Fix filename generation
Export names may be used with nbd+unix, too, fix nbd_refresh_filename()
accordingly. Also, for nbd+tcp, the documented path schema is
"nbd://host[:port]/export", so use it. Furthermore, as can be seen from
that schema, the port is optional.
That makes six single cases for how the filename can be formatted; it is
not easy to generalize these cases without the resulting statement being
completely unreadable, thus there is simply one snprintf() per case.
Finally, taking the options from BDRVNBDState::socket_opts is wrong,
because those will not contain the export name. Just use
BlockDriverState::options instead.
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2014-10-08 19:55:15 +02:00
|
|
|
if (path && export) {
|
2014-07-18 20:24:59 +02:00
|
|
|
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
|
nbd: Fix filename generation
Export names may be used with nbd+unix, too, fix nbd_refresh_filename()
accordingly. Also, for nbd+tcp, the documented path schema is
"nbd://host[:port]/export", so use it. Furthermore, as can be seen from
that schema, the port is optional.
That makes six single cases for how the filename can be formatted; it is
not easy to generalize these cases without the resulting statement being
completely unreadable, thus there is simply one snprintf() per case.
Finally, taking the options from BDRVNBDState::socket_opts is wrong,
because those will not contain the export name. Just use
BlockDriverState::options instead.
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2014-10-08 19:55:15 +02:00
|
|
|
"nbd+unix:///%s?socket=%s", export, path);
|
|
|
|
} else if (path && !export) {
|
2014-07-18 20:24:59 +02:00
|
|
|
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
|
nbd: Fix filename generation
Export names may be used with nbd+unix, too, fix nbd_refresh_filename()
accordingly. Also, for nbd+tcp, the documented path schema is
"nbd://host[:port]/export", so use it. Furthermore, as can be seen from
that schema, the port is optional.
That makes six single cases for how the filename can be formatted; it is
not easy to generalize these cases without the resulting statement being
completely unreadable, thus there is simply one snprintf() per case.
Finally, taking the options from BDRVNBDState::socket_opts is wrong,
because those will not contain the export name. Just use
BlockDriverState::options instead.
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2014-10-08 19:55:15 +02:00
|
|
|
"nbd+unix://?socket=%s", path);
|
|
|
|
} else if (!path && export && port) {
|
|
|
|
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
|
|
|
|
"nbd://%s:%s/%s", host, port, export);
|
|
|
|
} else if (!path && export && !port) {
|
|
|
|
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
|
|
|
|
"nbd://%s/%s", host, export);
|
|
|
|
} else if (!path && !export && port) {
|
|
|
|
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
|
|
|
|
"nbd://%s:%s", host, port);
|
|
|
|
} else if (!path && !export && !port) {
|
2014-07-18 20:24:59 +02:00
|
|
|
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
|
nbd: Fix filename generation
Export names may be used with nbd+unix, too, fix nbd_refresh_filename()
accordingly. Also, for nbd+tcp, the documented path schema is
"nbd://host[:port]/export", so use it. Furthermore, as can be seen from
that schema, the port is optional.
That makes six single cases for how the filename can be formatted; it is
not easy to generalize these cases without the resulting statement being
completely unreadable, thus there is simply one snprintf() per case.
Finally, taking the options from BDRVNBDState::socket_opts is wrong,
because those will not contain the export name. Just use
BlockDriverState::options instead.
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2014-10-08 19:55:15 +02:00
|
|
|
"nbd://%s", host);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (path) {
|
|
|
|
qdict_put_obj(opts, "path", QOBJECT(qstring_from_str(path)));
|
|
|
|
} else if (port) {
|
2014-07-18 20:24:59 +02:00
|
|
|
qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(host)));
|
|
|
|
qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(port)));
|
nbd: Fix filename generation
Export names may be used with nbd+unix, too, fix nbd_refresh_filename()
accordingly. Also, for nbd+tcp, the documented path schema is
"nbd://host[:port]/export", so use it. Furthermore, as can be seen from
that schema, the port is optional.
That makes six single cases for how the filename can be formatted; it is
not easy to generalize these cases without the resulting statement being
completely unreadable, thus there is simply one snprintf() per case.
Finally, taking the options from BDRVNBDState::socket_opts is wrong,
because those will not contain the export name. Just use
BlockDriverState::options instead.
Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2014-10-08 19:55:15 +02:00
|
|
|
} else {
|
|
|
|
qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(host)));
|
|
|
|
}
|
|
|
|
if (export) {
|
|
|
|
qdict_put_obj(opts, "export", QOBJECT(qstring_from_str(export)));
|
2014-07-18 20:24:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bs->full_open_options = opts;
|
|
|
|
}
|
|
|
|
|
2009-05-10 00:03:42 +02:00
|
|
|
static BlockDriver bdrv_nbd = {
|
2014-05-08 16:34:43 +02:00
|
|
|
.format_name = "nbd",
|
|
|
|
.protocol_name = "nbd",
|
|
|
|
.instance_size = sizeof(BDRVNBDState),
|
|
|
|
.bdrv_parse_filename = nbd_parse_filename,
|
|
|
|
.bdrv_file_open = nbd_open,
|
|
|
|
.bdrv_co_readv = nbd_co_readv,
|
|
|
|
.bdrv_co_writev = nbd_co_writev,
|
|
|
|
.bdrv_close = nbd_close,
|
|
|
|
.bdrv_co_flush_to_os = nbd_co_flush,
|
|
|
|
.bdrv_co_discard = nbd_co_discard,
|
2015-02-06 12:24:43 +01:00
|
|
|
.bdrv_refresh_limits = nbd_refresh_limits,
|
2014-05-08 16:34:43 +02:00
|
|
|
.bdrv_getlength = nbd_getlength,
|
|
|
|
.bdrv_detach_aio_context = nbd_detach_aio_context,
|
|
|
|
.bdrv_attach_aio_context = nbd_attach_aio_context,
|
2014-07-18 20:24:59 +02:00
|
|
|
.bdrv_refresh_filename = nbd_refresh_filename,
|
2012-11-04 13:04:24 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
static BlockDriver bdrv_nbd_tcp = {
|
2014-05-08 16:34:43 +02:00
|
|
|
.format_name = "nbd",
|
|
|
|
.protocol_name = "nbd+tcp",
|
|
|
|
.instance_size = sizeof(BDRVNBDState),
|
|
|
|
.bdrv_parse_filename = nbd_parse_filename,
|
|
|
|
.bdrv_file_open = nbd_open,
|
|
|
|
.bdrv_co_readv = nbd_co_readv,
|
|
|
|
.bdrv_co_writev = nbd_co_writev,
|
|
|
|
.bdrv_close = nbd_close,
|
|
|
|
.bdrv_co_flush_to_os = nbd_co_flush,
|
|
|
|
.bdrv_co_discard = nbd_co_discard,
|
2015-02-06 12:24:43 +01:00
|
|
|
.bdrv_refresh_limits = nbd_refresh_limits,
|
2014-05-08 16:34:43 +02:00
|
|
|
.bdrv_getlength = nbd_getlength,
|
|
|
|
.bdrv_detach_aio_context = nbd_detach_aio_context,
|
|
|
|
.bdrv_attach_aio_context = nbd_attach_aio_context,
|
2014-07-18 20:24:59 +02:00
|
|
|
.bdrv_refresh_filename = nbd_refresh_filename,
|
2012-11-04 13:04:24 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
static BlockDriver bdrv_nbd_unix = {
|
2014-05-08 16:34:43 +02:00
|
|
|
.format_name = "nbd",
|
|
|
|
.protocol_name = "nbd+unix",
|
|
|
|
.instance_size = sizeof(BDRVNBDState),
|
|
|
|
.bdrv_parse_filename = nbd_parse_filename,
|
|
|
|
.bdrv_file_open = nbd_open,
|
|
|
|
.bdrv_co_readv = nbd_co_readv,
|
|
|
|
.bdrv_co_writev = nbd_co_writev,
|
|
|
|
.bdrv_close = nbd_close,
|
|
|
|
.bdrv_co_flush_to_os = nbd_co_flush,
|
|
|
|
.bdrv_co_discard = nbd_co_discard,
|
2015-02-06 12:24:43 +01:00
|
|
|
.bdrv_refresh_limits = nbd_refresh_limits,
|
2014-05-08 16:34:43 +02:00
|
|
|
.bdrv_getlength = nbd_getlength,
|
|
|
|
.bdrv_detach_aio_context = nbd_detach_aio_context,
|
|
|
|
.bdrv_attach_aio_context = nbd_attach_aio_context,
|
2014-07-18 20:24:59 +02:00
|
|
|
.bdrv_refresh_filename = nbd_refresh_filename,
|
2008-07-03 15:41:03 +02:00
|
|
|
};
|
2009-05-10 00:03:42 +02:00
|
|
|
|
|
|
|
static void bdrv_nbd_init(void)
|
|
|
|
{
|
|
|
|
bdrv_register(&bdrv_nbd);
|
2012-11-04 13:04:24 +01:00
|
|
|
bdrv_register(&bdrv_nbd_tcp);
|
|
|
|
bdrv_register(&bdrv_nbd_unix);
|
2009-05-10 00:03:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
block_init(bdrv_nbd_init);
|