bitkeeper revision 1.1236.21.1 (422f6572a9UTrKNu9Wm3aHvy00ZEwA)

fix gcc 3.4 compile probs on blktap.

Signed-off-by: andrew.warfield@cl.cam.ac.uk

bitkeeper revision 1.1236.12.26 (422f4105wE_lbhdvI9pHdsnkR93-iw)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

bitkeeper revision 1.1236.19.2 (422f40f3l62sGOkmaI-pc1lI7OvE-A)

audit_pagelist added for debugging.
Signed-off-by: ian@xensource.com

bitkeeper revision 1.1236.19.1 (422f3fd8BustMuUXTkjmPaBu2yss5Q)

Fix ctrl_iface recovery across suspend/resume.
Signed-off-by: ian@xensource.com

bitkeeper revision 1.1236.12.25 (422f282953v_J4bTBy1CN1Z9x3rhog)

.del-util.c~fb55f547242f9869:
  Delete: tools/x2d2/util.c
.del-minixend.h~9bba8a3fbfa4153:
  Delete: tools/x2d2/minixend.h
.del-minixend.c~ef5576bb71152607:
  Delete: tools/x2d2/minixend.c
.del-cntrl_con.c~9df6acbfc777c229:
  Delete: tools/x2d2/cntrl_con.c
.del-Makefile~7ab0b94e34972cb0:
  Delete: tools/x2d2/Makefile

bitkeeper revision 1.1236.12.24 (422f27cdtDM6eDmFdDI-Oav5B0eS5A)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

bitkeeper revision 1.1236.18.1 (422f27c9EveZXnXhkLBg8iYwaAffoQ)

Begin integrating new instruction decoder and emulator.
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.12.23 (422f244fdQRUPxMUG1aht7dZl272hw)

ISO C90 forbids mixed declarations and code.
Signed-off-by: bin.ren@cl.cam.ac.uk

bitkeeper revision 1.1236.12.22 (422f1ddcMY-YRWMhvpqWmcER7Kb_kQ)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

bitkeeper revision 1.1236.17.1 (422f1dd7gDanpHUJdykMTKiG0ZvOsg)

Delete unused defns.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.21 (422ed80aiTMikZfL5YN_rGAiNUrUKg)

Merge donkeykong.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into donkeykong.cl.cam.ac.uk:/local/scratch/cwc22/XenBuild/xen-unstable.bk

bitkeeper revision 1.1236.16.1 (422ed7e7yYUESLC-7uwebq93laZxlw)

Stubbed out userspace access to granttables

bitkeeper revision 1.1236.12.20 (422ed726QE48iGSJKlGDKQ2zNgOceA)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into arcadians.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk

bitkeeper revision 1.1236.15.1 (422ed6ffKvpALk9Jv4dfEbnMfU7rPQ)

Unmap foreign pages properly.

Signed-off-by: andrew.warfield@cl.cam.ac.uk

bitkeeper revision 1.1236.12.19 (422ecb2bc2t7QxV32i8WkcYdNFkamw)

A few x86/64 fixes for Jun.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.18 (422ebdbe7uRYOpXY086XHnR2gRhjaQ)

Fix 'priviledge' typo.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.17 (422ebd6bbZvWUE6_1BGsaHxqMbgdQg)

[PATCH] [PATCH] fix error path handling in physdev

This patch fixes the error path handling in physdev.o.
- handle memory allocation failures properly
- physdev_pci_access_modify: if something fails, remove the new
physdev or reset its access mode if it already existed
- clear the priviledge bits if something fails
- do_physdev_op: properly check copy_to-user

Patch against the unstable tree, works for me in qemu on x86 with domU
accessing a single pci device, but more testing appreciated (is anyone
using the direct pci access stuff?)

Signed-Off-By: Muli Ben-Yehuda <mulix@mulix.org>

bitkeeper revision 1.1236.12.16 (422ebb7aYVp_Td4UP5dSmJUG7oOtyA)

