NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Add 'tls-creds' parameter to 'nbd-server-start' command

Browse Source 
To allow encryption of the non-shared storage migration NBD connection
we will need to instantiated the NBD server with the TLS env.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2018-02-21 14:18:15 +01:00
parent 51541809b8
commit 17d34b482b
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_migration.c
View File

@ -411,7 +411,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver,
else if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) else if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0)
goto exit_monitor; goto exit_monitor;
if (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0) if (qemuMonitorNBDServerStart(priv->mon, listenAddr, port, NULL) < 0)
goto exit_monitor; goto exit_monitor;
} }

7
src/qemu/qemu_monitor.c
View File

@ -3999,13 +3999,14 @@ qemuMonitorGetGICCapabilities(qemuMonitorPtr mon,
int int
qemuMonitorNBDServerStart(qemuMonitorPtr mon, qemuMonitorNBDServerStart(qemuMonitorPtr mon,
const char *host, const char *host,
unsigned int port) unsigned int port,
const char *tls_alias)
{ {
VIR_DEBUG("host=%s port=%u", host, port); VIR_DEBUG("host=%s port=%u tls_alias=%s", host, port, NULLSTR(tls_alias));
QEMU_CHECK_MONITOR_JSON(mon); QEMU_CHECK_MONITOR_JSON(mon);
return qemuMonitorJSONNBDServerStart(mon, host, port); return qemuMonitorJSONNBDServerStart(mon, host, port, tls_alias);
} }

3
src/qemu/qemu_monitor.h
View File

@ -1052,7 +1052,8 @@ char *qemuMonitorGetTargetArch(qemuMonitorPtr mon);
int qemuMonitorNBDServerStart(qemuMonitorPtr mon, int qemuMonitorNBDServerStart(qemuMonitorPtr mon,
const char *host, const char *host,
unsigned int port); unsigned int port,
const char *tls_alias);
int qemuMonitorNBDServerAdd(qemuMonitorPtr mon, int qemuMonitorNBDServerAdd(qemuMonitorPtr mon,
const char *deviceID, const char *deviceID,
bool writable); bool writable);

4
src/qemu/qemu_monitor_json.c
View File

@ -6396,7 +6396,8 @@ qemuMonitorJSONBuildUnixSocketAddress(const char *path)
int int
qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
const char *host, const char *host,
unsigned int port) unsigned int port,
const char *tls_alias)
{ {
int ret = -1; int ret = -1;
virJSONValuePtr cmd = NULL; virJSONValuePtr cmd = NULL;
@ -6412,6 +6413,7 @@ qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-start", if (!(cmd = qemuMonitorJSONMakeCommand("nbd-server-start",
"a:addr", &addr, "a:addr", &addr,
"S:tls-creds", tls_alias,
NULL))) NULL)))
goto cleanup; goto cleanup;

3
src/qemu/qemu_monitor_json.h
View File

@ -449,7 +449,8 @@ char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon);
int qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon, int qemuMonitorJSONNBDServerStart(qemuMonitorPtr mon,
const char *host, const char *host,
unsigned int port); unsigned int port,
const char *tls_alias);
int qemuMonitorJSONNBDServerAdd(qemuMonitorPtr mon, int qemuMonitorJSONNBDServerAdd(qemuMonitorPtr mon,
const char *deviceID, const char *deviceID,
bool writable); bool writable);

2
tests/qemumonitorjsontest.c
View File

@ -1350,7 +1350,7 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "/foo/bar1", "/foo/bar2", NULL,
GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb") GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
GEN_TEST_FUNC(qemuMonitorJSONScreendump, "/foo/bar") GEN_TEST_FUNC(qemuMonitorJSONScreendump, "/foo/bar")
GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd", false) GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd", false)
GEN_TEST_FUNC(qemuMonitorJSONNBDServerStart, "localhost", 12345) GEN_TEST_FUNC(qemuMonitorJSONNBDServerStart, "localhost", 12345, "test-alias")
GEN_TEST_FUNC(qemuMonitorJSONNBDServerAdd, "vda", true) GEN_TEST_FUNC(qemuMonitorJSONNBDServerAdd, "vda", true)
GEN_TEST_FUNC(qemuMonitorJSONDetachCharDev, "serial1") GEN_TEST_FUNC(qemuMonitorJSONDetachCharDev, "serial1")