rpms/libvirt/devel libvirt-0.6.3-bring-up-ipless-bridge.patch, NONE, 1.1 libvirt.spec, 1.135, 1.136

[Mark McLoughlin]

Author: markmc

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32425

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.3-bring-up-ipless-bridge.patch 
Log Message:
* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-11.fc12
- Bring up the bridge, even if it doesn't have an IP address (bug #501912)


libvirt-0.6.3-bring-up-ipless-bridge.patch:

--- NEW FILE libvirt-0.6.3-bring-up-ipless-bridge.patch ---
>From 4db7474b0c1907e877d7206edeb4d73962971096 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Tue, 12 May 2009 15:31:22 +0000
Subject: [PATCH 1/1] * src/network_driver.c: enable bridges which are not up
   without an IP address, patch by Ludwig Nussel
 Daniel

---
 src/network_driver.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/network_driver.c b/src/network_driver.c
index a17a769..a163b15 100644
--- a/src/network_driver.c
+++ b/src/network_driver.c
@@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
         goto err_delbr;
     }
 
-    if (network->def->ipAddress &&
-        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
         virReportSystemError(conn, err,
                              _("failed to bring the bridge '%s' up"),
                              network->def->bridge);
@@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
     networkRemoveIptablesRules(driver, network);
 
  err_delbr1:
-    if (network->def->ipAddress &&
-        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
         char ebuf[1024];
         networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
                  network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
@@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn,
     networkRemoveIptablesRules(driver, network);
 
     char ebuf[1024];
-    if (network->def->ipAddress &&
-        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
         networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
                  network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
     }
-- 
1.6.0.6



Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- libvirt.spec	21 May 2009 12:07:09 -0000	1.135
+++ libvirt.spec	25 May 2009 15:22:34 -0000	1.136
@@ -55,7 +55,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.3
-Release: 10%{?dist}%{?extra_release}
+Release: 11%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -79,6 +79,8 @@ Patch7: libvirt-0.6.3-xml-attribute-esca
 # Fix serious event handling issues causing guests to be destroyed (bz 499698)
 Patch8: libvirt-0.6.3-event-handling-1.patch
 Patch9: libvirt-0.6.3-event-handling-2.patch
+# Bring up the bridge, even if it doesn't have an IP address (bz 501912)
+Patch10: libvirt-0.6.3-bring-up-ipless-bridge.patch
 
 # Patches not for upstream.
 
@@ -243,6 +245,7 @@ of recent versions of Linux (and other O
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %patch200 -p0
 
@@ -573,6 +576,9 @@ fi
 %endif
 
 %changelog
+* Mon May 25 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-11.fc12
+- Bring up the bridge, even if it doesn't have an IP address (bug #501912)
+
 * Thu May 21 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.3-10.fc12
 - Fix XML attribute escaping (bug #499791)
 - Fix serious event handling issues causing guests to be destroyed (bug #499698)