ia64/xen-unstable

changeset 6422:e24fd7012ffb

merge?
author cl349@firebug.cl.cam.ac.uk
date Thu Aug 25 10:09:39 2005 +0000 (2005-08-25)
parents 2f20c2fce2c5 fd77dd32c8a4
children f4bc62ee03b4
files Config.mk linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 linux-2.6-xen-sparse/arch/xen/kernel/reboot.c linux-2.6-xen-sparse/arch/xen/x86_64/ia32/syscall32.c linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head.S linux-2.6-xen-sparse/arch/xen/x86_64/kernel/head64.c linux-2.6-xen-sparse/arch/xen/x86_64/kernel/setup.c linux-2.6-xen-sparse/arch/xen/x86_64/mm/init.c linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/blkfront/block.h linux-2.6-xen-sparse/drivers/xen/console/console.c linux-2.6-xen-sparse/drivers/xen/netback/Makefile linux-2.6-xen-sparse/drivers/xen/netback/common.h linux-2.6-xen-sparse/drivers/xen/netback/interface.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h tools/blktap/blktaplib.h tools/blktap/parallax/block-async.h tools/blktap/parallax/blockstore.h tools/console/Makefile tools/console/client/main.c tools/console/daemon/io.c tools/console/daemon/main.c tools/console/daemon/utils.c tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/linux-xen-low.c tools/debugger/libxendebug/Makefile tools/debugger/libxendebug/xendebug.c tools/debugger/libxendebug/xendebug.h tools/debugger/pdb/pdb_caml_domain.c tools/debugger/pdb/pdb_caml_evtchn.c tools/debugger/pdb/pdb_caml_process.c tools/debugger/pdb/pdb_caml_xc.c tools/debugger/pdb/pdb_caml_xcs.c tools/debugger/pdb/pdb_xen.c tools/examples/README tools/firmware/acpi/acpi2_0.h tools/ioemu/hw/i8254.c tools/ioemu/hw/i8259.c tools/ioemu/hw/ioapic.h tools/ioemu/target-i386-dm/Makefile tools/ioemu/target-i386-dm/helper2.c tools/ioemu/vl.c tools/libxc/Makefile tools/libxc/xc_core.c tools/libxc/xc_domain.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xc_load_aout9.c tools/libxc/xc_load_bin.c tools/libxc/xc_load_elf.c tools/libxc/xc_private.c tools/libxc/xc_private.h tools/libxc/xc_vmx_build.c tools/libxc/xenctrl.h tools/libxc/xenguest.h tools/libxc/xg_private.c tools/libxc/xg_private.h tools/misc/Makefile tools/misc/cpuperf/Makefile tools/misc/cpuperf/cpuperf_xeno.h tools/misc/xc_shadow.c tools/misc/xenperf.c tools/python/setup.py tools/python/xen/lowlevel/xc/xc.c tools/python/xen/lowlevel/xu/xu.c tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xm/main.py tools/xcs/Makefile tools/xcs/dump.h tools/xcs/xcs.h tools/xcs/xcsdump.c tools/xcutils/Makefile tools/xcutils/xc_restore.c tools/xcutils/xc_save.c tools/xenstore/Makefile tools/xenstore/xs_dom0_test.c tools/xenstore/xs_lib.h tools/xentrace/Makefile tools/xentrace/xenctx.c xen/arch/x86/cpu/amd.c xen/arch/x86/mm.c
line diff
     1.1 --- a/tools/examples/README	Thu Aug 25 00:55:20 2005 +0000
     1.2 +++ b/tools/examples/README	Thu Aug 25 10:09:39 2005 +0000
     1.3 @@ -9,9 +9,20 @@ If you write a useful script and would l
     1.4  send it (preferably with a little summary to go in this file) to
     1.5  <xen-devel@lists.sourceforge.net> so we can add it to this directory.
     1.6  
     1.7 +block-enbd          - binds/unbinds network block devices
     1.8 +block-file          - binds/unbinds file to loopback device
     1.9 +mem-map.sxp         - memory map xend configuration file.
    1.10  network             - default network setup script called by xend at startup.
    1.11 +network-route       - default xen network start/stop script.
    1.12 +network-nat         - default xen network start/stop script when using NAT.
    1.13  vif-bridge          - default virtual network interface setup script.
    1.14 +vif-route           - default xen virtual network start/stop script
    1.15 +vif-nat             - configures vif in routed-nat mode.
    1.16  xend-config.sxp     - default xend configuration file.
    1.17  xmexample1          - example configuration script for 'xm create'.
    1.18  xmexample2          - a more complex configuration script for 'xm create'.
    1.19 +xmexample3          - an advanced configuration script for 'xm create' 
    1.20 +                      that utilizes the vmid.
    1.21 +xmexample.vmx       - a configuration script for creating a vmx domain with
    1.22 +                      'xm create'.
    1.23  
     2.1 --- a/tools/python/xen/xm/main.py	Thu Aug 25 00:55:20 2005 +0000
     2.2 +++ b/tools/python/xen/xm/main.py	Thu Aug 25 10:09:39 2005 +0000
     2.3 @@ -665,8 +665,10 @@ def main(argv=sys.argv):
     2.4              err("Most commands need root access.  Please try again as root")
     2.5              sys.exit(1)
     2.6          except XendError, ex:
     2.7 +            if args[0] == "bogus":
     2.8 +                args.remove("bogus")
     2.9              if len(args) > 0:
    2.10 -                handle_xend_error(argv[1], args[1], ex)
    2.11 +                handle_xend_error(argv[1], args[0], ex)
    2.12              else:
    2.13                  print "Unexpected error:", sys.exc_info()[0]
    2.14                  print
     3.1 --- a/xen/arch/x86/cpu/amd.c	Thu Aug 25 00:55:20 2005 +0000
     3.2 +++ b/xen/arch/x86/cpu/amd.c	Thu Aug 25 10:09:39 2005 +0000
     3.3 @@ -39,7 +39,7 @@ custom_param("amd_flush_filter", flush_f
     3.4   */
     3.5   
     3.6  extern void vide(void);
     3.7 -__asm__(".align 4\nvide: ret");
     3.8 +__asm__(".text\n.align 4\nvide: ret");
     3.9  
    3.10  static void __init init_amd(struct cpuinfo_x86 *c)
    3.11  {