Three small patches for xen-4.1.0-rc

Three small patches for xen-4.1.0-rc

[M A Young]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1131 bytes --]

Here are three small patches that I have applied to the Fedora xen builds 
and I think are are suitable for xen-4.1.0.

The first patch fixes an anomaly in /etc/xen/scripts/network-route. 
Currently this script contains
netdev=${netdev:-eth${vifnum}}
ie. netdev is set to eth${vifnum} by default. Unfortunately vifnum is not 
set anywhere in the xen code so the default is actually the broken "eth". 
The patch changes the default to eth0 (which is what the comment at the 
top of the file says it should be).

The next patch updates a comment about NetworkManager not supporting 
bridging in Fedora 11 to refer instead to Fedora 14.

The final patch solve a build problem in Fedora rawhide, where rpm (4.9.0) 
doesn't automatically supply a "provides" entry for a library unless it is 
executable. This patch makes the libvhd and libblktap library files 
executable (and consistent with the other libraries in xen) so that rpm 
generates the right "provides" entries and therefore does the right thing 
when resolving package dependencies.
All the patches are
Signed-off-by: Michael Young <m.a.young@durham.ac.uk>

 	Michael Young

[-- Attachment #2: Type: TEXT/PLAIN, Size: 376 bytes --]

--- xen-4.0.1/tools/hotplug/Linux/network-route.orig	2010-08-25 11:22:09.000000000 +0100
+++ xen-4.0.1/tools/hotplug/Linux/network-route	2011-01-27 22:09:37.000000000 +0000
@@ -22,7 +22,7 @@
 
 evalVariables "$@"
 
-netdev=${netdev:-eth${vifnum}}
+netdev=${netdev:-eth0}
 
 echo 1 >/proc/sys/net/ipv4/ip_forward
 echo 1 >/proc/sys/net/ipv4/conf/${netdev}/proxy_arp

[-- Attachment #3: Type: TEXT/PLAIN, Size: 513 bytes --]

--- xen-4.0.1/docs/misc/network_setup.txt.orig	2010-08-25 11:22:07.000000000 +0100
+++ xen-4.0.1/docs/misc/network_setup.txt	2011-01-27 22:13:30.000000000 +0000
@@ -30,7 +30,7 @@
 Disabling NetworkManager
 ------------------------
 
-As of time of writing (Fedora 11) NetworkManager does not support bridging,
+As of time of writing (Fedora 14) NetworkManager does not support bridging,
 so it is neccessary to disable it, and revert to "classic" network initscripts
 
  # chkconfig NetworkManager off

[-- Attachment #4: Type: TEXT/PLAIN, Size: 1090 bytes --]

--- xen-4.0.1/tools/blktap/lib/Makefile.orig	2010-08-25 11:22:07.000000000 +0100
+++ xen-4.0.1/tools/blktap/lib/Makefile	2011-01-31 18:41:05.000000000 +0000
@@ -36,7 +36,7 @@
 install: all
 	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_PROG) $(LIB) $(DESTDIR)$(LIBDIR)
 	ln -sf libblktap.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libblktap.so.$(MAJOR)
 	ln -sf libblktap.so.$(MAJOR) $(DESTDIR)$(LIBDIR)/libblktap.so
 	$(INSTALL_DATA) blktaplib.h $(DESTDIR)$(INCLUDEDIR)
--- xen-4.0.1/tools/blktap2/vhd/lib/Makefile.orig	2010-08-25 11:22:07.000000000 +0100
+++ xen-4.0.1/tools/blktap2/vhd/lib/Makefile	2011-01-31 18:38:39.000000000 +0000
@@ -63,7 +63,7 @@
 
 install: all
 	$(INSTALL_DIR) -p $(DESTDIR)$(INST-DIR)
-	$(INSTALL_DATA) $(LIBVHD) $(DESTDIR)$(INST-DIR)
+	$(INSTALL_PROG) $(LIBVHD) $(DESTDIR)$(INST-DIR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR).$(LIBVHD-MINOR) $(DESTDIR)$(INST-DIR)/libvhd.so.$(LIBVHD-MAJOR)
 	ln -sf libvhd.so.$(LIBVHD-MAJOR) $(DESTDIR)$(INST-DIR)/libvhd.so
 

[-- Attachment #5: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: Three small patches for xen-4.1.0-rc

[Ian Campbell]

On Mon, 2011-01-31 at 22:37 +0000, M A Young wrote:
> Here are three small patches that I have applied to the Fedora xen builds 
> and I think are are suitable for xen-4.1.0.

Thanks, I general we would prefer separate patches to be submitted
separately rather than bundled in a single submission ("hg email" can
help with this for large series).

In particular having independent changelogs in a form where they can be
used directly (e.g. a good firstl ine summary and without references to
the "first patch" etc) is much appreciated.

> The first patch fixes an anomaly in /etc/xen/scripts/network-route. 
> Currently this script contains
> netdev=${netdev:-eth${vifnum}}
> ie. netdev is set to eth${vifnum} by default. Unfortunately vifnum is not 
> set anywhere in the xen code so the default is actually the broken "eth". 
> The patch changes the default to eth0 (which is what the comment at the 
> top of the file says it should be).

The comment also refers to an antispoof setting which I don't see being
implemented here. Is that just a wrong comment? (possibly cut and paste
error from one of the other network-*)

> The next patch updates a comment about NetworkManager not supporting 
> bridging in Fedora 11 to refer instead to Fedora 14.

Was the NetworkManager stuff introduced in 14 and erroneously documented
as being in 11, or was it in 11 and worked fine, or has it been
continuously broken since F11? IOW should this comment refer to breakage
in Fedora 11 thru 14 or something similar?

> The final patch solve a build problem in Fedora rawhide, where rpm (4.9.0) 
> doesn't automatically supply a "provides" entry for a library unless it is 
> executable. This patch makes the libvhd and libblktap library files 
> executable (and consistent with the other libraries in xen) so that rpm 
> generates the right "provides" entries and therefore does the right thing 
> when resolving package dependencies.

Ick, but apparently normal.

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Ian.

Re: Three small patches for xen-4.1.0-rc

[M A Young]

On Tue, 1 Feb 2011, Ian Campbell wrote:

> On Mon, 2011-01-31 at 22:37 +0000, M A Young wrote:
>> The first patch fixes an anomaly in /etc/xen/scripts/network-route.
>> Currently this script contains
>> netdev=${netdev:-eth${vifnum}}
>> ie. netdev is set to eth${vifnum} by default. Unfortunately vifnum is not
>> set anywhere in the xen code so the default is actually the broken "eth".
>> The patch changes the default to eth0 (which is what the comment at the
>> top of the file says it should be).
>
> The comment also refers to an antispoof setting which I don't see being
> implemented here. Is that just a wrong comment? (possibly cut and paste
> error from one of the other network-*)

I think it is wrong (or maybe there was an intention to implement it which 
never happened. Only the network-bridge has any antispoofing code.


>> The next patch updates a comment about NetworkManager not supporting
>> bridging in Fedora 11 to refer instead to Fedora 14.
>
> Was the NetworkManager stuff introduced in 14 and erroneously documented
> as being in 11, or was it in 11 and worked fine, or has it been
> continuously broken since F11? IOW should this comment refer to breakage
> in Fedora 11 thru 14 or something similar?

I think it has never worked. Fedora is perhaps mentioned because I think 
it may have been the first distribution to use NetworkManager. So perhaps 
the reference to Fedora could be removed altogether or by a more general 
phrase like "such as in Fedora" .

 	Michael Young

Re: Three small patches for xen-4.1.0-rc

[Ian Jackson]

Ian Campbell writes ("Re: [Xen-devel] Three small patches for xen-4.1.0-rc"):
> On Mon, 2011-01-31 at 22:37 +0000, M A Young wrote:
> > Here are three small patches that I have applied to the Fedora xen builds 
> > and I think are are suitable for xen-4.1.0.

Thanks, I have applied them.

> Thanks, I general we would prefer separate patches to be submitted
> separately rather than bundled in a single submission ("hg email" can
> help with this for large series).

I agree with Ian's comments.

> > The next patch updates a comment about NetworkManager not supporting 
> > bridging in Fedora 11 to refer instead to Fedora 14.
> 
> Was the NetworkManager stuff introduced in 14 and erroneously documented
> as being in 11, or was it in 11 and worked fine, or has it been
> continuously broken since F11? IOW should this comment refer to breakage
> in Fedora 11 thru 14 or something similar?

Perhaps you misread the document ?  I don't think NetworkManager can
set up a bridge at all.  So you just have to disable NetworkManager.
I clarified the wording slightly while applying the patch.

> > The final patch solve a build problem in Fedora rawhide, where rpm (4.9.0) 
> > doesn't automatically supply a "provides" entry for a library unless it is 
> > executable. This patch makes the libvhd and libblktap library files 
> > executable (and consistent with the other libraries in xen) so that rpm 
> > generates the right "provides" entries and therefore does the right thing 
> > when resolving package dependencies.
> 
> Ick, but apparently normal.

Shared libraries are indeed supposed to be executable.  This isn't the
only thing that can go wrong if they aren't.

Thanks,
Ian.