External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Make migration port range configurable

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1019053
This commit is contained in:
Jiri Denemark 2013-10-15 15:26:52 +02:00
parent 0196845d3a
commit e3ef20d7f7
5 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu.conf
View File

@ -452,3 +452,14 @@
# Override the listen address for all incoming migrations. Defaults to
# 0.0.0.0 or :: in case if both host and qemu are capable of IPv6.
#migration_address = "127.0.0.1"
# Override the port range used for incoming migrations.
#
# Minimum must be greater than 0, however when QEMU is not running as root,
# setting the minimum to be lower than 1024 will not work.
#
# Maximum must not be greater than 65535.
#
#migration_port_min = 49152
#migration_port_max = 49215

21
src/qemu/qemu_conf.c
View File

@ -225,6 +225,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged)
cfg->webSocketPortMin = QEMU_WEBSOCKET_PORT_MIN;
cfg->webSocketPortMax = QEMU_WEBSOCKET_PORT_MAX;
cfg->migrationPortMin = QEMU_MIGRATION_PORT_MIN;
cfg->migrationPortMax = QEMU_MIGRATION_PORT_MAX;
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
/* For privileged driver, try and find hugepage mount automatically.
* Non-privileged driver requires admin to create a dir for the
@ -462,6 +465,24 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
goto cleanup;
}
GET_VALUE_LONG("migration_port_min", cfg->migrationPortMin);
if (cfg->migrationPortMin <= 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s: migration_port_min: port must be greater than 0"),
filename);
goto cleanup;
}
GET_VALUE_LONG("migration_port_max", cfg->migrationPortMax);
if (cfg->migrationPortMax > 65535 ||
cfg->migrationPortMax < cfg->migrationPortMin) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("%s: migration_port_max: port must be between "
"the minimal port %d and 65535"),
filename, cfg->migrationPortMin);
goto cleanup;
}
p = virConfGetValue(conf, "user");
CHECK_TYPE("user", VIR_CONF_STRING);
if (p && p->str &&

2
src/qemu/qemu_conf.h
View File

@ -161,6 +161,8 @@ struct _virQEMUDriverConfig {
/* The default for -incoming */
char *migrationAddress;
int migrationPortMin;
int migrationPortMax;
};
/* Main driver state */

4
src/qemu/qemu_driver.c
View File

@ -688,8 +688,8 @@ qemuStateInitialize(bool privileged,
goto error;
if ((qemu_driver->migrationPorts =
virPortAllocatorNew(QEMU_MIGRATION_PORT_MIN,
QEMU_MIGRATION_PORT_MAX)) == NULL)
virPortAllocatorNew(cfg->migrationPortMin,
cfg->migrationPortMax)) == NULL)
goto error;
if (qemuSecurityInit(qemu_driver) < 0)

2
src/qemu/test_libvirtd_qemu.aug.in
View File

@ -70,3 +70,5 @@ module Test_libvirtd_qemu =
{ "keepalive_count" = "5" }
{ "seccomp_sandbox" = "1" }
{ "migration_address" = "127.0.0.1" }
{ "migration_port_min" = "1234" }
{ "migration_port_max" = "12345" }