|
 |
43fe83 |
From f1241c136e006b81b4f041be94bd226e4742c252 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <f1241c136e006b81b4f041be94bd226e4742c252.1382534062.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
43fe83 |
Date: Tue, 22 Oct 2013 16:26:26 +0100
|
|
|
43fe83 |
Subject: [PATCH] qemu: Fix augeas support for migration ports
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1019237
|
|
|
43fe83 |
|
|
|
43fe83 |
Commit e3ef20d7 allows user to configure migration ports range via
|
|
|
43fe83 |
qemu.conf. However, it forgot to update augeas definition file and
|
|
|
43fe83 |
even the test data was malicious.
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
43fe83 |
(cherry picked from commit d9be5a7157515eeae99379e9544c34b34c5e5198)
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/qemu/libvirtd_qemu.aug | 2 ++
|
|
|
43fe83 |
src/qemu/test_libvirtd_qemu.aug.in | 4 ++--
|
|
|
43fe83 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
|
|
|
43fe83 |
index 8ce6885..3a73820 100644
|
|
|
43fe83 |
--- a/src/qemu/libvirtd_qemu.aug
|
|
|
43fe83 |
+++ b/src/qemu/libvirtd_qemu.aug
|
|
|
43fe83 |
@@ -78,6 +78,8 @@ module Libvirtd_qemu =
|
|
|
43fe83 |
| int_entry "keepalive_count"
|
|
|
43fe83 |
|
|
|
43fe83 |
let network_entry = str_entry "migration_address"
|
|
|
43fe83 |
+ | int_entry "migration_port_min"
|
|
|
43fe83 |
+ | int_entry "migration_port_max"
|
|
|
43fe83 |
|
|
|
43fe83 |
(* Each entry in the config is one of the following ... *)
|
|
|
43fe83 |
let entry = vnc_entry
|
|
|
43fe83 |
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
43fe83 |
index d6d55b8..2683b9b 100644
|
|
|
43fe83 |
--- a/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
43fe83 |
+++ b/src/qemu/test_libvirtd_qemu.aug.in
|
|
|
43fe83 |
@@ -67,5 +67,5 @@ module Test_libvirtd_qemu =
|
|
|
43fe83 |
{ "keepalive_count" = "5" }
|
|
|
43fe83 |
{ "seccomp_sandbox" = "1" }
|
|
|
43fe83 |
{ "migration_address" = "127.0.0.1" }
|
|
|
43fe83 |
-{ "migration_port_min" = "1234" }
|
|
|
43fe83 |
-{ "migration_port_max" = "12345" }
|
|
|
43fe83 |
+{ "migration_port_min" = "49152" }
|
|
|
43fe83 |
+{ "migration_port_max" = "49215" }
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4
|
|
|
43fe83 |
|