New arch-specific function context_switch() subsumes switch_to() and
schedule_tail() which are now not at all visible to common code.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.15 (422e5a69zhiLV3Xbq3D-aL20QlyddA)

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/netbsd/xen-unstable.bk

bitkeeper revision 1.1159.258.34 (422e593fP_MDJ47j5LhtS8fQOVuyAQ)

Update to NetBSD 2.0.1.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1159.258.33 (422e4c2dbtydqXSZXhO6gOuY-qlS5A)

Support Xen-ifying a complete NetBSD source tree.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1236.12.14 (422e47e9xlByLicbmgGE7DC-Dy4qJg)

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/netbsd/xen-unstable.bk

bitkeeper revision 1.1159.258.32 (422e470bJa_VGcUAPdnpZWrD6n9uew)

Export Xen provided command line as /kern/xen/cmdline.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1236.12.13 (422e46b74CDqIst0SkN2s80Urlmg0Q)

replaced check for shadow_mode_external

bitkeeper revision 1.1159.258.31 (422e4564B542sr1LgKTQ3FWQwTZcZQ)

Add support for read file operation handlers.
Also fix fallback to default handlers.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1159.258.30 (422e43bag8TDBzRIwsJaOhrjeAZ-gg)

Enable vnd devices.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1159.258.29 (422e4382uaLzLWWGJwNl_pq0d8dMog)

Support Xen-ifying a complete NetBSD source tree.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1159.258.28 (422e42e5yWRuW_i02udqDbLjol4GOQ)

Support compiling kernels other than the XEN one.
Signed-off-by: Christian Limpach <cl@NetBSD.org>

bitkeeper revision 1.1236.12.12 (422e2f94y48ELm2z25jB8lJCOUxZgw)

grant tables: page ref counting fixes.

bitkeeper revision 1.1236.12.11 (422de58bI6Rru29oYT0ipOgZZhpqZw)

resolve of grant tables merge

bitkeeper revision 1.1236.9.4 (422de287K2jrgIwhqpseOXIo8w8acA)

tidying up debug msgs

bitkeeper revision 1.1236.12.10 (422ddcefnSKZRvTbeADnwuPWCKuy7w)

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

bitkeeper revision 1.1159.258.27 (422ddcd5Cf-97FdGP6TJyFvIxer4Mg)

Prevent buddy-allocator merges across Xen/Domain zones boundary.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.9.3 (422dcf06pBEc-gi-qwPDx52pb_x1Ig)

Added updates to pagetables in grant table map and unmap operations.

bitkeeper revision 1.1236.12.9 (422dcb96uoz8DJc8Aej_Ui7m49D3sA)

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

bitkeeper revision 1.1159.258.26 (422dcb82edKYqnLB0fr24Sf5anyo6Q)

Fix parallel build in Xen directory.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.8 (422db1ccGvS3XCMIAfMxRkhGucHbjA)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

bitkeeper revision 1.1236.13.1 (422db1bdZ6ZohI27rSF1Yo3Q91_REw)

Return mfn of m2p table correctly.

bitkeeper revision 1.1236.12.7 (422dacdcZEjp_SXRvSpRKap0KtkBag)

Must always send VIRQ_TIMER to a blocked guest.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.6 (422dab92KN13z2KG2xzMb-Q2HidZyQ)

Manual merge.

bitkeeper revision 1.1159.258.25 (422dab6bOBL6I9LRZYfF0ExfT5VXww)

Must always send VIRQ_TIMER to a blocked guest.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.5 (422da8ab_AbA2_rC_i23sDg0BY_avQ)

Time cleanup.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.4 (422d7a50g-lmMcSI2gKt0v9vRXTjYQ)

Clean up timer upcalls to guest kernel. Only send an upcall when
timestamp info actually changes.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.3 (422d775dKaZ31uEadZ69IypltHcqEQ)

Manual merge.

bitkeeper revision 1.1159.258.24 (422d768ae6_z9fpLLsp1seSXtGA5qA)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk

