aboutsummaryrefslogtreecommitdiffstats
path: root/tools/vnet
Commit message (Collapse)AuthorAgeFilesLines
* split LDLIBS from LDFLAGS to fix link errors in recent toolchainsStefano Stabellini2010-08-111-1/+1
| | | | | | | | | | | | | | | | Linker command lines are order-sensitive. Move linker options -Lfoo -lfoo from LDFLAGS to LDLIBS and place this new variable after the objects to link. This resolves build errors in xenpagin and blktap with recent toolchains. rename SHLIB_CFLAGS to SHLIB_LDFLAGS rename LDFLAGS_* to LDLIBS_* move LDFLAGS usage after CFLAGS in CC calls remove stale comments in xenpaging Makefile Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: clean up handling of xen config and scripts directories.Keir Fraser2009-05-191-2/+0
| | | | | | | For now hardcode /etc w/o a prefix as there are hardcoded config paths in the code which would break otherwise. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* tools: Always use sane upstream (`native') python pathsKeir Fraser2009-04-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, by default we would install our python modules into /usr/lib/python/xen, for example /usr/lib/python/xen/__init__.py. Upstream python's standard install location (a) includes the Python version number and (b) puts things in site-packages by default. Our best conjecture for the reason for this was an attempt to make the installs portable between different python versions. However, that doesn't work because compiled python modules (.pyc), and C python extensions corresponding to one version of python, are not compatible across different versions of python. This is why upstream include the version number. site-packages is the standard location for locally-installed packages and is automatically included on the python search path. In this change, we abandon our own unusual python path setup: * Invoke setup.py in an entirely standard manner. We pass PREFIX and DESTDIR using the appropriate options provided by setup.py for those purposes (adding them to setup.py calls which were previously lacking them). * Since the installation locations are now on the standard python path, we no longer need to add anything to the path in any of our python utilities. Therefore remove all that code from every python script. (Many of these scripts unconditionally added /usr/lib/python and /usr/lib64/python which is wrong even in the old world.) * There is no longer any special `Xen python path'. xen-python-path is no longer needed. It is no longer called by anything in our tree. However since out-of-tree callers may still invoke it, we retain it. It now prints a fixed string referring to a directory which does not to exist; callers (who use it to augment their python path) will thus add a nonexistent directory to their python path which is harmless. * Remove various workarounds including use of setup.py --home (which is intended for something completely different). * Remove tests for the XEN_PYTHON_NATIVE_INSTALL build-time environment variable. The new behaviour is the behaviour which we should have had if this variable had been set. That is, it is now as if this variable was always set but also bugs in the resulting install have been fixed. This should be a proper fix for the bug addressed by c/s 19515. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* build: Define cc-option-add to immediately add options to CFLAGSKeir Fraser2009-01-131-1/+2
| | | | | | | without deferring the test execution of CC. This avoids extra executions of CC every time CFLAGS is expanded. Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* Use -MMD -MF in tools/* rather than -Wp,-M...Keir Fraser2009-01-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | If you use -MMD -MF then the correct .o filename is written to the .*.d file as the compiler driver arranges everything. This was done in 19010:275abe1c5d24 for the hypervisor. In this patch we do the same elsewhere in the xen-unstable tree, particularly tools/. Specifically: * Change tools/Rules.mk to add -MMD -MF ... to CFLAGS and set DEPS. * Remove -Wp,-MD... from every other Makefile * Remove setting of DEPS from every other Makefile * Ensure that every Makefile says -include $(DEPS) * Ensure that every Makefile's clean target removes $(DEPS) Some Makefiles were already halfway there, but often for a different variable name eg PROG_DEP. The variable name is now standardised in Rules.mk as DEPS. I have done a test build with this change, on Debian etch. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* Download external tarballs from xenbits.xensource.comKeir Fraser2009-01-051-1/+2
| | | | | | | | | | | | | | I have copied the tarballs that the xen-unstable build downloads to xenbits.xensource.com (which also hosts our hg and git). This patch changes the download URLs to use that location. That way the build will depend on only one external machine, under one administration, rather than many. Also it means that the build won't break if these sites become permanently unavailable or are rearranged and we don't run a risk of having to panic and beg if a file should go missing. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* tools: replace sprintf with snprintf where applicableKeir Fraser2008-06-122-4/+4
| | | | Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
* Add MANDIR, MAN1DIR and MAN8DIR. Use it.Keir Fraser2008-01-221-5/+3
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Add SBINDIR. Use it always.Keir Fraser2008-01-222-8/+4
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* Apply PREFIX directly to LIBDIR.Keir Fraser2008-01-221-5/+5
| | | | Signed-off-by: Bastian Blank <waldi@debian.org>
* tools/docs: Fix example and default IP addresses.Keir Fraser2008-01-172-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In various places in documentation and code, IP addresses are provided as examples, defaults, or dummy configuration. In general the specific IP addresses used in Xen are not always appropriate. (For example, 1.2.3.4 is used in a few places!) The following addresses should be used: * For examples and documentation, 192.0.2.0/24. (See RFC3330.) * For defaults for private networks, a random network from RFC1918. I have randomly selected 172.30.206.0/24 for this purpose and documented this in at the only registry I know of, www.ucam.org/cam-grin. This network should henceforth be used for default configurations of local bridges, test networks, etc. in Xen tools. The following addresses should NOT be used: * 10.0.*.*, 10.1.*.*, 192.168.0.*, 192.168.1.*, etc. Using these addresses gives greatly increased likelihood of collision, as ignorant network administrators and reckless middlebox vendors often pick networks from the bottom of 10/8 and 192.168/16. * 169.254.*.*. These are reserved for zeroconf (ad-hoc networking) and should not be used for Xen private networks, bridges, etc., etc. Use of these addresses by Xen scripts causes trouble on hosts (eg laptops) which find themselves in ad-hoc networking environments. I think this is not hypothetical (!) since at least one Linux distribution have specific code to detect this case and cause Xen startup to fail iff the host already has an external zeroconf address. * 1.2.3.4. WTF !? I have also used 127.0.255.255 in one place where apparently a dummy address is needed (some Linux kernels won't accept a lack of an NFS server address). If 127.0.255.255 is mistakenly used it is unlikely to do any damage to real traffic even if it does escape into the network at large. Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
* vnet: Fix compilation on x86/64 which erroneously assertsKeir Fraser2007-12-041-1/+2
| | | | | __ARCH_WANT_SYS_SOCKETCALL. Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
* vnet: Fix compilation.Keir Fraser2007-12-043-5/+4
| | | | Signed-off-by: Samuel Thibault <samuel.thibault@citrix.com>
* Fix the vnet module for Xen 3.1.x.kfraser@localhost.localdomain2007-06-075-34/+51
| | | | Signed-off-by: Robert Valentan <R.Valentan@solid-soft.at>
* vnet: Another build fix for finding Linux build tree and version.Keir Fraser2007-04-282-12/+8
| | | | Signed-off-by: Robert Valentan <R.Valentan@solid-soft.at>
* vnet: Fix build of the vnet module.kfraser@localhost.localdomain2007-04-275-15/+14
| | | | | | | - correcting KERNEL_SRC ( ./build-linux... ) - typing errors in Makefile.ver - module-params Signed-off-by: Robert Valentan <R.Valentan@solid-soft.at>
* tools: Clean up use of 'install' command.kfraser@localhost.localdomain2007-03-071-1/+1
| | | | | | | | | - convert raw "install" command to use $(INSTALL) - convert some $(INSTALL) to $(INSTALL_DATA) as appropriate - modify the specific $(INSTALL) definitions to use -p. Original patch by Ben Thomas <ben@virtualiron.com> Signed-off-by: Keir Fraser <keir@xensource.com>
* [SOLARIS] On Solaris, GCC is configured to use Sun's LD. Fix the build to usekfraser@localhost.localdomain2006-10-171-1/+1
| | | | | | the correct flags, and link against libsocket where necessary. Signed-off-by: John Levon <john.levon@sun.com>
* Clean up duplication of 'install' macros in the Makefiles.kfraser@localhost.localdomain2006-10-175-17/+7
| | | | Signed-off-by: John Levon <john.levon@sun.com>
* Update vnet kernel module to handle architectures withoutkfraser@localhost.localdomain2006-09-2318-64/+205
| | | | | | | socketcall(), for example Itanium, and some small changes to be compatible with changed kernel interfaces. Signed-off-by: Mike Wray <mike.wray@hp.com>
* build: Clean up use of .PHONYkaf24@firebug.cl.cam.ac.uk2006-04-106-10/+31
| | | | | | | | | | | | * Move .PHONY directives next to targets, this makes them a lot harder to miss * Add missing .PHONY directives * Remove nonexistent .PHONY directives * Hopefully I didn'T miss anything... Signed-Off-By: Horms <horms@verge.net.au>
* Move 'debug' build option into the outermost Config.mk file.kaf24@firebug.cl.cam.ac.uk2006-03-092-3/+1
| | | | | | Signed-off-by: Keir Fraser <keir@xensource.com>
* Clean up the usage of CFLAGS. This is nice for packagers, who wouldkaf24@firebug.cl.cam.ac.uk2006-03-092-3/+1
| | | | | | | | like to control the base compilation flags from a central place. Signed-off-by: Charles Coffing <ccoffing@novell.com>
* Update vnets to support UDP encapsulation, multicast forwardingkaf24@firebug.cl.cam.ac.uk2006-02-0980-4286/+7987
| | | | | | | | and optionally running in user-space. Signed-off-by: Mike Wray <mike.wray@hp.com>
* New network-bridge script and associated gubbins.emellor@leeni.uk.xensource.com2005-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is Kurt Garloff's reworked network-bridge script: * we got rid of ifconfig * it works for netdev != eth0 * arp on and off are symmetric as are ifdown and ifup * ifup will be passed the ifcfg config file name if needed (the ifup may otherwise figure that the veth0 hardware is NOT the same as the original ${netdev} and not use the same config -- this happens on SUSE. Charles Coffing tracked this one down.) Plus Kurt's avoid-dash patch: the network setup scripts on SUSE have trouble with the bridge name xen-br0; they don't expect the '-'. Arguably this should be fixed. But I assume there's more scripts out there which may not like it, so I suggest the following patch to rename xen-br0 to xenbr0. Plus Charles Duffy's patch to support multiple bridges: The attached patch allows the network-bridge script to be used to generate multiple bridges corresponding to different physical interfaces. It adds a new parameter, "vifnum", used to refer both to the loopback interface to be used and to set defaults regarding the physical interface and bridge name. Thus, if one wishes to start xenbr0 on eth0 and xenbr1 on eth1, one need only call: network-bridge start ## vifnum is 0 by default network-bridge start vifnum=1 ...well, that and set loopback.nloopbacks=2 in the Dom0 kernel parameters. Plus renaming of virtnum to vifnum in Charles' patch, as requested by Ian Pratt. Plus a fix to DevController to allocate vif IDs starting from 0 (i.e. vif2.0 is now domain 2's first vif, as opposed to vif2.1 in the recent past). Plus tidying up inside network-bridge using some helper variables. Signed-off-by: Ewan Mellor <ewan@xensource.com>
* The last vnet patch was missing some files that had been addedkaf24@firebug.cl.cam.ac.uk2005-09-126-0/+618
| | | | | | | | to my tree but did not appear in 'hg diff'. This patch adds them. Signed-off-by: Mike Wray <mike.wray@hp.com>
* Vnet update.cl349@firebug.cl.cam.ac.uk2005-08-2645-1350/+1020
| | | | | | | | | | Fix the tools/vnet makefiles so that vnets will compile and includes updates to the vnet implementation. Vnet ids are increased to 128 bits. The vnet module will insmod whether xen-br0 exists or not. Signed-off-by: Mike Wray <mike.wray@hp.com> Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
* bitkeeper revision 1.1608 (429c646erSBefwnCqVeHKzsRTMIwjA)cl349@firebug.cl.cam.ac.uk2005-05-311-2/+2
|\ | | | | | | | | Merge.
| * bitkeeper revision 1.1159.258.159 (429c6342A2HJ4wUj0nM5MNauX7azZQ)cl349@firebug.cl.cam.ac.uk2005-05-311-2/+2
| | | | | | | | | | | | | | | | | | vnet-xend.txt, user.tex, README: Update the Linux kernel version number from 2.6.9 to 2.6 or 2.6.11 in several places in documentation. Original patch provided by Andrew Thompson <andrewkt@aktzero.com> Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
* | bitkeeper revision 1.1534.1.1 (429399e0oJudIjoFsgWFxNKnCM7qTg)cl349@firebug.cl.cam.ac.uk2005-05-2437-5/+6895
| | | | | | | | | | | | | | | | | | | | | | Nothing but vnet uses libxutil -- move it there. Makefile, xc.c, setup.py, configure, configure.in, Makefile.in: This doesn't use libxutil. Makefile, Makefile.vnet, Rules.mk: Move libxutil into vnet since it's only used there. Many files: mvdir
* | bitkeeper revision 1.1177.2.1 (420cdfe0gnE29cMitOCxShEE2d_lRA)cl349@arcadians.cl.cam.ac.uk2005-02-111-0/+31
|\| | | | | | | | | | | | | Sync w/ 2.0-testing changes. Signed-off-by: cl349@cl.cam.ac.uk
| * bitkeeper revision 1.1159.258.1 (420b963fGDqQqmlp_DO3u-T_klF82g)mjw@wray-m-3.hpl.hp.com2005-02-104-11/+42
| | | | | | | | | | | | | | | | | | Fixes to make the vnet module compile under 2.6.10. Thanks to Brian Bruce for spotting the problem and suggesting fixes. Signed-off-by: Mike Wray <mike.wray@hp.com>
* | bitkeeper revision 1.1159.223.85 (420a9b72OGag4m4sDtlxM-918tbudQ)iap10@freefall.cl.cam.ac.uk2005-02-096-23/+54
|/ | | | | | | | | | Subject: [Xen-devel] VNET - full update Allows vnets to compile and run under 2.6.10/xen-testing. PATCH: vnet-cleanup.patch Signed off by: bgb@nt-nv.com Signed-off-by: ian@xensource.com
* bitkeeper revision 1.1159.223.44 (41f8c832pMZZ7WmykH_gAUBQHtPF1A)kaf24@scramble.cl.cam.ac.uk2005-01-271-1/+1
| | | | | | Allow target architecture to be specified by specifying ARCH variable to root Makefile (e.g, make ARCH=x86_32).
* bitkeeper revision 1.1159.223.42 (41f77751X73w7_t6jI0dgGV6N-Bweg)kaf24@scramble.cl.cam.ac.uk2005-01-262-2/+0
| | | | | More build system fixes and tweaks.
* bitkeeper revision 1.1159.223.40 (41f676cbajLGqFeWFqajtJ3X4OkgoA)kaf24@scramble.cl.cam.ac.uk2005-01-255-11/+8
| | | | | | Build system fixes. Signed-off-by: keir.fraser@cl.cam.ac.uk
* bitkeeper revision 1.1159.193.2 (41a5c4ea-QO7fPUkeH3KKO5W7upn-w)mjw@wray-m-3.hpl.hp.com2004-11-256-22/+33
| | | | | | Fix 'make dist' to install in xen install dir and not remake gc every time.
* bitkeeper revision 1.1159.183.3 (41a2188bAFjxwwkR-Q5G7XglkWtKfQ)mjw@wray-m-3.hpl.hp.com2004-11-2258-0/+12767
Add vnet files.