External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Check whether migration_address is localhost

Browse Source 
When enabling the migration_address option, by default it is
set to "127.0.0.1", but it's not a valid address for migration.
so we should add verification and set the default migration_address
to "0.0.0.0".

Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Chen Fan 2014-10-07 12:07:32 +08:00 committed by Ján Tomko
parent 24c1603762
commit 5e0561e115
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu.conf
View File

@ -467,7 +467,7 @@
# Override the listen address for all incoming migrations. Defaults to # Override the listen address for all incoming migrations. Defaults to
# 0.0.0.0, or :: if both host and qemu are capable of IPv6. # 0.0.0.0, or :: if both host and qemu are capable of IPv6.
#migration_address = "127.0.0.1" #migration_address = "0.0.0.0"
# The default hostname or IP address which will be used by a migration # The default hostname or IP address which will be used by a migration

10
src/qemu/qemu_conf.c
View File

@ -719,6 +719,16 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
} }
GET_VALUE_STR("migration_address", cfg->migrationAddress); GET_VALUE_STR("migration_address", cfg->migrationAddress);
virStringStripIPv6Brackets(cfg->migrationAddress);
if (cfg->migrationAddress &&
(STRPREFIX(cfg->migrationAddress, "localhost") ||
virSocketAddrIsNumericLocalhost(cfg->migrationAddress))) {
virReportError(VIR_ERR_CONF_SYNTAX,
_("migration_address must not be the address of"
" the local machine: %s"),
cfg->migrationAddress);
goto cleanup;
}
GET_VALUE_BOOL("log_timestamp", cfg->logTimestamp); GET_VALUE_BOOL("log_timestamp", cfg->logTimestamp);

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

@ -69,7 +69,7 @@ module Test_libvirtd_qemu =
{ "keepalive_interval" = "5" } { "keepalive_interval" = "5" }
{ "keepalive_count" = "5" } { "keepalive_count" = "5" }
{ "seccomp_sandbox" = "1" } { "seccomp_sandbox" = "1" }
{ "migration_address" = "127.0.0.1" } { "migration_address" = "0.0.0.0" }
{ "migration_host" = "host.example.com" } { "migration_host" = "host.example.com" }
{ "migration_port_min" = "49152" } { "migration_port_min" = "49152" }
{ "migration_port_max" = "49215" } { "migration_port_max" = "49215" }