render / rpms / libvirt

Forked from rpms/libvirt 10 months ago
Clone
Blob Blame History Raw
From f1241c136e006b81b4f041be94bd226e4742c252 Mon Sep 17 00:00:00 2001
Message-Id: <f1241c136e006b81b4f041be94bd226e4742c252.1382534062.git.jdenemar@redhat.com>
From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 22 Oct 2013 16:26:26 +0100
Subject: [PATCH] qemu: Fix augeas support for migration ports

https://bugzilla.redhat.com/show_bug.cgi?id=1019237

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 <mprivozn@redhat.com>
(cherry picked from commit d9be5a7157515eeae99379e9544c34b34c5e5198)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/libvirtd_qemu.aug         | 2 ++
 src/qemu/test_libvirtd_qemu.aug.in | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 8ce6885..3a73820 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -78,6 +78,8 @@ module Libvirtd_qemu =
                  | int_entry "keepalive_count"
 
    let network_entry = str_entry "migration_address"
+                 | int_entry "migration_port_min"
+                 | int_entry "migration_port_max"
 
    (* Each entry in the config is one of the following ... *)
    let entry = vnc_entry
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
index d6d55b8..2683b9b 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -67,5 +67,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" }
+{ "migration_port_min" = "49152" }
+{ "migration_port_max" = "49215" }
-- 
1.8.4