bitkeeper revision 1.1159.264.1 (422d7683GAA5eJb-zpm3NsgvYf9Q9A)

Clean up timer upcalls to guest kernel. Only send an upcall when
timestamp info actually changes.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.12.2 (422d7345zz9yYZNfSXyhxHfWMIfkPA)

Merge airwolf.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into airwolf.cl.cam.ac.uk:/auto/homes/vh249/xen-unstable.bk

bitkeeper revision 1.1159.258.23 (422d72b8gvbXrWsyznqgyF7shPiduw)

Fix error path handling not calling iounmap() after ioremap()

Signed-off-by: Yann Droneaud <ydroneaud@mandrakesoft.com>
Signed-off-by: Vincent Hanquez <vincent@xensource.com>

bitkeeper revision 1.1236.12.1 (422d6eadP8rlqEFriOCwM-dW2OyQTA)

Fix ring definitions to not use typeof. The accessor macros no longer
take a 'params' argument.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.65 (422c9421LVndOoo0PvX8eyQwAXrjxw)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk

bitkeeper revision 1.1236.11.1 (422c8fffPd62_3ejA06WBfNou1MZyg)

Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk

bitkeeper revision 1.1236.1.64 (422c8a46Ahc4JfjN3Avhf5LSRWyn8g)

fix write-in-place problem -- radix tree wasn't returning writable bit on
lookups.

signed-off-by: andrew.warfield@cl.cam.ac.uk

bitkeeper revision 1.1236.1.63 (422c7030sEJW3a3P0-LyvjN0ZWwaMA)

Merge airwolf.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into airwolf.cl.cam.ac.uk:/auto/homes/vh249/xen-unstable.bk

bitkeeper revision 1.1159.258.22 (422c6612riGtD5GGqVTNqhuli2WrwQ)

fix spinlock still held while leaving function in case of error

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

bitkeeper revision 1.1236.1.62 (422996dcaXWGIhR3ZzSlNz3XpvLF0A)

[PATCH] [PATCH] gcc4isms part 2

This completes the gcc4ism changes to the Xen tree.  All of
the changes in this patch are in the tools/ subdirectory and
are pretty simple.  Some of the changes are for overly strict
gcc4 warnings, but I guess it's still good to verify that the
variable really wasn't unused, or that the sign change is
really harmless.

I guess I really do like -Werror now...

Signed-off-by: Rik van Riel <riel@redhat.com>
 libxc/xc_linux_build.c      |    2 +-
 libxc/xc_plan9_build.c      |   24 ++++++++++++------------
 libxc/xc_vmx_build.c        |    2 +-
 python/xen/lowlevel/xu/xu.c |    2 +-
 xcs/xcs.c                   |    2 +-
 xfrd/lzi_stream.c           |    2 +-
 xfrd/marshal.c              |    4 ++--
 xfrd/xdr.c                  |    2 +-
 xfrd/xfrd.c                 |   12 ++++++------
 9 files changed, 26 insertions(+), 26 deletions(-)

bitkeeper revision 1.1236.1.61 (422996d7OS-GHHO0uCOWruz6V8AWXw)

[PATCH] [PATCH] gcc4isms part 1

This patch gets rid of the compile warnings under the xen/
subdirectory, for an x86_32 compile.  The cpuid change has
also been sent to the upstream kernel.

I am not quite sure about the vmx_platform.c bits, since
__s8 should be the same as char, so gcc really shouldn't
warn...

Signed-off-by: Rik van Riel <riel@redhat.com>
 arch/x86/acpi.c             |    2 +-
 arch/x86/domain_build.c     |    2 +-
 arch/x86/pci-pc.c           |    4 ++--
 arch/x86/setup.c            |   16 ++++++++--------
 arch/x86/vmx.c              |    2 +-
 arch/x86/vmx_platform.c     |   20 ++++++++++----------
 common/kernel.c             |    2 +-
 drivers/char/console.c      |    4 ++--
 drivers/char/serial.c       |    4 ++--
 include/asm-x86/processor.h |    2 +-
 include/public/xen.h        |    2 +-
 include/xen/serial.h        |    2 +-
 12 files changed, 31 insertions(+), 31 deletions(-)

