From: Daniel Veillard <veillard@redhat.com>
Date: Wed, 1 Oct 2008 15:31:02 +0000 (+0000)
Subject: Xen interface order and fix python parallel build
X-Git-Tag: LIBVIRT_0_5_0~169
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bc324139ee2e01994ea0fdeb7194aadaf77a851;p=thirdparty%2Flibvirt.git

Xen interface order and fix python parallel build
* src/xend_internal.c: fix ordering when parsing multiple Xen
  interfaces, patch by Jim Fehlig
* python/Makefile.am: fix parallel build
Daniel
---

diff --git a/ChangeLog b/ChangeLog
index c9d6ee3fbb..af6c1fb69e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct  1 17:28:47 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+	* src/xend_internal.c: fix ordering when parsing multiple Xen
+	  interfaces, patch by Jim Fehlig
+	* python/Makefile.am: fix parallel build
+
 Thu Sep 25 13:37:42 IST 2008 Mark McLoughlin <markmc@redhat.com>
 
 	* docs/virsh.pod: fixup some minor issues - e.g. bogus
diff --git a/python/Makefile.am b/python/Makefile.am
index 09e4563ffb..cd9b6af466 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -50,7 +50,7 @@ GENERATED= libvirt-export.c \
 $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
 	$(PYTHON) $(srcdir)/$(GENERATE) $(srcdir)
 
-libvirt.py: $(srcdir)/libvir.py libvirtclass.py
+libvirt.py: $(srcdir)/libvir.py $(GENERATED)
 	cat $(srcdir)/libvir.py libvirtclass.py > $@-t
 	mv $@-t $@
 
diff --git a/src/xend_internal.c b/src/xend_internal.c
index 2e1a8d1d47..d6dcd3eaa3 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1884,6 +1884,8 @@ xenDaemonParseSxprNets(virConnectPtr conn,
                 prev->next = net;
             else
                 def->nets = net;
+
+            prev = net;
             vif_index++;
         }
     }