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 c9d6ee3fbbcab5012bb11e0c3238a79643e4c086..af6c1fb69edabab21af439f9c9b53ead57eaa24c 100644 (file)
--- 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 09e4563ffb4ee5e79e4c6b861a00c4259a66fb35..cd9b6af466596e76ccfa93812c6d7d50de2d243d 100644 (file)
--- 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 2e1a8d1d4771e2f885b50c1df8c13e24af9341d0..d6dcd3eaa3ca20a9e3332019ebf7d9616a312869 100644 (file)
--- 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++;
         }
     }