Commit Graph
176 Commits
Author SHA1 Message Date
kaf24@firebug.cl.cam.ac.uk 72098d9304 Device model SXP cleanup
- don't pollute the sxp with unused options
- use the same syntax as paravirtualized domains for disks

Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
2005-07-11 20:09:10 +00:00
kaf24@firebug.cl.cam.ac.uk 6c6af98325 Manual merge 2005-07-01 12:45:24 +00:00
kaf24@firebug.cl.cam.ac.uk 93a4a4449f Device model path cleanup. Remove bochsrc which is no longer needed.
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
2005-07-01 10:34:47 +00:00
arun.sharma@intel.com[kaf24] 03d545ffcd bitkeeper revision 1.1773 (42c3a841nLib9kdSmthr05jouqiNeg)
[PATCH] Device model cleanup.

Device model cleanup.

- Single config file for xen and device models
  (Shell script doesn't source xmdefconfig anymore)
- No more device-model shell script by default. You can
  have one if needed (qemu-dm.debug)
- All logic in the script device-model is moved to python
- $DISPLAY is passed from xm to xend
- Don't fork vncviewer on dryruns
- Add support for killing device models on domain destroy
- info vmxiopage command added to the monitor
- Refactor shared io page into global and per vcpu state
- Remove the hard coding of IOPACKET_PORT
- move the virtual_platform_def up to domain struct from vcpu
- xm create -n:

(vm
    (name ExampleVMXDomain)
    (memory 128)
    (ssidref -1)
    (image
        (vmx
            (kernel /usr/lib/xen/boot/vmxloader)
            (root '/dev/hda1 ro')
            (vcpus 1)
        )
    )
    (memmap )
    (device_model /tmp/foo)
    (hda /var/images/min-el3-i386.img)
    (hdb )
    (hdc )
    (hdd )
    (cdrom )
    (boot c)
    (fda )
    (fdb )
    (localtime 0)
    (serial )
    (macaddr )
    (stdvga 0)
    (isa 0)
    (nographic 0)
    (vnc 0)
    (sdl 0)
    (display localhost:10.0)
)

Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
2005-06-30 08:07:29 +00:00
arun.sharma@intel.com[kaf24] 4a9ea6b2cf bitkeeper revision 1.1711 (42a9e457jQGBsoAWKrbJlmIKRwGd3w)
[PATCH] xmexample-vmxassist.patch

Update VMX config for vmxassist.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>
2005-06-10 19:04:55 +00:00
cl349@firebug.cl.cam.ac.uk 9ed4cfb2ca bitkeeper revision 1.1637 (429efe55wJJIZHFiBeWAvMfzBaNppw)
network:
  - remove route added by setting addr/netmask on new interface
  - do exact match on interface names (eth0 matches veth0 otherwise)
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-06-02 12:40:53 +00:00
cl349@firebug.cl.cam.ac.uk 47b5bccd2f bitkeeper revision 1.1636 (429ed8e5gOiR2KuJtp1UWCleuYe5Kg)
network:
  Copy netmask across to veth0.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-06-02 10:01:09 +00:00
cl349@firebug.cl.cam.ac.uk 50f2601af9 bitkeeper revision 1.1533 (429379beNzrMmx_MJCmvdmLhK3EMfw)
migrate.py, params.py, SrvDaemon.py, xend, Makefile:
  Remove xfrd now that save/restore doesn't use xfrd anymore.
console.py:
  Remove/disable debug output.
.del-check_twisted~f74b05eb88f208a1:
  Delete: tools/check/check_twisted
xend:
  Twisted is no longer used -- remove check whether it's installed or not.
.del-Makefile~474b093f3e64d016:
  Delete: tools/xfrd/Makefile
.del-xfrdClient.py~d1d33f981191dfa:
  Delete: tools/xfrd/xfrdClient.py
.del-xfrd.h~54f8ea6e77cf4f26:
  Delete: tools/xfrd/xfrd.h
.del-xfrd.c~e3be851c3a4297a5:
  Delete: tools/xfrd/xfrd.c
.del-xen_domain.h~4a0c609ff18c63a8:
  Delete: tools/xfrd/xen_domain.h
.del-xen_domain.c~cd85f330a909fbce:
  Delete: tools/xfrd/xen_domain.c
.del-select.h~348b2b069dd5748:
  Delete: tools/xfrd/select.h
.del-select.c~373282d5f920303d:
  Delete: tools/xfrd/select.c
.del-marshal.h~9929a72563171372:
  Delete: tools/xfrd/marshal.h
.del-marshal.c~3108fab658d2220:
  Delete: tools/xfrd/marshal.c
.del-lzi_stream.h~49308e7b16ba42e3:
  Delete: tools/xfrd/lzi_stream.h
.del-lzi_stream.c~e1870394f081f255:
  Delete: tools/xfrd/lzi_stream.c
.del-debug.h~c268d8f144e5e4da:
  Delete: tools/xfrd/debug.h
.del-connection.h~ac7cb6a42316a421:
  Delete: tools/xfrd/connection.h
.del-connection.c~c025e96fc5649424:
  Delete: tools/xfrd/connection.c
.del-Make.xfrd~5a18d2f63aad1d40:
  Delete: tools/xfrd/Make.xfrd
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-05-24 19:00:14 +00:00
arun.sharma@intel.com[kaf24] 30451f914d bitkeeper revision 1.1472.1.1 (428d02affnTKrsebSylXhws68fWW9w)
[PATCH] qemu.patch

This patch is needed to get the tree to build for QEMU based I/O emulation.

- Run configure before doing make in tools/ioemu
- We now have a single config file for VMX domains (earlier we had a
  bochsrc and xmexample.vmx)

Signed-off-by: Xiaofeng Ling <xiaofeng.ling@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
2005-05-19 21:18:39 +00:00
kaf24@firebug.cl.cam.ac.uk 0e3449b666 bitkeeper revision 1.1442 (428af574YWiDAiHeZQyeMJke5Tb75Q)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2005-05-18 07:57:40 +00:00
kaf24@firebug.cl.cam.ac.uk 342b92476c bitkeeper revision 1.1159.258.136 (428af5483Yn2FWcrPnTRD2GVmftlhQ)
Fallback behaviour of the network startup script is now same as it
always was: IP addresses of eth0 are transferred to the bridge device
but not deleted from eth0. This is needed for the 2.0-series tools,
which by default look only at eth0 to determine IP parameters for domU.
Signed-off-by: Keir Fraser <keir@xensource.com>
2005-05-18 07:56:56 +00:00
kaf24@firebug.cl.cam.ac.uk 974467723b bitkeeper revision 1.1159.258.135 (428a3218LRhrEVrFCYcKckXl2ziRCQ)
Backport of network script fix from unstable.
Signed-off-by: Keir Fraser <keir@xensource.com>
2005-05-17 18:04:08 +00:00
kaf24@firebug.cl.cam.ac.uk 48cd6e9930 bitkeeper revision 1.1435 (428a3176t0PNiOuyFEWG44vc-VFypg)
No need to disable 'network stop' functionality.
Signed-off-by: Keir Fraser <keir@xensource.com>
2005-05-17 18:01:26 +00:00
cl349@firebug.cl.cam.ac.uk 994b549ef1 bitkeeper revision 1.1429.2.2 (428a036cO1cnBZO53U3HCW-Lk42RtA)
network:
  Handle xend restart -- don't take down the network setup and don't
  initialize it if it looks already initialized.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-05-17 14:45:00 +00:00
cl349@firebug.cl.cam.ac.uk b93e7f7e8b bitkeeper revision 1.1426.1.1 (4289cc8cPUM98bLJs4TV93NHY9LOKg)
Many files:
  Make interface to network/block scripts consistent:
  - output on stdout is returned to the script caller
  - output on stderr is logged at the error level, messages with a '-' prefix
    are logged at the debug level and messages with a '*' prefix are logged
    at the info level.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
2005-05-17 10:50:52 +00:00
kaf24@firebug.cl.cam.ac.uk 33ab556179 bitkeeper revision 1.1421 (4288ce4e6ck3yeSz45ZczyyRR_QzUw)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2005-05-16 16:46:06 +00:00
kaf24@firebug.cl.cam.ac.uk af97a9b045 bitkeeper revision 1.1159.283.1 (4288ce19qPIaLjPeI1_LphAJ6cDCJA)
Local netfront/netback emulation for domain0, to clean up and fix
Etherbridge setup.
Signed-off-by: Keir Fraser <keir@xensource.com>
2005-05-16 16:45:13 +00:00
iap10@freefall.cl.cam.ac.uk e9d4be73ca bitkeeper revision 1.1236.43.6 (4243f3f3rPSrXq5qC_rXYAkeTrQ7dQ)
manual merge
2005-03-25 11:20:19 +00:00
iap10@firebug.cl.cam.ac.uk e605a33bc9 bitkeeper revision 1.1236.1.95 (423d90c7SBXNlShGVmT7ksTwZFp-Bw)
LSM INIT INFO block added to xendomains
From: Kurt Garloff
Signed-off-by: ian@xensource.com
2005-03-20 15:03:35 +00:00
iap10@firebug.cl.cam.ac.uk 6b55919bfa bitkeeper revision 1.1236.1.94 (423d8424xa3IjKUn_8z0s4Bbep3LKA)
Trivial nits in the network-nat script..
signed-off by Nivedita Singhvi (niv@us.ibm.com)
2005-03-20 14:09:40 +00:00
xenbk@gandalf.hpl.hp.com 223619f4f8 bitkeeper revision 1.1159.258.61 (423ab8ffoSYKwCMKpGSklR9lHSby6g)
Merge http://xen.bkbits.net:8080/xen-2.0-testing.bk
into gandalf.hpl.hp.com:/var/bk/xen-2.0-testing.bk
2005-03-18 11:18:23 +00:00
mjw@wray-m-3.hpl.hp.com 7b14405f61 bitkeeper revision 1.1159.269.8 (423ab2eapL4QIhT8q2gPBPlVaSKmZw)
Script and xdm config to connect vnc in a domain back to
a viewer running in domain-0.

Signed-off-by: Mike Wray <mike.wray@hp.com>
2005-03-18 10:52:26 +00:00
mjw@wray-m-3.hpl.hp.com 8d90977141 bitkeeper revision 1.1159.269.3 (4236cc98Jkx2LDbrsWrj59Z-UTR_jA)
Change default config to bind to localhost only.

Signed-off-by: Mike Wray <mike.wray@hp.com>
2005-03-15 11:52:56 +00:00
kaf24@scramble.cl.cam.ac.uk 5f53c9cfb8 bitkeeper revision 1.1236.28.1 (42340a42zVMF1dHpLj0Rzok7P9t48Q)
Manual merge.
Signed-off-by: Keir Fraser <keir@xensource.com>
2005-03-13 09:39:14 +00:00
cl349@firebug.cl.cam.ac.uk b1520cbb5a bitkeeper revision 1.1236.25.10 (42335daeuY-j8gV61kHapguVRal9ig)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-2.6.11
2005-03-12 21:22:54 +00:00
iap10@freefall.cl.cam.ac.uk 2af36c51a2 bitkeeper revision 1.1159.258.51 (42332e7fgmGVTCY4Es7dEft7_Ne7MQ)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
2005-03-12 18:01:35 +00:00
doogie@brainfood.com[kaf24] be7913c187 bitkeeper revision 1.1159.270.3 (42330ae8efsd9SdlhNX6EpksrtV6oQ)
[PATCH] add-build.patch

 Add build targets to all makefiles.  Debian does builds as non-root, so
 it's better to do as much as possible before requiring root privs.
Signed-off-by: Adam Heath <doogie@brainfood.com>
2005-03-12 15:29:44 +00:00
doogie@brainfood.com[kaf24] 61b59d9dd5 bitkeeper revision 1.1159.270.2 (42330a929cE0pKehTkalVAgu8SLwKQ)
[PATCH] non-xen-init-exit.patch

Name: non-xen-init-exit.patch
Description: exit if not running on a xen dom0 kernel.
 If /proc/xen/privcmd doesn't exist, then exit successfully.  This allows
 for dual-boot setups, and installing xen before rebooting into a real
 xen kernel.
Signed-off-by: Adam Heath <doogie@brainfood.com>
2005-03-12 15:28:18 +00:00
iap10@freefall.cl.cam.ac.uk e77f3b1346 bitkeeper revision 1.1159.258.50 (4231b14a0Nqrojj7aAwM5Ge5I8cg9w)
Change defaults in /etc/xen/xend-config.sxp :
 * xend will now only listen on localhost for conenctions from 'xm'.
 * consoles are only available from localhost too

Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-03-11 14:55:06 +00:00
mjw@wray-m-3.hpl.hp.com fd4de8dfe3 bitkeeper revision 1.1159.265.2 (42319500DXIXjiTkjszNpliySomMvA)
Add support for setting the listen address for consoles
and the event port.

Signed-off-by: Mike Wray <mike.wray@hp.com>
2005-03-11 12:54:24 +00:00
cl349@firebug.cl.cam.ac.uk 50a72e5d2d bitkeeper revision 1.1236.1.56 (4227b2b4dQ6XlQ1LnHLnW5ENc2B7LA)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
2005-03-04 00:58:28 +00:00
cl349@firebug.cl.cam.ac.uk b819ef725e bitkeeper revision 1.1159.258.21 (4227b272juDzo6xMj-KE4nB4e0xsmA)
xmexample updates.
Signed-off-by: chris@xensource.com
2005-03-04 00:57:22 +00:00
iap10@tetris.cl.cam.ac.uk b762a4715d bitkeeper revision 1.1236.1.20 (421e79e2QCkwvVmtkyb5ugRhPlYFWw)
acpi=off as the default for vmx domains.
Signed-off-by: ian@xensource.com
2005-02-25 01:05:38 +00:00
iap10@labyrinth.cl.cam.ac.uk 6d5c7e8551 bitkeeper revision 1.1159.212.119 (42080936hYySAGh0O5TePVvGrzAKtA)
Enable PCI.

Signed-off-by: Xin B Li <xin.b.li@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian@xensource.com
2005-02-08 00:35:02 +00:00
iap10@labyrinth.cl.cam.ac.uk fe5c36a66a bitkeeper revision 1.1159.212.118 (420808adQbNXWTSEhY2Rqu5ALqDF5Q)
- Detect the CPU speed automatically, rather than having the user 
  specify a ips in bochsrc. The user can still specify it to override
  the auto-detected value.

- Care should be taken to make sure that tsc_per_bx_tick is not too
  small or too big. Otherwise, numerical precision issues may result
  in the wrong calculation of elapsed time

Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Signed-off-by: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian@xensource.com
2005-02-08 00:32:45 +00:00
iap10@labyrinth.cl.cam.ac.uk d3fda59bcc bitkeeper revision 1.1159.212.117 (4208081dSxJads7MU6-VcXvC6TNMjQ)
- Use a more appropriate path for disk images
- Add a 1 GB disk image as an option

From: Arun Sharma <arun.sharma@intel.com>
Signed-off-by: ian@xensource.com
2005-02-08 00:30:21 +00:00
kaf24@scramble.cl.cam.ac.uk f399f184eb bitkeeper revision 1.1159.212.114 (4207bda3k03bdnnP3uGkOvKhmXjbkg)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
2005-02-07 19:12:35 +00:00
kaf24@scramble.cl.cam.ac.uk 90dd5b6a18 bitkeeper revision 1.1159.223.77 (4207bd65yRdFmE9Py8fLUBk3826_Ig)
Minor tidy of vif-nat script.
Signed-off-by: keir.fraser@cl.cam.ac.uk
2005-02-07 19:11:33 +00:00
iap10@labyrinth.cl.cam.ac.uk b9cb078242 bitkeeper revision 1.1159.212.59 (41fc114c3QNYidj-HaO5jjZA5jbgpQ)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
2005-01-29 22:42:20 +00:00
iap10@labyrinth.cl.cam.ac.uk 744d0bbffb bitkeeper revision 1.1159.223.53 (41fc0c19tGe1rM62SUQk8WYZjH-D1Q)
Add iptables modules to the default xen0 kernel, and add example configuration files for a NAT setup.
2005-01-29 22:20:09 +00:00
cl349@arcadians.cl.cam.ac.uk 2ef6d5718f bitkeeper revision 1.1159.231.8 (41f92d4dBn-4k24hnQtAJIjhmWfRjQ)
Merge changes from 2.0-testing.

Signed-off-by: c@pin.lu
2005-01-27 18:05:01 +00:00
cl349@arcadians.cl.cam.ac.uk 8f230701e2 bitkeeper revision 1.1159.234.1 (41f9203a3hESfmWBG29VVoqa-chOrA)
Build system cleanups.

Signed-off-by: c@pin.lu
2005-01-27 17:09:14 +00:00
kaf24@scramble.cl.cam.ac.uk ad6b799253 bitkeeper revision 1.1159.212.41 (41f6787aKvcI0-k3FYgkk8w74QD5gg)
manual merge.
2005-01-25 16:48:58 +00:00
kaf24@scramble.cl.cam.ac.uk 3279b48916 bitkeeper revision 1.1159.223.40 (41f676cbajLGqFeWFqajtJ3X4OkgoA)
Build system fixes.
Signed-off-by: keir.fraser@cl.cam.ac.uk
2005-01-25 16:41:47 +00:00
iap10@freefall.cl.cam.ac.uk 7a564e6a4c bitkeeper revision 1.1159.212.34 (41f5a289J4SAf6zaQUhGEBrQWQ14dA)
manual merge
2005-01-25 01:36:09 +00:00
iap10@pb007.cl.cam.ac.uk f90f7afb43 bitkeeper revision 1.1159.223.30 (41f57c8aGPV5CqOP-AQvc0TjHU_n8A)
Merge pb007.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into pb007.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-2.0-testing.bk
2005-01-24 22:54:02 +00:00
iap10@labyrinth.cl.cam.ac.uk aac66e34a6 bitkeeper revision 1.1159.226.3 (41f55c8er11pRwXCJ66we1vDzrEZ9Q)
With ipv6, every network interface always has a link local
address.  This fools the network script into thinking that
xen-br0 already has a network address, and it refuses to
transfer over eth0's IP address to xen-br0.

By grepping for 'inet ' instead of just 'inet', the network
script is no longer fooled and does the right thing.  This
patch makes Xen networking work again on my Fedora system.

Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-24 20:37:34 +00:00
iap10@labyrinth.cl.cam.ac.uk d2f5d53621 bitkeeper revision 1.1159.223.26 (41f2cdb6LNpheOtPoAKEUn-czlZFig)
Description: use DESTDIR correctly
Standard makefiles always attempt to install to the root(/).  Setting
DESTDIR is the normal way to install to an alternative location.
Setting prefix has the possibility of breaking programs, as the prefix
may have been embedded inside a compiled binary.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-22 22:03:34 +00:00
iap10@labyrinth.cl.cam.ac.uk bce79d6f98 bitkeeper revision 1.1159.223.22 (41f2c983tNSS8-VlWIzF9A78zTQx-w)
Description: add force-reload option
Debian policy requires init scripts to implement force-reload.  So, alias
that to restart.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-22 21:45:39 +00:00
iap10@labyrinth.cl.cam.ac.uk 6b422c28fa bitkeeper revision 1.1159.223.18 (41f2c6eamwtTkjdrv4CuL1WnOy4iGw)
Description: use INSTALL everywhere
Use install(by way of INSTALL variables) to create directories, install
programs, and install data files.

From: Adam Heath <doogie@brainfood.com>
Signed-off-by: ian.pratt@cl.cam.ac.uk
2005-01-22 21:34:34 +00:00