openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: storage: Add support for type 'inet' in virStorageSourceParseBackingJSONSocketAddress 

'SocketAddress' structure was changed to contain 'inet' instead of
'tcp' since qemu commit c5f1ae3ae7b. Existing entries have a backward
compatibility layer.

Libvirt will parse 'inet' and 'tcp' as equivalents.
This commit is contained in:
Peter Krempa 2017-06-19 14:37:47 +02:00
parent 8829142b46
commit 1f915d40a2
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/virstoragefile.c
View File

@ -2802,18 +2802,17 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
const char *hostname = virJSONValueObjectGetString(json, "host"); const char *hostname = virJSONValueObjectGetString(json, "host");
const char *port = virJSONValueObjectGetString(json, "port"); const char *port = virJSONValueObjectGetString(json, "port");
const char *socket = virJSONValueObjectGetString(json, "socket"); const char *socket = virJSONValueObjectGetString(json, "socket");
int transport;
if ((transport = virStorageNetHostTransportTypeFromString(type)) < 0) { if (!type) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INVALID_ARG, "%s",
_("unknown backing store transport protocol '%s'"), type); _("missing socket address type in "
"JSON backing volume definition"));
return -1; return -1;
} }
host->transport = transport; if (STREQ(type, "tcp") || STREQ(type, "inet")) {
host->transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
switch ((virStorageNetHostTransport) transport) {
case VIR_STORAGE_NET_HOST_TRANS_TCP:
if (!hostname) { if (!hostname) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing hostname for tcp backing server in " _("missing hostname for tcp backing server in "
@ -2824,9 +2823,9 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
if (VIR_STRDUP(host->name, hostname) < 0 || if (VIR_STRDUP(host->name, hostname) < 0 ||
VIR_STRDUP(host->port, port) < 0) VIR_STRDUP(host->port, port) < 0)
return -1; return -1;
break; } else if (STREQ(type, "unix")) {
host->transport = VIR_STORAGE_NET_HOST_TRANS_UNIX;
case VIR_STORAGE_NET_HOST_TRANS_UNIX:
if (!socket) { if (!socket) {
virReportError(VIR_ERR_INVALID_ARG, "%s", virReportError(VIR_ERR_INVALID_ARG, "%s",
_("missing socket path for udp backing server in " _("missing socket path for udp backing server in "
@ -2834,13 +2833,9 @@ virStorageSourceParseBackingJSONSocketAddress(virStorageNetHostDefPtr host,
return -1; return -1;
} }
if (VIR_STRDUP(host->socket, socket) < 0) if (VIR_STRDUP(host->socket, socket) < 0)
return -1; return -1;
break; } else {
case VIR_STORAGE_NET_HOST_TRANS_RDMA:
case VIR_STORAGE_NET_HOST_TRANS_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("backing store protocol '%s' is not yet supported"), _("backing store protocol '%s' is not yet supported"),
type); type);

2
tests/virstoragetest.c
View File

@ -1431,7 +1431,7 @@ mymain(void)
"{ \"type\":\"unix\"," "{ \"type\":\"unix\","
"\"socket\":\"/path/socket\"" "\"socket\":\"/path/socket\""
"}," "},"
"{ \"type\":\"tcp\"," "{ \"type\":\"inet\","
"\"host\":\"example.com\"" "\"host\":\"example.com\""
"}" "}"
"]" "]"