From: Christoph Egger Subject: Re: [PATCH] ioemu: portability fixes for qemu-ifup Date: Thu, 9 Jul 2009 16:19:33 +0200 Message-ID: <200907091619.33770.Christoph.Egger@amd.com> References: <200907021214.54499.Christoph.Egger@amd.com> <19028.41195.728443.309647@mariner.uk.xensource.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_1xfVKSxwRDjsWbk" Return-path: In-Reply-To: <19028.41195.728443.309647@mariner.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Jackson Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --Boundary-00=_1xfVKSxwRDjsWbk Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Wednesday 08 July 2009 15:36:43 Ian Jackson wrote: > Christoph Egger writes ("[PATCH] ioemu: portability fixes for qemu-ifup"): > > Attached patch applies portability fixes to ioemu's qemu-ifup script: > > - rename qemu-ifup to qemu-ifup-Linux > > - add qemu-ifup-NetBSD for NetBSD > > - add qemu-ifup which calls one of above. > > This is quite ugly. Why would we install both of them on the same > computer and then switch at runtime ? Surely the build system should > pick the right one and install just that under the conventional name ? Good idea. Attached patch does this. Signed-off-by: Christoph Egger -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --Boundary-00=_1xfVKSxwRDjsWbk Content-Type: text/x-diff; charset="iso-8859-1"; name="xen_qemu_ifup.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_qemu_ifup.diff" diff --git a/i386-dm/hookstarget.mak b/i386-dm/hookstarget.mak index cf4b39e..de2a670 100644 --- a/i386-dm/hookstarget.mak +++ b/i386-dm/hookstarget.mak @@ -1,5 +1,6 @@ +IOEMU_OS=$(shell uname -s) install-hook: $(INSTALL_DIR) "$(DESTDIR)/$(bindir)" $(INSTALL_DIR) "$(DESTDIR)/$(configdir)" - $(INSTALL_PROG) qemu-ifup "$(DESTDIR)/$(configdir)/" + $(INSTALL_PROG) qemu-ifup-$(IOEMU_OS) "$(DESTDIR)/$(configdir)/qemu-ifup" diff --git a/i386-dm/qemu-ifup b/i386-dm/qemu-ifup deleted file mode 100644 index bcbee92..0000000 --- a/i386-dm/qemu-ifup +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -#. /etc/rc.d/init.d/functions -#ulimit -c unlimited - -echo 'config qemu network with xen bridge for ' $* - -bridge=$2 - -# -# Old style bridge setup with netloop, used to have a bridge name -# of xenbrX, enslaving pethX and vif0.X, and then configuring -# eth0. -# -# New style bridge setup does not use netloop, so the bridge name -# is ethX and the physical device is enslaved pethX -# -# So if... -# -# - User asks for xenbrX -# - AND xenbrX doesn't exist -# - AND there is a ethX device which is a bridge -# -# ..then we translate xenbrX to ethX -# -# This lets old config files work without modification -# -if [ ! -e "/sys/class/net/$bridge" ] && [ -z "${bridge##xenbr*}" ] -then - if [ -e "/sys/class/net/eth${bridge#xenbr}/bridge" ] - then - bridge="eth${bridge#xenbr}" - fi -fi - -ifconfig $1 0.0.0.0 up -brctl addif $bridge $1 || true diff --git a/i386-dm/qemu-ifup-Linux b/i386-dm/qemu-ifup-Linux new file mode 100644 index 0000000..bcbee92 --- /dev/null +++ b/i386-dm/qemu-ifup-Linux @@ -0,0 +1,37 @@ +#!/bin/sh + +#. /etc/rc.d/init.d/functions +#ulimit -c unlimited + +echo 'config qemu network with xen bridge for ' $* + +bridge=$2 + +# +# Old style bridge setup with netloop, used to have a bridge name +# of xenbrX, enslaving pethX and vif0.X, and then configuring +# eth0. +# +# New style bridge setup does not use netloop, so the bridge name +# is ethX and the physical device is enslaved pethX +# +# So if... +# +# - User asks for xenbrX +# - AND xenbrX doesn't exist +# - AND there is a ethX device which is a bridge +# +# ..then we translate xenbrX to ethX +# +# This lets old config files work without modification +# +if [ ! -e "/sys/class/net/$bridge" ] && [ -z "${bridge##xenbr*}" ] +then + if [ -e "/sys/class/net/eth${bridge#xenbr}/bridge" ] + then + bridge="eth${bridge#xenbr}" + fi +fi + +ifconfig $1 0.0.0.0 up +brctl addif $bridge $1 || true diff --git a/i386-dm/qemu-ifup-NetBSD b/i386-dm/qemu-ifup-NetBSD new file mode 100644 index 0000000..eee7876 --- /dev/null +++ b/i386-dm/qemu-ifup-NetBSD @@ -0,0 +1,3 @@ +#!/bin/sh +ifconfig $1 up +exec /sbin/brconfig $2 add $1 --Boundary-00=_1xfVKSxwRDjsWbk Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_1xfVKSxwRDjsWbk--