bitkeeper revision 1.1236.1.60 (42299622PoSV4xT6Ds22AHb8mP24xA)

XCS binds thru /var/lib/xen and gives better error message if this
fails.
Signed-off-by: Muli Ben-Yahuda <mulix@mulix.org>
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.59 (4228886djJDkWyw9MinvuEdsb1X0KQ)

Merge tempest.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk

bitkeeper revision 1.1236.10.1 (42288860WihptaT0mMRS7KBmfxWFcA)

build fixes

Signed-off-by: steven.hand@cl.cam.ac.uk

bitkeeper revision 1.1236.1.58 (42288505tf22vxeNSISpP2B48DpV5A)

Fix the Emacs 'local variables' block to include required end stmt.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.9.2 (422840a9xbbNuTrbO6poyFnzBRcuOg)

caller specified decrement to put_page_type(s)

bitkeeper revision 1.1236.1.57 (422826c66IM1rOTAlb2AHZ3oXvqO-A)

GCC4 fix. Define tss_struct before declaring an array.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.9.1 (4227c12cJQxFhBUYk0ojkmnooUw0jQ)

Grant tables work on data structures.

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

bitkeeper revision 1.1159.258.21 (4227b272juDzo6xMj-KE4nB4e0xsmA)

xmexample updates.
Signed-off-by: chris@xensource.com

bitkeeper revision 1.1159.258.20 (42277e15JmrB3LkX2vA4MklHkX1hQA)

Fix build
Signed-off-by: ian@xensource.com

bitkeeper revision 1.1236.1.55 (42277df7j-1VW2xTCyrLOtTW1Z8OVg)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into arcadians.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk

bitkeeper revision 1.1236.1.54 (42277de2WK7_Nt8AUEblj6keTcJhBw)

Fix short int defines to match other fixes to tools tree.

Signed-off-by: andrew.warfield@cl.cam.ac.uk

bitkeeper revision 1.1236.8.1 (42277d6dJcqUMaI0LWRabpTP52KawQ)

Fix build.
Signed-off-by: ian@xensource.com

bitkeeper revision 1.1236.1.53 (42277c41EuPccbqmVurI0fsfmSfYuA)

fix conflict.

bitkeeper revision 1.1236.7.1 (42277b06gMBo3oqaq35om--uwNImNg)

Initial checkin of parallax code.
See README-PARALLAX for details.

Signed-off-by: andrew.warfield@cl.cam.ac.uk

bitkeeper revision 1.1236.6.2 (42275c2ak287mv70u-J_l044a-Ef6A)

Handle (rare and previously unencountered) page-not-present
trap by reflecting to domain

bitkeeper revision 1.1236.1.52 (42273792F0NBFkhZz96wi1afyF7_Uw)

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-xenod/BK/xen-unstable.bk

bitkeeper revision 1.1159.258.19 (42273652yPWGOWH6C8w45TOchk7Jog)

This patch enables argument passing to plan 9 domains, so that users can
now have parameters for things like Venti etc.

Signed-off-by: ron minnich <rminnich@lanl.gov>
Signed-off-by: ian.pratt@cl.cam.ac.uk

bitkeeper revision 1.1236.1.51 (42272095QxAhIP6x9_72fHg_JpS8Xw)

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

bitkeeper revision 1.1159.258.18 (4226f857ltmzeYRsvtnlD8t5FVTvhw)

Remove support for tgif as a tool.  We don't use it and it's hard to find as
and rpm.
Signed-off-by: cl349@cl.cam.ac.uk

bitkeeper revision 1.1236.1.50 (4226e18dPTdFTiLOPiPo6q_3m7Ycyw)

Speed up 'bk citool' by forcing it to skip scan of build directories.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.49 (4226ddd3E_h9Dlj5W6XverRkiMcqMw)

