From b10a1d453cf964754cffd031f6d2541e8f2cd7df Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Tue, 12 Apr 2005 15:40:41 +0000 Subject: [PATCH 1/3] bitkeeper revision 1.1291.1.1 (425bebf9aCUxgH4Es3NJxOCwIS_yVA) Remove debug hooks that shouldn't be enabled by default. --- tools/libxc/xc_linux_build.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/libxc/xc_linux_build.c b/tools/libxc/xc_linux_build.c index 108d591107..d4b28de06e 100644 --- a/tools/libxc/xc_linux_build.c +++ b/tools/libxc/xc_linux_build.c @@ -210,11 +210,9 @@ static int setup_guest(int xc_handle, } *vl1e = (page_array[count] << PAGE_SHIFT) | L1_PROT; -#if !(1 || defined(GROSS_HACK_TO_TEST_SHADOW_MODE_CLIENTS)) if ( (count >= ((vpt_start-dsi.v_start)>>PAGE_SHIFT)) && (count < ((vpt_end -dsi.v_start)>>PAGE_SHIFT)) ) *vl1e &= ~_PAGE_RW; -#endif vl1e++; } munmap(vl1tab, PAGE_SIZE); @@ -245,25 +243,12 @@ static int setup_guest(int xc_handle, } munmap(physmap, PAGE_SIZE); -#if 1 || defined(GROSS_HACK_TO_TEST_SHADOW_MODE_CLIENTS) - { - int ret; - ret = xc_shadow_control(xc_handle, dom, - DOM0_SHADOW_CONTROL_OP_ENABLE_TEST, - NULL, 0, NULL); - if ( !ret ) - ERROR("enabling shadow test mode failed\n"); - } -#endif - /* * Pin down l2tab addr as page dir page - causes hypervisor to provide * correct protection for the page */ -#if !(1 || defined(GROSS_HACK_TO_TEST_SHADOW_MODE_CLIENTS)) if ( pin_table(xc_handle, MMUEXT_PIN_L2_TABLE, l2tab>>PAGE_SHIFT, dom) ) goto error_out; -#endif start_info = xc_map_foreign_range( xc_handle, dom, PAGE_SIZE, PROT_READ|PROT_WRITE, From d3aedc9567099c94852f1f72f7e6a9acff8b1cb8 Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Tue, 12 Apr 2005 16:33:28 +0000 Subject: [PATCH 2/3] bitkeeper revision 1.1291.1.2 (425bf858UzCNdwL5gna8YNNdZ5iYAA) The shadow control hypercall can now invoke shadow translate mode. --- xen/arch/x86/shadow.c | 5 +++++ xen/include/public/dom0_ops.h | 1 + 2 files changed, 6 insertions(+) diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c index bf749781bd..0fddfdd9a8 100644 --- a/xen/arch/x86/shadow.c +++ b/xen/arch/x86/shadow.c @@ -1228,6 +1228,11 @@ int shadow_mode_control(struct domain *d, dom0_shadow_control_t *sc) rc = __shadow_mode_enable(d, d->arch.shadow_mode|SHM_enable|SHM_log_dirty); break; + case DOM0_SHADOW_CONTROL_OP_ENABLE_TRANSLATE: + free_shadow_pages(d); + rc = __shadow_mode_enable(d, d->arch.shadow_mode|SHM_enable|SHM_translate); + break; + default: rc = shadow_mode_enabled(d) ? shadow_mode_table_op(d, sc) : -EINVAL; break; diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h index 33c196b8f6..ad185ae26d 100644 --- a/xen/include/public/dom0_ops.h +++ b/xen/include/public/dom0_ops.h @@ -242,6 +242,7 @@ typedef struct { #define DOM0_SHADOW_CONTROL_OP_OFF 0 #define DOM0_SHADOW_CONTROL_OP_ENABLE_TEST 1 #define DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY 2 +#define DOM0_SHADOW_CONTROL_OP_ENABLE_TRANSLATE 3 #define DOM0_SHADOW_CONTROL_OP_FLUSH 10 /* table ops */ #define DOM0_SHADOW_CONTROL_OP_CLEAN 11 From 99a2243d06048b07c5f96aaafdc90e8e72c144b2 Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Wed, 13 Apr 2005 10:00:30 +0000 Subject: [PATCH 3/3] bitkeeper revision 1.1291.1.3 (425cedbeGiOGgBWe1ZUNOQP3QLs_kw) Fix compilation problem in linux 2.4 kernel --- linux-2.4.29-xen-sparse/mkbuildtree | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-2.4.29-xen-sparse/mkbuildtree b/linux-2.4.29-xen-sparse/mkbuildtree index f086298a69..99ddd461d2 100755 --- a/linux-2.4.29-xen-sparse/mkbuildtree +++ b/linux-2.4.29-xen-sparse/mkbuildtree @@ -212,6 +212,7 @@ ln -sf ../../${LINUX_26}/include/asm-xen/gnttab.h ln -sf ../../${LINUX_26}/include/asm-xen/hypervisor.h ln -sf ../../${LINUX_26}/include/asm-xen/xen_proc.h ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/synch_bitops.h +ln -sf ../../${LINUX_26}/include/asm-xen/asm-i386/hypercall.h mkdir -p linux-public && cd linux-public ln -sf ../../../${LINUX_26}/include/asm-xen/linux-public/privcmd.h