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.
|
|
|
|
*/
|
|
|
|
|
2016-01-18 19:01:42 +01:00
|
|
|
#include "qemu/osdep.h"
|
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"
|
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
|
|
|
|
|
|
|
|
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;
|
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
|
|
|
}
|
|
|
|
|
2015-09-16 15:52:22 +02:00
|
|
|
static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char **export,
|
|
|
|
Error **errp)
|
2013-03-07 16:15:11 +01:00
|
|
|
{
|
2015-09-16 15:52:22 +02:00
|
|
|
SocketAddress *saddr;
|
2013-03-07 16:15:11 +01:00
|
|
|
|
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
|
|
|
}
|
2015-09-16 15:52:22 +02:00
|
|
|
return NULL;
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
2013-03-07 16:15:11 +01:00
|
|
|
|
2015-09-16 15:52:22 +02:00
|
|
|
saddr = g_new0(SocketAddress, 1);
|
2013-03-07 16:15:11 +01:00
|
|
|
|
2015-09-16 15:52:22 +02:00
|
|
|
if (qdict_haskey(options, "path")) {
|
2016-03-03 17:16:48 +01:00
|
|
|
UnixSocketAddress *q_unix;
|
2015-10-26 23:34:54 +01:00
|
|
|
saddr->type = SOCKET_ADDRESS_KIND_UNIX;
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 23:48:37 +01:00
|
|
|
q_unix = saddr->u.q_unix.data = g_new0(UnixSocketAddress, 1);
|
2016-03-03 17:16:48 +01:00
|
|
|
q_unix->path = g_strdup(qdict_get_str(options, "path"));
|
2015-09-16 15:52:22 +02:00
|
|
|
qdict_del(options, "path");
|
|
|
|
} else {
|
2016-03-03 17:16:48 +01:00
|
|
|
InetSocketAddress *inet;
|
2015-10-26 23:34:54 +01:00
|
|
|
saddr->type = SOCKET_ADDRESS_KIND_INET;
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 23:48:37 +01:00
|
|
|
inet = saddr->u.inet.data = g_new0(InetSocketAddress, 1);
|
2016-03-03 17:16:48 +01:00
|
|
|
inet->host = g_strdup(qdict_get_str(options, "host"));
|
2015-09-16 15:52:22 +02:00
|
|
|
if (!qdict_get_try_str(options, "port")) {
|
2016-03-03 17:16:48 +01:00
|
|
|
inet->port = g_strdup_printf("%d", NBD_DEFAULT_PORT);
|
2015-09-16 15:52:22 +02:00
|
|
|
} else {
|
2016-03-03 17:16:48 +01:00
|
|
|
inet->port = g_strdup(qdict_get_str(options, "port"));
|
2015-09-16 15:52:22 +02:00
|
|
|
}
|
|
|
|
qdict_del(options, "host");
|
|
|
|
qdict_del(options, "port");
|
2013-03-07 16:15:11 +01:00
|
|
|
}
|
|
|
|
|
2015-10-26 23:34:54 +01:00
|
|
|
s->client.is_unix = saddr->type == SOCKET_ADDRESS_KIND_UNIX;
|
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");
|
|
|
|
}
|
2015-09-16 15:52:22 +02:00
|
|
|
|
|
|
|
return saddr;
|
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;
|
|
|
|
}
|
|
|
|
|
2016-02-10 19:41:01 +01:00
|
|
|
static QIOChannelSocket *nbd_establish_connection(SocketAddress *saddr,
|
|
|
|
Error **errp)
|
2011-02-22 16:44:54 +01:00
|
|
|
{
|
2016-02-10 19:41:01 +01:00
|
|
|
QIOChannelSocket *sioc;
|
|
|
|
Error *local_err = NULL;
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2016-02-10 19:41:01 +01:00
|
|
|
sioc = qio_channel_socket_new();
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2016-02-10 19:41:01 +01:00
|
|
|
qio_channel_socket_connect_sync(sioc,
|
|
|
|
saddr,
|
|
|
|
&local_err);
|
|
|
|
if (local_err) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return NULL;
|
2010-08-25 22:48:33 +02:00
|
|
|
}
|
2008-07-03 15:41:03 +02:00
|
|
|
|
2016-02-10 19:41:01 +01:00
|
|
|
qio_channel_set_delay(QIO_CHANNEL(sioc), false);
|
2015-09-16 15:52:22 +02:00
|
|
|
|
2016-02-10 19:41:01 +01:00
|
|
|
return sioc;
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
|
|
|
|
2016-02-10 19:41:12 +01:00
|
|
|
|
|
|
|
static QCryptoTLSCreds *nbd_get_tls_creds(const char *id, Error **errp)
|
|
|
|
{
|
|
|
|
Object *obj;
|
|
|
|
QCryptoTLSCreds *creds;
|
|
|
|
|
|
|
|
obj = object_resolve_path_component(
|
|
|
|
object_get_objects_root(), id);
|
|
|
|
if (!obj) {
|
|
|
|
error_setg(errp, "No TLS credentials with id '%s'",
|
|
|
|
id);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
creds = (QCryptoTLSCreds *)
|
|
|
|
object_dynamic_cast(obj, TYPE_QCRYPTO_TLS_CREDS);
|
|
|
|
if (!creds) {
|
|
|
|
error_setg(errp, "Object with id '%s' is not TLS credentials",
|
|
|
|
id);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
|
|
|
|
error_setg(errp,
|
|
|
|
"Expecting TLS credentials with a client endpoint");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
object_ref(obj);
|
|
|
|
return creds;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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;
|
2016-02-10 19:41:12 +01:00
|
|
|
QIOChannelSocket *sioc = NULL;
|
2015-09-16 15:52:22 +02:00
|
|
|
SocketAddress *saddr;
|
2016-02-10 19:41:12 +01:00
|
|
|
const char *tlscredsid;
|
|
|
|
QCryptoTLSCreds *tlscreds = NULL;
|
|
|
|
const char *hostname = NULL;
|
|
|
|
int ret = -EINVAL;
|
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. */
|
2015-09-16 15:52:22 +02:00
|
|
|
saddr = nbd_config(s, options, &export, errp);
|
|
|
|
if (!saddr) {
|
2016-02-10 19:41:12 +01:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
tlscredsid = g_strdup(qdict_get_try_str(options, "tls-creds"));
|
|
|
|
if (tlscredsid) {
|
|
|
|
qdict_del(options, "tls-creds");
|
|
|
|
tlscreds = nbd_get_tls_creds(tlscredsid, errp);
|
|
|
|
if (!tlscreds) {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (saddr->type != SOCKET_ADDRESS_KIND_INET) {
|
|
|
|
error_setg(errp, "TLS only supported over IP sockets");
|
|
|
|
goto error;
|
|
|
|
}
|
qapi: Don't special-case simple union wrappers
Simple unions were carrying a special case that hid their 'data'
QMP member from the resulting C struct, via the hack method
QAPISchemaObjectTypeVariant.simple_union_type(). But by using
the work we started by unboxing flat union and alternate
branches, coupled with the ability to visit the members of an
implicit type, we can now expose the simple union's implicit
type in qapi-types.h:
| struct q_obj_ImageInfoSpecificQCow2_wrapper {
| ImageInfoSpecificQCow2 *data;
| };
|
| struct q_obj_ImageInfoSpecificVmdk_wrapper {
| ImageInfoSpecificVmdk *data;
| };
...
| struct ImageInfoSpecific {
| ImageInfoSpecificKind type;
| union { /* union tag is @type */
| void *data;
|- ImageInfoSpecificQCow2 *qcow2;
|- ImageInfoSpecificVmdk *vmdk;
|+ q_obj_ImageInfoSpecificQCow2_wrapper qcow2;
|+ q_obj_ImageInfoSpecificVmdk_wrapper vmdk;
| } u;
| };
Doing this removes asymmetry between QAPI's QMP side and its
C side (both sides now expose 'data'), and means that the
treatment of a simple union as sugar for a flat union is now
equivalent in both languages (previously the two approaches used
a different layer of dereferencing, where the simple union could
be converted to a flat union with equivalent C layout but
different {} on the wire, or to an equivalent QMP wire form
but with different C representation). Using the implicit type
also lets us get rid of the simple_union_type() hack.
Of course, now all clients of simple unions have to adjust from
using su->u.member to using su->u.member.data; while this touches
a number of files in the tree, some earlier cleanup patches
helped minimize the change to the initialization of a temporary
variable rather than every single member access. The generated
qapi-visit.c code is also affected by the layout change:
|@@ -7393,10 +7393,10 @@ void visit_type_ImageInfoSpecific_member
| }
| switch (obj->type) {
| case IMAGE_INFO_SPECIFIC_KIND_QCOW2:
|- visit_type_ImageInfoSpecificQCow2(v, "data", &obj->u.qcow2, &err);
|+ visit_type_q_obj_ImageInfoSpecificQCow2_wrapper_members(v, &obj->u.qcow2, &err);
| break;
| case IMAGE_INFO_SPECIFIC_KIND_VMDK:
|- visit_type_ImageInfoSpecificVmdk(v, "data", &obj->u.vmdk, &err);
|+ visit_type_q_obj_ImageInfoSpecificVmdk_wrapper_members(v, &obj->u.vmdk, &err);
| break;
| default:
| abort();
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1458254921-17042-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2016-03-17 23:48:37 +01:00
|
|
|
hostname = saddr->u.inet.data->host;
|
2011-02-22 16:44:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* establish TCP connection, return error if it fails
|
|
|
|
* TODO: Configurable retry-until-timeout behaviour.
|
|
|
|
*/
|
2016-02-10 19:41:01 +01:00
|
|
|
sioc = nbd_establish_connection(saddr, errp);
|
|
|
|
if (!sioc) {
|
2016-02-10 19:41:12 +01:00
|
|
|
ret = -ECONNREFUSED;
|
|
|
|
goto error;
|
2011-10-21 13:16:28 +02:00
|
|
|
}
|
|
|
|
|
2013-12-01 22:23:41 +01:00
|
|
|
/* NBD handshake */
|
2016-02-10 19:41:12 +01:00
|
|
|
ret = nbd_client_init(bs, sioc, export,
|
|
|
|
tlscreds, hostname, errp);
|
|
|
|
error:
|
|
|
|
if (sioc) {
|
|
|
|
object_unref(OBJECT(sioc));
|
|
|
|
}
|
|
|
|
if (tlscreds) {
|
|
|
|
object_unref(OBJECT(tlscreds));
|
|
|
|
}
|
|
|
|
qapi_free_SocketAddress(saddr);
|
2013-12-01 22:23:43 +01:00
|
|
|
g_free(export);
|
2016-02-10 19:41:12 +01:00
|
|
|
return ret;
|
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)
|
|
|
|
{
|
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
|
|
|
}
|
|
|
|
|
2015-04-27 13:50:54 +02:00
|
|
|
static void nbd_refresh_filename(BlockDriverState *bs, QDict *options)
|
2014-07-18 20:24:59 +02:00
|
|
|
{
|
|
|
|
QDict *opts = qdict_new();
|
2015-04-27 13:50:54 +02:00
|
|
|
const char *path = qdict_get_try_str(options, "path");
|
|
|
|
const char *host = qdict_get_try_str(options, "host");
|
|
|
|
const char *port = qdict_get_try_str(options, "port");
|
|
|
|
const char *export = qdict_get_try_str(options, "export");
|
2016-02-10 19:41:12 +01:00
|
|
|
const char *tlscreds = qdict_get_try_str(options, "tls-creds");
|
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
|
|
|
}
|
2016-02-10 19:41:12 +01:00
|
|
|
if (tlscreds) {
|
|
|
|
qdict_put_obj(opts, "tls-creds", QOBJECT(qstring_from_str(tlscreds)));
|
|
|
|
}
|
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);
|