From 6f5b60a95b50a633b3c404e8c4a0911326dbdf6f Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 18 Oct 2013 18:28:14 +0200 Subject: [PATCH] qemu: Fix augeas support for migration ports Commit e3ef20d7 allows user to configure migration ports range via qemu.conf. However, it forgot to update augeas definition file and even the test data was malicious. Signed-off-by: Michal Privoznik (cherry picked from commit d9be5a7157515eeae99379e9544c34b34c5e5198) Conflicts: src/qemu/libvirtd_qemu.aug src/qemu/test_libvirtd_qemu.aug.in --- src/qemu/libvirtd_qemu.aug | 4 ++++ src/qemu/test_libvirtd_qemu.aug.in | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index cd13d53e3b..6d1ad931fc 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -78,6 +78,9 @@ module Libvirtd_qemu = | int_entry "keepalive_interval" | int_entry "keepalive_count" + let network_entry = int_entry "migration_port_min" + | int_entry "migration_port_max" + (* Each entry in the config is one of the following ... *) let entry = vnc_entry | spice_entry @@ -88,6 +91,7 @@ module Libvirtd_qemu = | process_entry | device_entry | rpc_entry + | network_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 42b9e863ea..b2688a701e 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -66,5 +66,5 @@ module Test_libvirtd_qemu = { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -{ "migration_port_min" = "1234" } -{ "migration_port_max" = "12345" } +{ "migration_port_min" = "49152" } +{ "migration_port_max" = "49215" }