x86 ( 32bit) is the only architecture that uses Fast trap vector offset
( fast_trap_idx ). This makes sure that x86 is the only architecture to
use this variable.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.48 (42266bcdE0YKInNbHNUP19tmx6VSdA)

Fix 32-bit build on 64-bit machines.
Signed-off-by: chris@xensource.com

bitkeeper revision 1.1236.6.1 (42265e38FOWXHddB1NPxV83mnMxy7Q)

Merge kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk
into kirby.fc.hp.com:/home/djm/src/xen/useraccess.bk

bitkeeper revision 1.1221.1.1 (42265de0hZSi5pHFW0EmtG7Pkn2Ojw)

Add user access code and mechanism and switch privop access
code over to use it.

bitkeeper revision 1.1236.1.47 (4225ff68LvKUt73k78dKjnXxsnQt7A)

Fix tools build. Clean up barrier defs.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.46 (4225fdb2Fsz5LfXWKyVON4u_POTHkQ)

Credit-based rate limiting in net backend. From Ross Mcilroy.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.45 (42258857U4okIoyPxH5YjJWR8rXbew)

Xen emulates WBINVD -- reduce diffs in Linux 2.6 in light of this.
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.44 (4224f156AyEV3oV5JinuYtfS9e_ITA)

Rationalise memory-barrier definitions in user-space tools.
Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.43 (4224d4d8TmK1ky7zQ9p-c46bp6D7eg)

Fix uninitialised variable.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.42 (4224bb8fOnbAClkv82bfZwfayrn5Rw)

Fix error-code generation in rdmsr_user and wrmsr_user.
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.41 (4224ab34YunoDc0_FV3T0OZPcJ0Pcw)

Performance counters for hypercalls and exceptions. Perfctr histograms
for pagetable updates.
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@intel.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.40 (4224a931TYcCJacGK8niT_gal7iuRw)

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

bitkeeper revision 1.1159.258.17 (4224a8faTVrzHrdNP0aTwjJrfZ4vnw)

Fix another -Wall -Werror compile error.
Signed-off-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Keir Fraser <keir.fraser@cl.cam.ac.uk>

bitkeeper revision 1.1236.1.39 (422385e3JUTcpAnifvTDP-tLQGjpug)

trivial fix to remove time.usleep
Signed-off-by: ian@xensource.com

bitkeeper revision 1.1236.1.38 (42221634EYMEOeOSyYh0c2ti_q6P0w)

Merge planb.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into planb.cl.cam.ac.uk:/auto/anfs/scratch/scramble/kaf24/xen-unstable.bk

bitkeeper revision 1.1236.5.1 (42221629GhhpYjgKPI7BEb9C8FJ2aA)

Specify compile/target architectures for Xen build process via
XEN_COMPILE_ARCH and XEN_TARGET_ARCH.
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.37 (42220839uiUo4mhX0fedaXFvOocS4Q)

Update error message when loading a "not Xen v3.0" image.
Signed-off-by: chris@xensource.com

bitkeeper revision 1.1236.1.36 (4221cfd30UrMyu3TpXKGjVNXNVS1Bw)

Update 'xen version' in guest-OS images to 3.0.
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.35 (4221cdcevFIhlA_vszZmPBjpl9nLjQ)

Set pagetable bits correctly (for Linux) in DOM0 builder.
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.34 (4221a315ShkFw2X--zS0IOD04zHUnA)

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

bitkeeper revision 1.1159.258.16 (4221a2ecsI-7_TFUEYf9_8zVhzHq3Q)

Fix 2.4 build, and a small 2.6 bootstrap tweak.
Signed-off-by: Keir Fraser <keir@xensource.com>

bitkeeper revision 1.1236.1.33 (4220c1d4kWBTmwyNeriCfcEPm-7p4g)

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

bitkeeper revision 1.1159.258.15 (4220c1b89PleMUER22Q6eIRqab93Dg)

Typo in 2.6 file.
Signed-off-by: Keir Fraser <keir@xensource.com>