External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-29 20:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: block: Remove legacy spellings for InetSocketAddress

Browse Source 
In one of early iterations of the gluster driver 'tcp' was used instead
of 'inet' and 'socket' instead of 'path' for unix sockets. All of this
can be now removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-19 15:45:22 +02:00
parent b45f63ecd9
commit b74d17279d
1 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/qemu/qemu_block.c
View File

@ -431,36 +431,24 @@ qemuBlockStorageSourceGetURI(virStorageSource *src)
/** /**
* qemuBlockStorageSourceBuildJSONSocketAddress * qemuBlockStorageSourceBuildJSONSocketAddress
* @host: the virStorageNetHostDef * definition to build * @host: the virStorageNetHostDef * definition to build
* @legacy: use old field names/values
* *
* Formats @hosts into a json object conforming to the 'SocketAddress' type * Formats @hosts into a json object conforming to the 'SocketAddress' type
* in qemu. * in qemu.
* *
* For compatibility with old approach used in the gluster driver of old qemus
* use the old spelling for TCP transport and, the path field of the unix socket.
*
* Returns a virJSONValue * for a single server. * Returns a virJSONValue * for a single server.
*/ */
static virJSONValue * static virJSONValue *
qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host, qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host)
bool legacy)
{ {
g_autoptr(virJSONValue) server = NULL; g_autoptr(virJSONValue) server = NULL;
const char *transport;
const char *field;
g_autofree char *port = NULL; g_autofree char *port = NULL;
switch ((virStorageNetHostTransport) host->transport) { switch ((virStorageNetHostTransport) host->transport) {
case VIR_STORAGE_NET_HOST_TRANS_TCP: case VIR_STORAGE_NET_HOST_TRANS_TCP:
if (legacy)
transport = "tcp";
else
transport = "inet";
port = g_strdup_printf("%u", host->port); port = g_strdup_printf("%u", host->port);
if (virJSONValueObjectAdd(&server, if (virJSONValueObjectAdd(&server,
"s:type", transport, "s:type", "inet",
"s:host", host->name, "s:host", host->name,
"s:port", port, "s:port", port,
NULL) < 0) NULL) < 0)
@ -468,14 +456,9 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host,
break; break;
case VIR_STORAGE_NET_HOST_TRANS_UNIX: case VIR_STORAGE_NET_HOST_TRANS_UNIX:
if (legacy)
field = "s:socket";
else
field = "s:path";
if (virJSONValueObjectAdd(&server, if (virJSONValueObjectAdd(&server,
"s:type", "unix", "s:type", "unix",
field, host->socket, "s:path", host->socket,
NULL) < 0) NULL) < 0)
return NULL; return NULL;
break; break;
@ -495,14 +478,12 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host,
/** /**
* qemuBlockStorageSourceBuildHostsJSONSocketAddress: * qemuBlockStorageSourceBuildHostsJSONSocketAddress:
* @src: disk storage source * @src: disk storage source
* @legacy: use 'tcp' instead of 'inet' for compatibility reasons
* *
* Formats src->hosts into a json object conforming to the 'SocketAddress' type * Formats src->hosts into a json object conforming to the 'SocketAddress' type
* in qemu. * in qemu.
*/ */
static virJSONValue * static virJSONValue *
qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src, qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src)
bool legacy)
{ {
g_autoptr(virJSONValue) servers = NULL; g_autoptr(virJSONValue) servers = NULL;
g_autoptr(virJSONValue) server = NULL; g_autoptr(virJSONValue) server = NULL;
@ -514,7 +495,7 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src,
for (i = 0; i < src->nhosts; i++) { for (i = 0; i < src->nhosts; i++) {
host = src->hosts + i; host = src->hosts + i;
if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(host, legacy))) if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(host)))
return NULL; return NULL;
if (virJSONValueArrayAppend(servers, &server) < 0) if (virJSONValueArrayAppend(servers, &server) < 0)
@ -613,13 +594,12 @@ qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(virStorageSource *src)
static virJSONValue * static virJSONValue *
qemuBlockStorageSourceGetGlusterProps(virStorageSource *src, qemuBlockStorageSourceGetGlusterProps(virStorageSource *src,
bool legacy,
bool onlytarget) bool onlytarget)
{ {
g_autoptr(virJSONValue) servers = NULL; g_autoptr(virJSONValue) servers = NULL;
g_autoptr(virJSONValue) props = NULL; g_autoptr(virJSONValue) props = NULL;
if (!(servers = qemuBlockStorageSourceBuildHostsJSONSocketAddress(src, legacy))) if (!(servers = qemuBlockStorageSourceBuildHostsJSONSocketAddress(src)))
return NULL; return NULL;
/* { driver:"gluster", /* { driver:"gluster",
@ -850,9 +830,7 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src,
return NULL; return NULL;
} }
serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0], if (!(serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0])))
false);
if (!serverprops)
return NULL; return NULL;
if (onlytarget) { if (onlytarget) {
@ -951,9 +929,7 @@ qemuBlockStorageSourceGetSheepdogProps(virStorageSource *src)
return NULL; return NULL;
} }
serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0], if (!(serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0])))
false);
if (!serverprops)
return NULL; return NULL;
/* libvirt does not support the 'snap-id' and 'tag' properties */ /* libvirt does not support the 'snap-id' and 'tag' properties */
@ -1191,7 +1167,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSource *src,
switch ((virStorageNetProtocol) src->protocol) { switch ((virStorageNetProtocol) src->protocol) {
case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
driver = "gluster"; driver = "gluster";
if (!(fileprops = qemuBlockStorageSourceGetGlusterProps(src, legacy, onlytarget))) if (!(fileprops = qemuBlockStorageSourceGetGlusterProps(src, onlytarget)))
return NULL; return NULL;
break; break;
@ -2611,7 +2587,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorageSource *src,
switch ((virStorageNetProtocol) src->protocol) { switch ((virStorageNetProtocol) src->protocol) {
case VIR_STORAGE_NET_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
driver = "gluster"; driver = "gluster";
if (!(location = qemuBlockStorageSourceGetGlusterProps(src, false, false))) if (!(location = qemuBlockStorageSourceGetGlusterProps(src, false)))
return -1; return -1;
break; break;