From c94b37d43ed79fb7a55610a258897181ed7c4f7c 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: missing support for changing migration listen_address 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 a3dcb30d22..58d7258def 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -74,6 +74,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 @@ -83,6 +86,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 d57b3b48c4..de23e8e4e5 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -63,5 +63,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" } -- GitLab