6:34 a.m.
When looking for a port to allocate, the port allocator didn't take in
consideration ports that are statically set by the user. Defining
these two graphics elements in the XML would cause an error, as the
port allocator would try to use the same port for the spice graphics
element:
<graphics type='spice' autoport='yes'/>
<graphics type='vnc' port='5900' autoport='no'/>
The new *[pP]ortReserved variables keep track of the ports that were
successfully tracked as used by the port allocator but that weren't
bound.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1081881
Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com>
---
src/conf/domain_conf.h | 3 +++
src/qemu/qemu_process.c | 68 ++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 6779a41..1122eb2 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1385,6 +1385,7 @@ struct _virDomainGraphicsDef {
union {
struct {
int port;
+ bool portReserved;
int websocket;
bool autoport;
char *keymap;
@@ -1410,6 +1411,8 @@ struct _virDomainGraphicsDef {
struct {
int port;
int tlsPort;
+ bool portReserved;
+ bool tlsPortReserved;
int mousemode;
char *keymap;
virDomainGraphicsAuthDef auth;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0b8155b..561e37e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3803,6 +3803,41 @@ int qemuProcessStart(virConnectPtr conn,
for (i = 0; i < vm->def->ngraphics; ++i) {
virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
+ if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
+ !graphics->data.vnc.autoport) {
+ if (virPortAllocatorSetUsed(driver->remotePorts,
+ graphics->data.vnc.port,
+ true) < 0) {
+ goto cleanup;
+ }
+
+ graphics->data.vnc.portReserved = true;
+
+ } else if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
+ !graphics->data.spice.autoport) {
+
+ if (graphics->data.spice.port > 0) {
+ if (virPortAllocatorSetUsed(driver->remotePorts,
+ graphics->data.spice.port,
+ true) < 0)
+ goto cleanup;
+
+ graphics->data.spice.portReserved = true;
+ }
+
+ if (graphics->data.spice.tlsPort > 0) {
+ if (virPortAllocatorSetUsed(driver->remotePorts,
+ graphics->data.spice.tlsPort,
+ true) < 0)
+ goto cleanup;
+
+ graphics->data.spice.tlsPortReserved = true;
+ }
+ }
+ }
+
+ for (i = 0; i < vm->def->ngraphics; ++i) {
+ virDomainGraphicsDefPtr graphics = vm->def->graphics[i];
if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
if (qemuProcessVNCAllocatePorts(driver, graphics) < 0)
goto cleanup;
@@ -4513,15 +4548,36 @@ void qemuProcessStop(virQEMUDriverPtr driver,
virPortAllocatorRelease(driver->remotePorts,
graphics->data.vnc.port);
}
+ else if (graphics->data.vnc.portReserved) {
+ virPortAllocatorSetUsed(driver->remotePorts,
+ graphics->data.spice.port,
+ false);
+ graphics->data.vnc.portReserved = false;
+ }
virPortAllocatorRelease(driver->webSocketPorts,
graphics->data.vnc.websocket);
}
- if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
- graphics->data.spice.autoport) {
- virPortAllocatorRelease(driver->remotePorts,
- graphics->data.spice.port);
- virPortAllocatorRelease(driver->remotePorts,
- graphics->data.spice.tlsPort);
+ if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
+ if (graphics->data.spice.autoport) {
+ virPortAllocatorRelease(driver->remotePorts,
+ graphics->data.spice.port);
+ virPortAllocatorRelease(driver->remotePorts,
+ graphics->data.spice.tlsPort);
+ } else {
+ if (graphics->data.spice.portReserved) {
+ virPortAllocatorSetUsed(driver->remotePorts,
+ graphics->data.spice.port,
+ false);
+ graphics->data.spice.portReserved = false;
+ }
+
+ if (graphics->data.spice.tlsPortReserved) {
+ virPortAllocatorSetUsed(driver->remotePorts,
+ graphics->data.spice.tlsPort,
+ false);
+ graphics->data.spice.tlsPortReserved = false;
+ }
+ }
}
}
--
1.9.3