1.1 --- a/Config.mk	Thu Jul 27 17:44:14 2006 -0500
     1.2 +++ b/Config.mk	Fri Jul 28 10:51:38 2006 +0100
     1.3 @@ -36,6 +36,8 @@ ifneq ($(debug),y)
     1.4  CFLAGS    ?= -O2 -fomit-frame-pointer
     1.5  CFLAGS    += -DNDEBUG
     1.6  else
     1.7 +# Less than -O1 produces bad code and large stack frames
     1.8 +CFLAGS    ?= -O1 -fno-omit-frame-pointer
     1.9  CFLAGS    += -g
    1.10  endif
    1.11  

     2.1 --- a/buildconfigs/linux-defconfig_xen0_ia64	Thu Jul 27 17:44:14 2006 -0500
     2.2 +++ b/buildconfigs/linux-defconfig_xen0_ia64	Fri Jul 28 10:51:38 2006 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6  # Linux kernel version: 2.6.16.13-xen0
     2.7 -# Mon May 22 14:46:31 2006
     2.8 +# Fri Jun 30 12:59:19 2006
     2.9  #
    2.10  
    2.11  #
    2.12 @@ -721,21 +721,10 @@ CONFIG_SERIAL_NONSTANDARD=y
    2.13  #
    2.14  # Serial drivers
    2.15  #
    2.16 -CONFIG_SERIAL_8250=y
    2.17 -CONFIG_SERIAL_8250_CONSOLE=y
    2.18 -CONFIG_SERIAL_8250_ACPI=y
    2.19 -CONFIG_SERIAL_8250_NR_UARTS=6
    2.20 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4
    2.21 -CONFIG_SERIAL_8250_EXTENDED=y
    2.22 -CONFIG_SERIAL_8250_SHARE_IRQ=y
    2.23 -# CONFIG_SERIAL_8250_DETECT_IRQ is not set
    2.24 -# CONFIG_SERIAL_8250_RSA is not set
    2.25  
    2.26  #
    2.27  # Non-8250 serial port support
    2.28  #
    2.29 -CONFIG_SERIAL_CORE=y
    2.30 -CONFIG_SERIAL_CORE_CONSOLE=y
    2.31  # CONFIG_SERIAL_JSM is not set
    2.32  CONFIG_UNIX98_PTYS=y
    2.33  CONFIG_LEGACY_PTYS=y
    2.34 @@ -1516,8 +1505,16 @@ CONFIG_CRYPTO_DES=y
    2.35  #
    2.36  # Hardware crypto devices
    2.37  #
    2.38 +# CONFIG_XEN_UTIL is not set
    2.39  CONFIG_HAVE_ARCH_ALLOC_SKB=y
    2.40  CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    2.41 +CONFIG_XEN_BALLOON=y
    2.42 +CONFIG_XEN_SKBUFF=y
    2.43 +CONFIG_XEN_NETDEV_BACKEND=y
    2.44 +CONFIG_XEN_NETDEV_FRONTEND=y
    2.45 +# CONFIG_XEN_DEVMEM is not set
    2.46 +# CONFIG_XEN_REBOOT is not set
    2.47 +# CONFIG_XEN_SMPBOOT is not set
    2.48  CONFIG_XEN_INTERFACE_VERSION=0x00030202
    2.49  
    2.50  #
    2.51 @@ -1525,20 +1522,21 @@ CONFIG_XEN_INTERFACE_VERSION=0x00030202
    2.52  #
    2.53  CONFIG_XEN_PRIVILEGED_GUEST=y
    2.54  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    2.55 +CONFIG_XEN_PRIVCMD=y
    2.56  CONFIG_XEN_BACKEND=y
    2.57  # CONFIG_XEN_PCIDEV_BACKEND is not set
    2.58  CONFIG_XEN_BLKDEV_BACKEND=y
    2.59 +CONFIG_XEN_XENBUS_DEV=y
    2.60  # CONFIG_XEN_BLKDEV_TAP is not set
    2.61 -CONFIG_XEN_NETDEV_BACKEND=y
    2.62  # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
    2.63  CONFIG_XEN_NETDEV_LOOPBACK=y
    2.64  # CONFIG_XEN_TPMDEV_BACKEND is not set
    2.65  CONFIG_XEN_BLKDEV_FRONTEND=y
    2.66 -CONFIG_XEN_NETDEV_FRONTEND=y
    2.67  # CONFIG_XEN_SCRUB_PAGES is not set
    2.68 -# CONFIG_XEN_DISABLE_SERIAL is not set
    2.69 +CONFIG_XEN_DISABLE_SERIAL=y
    2.70  CONFIG_XEN_SYSFS=y
    2.71  CONFIG_XEN_COMPAT_030002_AND_LATER=y
    2.72  # CONFIG_XEN_COMPAT_LATEST_ONLY is not set
    2.73  CONFIG_XEN_COMPAT_030002=y
    2.74 +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y
    2.75  CONFIG_NO_IDLE_HZ=y

     3.1 --- a/buildconfigs/linux-defconfig_xen_ia64	Thu Jul 27 17:44:14 2006 -0500
     3.2 +++ b/buildconfigs/linux-defconfig_xen_ia64	Fri Jul 28 10:51:38 2006 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  #
     3.5  # Automatically generated make config: don't edit
     3.6  # Linux kernel version: 2.6.16.13-xen
     3.7 -# Mon May 22 14:15:20 2006
     3.8 +# Thu Jun 29 16:23:48 2006
     3.9  #
    3.10  
    3.11  #
    3.12 @@ -727,21 +727,10 @@ CONFIG_SERIAL_NONSTANDARD=y
    3.13  #
    3.14  # Serial drivers
    3.15  #
    3.16 -CONFIG_SERIAL_8250=y
    3.17 -CONFIG_SERIAL_8250_CONSOLE=y
    3.18 -CONFIG_SERIAL_8250_ACPI=y
    3.19 -CONFIG_SERIAL_8250_NR_UARTS=6
    3.20 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4
    3.21 -CONFIG_SERIAL_8250_EXTENDED=y
    3.22 -CONFIG_SERIAL_8250_SHARE_IRQ=y
    3.23 -# CONFIG_SERIAL_8250_DETECT_IRQ is not set
    3.24 -# CONFIG_SERIAL_8250_RSA is not set
    3.25  
    3.26  #
    3.27  # Non-8250 serial port support
    3.28  #
    3.29 -CONFIG_SERIAL_CORE=y
    3.30 -CONFIG_SERIAL_CORE_CONSOLE=y
    3.31  # CONFIG_SERIAL_JSM is not set
    3.32  CONFIG_UNIX98_PTYS=y
    3.33  CONFIG_LEGACY_PTYS=y
    3.34 @@ -1522,8 +1511,16 @@ CONFIG_CRYPTO_DES=y
    3.35  #
    3.36  # Hardware crypto devices
    3.37  #
    3.38 +# CONFIG_XEN_UTIL is not set
    3.39  CONFIG_HAVE_ARCH_ALLOC_SKB=y
    3.40  CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y
    3.41 +CONFIG_XEN_BALLOON=y
    3.42 +CONFIG_XEN_SKBUFF=y
    3.43 +CONFIG_XEN_NETDEV_BACKEND=y
    3.44 +CONFIG_XEN_NETDEV_FRONTEND=y
    3.45 +# CONFIG_XEN_DEVMEM is not set
    3.46 +# CONFIG_XEN_REBOOT is not set
    3.47 +# CONFIG_XEN_SMPBOOT is not set
    3.48  CONFIG_XEN_INTERFACE_VERSION=0x00030202
    3.49  
    3.50  #
    3.51 @@ -1531,20 +1528,21 @@ CONFIG_XEN_INTERFACE_VERSION=0x00030202
    3.52  #
    3.53  CONFIG_XEN_PRIVILEGED_GUEST=y
    3.54  # CONFIG_XEN_UNPRIVILEGED_GUEST is not set
    3.55 +CONFIG_XEN_PRIVCMD=y
    3.56  CONFIG_XEN_BACKEND=y
    3.57  # CONFIG_XEN_PCIDEV_BACKEND is not set
    3.58  CONFIG_XEN_BLKDEV_BACKEND=y
    3.59 +CONFIG_XEN_XENBUS_DEV=y
    3.60  # CONFIG_XEN_BLKDEV_TAP is not set
    3.61 -CONFIG_XEN_NETDEV_BACKEND=y
    3.62  # CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
    3.63  CONFIG_XEN_NETDEV_LOOPBACK=y
    3.64  # CONFIG_XEN_TPMDEV_BACKEND is not set
    3.65  CONFIG_XEN_BLKDEV_FRONTEND=y
    3.66 -CONFIG_XEN_NETDEV_FRONTEND=y
    3.67  # CONFIG_XEN_SCRUB_PAGES is not set
    3.68 -# CONFIG_XEN_DISABLE_SERIAL is not set
    3.69 +CONFIG_XEN_DISABLE_SERIAL=y
    3.70  CONFIG_XEN_SYSFS=y
    3.71  CONFIG_XEN_COMPAT_030002_AND_LATER=y
    3.72  # CONFIG_XEN_COMPAT_LATEST_ONLY is not set
    3.73  CONFIG_XEN_COMPAT_030002=y
    3.74 +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y
    3.75  CONFIG_NO_IDLE_HZ=y

     4.1 --- a/linux-2.6-xen-sparse/arch/ia64/Kconfig	Thu Jul 27 17:44:14 2006 -0500
     4.2 +++ b/linux-2.6-xen-sparse/arch/ia64/Kconfig	Fri Jul 28 10:51:38 2006 +0100
     4.3 @@ -71,6 +71,13 @@ config XEN_IA64_DOM0_NON_VP
     4.4  	help
     4.5  	  dom0 P=M model
     4.6  
     4.7 +config XEN_IA64_VDSO_PARAVIRT
     4.8 +	bool
     4.9 +	depends on XEN && !ITANIUM
    4.10 +	default y
    4.11 +	help
    4.12 +	  vDSO paravirtualization
    4.13 +
    4.14  config SCHED_NO_NO_OMIT_FRAME_POINTER
    4.15  	bool
    4.16  	default y
    4.17 @@ -518,7 +525,7 @@ config XEN_DEVMEM
    4.18  	default n
    4.19  
    4.20  config XEN_REBOOT
    4.21 -	default n
    4.22 +	default y
    4.23  
    4.24  config XEN_SMPBOOT
    4.25  	default n

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/gate.S	Fri Jul 28 10:51:38 2006 +0100
     5.3 @@ -0,0 +1,488 @@
     5.4 +/*
     5.5 + * This file contains the code that gets mapped at the upper end of each task's text
     5.6 + * region.  For now, it contains the signal trampoline code only.
     5.7 + *
     5.8 + * Copyright (C) 1999-2003 Hewlett-Packard Co
     5.9 + * 	David Mosberger-Tang <davidm@hpl.hp.com>
    5.10 + */
    5.11 +
    5.12 +#include <linux/config.h>
    5.13 +
    5.14 +#include <asm/asmmacro.h>
    5.15 +#include <asm/errno.h>
    5.16 +#include <asm/asm-offsets.h>
    5.17 +#include <asm/sigcontext.h>
    5.18 +#include <asm/system.h>
    5.19 +#include <asm/unistd.h>
    5.20 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
    5.21 +# include <asm/privop.h>
    5.22 +#endif
    5.23 +
    5.24 +/*
    5.25 + * We can't easily refer to symbols inside the kernel.  To avoid full runtime relocation,
    5.26 + * complications with the linker (which likes to create PLT stubs for branches
    5.27 + * to targets outside the shared object) and to avoid multi-phase kernel builds, we
    5.28 + * simply create minimalistic "patch lists" in special ELF sections.
    5.29 + */
    5.30 +	.section ".data.patch.fsyscall_table", "a"
    5.31 +	.previous
    5.32 +#define LOAD_FSYSCALL_TABLE(reg)			\
    5.33 +[1:]	movl reg=0;					\
    5.34 +	.xdata4 ".data.patch.fsyscall_table", 1b-.
    5.35 +
    5.36 +	.section ".data.patch.brl_fsys_bubble_down", "a"
    5.37 +	.previous
    5.38 +#define BRL_COND_FSYS_BUBBLE_DOWN(pr)			\
    5.39 +[1:](pr)brl.cond.sptk 0;				\
    5.40 +	.xdata4 ".data.patch.brl_fsys_bubble_down", 1b-.
    5.41 +
    5.42 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
    5.43 +	// The page in which hyperprivop lives must be pinned by ITR.
    5.44 +	// However vDSO area isn't pinned. So issuing hyperprivop
    5.45 +	// from vDSO page causes trouble that Kevin pointed out.
    5.46 +	// After clearing vpsr.ic, the vcpu is pre-empted and the itlb
    5.47 +	// is flushed. Then vcpu get cpu again, tlb miss fault occures.
    5.48 +	// However it results in nested dtlb fault because vpsr.ic is off.
    5.49 +	// To avoid such a situation, we jump into the kernel text area
    5.50 +	// which is pinned, and then issue hyperprivop and return back
    5.51 +	// to vDSO page.
    5.52 +	// This is Dan Magenheimer's idea.
    5.53 +
    5.54 +	// Currently is_running_on_xen() is defined as running_on_xen.
    5.55 +	// If is_running_on_xen() is a real function, we must update
    5.56 +	// according to it.
    5.57 +	.section ".data.patch.running_on_xen", "a"
    5.58 +	.previous
    5.59 +#define LOAD_RUNNING_ON_XEN(reg)			\
    5.60 +[1:]	movl reg=0;					\
    5.61 +	.xdata4 ".data.patch.running_on_xen", 1b-.
    5.62 +
    5.63 +	.section ".data.patch.brl_xen_rsm_be_i", "a"
    5.64 +	.previous
    5.65 +#define BRL_COND_XEN_RSM_BE_I(pr)			\
    5.66 +[1:](pr)brl.cond.sptk 0;				\
    5.67 +	.xdata4 ".data.patch.brl_xen_rsm_be_i", 1b-.
    5.68 +
    5.69 +	.section ".data.patch.brl_xen_get_psr", "a"
    5.70 +	.previous
    5.71 +#define BRL_COND_XEN_GET_PSR(pr)			\
    5.72 +[1:](pr)brl.cond.sptk 0;				\
    5.73 +	.xdata4 ".data.patch.brl_xen_get_psr", 1b-.
    5.74 +
    5.75 +	.section ".data.patch.brl_xen_ssm_i_0", "a"
    5.76 +	.previous
    5.77 +#define BRL_COND_XEN_SSM_I_0(pr)			\
    5.78 +[1:](pr)brl.cond.sptk 0;				\
    5.79 +	.xdata4 ".data.patch.brl_xen_ssm_i_0", 1b-.
    5.80 +
    5.81 +	.section ".data.patch.brl_xen_ssm_i_1", "a"
    5.82 +	.previous
    5.83 +#define BRL_COND_XEN_SSM_I_1(pr)			\
    5.84 +[1:](pr)brl.cond.sptk 0;				\
    5.85 +	.xdata4 ".data.patch.brl_xen_ssm_i_1", 1b-.
    5.86 +#endif
    5.87 +
    5.88 +GLOBAL_ENTRY(__kernel_syscall_via_break)
    5.89 +	.prologue
    5.90 +	.altrp b6
    5.91 +	.body
    5.92 +	/*
    5.93 +	 * Note: for (fast) syscall restart to work, the break instruction must be
    5.94 +	 *	 the first one in the bundle addressed by syscall_via_break.
    5.95 +	 */
    5.96 +{ .mib
    5.97 +	break 0x100000
    5.98 +	nop.i 0
    5.99 +	br.ret.sptk.many b6
   5.100 +}
   5.101 +END(__kernel_syscall_via_break)
   5.102 +
   5.103 +/*
   5.104 + * On entry:
   5.105 + *	r11 = saved ar.pfs
   5.106 + *	r15 = system call #
   5.107 + *	b0  = saved return address
   5.108 + *	b6  = return address
   5.109 + * On exit:
   5.110 + *	r11 = saved ar.pfs
   5.111 + *	r15 = system call #
   5.112 + *	b0  = saved return address
   5.113 + *	all other "scratch" registers:	undefined
   5.114 + *	all "preserved" registers:	same as on entry
   5.115 + */
   5.116 +
   5.117 +GLOBAL_ENTRY(__kernel_syscall_via_epc)
   5.118 +	.prologue
   5.119 +	.altrp b6
   5.120 +	.body
   5.121 +{
   5.122 +	/*
   5.123 +	 * Note: the kernel cannot assume that the first two instructions in this
   5.124 +	 * bundle get executed.  The remaining code must be safe even if
   5.125 +	 * they do not get executed.
   5.126 +	 */
   5.127 +	adds r17=-1024,r15			// A
   5.128 +	mov r10=0				// A    default to successful syscall execution
   5.129 +	epc					// B	causes split-issue
   5.130 +}
   5.131 +	;;
   5.132 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
   5.133 +	// r20 = 1
   5.134 +	// r22 = &vcpu->evtchn_mask
   5.135 +	// r23 = &vpsr.ic
   5.136 +	// r24 = vcpu->pending_interruption
   5.137 +	// r25 = tmp
   5.138 +	// r28 = &running_on_xen
   5.139 +	// r30 = running_on_xen
   5.140 +	// r31 = tmp
   5.141 +	// p11 = tmp
   5.142 +	// p12 = running_on_xen
   5.143 +	// p13 = !running_on_xen
   5.144 +	// p14 = tmp
   5.145 +	// p15 = tmp
   5.146 +#define isXen	p12
   5.147 +#define isRaw	p13
   5.148 +	LOAD_RUNNING_ON_XEN(r28)
   5.149 +	movl r22=XSI_PSR_I_ADDR
   5.150 +	movl r23=XSI_PSR_IC
   5.151 +	movl r24=XSI_PSR_I_ADDR+(XSI_PEND_OFS-XSI_PSR_I_ADDR_OFS)
   5.152 +	mov r20=1
   5.153 +	;;
   5.154 +	ld4 r30=[r28]
   5.155 +	;;
   5.156 +	cmp.ne isXen,isRaw=r0,r30
   5.157 +	;;
   5.158 +(isRaw)	rsm psr.be | psr.i
   5.159 +	BRL_COND_XEN_RSM_BE_I(isXen)
   5.160 +	.global .vdso_rsm_be_i_ret
   5.161 +.vdso_rsm_be_i_ret:
   5.162 +#else
   5.163 +	rsm psr.be | psr.i			// M2 (5 cyc to srlz.d)
   5.164 +#endif
   5.165 +	LOAD_FSYSCALL_TABLE(r14)		// X
   5.166 +	;;
   5.167 +	mov r16=IA64_KR(CURRENT)		// M2 (12 cyc)
   5.168 +	shladd r18=r17,3,r14			// A
   5.169 +	mov r19=NR_syscalls-1			// A
   5.170 +	;;
   5.171 +	lfetch [r18]				// M0|1
   5.172 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
   5.173 +(isRaw)	mov r29=psr
   5.174 +	BRL_COND_XEN_GET_PSR(isXen)
   5.175 +	.global .vdso_get_psr_ret
   5.176 +.vdso_get_psr_ret:
   5.177 +#else
   5.178 +	mov r29=psr				// M2 (12 cyc)
   5.179 +#endif
   5.180 +	// If r17 is a NaT, p6 will be zero
   5.181 +	cmp.geu p6,p7=r19,r17			// A    (sysnr > 0 && sysnr < 1024+NR_syscalls)?
   5.182 +	;;
   5.183 +	mov r21=ar.fpsr				// M2 (12 cyc)
   5.184 +	tnat.nz p10,p9=r15			// I0
   5.185 +	mov.i r26=ar.pfs			// I0 (would stall anyhow due to srlz.d...)
   5.186 +	;;
   5.187 +	srlz.d					// M0 (forces split-issue) ensure PSR.BE==0
   5.188 +(p6)	ld8 r18=[r18]				// M0|1
   5.189 +	nop.i 0
   5.190 +	;;
   5.191 +	nop.m 0
   5.192 +(p6)	tbit.z.unc p8,p0=r18,0			// I0 (dual-issues with "mov b7=r18"!)
   5.193 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
   5.194 +	;;
   5.195 +	// p14 = running_on_xen && p8
   5.196 +	// p15 = !running_on_xen && p8
   5.197 +(p8)	cmp.ne.unc p14,p15=r0,r30
   5.198 +	;;
   5.199 +(p15)	ssm psr.i
   5.200 +	BRL_COND_XEN_SSM_I_0(p14)
   5.201 +	.global .vdso_ssm_i_0_ret
   5.202 +.vdso_ssm_i_0_ret:
   5.203 +#else
   5.204 +	nop.i 0
   5.205 +	;;
   5.206 +(p8)	ssm psr.i
   5.207 +#endif
   5.208 +(p6)	mov b7=r18				// I0
   5.209 +(p8)	br.dptk.many b7				// B
   5.210 +
   5.211 +	mov r27=ar.rsc				// M2 (12 cyc)
   5.212 +/*
   5.213 + * brl.cond doesn't work as intended because the linker would convert this branch
   5.214 + * into a branch to a PLT.  Perhaps there will be a way to avoid this with some
   5.215 + * future version of the linker.  In the meantime, we just use an indirect branch
   5.216 + * instead.
   5.217 + */
   5.218 +#ifdef CONFIG_ITANIUM
   5.219 +(p6)	add r14=-8,r14				// r14 <- addr of fsys_bubble_down entry
   5.220 +	;;
   5.221 +(p6)	ld8 r14=[r14]				// r14 <- fsys_bubble_down
   5.222 +	;;
   5.223 +(p6)	mov b7=r14
   5.224 +(p6)	br.sptk.many b7
   5.225 +#else
   5.226 +	BRL_COND_FSYS_BUBBLE_DOWN(p6)
   5.227 +#endif
   5.228 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
   5.229 +(isRaw)	ssm psr.i
   5.230 +	BRL_COND_XEN_SSM_I_1(isXen)
   5.231 +	.global .vdso_ssm_i_1_ret
   5.232 +.vdso_ssm_i_1_ret:
   5.233 +#else
   5.234 +	ssm psr.i
   5.235 +#endif
   5.236 +	mov r10=-1
   5.237 +(p10)	mov r8=EINVAL
   5.238 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
   5.239 +	dv_serialize_data // shut up gas warning.
   5.240 +		          // we know xen_hyper_ssm_i_0 or xen_hyper_ssm_i_1
   5.241 +		          // doesn't change p9 and p10
   5.242 +#endif
   5.243 +(p9)	mov r8=ENOSYS
   5.244 +	FSYS_RETURN
   5.245 +END(__kernel_syscall_via_epc)
   5.246 +
   5.247 +#	define ARG0_OFF		(16 + IA64_SIGFRAME_ARG0_OFFSET)
   5.248 +#	define ARG1_OFF		(16 + IA64_SIGFRAME_ARG1_OFFSET)
   5.249 +#	define ARG2_OFF		(16 + IA64_SIGFRAME_ARG2_OFFSET)
   5.250 +#	define SIGHANDLER_OFF	(16 + IA64_SIGFRAME_HANDLER_OFFSET)
   5.251 +#	define SIGCONTEXT_OFF	(16 + IA64_SIGFRAME_SIGCONTEXT_OFFSET)
   5.252 +
   5.253 +#	define FLAGS_OFF	IA64_SIGCONTEXT_FLAGS_OFFSET
   5.254 +#	define CFM_OFF		IA64_SIGCONTEXT_CFM_OFFSET
   5.255 +#	define FR6_OFF		IA64_SIGCONTEXT_FR6_OFFSET
   5.256 +#	define BSP_OFF		IA64_SIGCONTEXT_AR_BSP_OFFSET
   5.257 +#	define RNAT_OFF		IA64_SIGCONTEXT_AR_RNAT_OFFSET
   5.258 +#	define UNAT_OFF		IA64_SIGCONTEXT_AR_UNAT_OFFSET
   5.259 +#	define FPSR_OFF		IA64_SIGCONTEXT_AR_FPSR_OFFSET
   5.260 +#	define PR_OFF		IA64_SIGCONTEXT_PR_OFFSET
   5.261 +#	define RP_OFF		IA64_SIGCONTEXT_IP_OFFSET
   5.262 +#	define SP_OFF		IA64_SIGCONTEXT_R12_OFFSET
   5.263 +#	define RBS_BASE_OFF	IA64_SIGCONTEXT_RBS_BASE_OFFSET
   5.264 +#	define LOADRS_OFF	IA64_SIGCONTEXT_LOADRS_OFFSET
   5.265 +#	define base0		r2
   5.266 +#	define base1		r3
   5.267 +	/*
   5.268 +	 * When we get here, the memory stack looks like this:
   5.269 +	 *
   5.270 +	 *   +===============================+
   5.271 +       	 *   |				     |
   5.272 +       	 *   //	    struct sigframe          //
   5.273 +       	 *   |				     |
   5.274 +	 *   +-------------------------------+ <-- sp+16
   5.275 +	 *   |      16 byte of scratch       |
   5.276 +	 *   |            space              |
   5.277 +	 *   +-------------------------------+ <-- sp
   5.278 +	 *
   5.279 +	 * The register stack looks _exactly_ the way it looked at the time the signal
   5.280 +	 * occurred.  In other words, we're treading on a potential mine-field: each
   5.281 +	 * incoming general register may be a NaT value (including sp, in which case the
   5.282 +	 * process ends up dying with a SIGSEGV).
   5.283 +	 *
   5.284 +	 * The first thing need to do is a cover to get the registers onto the backing
   5.285 +	 * store.  Once that is done, we invoke the signal handler which may modify some
   5.286 +	 * of the machine state.  After returning from the signal handler, we return
   5.287 +	 * control to the previous context by executing a sigreturn system call.  A signal
   5.288 +	 * handler may call the rt_sigreturn() function to directly return to a given
   5.289 +	 * sigcontext.  However, the user-level sigreturn() needs to do much more than
   5.290 +	 * calling the rt_sigreturn() system call as it needs to unwind the stack to
   5.291 +	 * restore preserved registers that may have been saved on the signal handler's
   5.292 +	 * call stack.
   5.293 +	 */
   5.294 +
   5.295 +#define SIGTRAMP_SAVES										\
   5.296 +	.unwabi 3, 's';		/* mark this as a sigtramp handler (saves scratch regs) */	\
   5.297 +	.unwabi @svr4, 's'; /* backwards compatibility with old unwinders (remove in v2.7) */	\
   5.298 +	.savesp ar.unat, UNAT_OFF+SIGCONTEXT_OFF;						\
   5.299 +	.savesp ar.fpsr, FPSR_OFF+SIGCONTEXT_OFF;						\
   5.300 +	.savesp pr, PR_OFF+SIGCONTEXT_OFF;     							\
   5.301 +	.savesp rp, RP_OFF+SIGCONTEXT_OFF;							\
   5.302 +	.savesp ar.pfs, CFM_OFF+SIGCONTEXT_OFF;							\
   5.303 +	.vframesp SP_OFF+SIGCONTEXT_OFF
   5.304 +
   5.305 +GLOBAL_ENTRY(__kernel_sigtramp)
   5.306 +	// describe the state that is active when we get here:
   5.307 +	.prologue
   5.308 +	SIGTRAMP_SAVES
   5.309 +	.body
   5.310 +
   5.311 +	.label_state 1
   5.312 +
   5.313 +	adds base0=SIGHANDLER_OFF,sp
   5.314 +	adds base1=RBS_BASE_OFF+SIGCONTEXT_OFF,sp
   5.315 +	br.call.sptk.many rp=1f
   5.316 +1:
   5.317 +	ld8 r17=[base0],(ARG0_OFF-SIGHANDLER_OFF)	// get pointer to signal handler's plabel
   5.318 +	ld8 r15=[base1]					// get address of new RBS base (or NULL)
   5.319 +	cover				// push args in interrupted frame onto backing store
   5.320 +	;;
   5.321 +	cmp.ne p1,p0=r15,r0		// do we need to switch rbs? (note: pr is saved by kernel)
   5.322 +	mov.m r9=ar.bsp			// fetch ar.bsp
   5.323 +	.spillsp.p p1, ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
   5.324 +(p1)	br.cond.spnt setup_rbs		// yup -> (clobbers p8, r14-r16, and r18-r20)
   5.325 +back_from_setup_rbs:
   5.326 +	alloc r8=ar.pfs,0,0,3,0
   5.327 +	ld8 out0=[base0],16		// load arg0 (signum)
   5.328 +	adds base1=(ARG1_OFF-(RBS_BASE_OFF+SIGCONTEXT_OFF)),base1
   5.329 +	;;
   5.330 +	ld8 out1=[base1]		// load arg1 (siginfop)
   5.331 +	ld8 r10=[r17],8			// get signal handler entry point
   5.332 +	;;
   5.333 +	ld8 out2=[base0]		// load arg2 (sigcontextp)
   5.334 +	ld8 gp=[r17]			// get signal handler's global pointer
   5.335 +	adds base0=(BSP_OFF+SIGCONTEXT_OFF),sp
   5.336 +	;;
   5.337 +	.spillsp ar.bsp, BSP_OFF+SIGCONTEXT_OFF
   5.338 +	st8 [base0]=r9			// save sc_ar_bsp
   5.339 +	adds base0=(FR6_OFF+SIGCONTEXT_OFF),sp
   5.340 +	adds base1=(FR6_OFF+16+SIGCONTEXT_OFF),sp
   5.341 +	;;
   5.342 +	stf.spill [base0]=f6,32
   5.343 +	stf.spill [base1]=f7,32
   5.344 +	;;
   5.345 +	stf.spill [base0]=f8,32
   5.346 +	stf.spill [base1]=f9,32
   5.347 +	mov b6=r10
   5.348 +	;;
   5.349 +	stf.spill [base0]=f10,32
   5.350 +	stf.spill [base1]=f11,32
   5.351 +	;;
   5.352 +	stf.spill [base0]=f12,32
   5.353 +	stf.spill [base1]=f13,32
   5.354 +	;;
   5.355 +	stf.spill [base0]=f14,32
   5.356 +	stf.spill [base1]=f15,32
   5.357 +	br.call.sptk.many rp=b6			// call the signal handler
   5.358 +.ret0:	adds base0=(BSP_OFF+SIGCONTEXT_OFF),sp
   5.359 +	;;
   5.360 +	ld8 r15=[base0]				// fetch sc_ar_bsp
   5.361 +	mov r14=ar.bsp
   5.362 +	;;
   5.363 +	cmp.ne p1,p0=r14,r15			// do we need to restore the rbs?
   5.364 +(p1)	br.cond.spnt restore_rbs		// yup -> (clobbers r14-r18, f6 & f7)
   5.365 +	;;
   5.366 +back_from_restore_rbs:
   5.367 +	adds base0=(FR6_OFF+SIGCONTEXT_OFF),sp
   5.368 +	adds base1=(FR6_OFF+16+SIGCONTEXT_OFF),sp
   5.369 +	;;
   5.370 +	ldf.fill f6=[base0],32
   5.371 +	ldf.fill f7=[base1],32
   5.372 +	;;
   5.373 +	ldf.fill f8=[base0],32
   5.374 +	ldf.fill f9=[base1],32
   5.375 +	;;
   5.376 +	ldf.fill f10=[base0],32
   5.377 +	ldf.fill f11=[base1],32
   5.378 +	;;
   5.379 +	ldf.fill f12=[base0],32
   5.380 +	ldf.fill f13=[base1],32
   5.381 +	;;
   5.382 +	ldf.fill f14=[base0],32
   5.383 +	ldf.fill f15=[base1],32
   5.384 +	mov r15=__NR_rt_sigreturn
   5.385 +	.restore sp				// pop .prologue
   5.386 +	break __BREAK_SYSCALL
   5.387 +
   5.388 +	.prologue
   5.389 +	SIGTRAMP_SAVES
   5.390 +setup_rbs:
   5.391 +	mov ar.rsc=0				// put RSE into enforced lazy mode
   5.392 +	;;
   5.393 +	.save ar.rnat, r19
   5.394 +	mov r19=ar.rnat				// save RNaT before switching backing store area
   5.395 +	adds r14=(RNAT_OFF+SIGCONTEXT_OFF),sp
   5.396 +
   5.397 +	mov r18=ar.bspstore
   5.398 +	mov ar.bspstore=r15			// switch over to new register backing store area
   5.399 +	;;
   5.400 +
   5.401 +	.spillsp ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
   5.402 +	st8 [r14]=r19				// save sc_ar_rnat
   5.403 +	.body
   5.404 +	mov.m r16=ar.bsp			// sc_loadrs <- (new bsp - new bspstore) << 16
   5.405 +	adds r14=(LOADRS_OFF+SIGCONTEXT_OFF),sp
   5.406 +	;;
   5.407 +	invala
   5.408 +	sub r15=r16,r15
   5.409 +	extr.u r20=r18,3,6
   5.410 +	;;
   5.411 +	mov ar.rsc=0xf				// set RSE into eager mode, pl 3
   5.412 +	cmp.eq p8,p0=63,r20
   5.413 +	shl r15=r15,16
   5.414 +	;;
   5.415 +	st8 [r14]=r15				// save sc_loadrs
   5.416 +(p8)	st8 [r18]=r19		// if bspstore points at RNaT slot, store RNaT there now
   5.417 +	.restore sp				// pop .prologue
   5.418 +	br.cond.sptk back_from_setup_rbs
   5.419 +
   5.420 +	.prologue
   5.421 +	SIGTRAMP_SAVES
   5.422 +	.spillsp ar.rnat, RNAT_OFF+SIGCONTEXT_OFF
   5.423 +	.body
   5.424 +restore_rbs:
   5.425 +	// On input:
   5.426 +	//	r14 = bsp1 (bsp at the time of return from signal handler)
   5.427 +	//	r15 = bsp0 (bsp at the time the signal occurred)
   5.428 +	//
   5.429 +	// Here, we need to calculate bspstore0, the value that ar.bspstore needs
   5.430 +	// to be set to, based on bsp0 and the size of the dirty partition on
   5.431 +	// the alternate stack (sc_loadrs >> 16).  This can be done with the
   5.432 +	// following algorithm:
   5.433 +	//
   5.434 +	//  bspstore0 = rse_skip_regs(bsp0, -rse_num_regs(bsp1 - (loadrs >> 19), bsp1));
   5.435 +	//
   5.436 +	// This is what the code below does.
   5.437 +	//
   5.438 +	alloc r2=ar.pfs,0,0,0,0			// alloc null frame
   5.439 +	adds r16=(LOADRS_OFF+SIGCONTEXT_OFF),sp
   5.440 +	adds r18=(RNAT_OFF+SIGCONTEXT_OFF),sp
   5.441 +	;;
   5.442 +	ld8 r17=[r16]
   5.443 +	ld8 r16=[r18]			// get new rnat
   5.444 +	extr.u r18=r15,3,6	// r18 <- rse_slot_num(bsp0)
   5.445 +	;;
   5.446 +	mov ar.rsc=r17			// put RSE into enforced lazy mode
   5.447 +	shr.u r17=r17,16
   5.448 +	;;
   5.449 +	sub r14=r14,r17		// r14 (bspstore1) <- bsp1 - (sc_loadrs >> 16)
   5.450 +	shr.u r17=r17,3		// r17 <- (sc_loadrs >> 19)
   5.451 +	;;
   5.452 +	loadrs			// restore dirty partition
   5.453 +	extr.u r14=r14,3,6	// r14 <- rse_slot_num(bspstore1)
   5.454 +	;;
   5.455 +	add r14=r14,r17		// r14 <- rse_slot_num(bspstore1) + (sc_loadrs >> 19)
   5.456 +	;;
   5.457 +	shr.u r14=r14,6		// r14 <- (rse_slot_num(bspstore1) + (sc_loadrs >> 19))/0x40
   5.458 +	;;
   5.459 +	sub r14=r14,r17		// r14 <- -rse_num_regs(bspstore1, bsp1)
   5.460 +	movl r17=0x8208208208208209
   5.461 +	;;
   5.462 +	add r18=r18,r14		// r18 (delta) <- rse_slot_num(bsp0) - rse_num_regs(bspstore1,bsp1)
   5.463 +	setf.sig f7=r17
   5.464 +	cmp.lt p7,p0=r14,r0	// p7 <- (r14 < 0)?
   5.465 +	;;
   5.466 +(p7)	adds r18=-62,r18	// delta -= 62
   5.467 +	;;
   5.468 +	setf.sig f6=r18
   5.469 +	;;
   5.470 +	xmpy.h f6=f6,f7
   5.471 +	;;
   5.472 +	getf.sig r17=f6
   5.473 +	;;
   5.474 +	add r17=r17,r18
   5.475 +	shr r18=r18,63
   5.476 +	;;
   5.477 +	shr r17=r17,5
   5.478 +	;;
   5.479 +	sub r17=r17,r18		// r17 = delta/63
   5.480 +	;;
   5.481 +	add r17=r14,r17		// r17 <- delta/63 - rse_num_regs(bspstore1, bsp1)
   5.482 +	;;
   5.483 +	shladd r15=r17,3,r15	// r15 <- bsp0 + 8*(delta/63 - rse_num_regs(bspstore1, bsp1))
   5.484 +	;;
   5.485 +	mov ar.bspstore=r15			// switch back to old register backing store area
   5.486 +	;;
   5.487 +	mov ar.rnat=r16				// restore RNaT
   5.488 +	mov ar.rsc=0xf				// (will be restored later on from sc_ar_rsc)
   5.489 +	// invala not necessary as that will happen when returning to user-mode
   5.490 +	br.cond.sptk back_from_restore_rbs
   5.491 +END(__kernel_sigtramp)

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/gate.lds.S	Fri Jul 28 10:51:38 2006 +0100
     6.3 @@ -0,0 +1,117 @@
     6.4 +/*
     6.5 + * Linker script for gate DSO.  The gate pages are an ELF shared object prelinked to its
     6.6 + * virtual address, with only one read-only segment and one execute-only segment (both fit
     6.7 + * in one page).  This script controls its layout.
     6.8 + */
     6.9 +
    6.10 +#include <linux/config.h>
    6.11 +
    6.12 +#include <asm/system.h>
    6.13 +
    6.14 +SECTIONS
    6.15 +{
    6.16 +  . = GATE_ADDR + SIZEOF_HEADERS;
    6.17 +
    6.18 +  .hash				: { *(.hash) }				:readable
    6.19 +  .dynsym			: { *(.dynsym) }
    6.20 +  .dynstr			: { *(.dynstr) }
    6.21 +  .gnu.version			: { *(.gnu.version) }
    6.22 +  .gnu.version_d		: { *(.gnu.version_d) }
    6.23 +  .gnu.version_r		: { *(.gnu.version_r) }
    6.24 +  .dynamic			: { *(.dynamic) }			:readable :dynamic
    6.25 +
    6.26 +  /*
    6.27 +   * This linker script is used both with -r and with -shared.  For the layouts to match,
    6.28 +   * we need to skip more than enough space for the dynamic symbol table et al.  If this
    6.29 +   * amount is insufficient, ld -shared will barf.  Just increase it here.
    6.30 +   */
    6.31 +  . = GATE_ADDR + 0x500;
    6.32 +
    6.33 +  .data.patch			: {
    6.34 +				    __start_gate_mckinley_e9_patchlist = .;
    6.35 +				    *(.data.patch.mckinley_e9)
    6.36 +				    __end_gate_mckinley_e9_patchlist = .;
    6.37 +
    6.38 +				    __start_gate_vtop_patchlist = .;
    6.39 +				    *(.data.patch.vtop)
    6.40 +				    __end_gate_vtop_patchlist = .;
    6.41 +
    6.42 +				    __start_gate_fsyscall_patchlist = .;
    6.43 +				    *(.data.patch.fsyscall_table)
    6.44 +				    __end_gate_fsyscall_patchlist = .;
    6.45 +
    6.46 +				    __start_gate_brl_fsys_bubble_down_patchlist = .;
    6.47 +				    *(.data.patch.brl_fsys_bubble_down)
    6.48 +				    __end_gate_brl_fsys_bubble_down_patchlist = .;
    6.49 +
    6.50 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
    6.51 +				    __start_gate_running_on_xen_patchlist = .;
    6.52 +				    *(.data.patch.running_on_xen)
    6.53 +				    __end_gate_running_on_xen_patchlist = .;
    6.54 +
    6.55 +				    __start_gate_brl_xen_rsm_be_i_patchlist = .;
    6.56 +				    *(.data.patch.brl_xen_rsm_be_i)
    6.57 +				    __end_gate_brl_xen_rsm_be_i_patchlist = .;
    6.58 +
    6.59 +				    __start_gate_brl_xen_get_psr_patchlist = .;
    6.60 +				    *(.data.patch.brl_xen_get_psr)
    6.61 +				    __end_gate_brl_xen_get_psr_patchlist = .;
    6.62 +
    6.63 +				    __start_gate_brl_xen_ssm_i_0_patchlist = .;
    6.64 +				    *(.data.patch.brl_xen_ssm_i_0)
    6.65 +				    __end_gate_brl_xen_ssm_i_0_patchlist = .;
    6.66 +
    6.67 +				    __start_gate_brl_xen_ssm_i_1_patchlist = .;
    6.68 +				    *(.data.patch.brl_xen_ssm_i_1)
    6.69 +				    __end_gate_brl_xen_ssm_i_1_patchlist = .;
    6.70 +#endif
    6.71 +  }									:readable
    6.72 +  .IA_64.unwind_info		: { *(.IA_64.unwind_info*) }
    6.73 +  .IA_64.unwind			: { *(.IA_64.unwind*) }			:readable :unwind
    6.74 +#ifdef HAVE_BUGGY_SEGREL
    6.75 +  .text (GATE_ADDR + PAGE_SIZE)	: { *(.text) *(.text.*) }		:readable
    6.76 +#else
    6.77 +  . = ALIGN (PERCPU_PAGE_SIZE) + (. & (PERCPU_PAGE_SIZE - 1));
    6.78 +  .text				: { *(.text) *(.text.*) }		:epc
    6.79 +#endif
    6.80 +
    6.81 +  /DISCARD/			: {
    6.82 +  	*(.got.plt) *(.got)
    6.83 +	*(.data .data.* .gnu.linkonce.d.*)
    6.84 +	*(.dynbss)
    6.85 +	*(.bss .bss.* .gnu.linkonce.b.*)
    6.86 +	*(__ex_table)
    6.87 +  }
    6.88 +}
    6.89 +
    6.90 +/*
    6.91 + * We must supply the ELF program headers explicitly to get just one
    6.92 + * PT_LOAD segment, and set the flags explicitly to make segments read-only.
    6.93 + */
    6.94 +PHDRS
    6.95 +{
    6.96 +  readable  PT_LOAD	FILEHDR	PHDRS	FLAGS(4);	/* PF_R */
    6.97 +#ifndef HAVE_BUGGY_SEGREL
    6.98 +  epc	    PT_LOAD	FILEHDR PHDRS	FLAGS(1);	/* PF_X */
    6.99 +#endif
   6.100 +  dynamic   PT_DYNAMIC			FLAGS(4);	/* PF_R */
   6.101 +  unwind    0x70000001; /* PT_IA_64_UNWIND, but ld doesn't match the name */
   6.102 +}
   6.103 +
   6.104 +/*
   6.105 + * This controls what symbols we export from the DSO.
   6.106 + */
   6.107 +VERSION
   6.108 +{
   6.109 +  LINUX_2.5 {
   6.110 +    global:
   6.111 +	__kernel_syscall_via_break;
   6.112 +	__kernel_syscall_via_epc;
   6.113 +	__kernel_sigtramp;
   6.114 +
   6.115 +    local: *;
   6.116 +  };
   6.117 +}
   6.118 +
   6.119 +/* The ELF entry point can be used to set the AT_SYSINFO value.  */
   6.120 +ENTRY(__kernel_syscall_via_epc)

     7.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/irq_ia64.c	Thu Jul 27 17:44:14 2006 -0500
     7.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/irq_ia64.c	Fri Jul 28 10:51:38 2006 +0100
     7.3 @@ -31,6 +31,9 @@
     7.4  #include <linux/smp_lock.h>
     7.5  #include <linux/threads.h>
     7.6  #include <linux/bitops.h>
     7.7 +#ifdef CONFIG_XEN
     7.8 +#include <linux/cpu.h>
     7.9 +#endif
    7.10  
    7.11  #include <asm/delay.h>
    7.12  #include <asm/intrinsics.h>
    7.13 @@ -235,6 +238,9 @@ static struct irqaction ipi_irqaction = 
    7.14  #include <xen/evtchn.h>
    7.15  #include <xen/interface/callback.h>
    7.16  
    7.17 +static DEFINE_PER_CPU(int, timer_irq) = -1;
    7.18 +static DEFINE_PER_CPU(int, ipi_irq) = -1;
    7.19 +static DEFINE_PER_CPU(int, resched_irq) = -1;
    7.20  static char timer_name[NR_CPUS][15];
    7.21  static char ipi_name[NR_CPUS][15];
    7.22  static char resched_name[NR_CPUS][15];
    7.23 @@ -252,6 +258,7 @@ static unsigned short late_irq_cnt = 0;
    7.24  static unsigned short saved_irq_cnt = 0;
    7.25  static int xen_slab_ready = 0;
    7.26  
    7.27 +#ifdef CONFIG_SMP
    7.28  /* Dummy stub. Though we may check RESCHEDULE_VECTOR before __do_IRQ,
    7.29   * it ends up to issue several memory accesses upon percpu data and
    7.30   * thus adds unnecessary traffic to other paths.
    7.31 @@ -268,6 +275,7 @@ static struct irqaction resched_irqactio
    7.32  	.flags =	SA_INTERRUPT,
    7.33  	.name =		"RESCHED"
    7.34  };
    7.35 +#endif
    7.36  
    7.37  /*
    7.38   * This is xen version percpu irq registration, which needs bind
    7.39 @@ -294,6 +302,7 @@ xen_register_percpu_irq (unsigned int ir
    7.40  			ret = bind_virq_to_irqhandler(VIRQ_ITC, cpu,
    7.41  				action->handler, action->flags,
    7.42  				timer_name[cpu], action->dev_id);
    7.43 +			per_cpu(timer_irq,cpu) = ret;
    7.44  			printk(KERN_INFO "register VIRQ_ITC (%s) to xen irq (%d)\n", timer_name[cpu], ret);
    7.45  			break;
    7.46  		case IA64_IPI_RESCHEDULE:
    7.47 @@ -301,6 +310,7 @@ xen_register_percpu_irq (unsigned int ir
    7.48  			ret = bind_ipi_to_irqhandler(RESCHEDULE_VECTOR, cpu,
    7.49  				action->handler, action->flags,
    7.50  				resched_name[cpu], action->dev_id);
    7.51 +			per_cpu(resched_irq,cpu) = ret;
    7.52  			printk(KERN_INFO "register RESCHEDULE_VECTOR (%s) to xen irq (%d)\n", resched_name[cpu], ret);
    7.53  			break;
    7.54  		case IA64_IPI_VECTOR:
    7.55 @@ -308,6 +318,7 @@ xen_register_percpu_irq (unsigned int ir
    7.56  			ret = bind_ipi_to_irqhandler(IPI_VECTOR, cpu,
    7.57  				action->handler, action->flags,
    7.58  				ipi_name[cpu], action->dev_id);
    7.59 +			per_cpu(ipi_irq,cpu) = ret;
    7.60  			printk(KERN_INFO "register IPI_VECTOR (%s) to xen irq (%d)\n", ipi_name[cpu], ret);
    7.61  			break;
    7.62  		case IA64_SPURIOUS_INT_VECTOR:
    7.63 @@ -343,7 +354,7 @@ xen_bind_early_percpu_irq (void)
    7.64  	 */
    7.65  	for (i = 0; i < late_irq_cnt; i++)
    7.66  		xen_register_percpu_irq(saved_percpu_irqs[i].irq,
    7.67 -			saved_percpu_irqs[i].action, 0);
    7.68 +		                        saved_percpu_irqs[i].action, 0);
    7.69  }
    7.70  
    7.71  /* FIXME: There's no obvious point to check whether slab is ready. So
    7.72 @@ -353,6 +364,38 @@ extern void (*late_time_init)(void);
    7.73  extern char xen_event_callback;
    7.74  extern void xen_init_IRQ(void);
    7.75  
    7.76 +#ifdef CONFIG_HOTPLUG_CPU
    7.77 +static int __devinit
    7.78 +unbind_evtchn_callback(struct notifier_block *nfb,
    7.79 +                       unsigned long action, void *hcpu)
    7.80 +{
    7.81 +	unsigned int cpu = (unsigned long)hcpu;
    7.82 +
    7.83 +	if (action == CPU_DEAD) {
    7.84 +		/* Unregister evtchn.  */
    7.85 +		if (per_cpu(ipi_irq,cpu) >= 0) {
    7.86 +			unbind_from_irqhandler (per_cpu(ipi_irq, cpu), NULL);
    7.87 +			per_cpu(ipi_irq, cpu) = -1;
    7.88 +		}
    7.89 +		if (per_cpu(resched_irq,cpu) >= 0) {
    7.90 +			unbind_from_irqhandler (per_cpu(resched_irq, cpu),
    7.91 +						NULL);
    7.92 +			per_cpu(resched_irq, cpu) = -1;
    7.93 +		}
    7.94 +		if (per_cpu(timer_irq,cpu) >= 0) {
    7.95 +			unbind_from_irqhandler (per_cpu(timer_irq, cpu), NULL);
    7.96 +			per_cpu(timer_irq, cpu) = -1;
    7.97 +		}
    7.98 +	}
    7.99 +	return NOTIFY_OK;
   7.100 +}
   7.101 +
   7.102 +static struct notifier_block unbind_evtchn_notifier = {
   7.103 +	.notifier_call = unbind_evtchn_callback,
   7.104 +	.priority = 0
   7.105 +};
   7.106 +#endif
   7.107 +
   7.108  DECLARE_PER_CPU(int, ipi_to_irq[NR_IPIS]);
   7.109  void xen_smp_intr_init(void)
   7.110  {
   7.111 @@ -363,21 +406,22 @@ void xen_smp_intr_init(void)
   7.112  		.type = CALLBACKTYPE_event,
   7.113  		.address = (unsigned long)&xen_event_callback,
   7.114  	};
   7.115 -	static cpumask_t registered_cpumask;
   7.116  
   7.117 -	if (!cpu)
   7.118 +	if (cpu == 0) {
   7.119 +		/* Initialization was already done for boot cpu.  */
   7.120 +#ifdef CONFIG_HOTPLUG_CPU
   7.121 +		/* Register the notifier only once.  */
   7.122 +		register_cpu_notifier(&unbind_evtchn_notifier);
   7.123 +#endif
   7.124  		return;
   7.125 +	}
   7.126  
   7.127  	/* This should be piggyback when setup vcpu guest context */
   7.128  	BUG_ON(HYPERVISOR_callback_op(CALLBACKOP_register, &event));
   7.129  
   7.130 -	if (!cpu_isset(cpu, registered_cpumask)) {
   7.131 -		cpu_set(cpu, registered_cpumask);
   7.132 -		for (i = 0; i < saved_irq_cnt; i++)
   7.133 -			xen_register_percpu_irq(saved_percpu_irqs[i].irq,
   7.134 -						saved_percpu_irqs[i].action,
   7.135 -						0);
   7.136 -	}
   7.137 +	for (i = 0; i < saved_irq_cnt; i++)
   7.138 +		xen_register_percpu_irq(saved_percpu_irqs[i].irq,
   7.139 +		                        saved_percpu_irqs[i].action, 0);
   7.140  #endif /* CONFIG_SMP */
   7.141  }
   7.142  #endif /* CONFIG_XEN */
   7.143 @@ -388,12 +432,13 @@ register_percpu_irq (ia64_vector vec, st
   7.144  	irq_desc_t *desc;
   7.145  	unsigned int irq;
   7.146  
   7.147 +#ifdef CONFIG_XEN
   7.148 +	if (is_running_on_xen())
   7.149 +		return xen_register_percpu_irq(vec, action, 1);
   7.150 +#endif
   7.151 +
   7.152  	for (irq = 0; irq < NR_IRQS; ++irq)
   7.153  		if (irq_to_vector(irq) == vec) {
   7.154 -#ifdef CONFIG_XEN
   7.155 -			if (is_running_on_xen())
   7.156 -				return xen_register_percpu_irq(vec, action, 1);
   7.157 -#endif
   7.158  			desc = irq_descp(irq);
   7.159  			desc->status |= IRQ_PER_CPU;
   7.160  			desc->handler = &irq_type_ia64_lsapic;
   7.161 @@ -441,6 +486,7 @@ ia64_send_ipi (int cpu, int vector, int 
   7.162          if (is_running_on_xen()) {
   7.163  		int irq = -1;
   7.164  
   7.165 +#ifdef CONFIG_SMP
   7.166  		/* TODO: we need to call vcpu_up here */
   7.167  		if (unlikely(vector == ap_wakeup_vector)) {
   7.168  			extern void xen_send_ipi (int cpu, int vec);
   7.169 @@ -448,6 +494,7 @@ ia64_send_ipi (int cpu, int vector, int 
   7.170  			//vcpu_prepare_and_up(cpu);
   7.171  			return;
   7.172  		}
   7.173 +#endif
   7.174  
   7.175  		switch(vector) {
   7.176  		case IA64_IPI_VECTOR:

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/patch.c	Fri Jul 28 10:51:38 2006 +0100
     8.3 @@ -0,0 +1,268 @@
     8.4 +/*
     8.5 + * Instruction-patching support.
     8.6 + *
     8.7 + * Copyright (C) 2003 Hewlett-Packard Co
     8.8 + *	David Mosberger-Tang <davidm@hpl.hp.com>
     8.9 + */
    8.10 +#include <linux/init.h>
    8.11 +#include <linux/string.h>
    8.12 +
    8.13 +#include <asm/patch.h>
    8.14 +#include <asm/processor.h>
    8.15 +#include <asm/sections.h>
    8.16 +#include <asm/system.h>
    8.17 +#include <asm/unistd.h>
    8.18 +
    8.19 +/*
    8.20 + * This was adapted from code written by Tony Luck:
    8.21 + *
    8.22 + * The 64-bit value in a "movl reg=value" is scattered between the two words of the bundle
    8.23 + * like this:
    8.24 + *
    8.25 + * 6  6         5         4         3         2         1
    8.26 + * 3210987654321098765432109876543210987654321098765432109876543210
    8.27 + * ABBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCDEEEEEFFFFFFFFFGGGGGGG
    8.28 + *
    8.29 + * CCCCCCCCCCCCCCCCCCxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
    8.30 + * xxxxAFFFFFFFFFEEEEEDxGGGGGGGxxxxxxxxxxxxxBBBBBBBBBBBBBBBBBBBBBBB
    8.31 + */
    8.32 +static u64
    8.33 +get_imm64 (u64 insn_addr)
    8.34 +{
    8.35 +	u64 *p = (u64 *) (insn_addr & -16);	/* mask out slot number */
    8.36 +
    8.37 +	return ( (p[1] & 0x0800000000000000UL) << 4)  | /*A*/
    8.38 +		((p[1] & 0x00000000007fffffUL) << 40) | /*B*/
    8.39 +		((p[0] & 0xffffc00000000000UL) >> 24) | /*C*/
    8.40 +		((p[1] & 0x0000100000000000UL) >> 23) | /*D*/
    8.41 +		((p[1] & 0x0003e00000000000UL) >> 29) | /*E*/
    8.42 +		((p[1] & 0x07fc000000000000UL) >> 43) | /*F*/
    8.43 +		((p[1] & 0x000007f000000000UL) >> 36);  /*G*/
    8.44 +}
    8.45 +
    8.46 +/* Patch instruction with "val" where "mask" has 1 bits. */
    8.47 +void
    8.48 +ia64_patch (u64 insn_addr, u64 mask, u64 val)
    8.49 +{
    8.50 +	u64 m0, m1, v0, v1, b0, b1, *b = (u64 *) (insn_addr & -16);
    8.51 +#	define insn_mask ((1UL << 41) - 1)
    8.52 +	unsigned long shift;
    8.53 +
    8.54 +	b0 = b[0]; b1 = b[1];
    8.55 +	shift = 5 + 41 * (insn_addr % 16); /* 5 bits of template, then 3 x 41-bit instructions */
    8.56 +	if (shift >= 64) {
    8.57 +		m1 = mask << (shift - 64);
    8.58 +		v1 = val << (shift - 64);
    8.59 +	} else {
    8.60 +		m0 = mask << shift; m1 = mask >> (64 - shift);
    8.61 +		v0 = val  << shift; v1 = val >> (64 - shift);
    8.62 +		b[0] = (b0 & ~m0) | (v0 & m0);
    8.63 +	}
    8.64 +	b[1] = (b1 & ~m1) | (v1 & m1);
    8.65 +}
    8.66 +
    8.67 +void
    8.68 +ia64_patch_imm64 (u64 insn_addr, u64 val)
    8.69 +{
    8.70 +	/* The assembler may generate offset pointing to either slot 1
    8.71 +	   or slot 2 for a long (2-slot) instruction, occupying slots 1
    8.72 +	   and 2.  */
    8.73 +  	insn_addr &= -16UL;
    8.74 +	ia64_patch(insn_addr + 2,
    8.75 +		   0x01fffefe000UL, (  ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */
    8.76 +				     | ((val & 0x0000000000200000UL) <<  0) /* bit 21 -> 21 */
    8.77 +				     | ((val & 0x00000000001f0000UL) <<  6) /* bit 16 -> 22 */
    8.78 +				     | ((val & 0x000000000000ff80UL) << 20) /* bit  7 -> 27 */
    8.79 +				     | ((val & 0x000000000000007fUL) << 13) /* bit  0 -> 13 */));
    8.80 +	ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22);
    8.81 +}
    8.82 +
    8.83 +void
    8.84 +ia64_patch_imm60 (u64 insn_addr, u64 val)
    8.85 +{
    8.86 +	/* The assembler may generate offset pointing to either slot 1
    8.87 +	   or slot 2 for a long (2-slot) instruction, occupying slots 1
    8.88 +	   and 2.  */
    8.89 +  	insn_addr &= -16UL;
    8.90 +	ia64_patch(insn_addr + 2,
    8.91 +		   0x011ffffe000UL, (  ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */
    8.92 +				     | ((val & 0x00000000000fffffUL) << 13) /* bit  0 -> 13 */));
    8.93 +	ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18);
    8.94 +}
    8.95 +
    8.96 +/*
    8.97 + * We need sometimes to load the physical address of a kernel
    8.98 + * object.  Often we can convert the virtual address to physical
    8.99 + * at execution time, but sometimes (either for performance reasons
   8.100 + * or during error recovery) we cannot to this.  Patch the marked
   8.101 + * bundles to load the physical address.
   8.102 + */
   8.103 +void __init
   8.104 +ia64_patch_vtop (unsigned long start, unsigned long end)
   8.105 +{
   8.106 +	s32 *offp = (s32 *) start;
   8.107 +	u64 ip;
   8.108 +
   8.109 +	while (offp < (s32 *) end) {
   8.110 +		ip = (u64) offp + *offp;
   8.111 +
   8.112 +		/* replace virtual address with corresponding physical address: */
   8.113 +		ia64_patch_imm64(ip, ia64_tpa(get_imm64(ip)));
   8.114 +		ia64_fc((void *) ip);
   8.115 +		++offp;
   8.116 +	}
   8.117 +	ia64_sync_i();
   8.118 +	ia64_srlz_i();
   8.119 +}
   8.120 +
   8.121 +void
   8.122 +ia64_patch_mckinley_e9 (unsigned long start, unsigned long end)
   8.123 +{
   8.124 +	static int first_time = 1;
   8.125 +	int need_workaround;
   8.126 +	s32 *offp = (s32 *) start;
   8.127 +	u64 *wp;
   8.128 +
   8.129 +	need_workaround = (local_cpu_data->family == 0x1f && local_cpu_data->model == 0);
   8.130 +
   8.131 +	if (first_time) {
   8.132 +		first_time = 0;
   8.133 +		if (need_workaround)
   8.134 +			printk(KERN_INFO "Leaving McKinley Errata 9 workaround enabled\n");
   8.135 +		else
   8.136 +			printk(KERN_INFO "McKinley Errata 9 workaround not needed; "
   8.137 +			       "disabling it\n");
   8.138 +	}
   8.139 +	if (need_workaround)
   8.140 +		return;
   8.141 +
   8.142 +	while (offp < (s32 *) end) {
   8.143 +		wp = (u64 *) ia64_imva((char *) offp + *offp);
   8.144 +		wp[0] = 0x0000000100000000UL; /* nop.m 0; nop.i 0; nop.i 0 */
   8.145 +		wp[1] = 0x0004000000000200UL;
   8.146 +		wp[2] = 0x0000000100000011UL; /* nop.m 0; nop.i 0; br.ret.sptk.many b6 */
   8.147 +		wp[3] = 0x0084006880000200UL;
   8.148 +		ia64_fc(wp); ia64_fc(wp + 2);
   8.149 +		++offp;
   8.150 +	}
   8.151 +	ia64_sync_i();
   8.152 +	ia64_srlz_i();
   8.153 +}
   8.154 +
   8.155 +static void
   8.156 +patch_fsyscall_table (unsigned long start, unsigned long end)
   8.157 +{
   8.158 +	extern unsigned long fsyscall_table[NR_syscalls];
   8.159 +	s32 *offp = (s32 *) start;
   8.160 +	u64 ip;
   8.161 +
   8.162 +	while (offp < (s32 *) end) {
   8.163 +		ip = (u64) ia64_imva((char *) offp + *offp);
   8.164 +		ia64_patch_imm64(ip, (u64) fsyscall_table);
   8.165 +		ia64_fc((void *) ip);
   8.166 +		++offp;
   8.167 +	}
   8.168 +	ia64_sync_i();
   8.169 +	ia64_srlz_i();
   8.170 +}
   8.171 +
   8.172 +static void
   8.173 +patch_brl_fsys_bubble_down (unsigned long start, unsigned long end)
   8.174 +{
   8.175 +	extern char fsys_bubble_down[];
   8.176 +	s32 *offp = (s32 *) start;
   8.177 +	u64 ip;
   8.178 +
   8.179 +	while (offp < (s32 *) end) {
   8.180 +		ip = (u64) offp + *offp;
   8.181 +		ia64_patch_imm60((u64) ia64_imva((void *) ip),
   8.182 +				 (u64) (fsys_bubble_down - (ip & -16)) / 16);
   8.183 +		ia64_fc((void *) ip);
   8.184 +		++offp;
   8.185 +	}
   8.186 +	ia64_sync_i();
   8.187 +	ia64_srlz_i();
   8.188 +}
   8.189 +
   8.190 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
   8.191 +extern char __start_gate_running_on_xen_patchlist[];
   8.192 +extern char __end_gate_running_on_xen_patchlist[];
   8.193 +
   8.194 +void
   8.195 +patch_running_on_xen(unsigned long start, unsigned long end)
   8.196 +{
   8.197 +	extern int running_on_xen;
   8.198 +	s32 *offp = (s32 *)start;
   8.199 +	u64 ip;
   8.200 +
   8.201 +	while (offp < (s32 *)end) {
   8.202 +		ip = (u64)ia64_imva((char *)offp + *offp);
   8.203 +		ia64_patch_imm64(ip, (u64)&running_on_xen);
   8.204 +		ia64_fc((void *)ip);
   8.205 +		++offp;
   8.206 +	}
   8.207 +	ia64_sync_i();
   8.208 +	ia64_srlz_i();
   8.209 +}
   8.210 +
   8.211 +static void
   8.212 +patch_brl_symaddr(unsigned long start, unsigned long end,
   8.213 +                  unsigned long symaddr)
   8.214 +{
   8.215 +	s32 *offp = (s32 *)start;
   8.216 +	u64 ip;
   8.217 +
   8.218 +	while (offp < (s32 *)end) {
   8.219 +		ip = (u64)offp + *offp;
   8.220 +		ia64_patch_imm60((u64)ia64_imva((void *)ip),
   8.221 +				 (u64)(symaddr - (ip & -16)) / 16);
   8.222 +		ia64_fc((void *)ip);
   8.223 +		++offp;
   8.224 +	}
   8.225 +	ia64_sync_i();
   8.226 +	ia64_srlz_i();
   8.227 +}
   8.228 +
   8.229 +#define EXTERN_PATCHLIST(name)					\
   8.230 +	extern char __start_gate_brl_##name##_patchlist[];	\
   8.231 +	extern char __end_gate_brl_##name##_patchlist[];	\
   8.232 +	extern char name[]
   8.233 +
   8.234 +#define PATCH_BRL_SYMADDR(name)						\
   8.235 +	patch_brl_symaddr((unsigned long)__start_gate_brl_##name##_patchlist, \
   8.236 +	                  (unsigned long)__end_gate_brl_##name##_patchlist,   \
   8.237 +	                  (unsigned long)name)
   8.238 +
   8.239 +static void
   8.240 +patch_brl_in_vdso(void)
   8.241 +{
   8.242 +	EXTERN_PATCHLIST(xen_rsm_be_i);
   8.243 +	EXTERN_PATCHLIST(xen_get_psr);
   8.244 +	EXTERN_PATCHLIST(xen_ssm_i_0);
   8.245 +	EXTERN_PATCHLIST(xen_ssm_i_1);
   8.246 +
   8.247 +	PATCH_BRL_SYMADDR(xen_rsm_be_i);
   8.248 +	PATCH_BRL_SYMADDR(xen_get_psr);
   8.249 +	PATCH_BRL_SYMADDR(xen_ssm_i_0);
   8.250 +	PATCH_BRL_SYMADDR(xen_ssm_i_1);
   8.251 +}
   8.252 +#else
   8.253 +#define patch_running_on_xen(start, end)	do { } while (0)
   8.254 +#define patch_brl_in_vdso()			do { } while (0)
   8.255 +#endif
   8.256 +
   8.257 +void
   8.258 +ia64_patch_gate (void)
   8.259 +{
   8.260 +#	define START(name)	((unsigned long) __start_gate_##name##_patchlist)
   8.261 +#	define END(name)	((unsigned long)__end_gate_##name##_patchlist)
   8.262 +
   8.263 +	patch_fsyscall_table(START(fsyscall), END(fsyscall));
   8.264 +	patch_brl_fsys_bubble_down(START(brl_fsys_bubble_down), END(brl_fsys_bubble_down));
   8.265 +#ifdef CONFIG_XEN
   8.266 +	patch_running_on_xen(START(running_on_xen), END(running_on_xen));
   8.267 +	patch_brl_in_vdso();
   8.268 +#endif
   8.269 +	ia64_patch_vtop(START(vtop), END(vtop));
   8.270 +	ia64_patch_mckinley_e9(START(mckinley_e9), END(mckinley_e9));
   8.271 +}

     9.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Thu Jul 27 17:44:14 2006 -0500
     9.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Fri Jul 28 10:51:38 2006 +0100
     9.3 @@ -75,6 +75,20 @@ unsigned long __per_cpu_offset[NR_CPUS];
     9.4  EXPORT_SYMBOL(__per_cpu_offset);
     9.5  #endif
     9.6  
     9.7 +#ifdef CONFIG_XEN
     9.8 +static int
     9.9 +xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
    9.10 +{
    9.11 +	HYPERVISOR_shutdown(SHUTDOWN_crash);
    9.12 +	/* we're never actually going to get here... */
    9.13 +	return NOTIFY_DONE;
    9.14 +}
    9.15 +
    9.16 +static struct notifier_block xen_panic_block = {
    9.17 +	xen_panic_event, NULL, 0 /* try to go last */
    9.18 +};
    9.19 +#endif
    9.20 +
    9.21  extern void ia64_setup_printk_clock(void);
    9.22  
    9.23  DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info);
    9.24 @@ -418,8 +432,11 @@ setup_arch (char **cmdline_p)
    9.25  	unw_init();
    9.26  
    9.27  #ifdef CONFIG_XEN
    9.28 -	if (is_running_on_xen())
    9.29 +	if (is_running_on_xen()) {
    9.30  		setup_xen_features();
    9.31 +		/* Register a call for panic conditions. */
    9.32 +		notifier_chain_register(&panic_notifier_list, &xen_panic_block);
    9.33 +	}
    9.34  #endif
    9.35  
    9.36  	ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);
    9.37 @@ -523,15 +540,14 @@ setup_arch (char **cmdline_p)
    9.38  		shared_info_t *s = HYPERVISOR_shared_info;
    9.39  
    9.40  		xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
    9.41 -		xen_start_info->flags = s->arch.flags;
    9.42  
    9.43  		printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%ld "
    9.44  		       "flags=0x%x\n", s->arch.start_info_pfn,
    9.45  		       xen_start_info->nr_pages, xen_start_info->flags);
    9.46  
    9.47  		/* xen_start_info isn't setup yet, get the flags manually */
    9.48 -		if (s->arch.flags & SIF_INITDOMAIN) {
    9.49 -			if (!(s->arch.flags & SIF_PRIVILEGED))
    9.50 +		if (xen_start_info->flags & SIF_INITDOMAIN) {
    9.51 +			if (!(xen_start_info->flags & SIF_PRIVILEGED))
    9.52  				panic("Xen granted us console access "
    9.53  				      "but not privileged status");
    9.54  		} else {

    10.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypercall.S	Thu Jul 27 17:44:14 2006 -0500
    10.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypercall.S	Fri Jul 28 10:51:38 2006 +0100
    10.3 @@ -351,3 +351,59 @@ GLOBAL_ENTRY(xen_send_ipi)
    10.4          br.ret.sptk.many rp
    10.5          ;;
    10.6  END(xen_send_ipi)
    10.7 +
    10.8 +#ifdef CONFIG_XEN_IA64_VDSO_PARAVIRT
    10.9 +// Those are vdso specialized.
   10.10 +// In fsys mode, call, ret can't be used.
   10.11 +GLOBAL_ENTRY(xen_rsm_be_i)
   10.12 +	ld8 r22=[r22]
   10.13 +	;; 
   10.14 +	st1 [r22]=r20
   10.15 +	st4 [r23]=r0
   10.16 +	XEN_HYPER_RSM_BE
   10.17 +	st4 [r23]=r20
   10.18 +	brl.cond.sptk	.vdso_rsm_be_i_ret
   10.19 +	;; 
   10.20 +END(xen_rsm_be_i)
   10.21 +
   10.22 +GLOBAL_ENTRY(xen_get_psr)
   10.23 +	mov r31=r8
   10.24 +	mov r25=IA64_PSR_IC
   10.25 +	st4 [r23]=r0
   10.26 +	XEN_HYPER_GET_PSR
   10.27 +	;; 
   10.28 +	st4 [r23]=r20
   10.29 +	or r29=r8,r25 // vpsr.ic was cleared for hyperprivop
   10.30 +	mov r8=r31
   10.31 +	brl.cond.sptk	.vdso_get_psr_ret
   10.32 +	;; 
   10.33 +END(xen_get_psr)
   10.34 +
   10.35 +GLOBAL_ENTRY(xen_ssm_i_0)
   10.36 +	st4 [r22]=r20
   10.37 +	ld4 r25=[r24]
   10.38 +	;;
   10.39 +	cmp.ne.unc p11,p0=r0, r25
   10.40 +	;; 
   10.41 +(p11)	st4 [r22]=r0
   10.42 +(p11)	st4 [r23]=r0
   10.43 +(p11)	XEN_HYPER_SSM_I
   10.44 +	
   10.45 +	brl.cond.sptk	.vdso_ssm_i_0_ret
   10.46 +	;; 
   10.47 +END(xen_ssm_i_0)
   10.48 +
   10.49 +GLOBAL_ENTRY(xen_ssm_i_1)
   10.50 +	st4 [r22]=r20
   10.51 +	ld4 r25=[r24]
   10.52 +	;; 
   10.53 +	cmp.ne.unc p11,p0=r0, r25
   10.54 +	;; 
   10.55 +(p11)	st4 [r22]=r0
   10.56 +(p11)	st4 [r23]=r0
   10.57 +(p11)	XEN_HYPER_SSM_I
   10.58 +	;;
   10.59 +	brl.cond.sptk	.vdso_ssm_i_1_ret
   10.60 +	;; 
   10.61 +END(xen_ssm_i_1)
   10.62 +#endif

    11.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Thu Jul 27 17:44:14 2006 -0500
    11.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c	Fri Jul 28 10:51:38 2006 +0100
    11.3 @@ -198,7 +198,7 @@ int
    11.4  		.nr_exchanged = 0
    11.5  	};
    11.6  
    11.7 -	if (order > MAX_CONTIG_ORDER)
    11.8 +	if (unlikely(order > MAX_CONTIG_ORDER))
    11.9  		return -ENOMEM;
   11.10  	
   11.11  	set_xen_guest_handle(exchange.in.extent_start, in_frames);
   11.12 @@ -299,7 +299,7 @@ void
   11.13  	if (!test_bit(start_gpfn, contiguous_bitmap))
   11.14  		return;
   11.15  
   11.16 -	if (order > MAX_CONTIG_ORDER)
   11.17 +	if (unlikely(order > MAX_CONTIG_ORDER))
   11.18  		return;
   11.19  
   11.20  	set_xen_guest_handle(exchange.in.extent_start, &in_frame);
   11.21 @@ -547,8 +547,10 @@ xen_ia64_privcmd_entry_mmap(struct vm_ar
   11.22  	unsigned long gpfn;
   11.23  	unsigned long flags;
   11.24  
   11.25 -	BUG_ON((addr & ~PAGE_MASK) != 0);
   11.26 -	BUG_ON(mfn == INVALID_MFN);
   11.27 +	if ((addr & ~PAGE_MASK) != 0 || mfn == INVALID_MFN) {
   11.28 +		error = -EINVAL;
   11.29 +		goto out;
   11.30 +	}
   11.31  
   11.32  	if (entry->gpfn != INVALID_GPFN) {
   11.33  		error = -EBUSY;
   11.34 @@ -793,3 +795,13 @@ direct_remap_pfn_range(struct vm_area_st
   11.35  	return error;
   11.36  }
   11.37  
   11.38 +
   11.39 +/* Called after suspend, to resume time.  */
   11.40 +void
   11.41 +time_resume(void)
   11.42 +{
   11.43 +	extern void ia64_cpu_local_tick(void);
   11.44 +
   11.45 +	/* Just trigger a tick.  */
   11.46 +	ia64_cpu_local_tick();
   11.47 +}

    12.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/util.c	Thu Jul 27 17:44:14 2006 -0500
    12.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/util.c	Fri Jul 28 10:51:38 2006 +0100
    12.3 @@ -71,6 +71,9 @@ void free_vm_area(struct vm_struct *area
    12.4  	unsigned int order = get_order(area->size);
    12.5  	unsigned long i;
    12.6  
    12.7 +	/* xenbus_map_ring_valloc overrides this field!  */
    12.8 +	area->phys_addr = __pa(area->addr);
    12.9 +
   12.10  	// This area is used for foreign page mappping.
   12.11  	// So underlying machine page may not be assigned.
   12.12  	for (i = 0; i < (1 << order); i++) {

    13.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S	Thu Jul 27 17:44:14 2006 -0500
    13.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S	Fri Jul 28 10:51:38 2006 +0100
    13.3 @@ -33,3 +33,23 @@ GLOBAL_ENTRY(early_xen_setup)
    13.4  	br.ret.sptk.many rp
    13.5  	;;
    13.6  END(early_xen_setup)
    13.7 +
    13.8 +#include <xen/interface/xen.h>
    13.9 +
   13.10 +/* Stub for suspend.
   13.11 +   Just force the stacked registers to be written in memory.  */	
   13.12 +GLOBAL_ENTRY(HYPERVISOR_suspend)
   13.13 +	alloc r20=ar.pfs,0,0,0,0
   13.14 +	mov r14=2
   13.15 +	mov r15=r12
   13.16 +	;;
   13.17 +	/* We don't want to deal with RSE.  */
   13.18 +	flushrs
   13.19 +	mov r2=__HYPERVISOR_sched_op
   13.20 +	st4 [r12]=r14
   13.21 +	;;
   13.22 +	break 0x1000
   13.23 +	;; 
   13.24 +	mov ar.pfs=r20
   13.25 +	br.ret.sptk.many b0
   13.26 +END(HYPERVISOR_suspend)

    14.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/reboot.c	Thu Jul 27 17:44:14 2006 -0500
    14.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/reboot.c	Fri Jul 28 10:51:38 2006 +0100
    14.3 @@ -39,6 +39,7 @@ extern void ctrl_alt_del(void);
    14.4   */
    14.5  #define SHUTDOWN_HALT      4
    14.6  
    14.7 +#if defined(__i386__) || defined(__x86_64__)
    14.8  void machine_emergency_restart(void)
    14.9  {
   14.10  	/* We really want to get pending console data out before we die. */
   14.11 @@ -60,10 +61,8 @@ void machine_power_off(void)
   14.12  {
   14.13  	/* We really want to get pending console data out before we die. */
   14.14  	xencons_force_flush();
   14.15 -#if defined(__i386__) || defined(__x86_64__)
   14.16  	if (pm_power_off)
   14.17  		pm_power_off();
   14.18 -#endif
   14.19  	HYPERVISOR_shutdown(SHUTDOWN_poweroff);
   14.20  }
   14.21  
   14.22 @@ -71,7 +70,7 @@ int reboot_thru_bios = 0;	/* for dmi_sca
   14.23  EXPORT_SYMBOL(machine_restart);
   14.24  EXPORT_SYMBOL(machine_halt);
   14.25  EXPORT_SYMBOL(machine_power_off);
   14.26 -
   14.27 +#endif
   14.28  
   14.29  /******************************************************************************
   14.30   * Stop/pickle callback handling.
   14.31 @@ -82,6 +81,7 @@ static int shutting_down = SHUTDOWN_INVA
   14.32  static void __shutdown_handler(void *unused);
   14.33  static DECLARE_WORK(shutdown_work, __shutdown_handler, NULL);
   14.34  
   14.35 +#if defined(__i386__) || defined(__x86_64__)
   14.36  /* Ensure we run on the idle task page tables so that we will
   14.37     switch page tables before running user space. This is needed
   14.38     on architectures with separate kernel and user page tables
   14.39 @@ -98,25 +98,30 @@ static void switch_idle_mm(void)
   14.40  	current->active_mm = &init_mm;
   14.41  	mmdrop(mm);
   14.42  }
   14.43 +#endif
   14.44  
   14.45  static int __do_suspend(void *ignore)
   14.46  {
   14.47 -	int i, j, k, fpp, err;
   14.48 -
   14.49 +	int err;
   14.50 +#if defined(__i386__) || defined(__x86_64__)
   14.51 +	int i, j, k, fpp;
   14.52  	extern unsigned long max_pfn;
   14.53  	extern unsigned long *pfn_to_mfn_frame_list_list;
   14.54  	extern unsigned long *pfn_to_mfn_frame_list[];
   14.55 +#endif
   14.56  
   14.57  	extern void time_resume(void);
   14.58  
   14.59  	BUG_ON(smp_processor_id() != 0);
   14.60  	BUG_ON(in_interrupt());
   14.61  
   14.62 +#if defined(__i386__) || defined(__x86_64__)
   14.63  	if (xen_feature(XENFEAT_auto_translated_physmap)) {
   14.64  		printk(KERN_WARNING "Cannot suspend in "
   14.65  		       "auto_translated_physmap mode.\n");
   14.66  		return -EOPNOTSUPP;
   14.67  	}
   14.68 +#endif
   14.69  
   14.70  	err = smp_suspend();
   14.71  	if (err)
   14.72 @@ -129,18 +134,24 @@ static int __do_suspend(void *ignore)
   14.73  #ifdef __i386__
   14.74  	kmem_cache_shrink(pgd_cache);
   14.75  #endif
   14.76 +#if defined(__i386__) || defined(__x86_64__)
   14.77  	mm_pin_all();
   14.78  
   14.79  	__cli();
   14.80 +#elif defined(__ia64__)
   14.81 +	local_irq_disable();
   14.82 +#endif
   14.83  	preempt_enable();
   14.84  
   14.85  	gnttab_suspend();
   14.86  
   14.87 +#if defined(__i386__) || defined(__x86_64__)
   14.88  	HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page;
   14.89  	clear_fixmap(FIX_SHARED_INFO);
   14.90  
   14.91  	xen_start_info->store_mfn = mfn_to_pfn(xen_start_info->store_mfn);
   14.92  	xen_start_info->console_mfn = mfn_to_pfn(xen_start_info->console_mfn);
   14.93 +#endif
   14.94  
   14.95  	/*
   14.96  	 * We'll stop somewhere inside this hypercall. When it returns,
   14.97 @@ -150,6 +161,7 @@ static int __do_suspend(void *ignore)
   14.98  
   14.99  	shutting_down = SHUTDOWN_INVALID;
  14.100  
  14.101 +#if defined(__i386__) || defined(__x86_64__)
  14.102  	set_fixmap(FIX_SHARED_INFO, xen_start_info->shared_info);
  14.103  
  14.104  	HYPERVISOR_shared_info = (shared_info_t *)fix_to_virt(FIX_SHARED_INFO);
  14.105 @@ -171,6 +183,7 @@ static int __do_suspend(void *ignore)
  14.106  			virt_to_mfn(&phys_to_machine_mapping[i]);
  14.107  	}
  14.108  	HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
  14.109 +#endif
  14.110  
  14.111  	gnttab_resume();
  14.112  
  14.113 @@ -178,9 +191,13 @@ static int __do_suspend(void *ignore)
  14.114  
  14.115  	time_resume();
  14.116  
  14.117 +#if defined(__i386__) || defined(__x86_64__)
  14.118  	switch_idle_mm();
  14.119  
  14.120  	__sti();
  14.121 +#elif defined(__ia64__)
  14.122 +	local_irq_enable();
  14.123 +#endif
  14.124  
  14.125  	xencons_resume();
  14.126  

    15.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Thu Jul 27 17:44:14 2006 -0500
    15.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Fri Jul 28 10:51:38 2006 +0100
    15.3 @@ -99,24 +99,21 @@ static spinlock_t net_schedule_list_lock
    15.4  #define MAX_MFN_ALLOC 64
    15.5  static unsigned long mfn_list[MAX_MFN_ALLOC];
    15.6  static unsigned int alloc_index = 0;
    15.7 -static DEFINE_SPINLOCK(mfn_lock);
    15.8  
    15.9  static unsigned long alloc_mfn(void)
   15.10  {
   15.11 -	unsigned long mfn = 0, flags;
   15.12 +	unsigned long mfn = 0;
   15.13  	struct xen_memory_reservation reservation = {
   15.14  		.nr_extents   = MAX_MFN_ALLOC,
   15.15  		.extent_order = 0,
   15.16  		.domid        = DOMID_SELF
   15.17  	};
   15.18  	set_xen_guest_handle(reservation.extent_start, mfn_list);
   15.19 -	spin_lock_irqsave(&mfn_lock, flags);
   15.20  	if ( unlikely(alloc_index == 0) )
   15.21  		alloc_index = HYPERVISOR_memory_op(
   15.22  			XENMEM_increase_reservation, &reservation);
   15.23  	if ( alloc_index != 0 )
   15.24  		mfn = mfn_list[--alloc_index];
   15.25 -	spin_unlock_irqrestore(&mfn_lock, flags);
   15.26  	return mfn;
   15.27  }
   15.28  
   15.29 @@ -222,9 +219,13 @@ static void net_rx_action(unsigned long 
   15.30  	unsigned long vdata, old_mfn, new_mfn;
   15.31  	struct sk_buff_head rxq;
   15.32  	struct sk_buff *skb;
   15.33 -	u16 notify_list[NET_RX_RING_SIZE];
   15.34  	int notify_nr = 0;
   15.35  	int ret;
   15.36 +	/*
   15.37 +	 * Putting hundreds of bytes on the stack is considered rude.
   15.38 +	 * Static works because a tasklet can only be on one CPU at any time.
   15.39 +	 */
   15.40 +	static u16 notify_list[NET_RX_RING_SIZE];
   15.41  
   15.42  	skb_queue_head_init(&rxq);
   15.43  

    16.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Jul 27 17:44:14 2006 -0500
    16.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Fri Jul 28 10:51:38 2006 +0100
    16.3 @@ -788,6 +788,8 @@ static int network_start_xmit(struct sk_
    16.4  
    16.5  		gso->u.gso.size = skb_shinfo(skb)->gso_size;
    16.6  		gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
    16.7 +		gso->u.gso.pad = 0;
    16.8 +		gso->u.gso.features = 0;
    16.9  
   16.10  		gso->type = XEN_NETIF_EXTRA_TYPE_GSO;
   16.11  		gso->flags = 0;

    17.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Thu Jul 27 17:44:14 2006 -0500
    17.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Fri Jul 28 10:51:38 2006 +0100
    17.3 @@ -302,23 +302,7 @@ HYPERVISOR_vcpu_op(
    17.4      return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
    17.5  }
    17.6  
    17.7 -static inline int
    17.8 -HYPERVISOR_suspend(
    17.9 -	unsigned long srec)
   17.10 -{
   17.11 -	struct sched_shutdown sched_shutdown = {
   17.12 -		.reason = SHUTDOWN_suspend
   17.13 -	};
   17.14 -
   17.15 -	int rc = _hypercall3(int, sched_op, SCHEDOP_shutdown,
   17.16 -			     &sched_shutdown, srec);
   17.17 -
   17.18 -	if (rc == -ENOSYS)
   17.19 -		rc = _hypercall3(int, sched_op_compat, SCHEDOP_shutdown,
   17.20 -				 SHUTDOWN_suspend, srec);
   17.21 -
   17.22 -	return rc;
   17.23 -}
   17.24 +extern int HYPERVISOR_suspend(unsigned long srec);
   17.25  
   17.26  static inline int
   17.27  HYPERVISOR_callback_op(

    18.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h	Thu Jul 27 17:44:14 2006 -0500
    18.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h	Fri Jul 28 10:51:38 2006 +0100
    18.3 @@ -48,6 +48,8 @@
    18.4  #define	XEN_HYPER_GET_PMD		break HYPERPRIVOP_GET_PMD
    18.5  #define	XEN_HYPER_GET_EFLAG		break HYPERPRIVOP_GET_EFLAG
    18.6  #define	XEN_HYPER_SET_EFLAG		break HYPERPRIVOP_SET_EFLAG
    18.7 +#define	XEN_HYPER_RSM_BE		break HYPERPRIVOP_RSM_BE
    18.8 +#define	XEN_HYPER_GET_PSR		break HYPERPRIVOP_GET_PSR
    18.9  
   18.10  #define XSI_IFS			(XSI_BASE + XSI_IFS_OFS)
   18.11  #define XSI_PRECOVER_IFS	(XSI_BASE + XSI_PRECOVER_IFS_OFS)

    19.1 --- a/tools/ioemu/patches/domain-reset	Thu Jul 27 17:44:14 2006 -0500
    19.2 +++ b/tools/ioemu/patches/domain-reset	Fri Jul 28 10:51:38 2006 +0100
    19.3 @@ -1,7 +1,7 @@
    19.4  Index: ioemu/target-i386-dm/helper2.c
    19.5  ===================================================================
    19.6 ---- ioemu.orig/target-i386-dm/helper2.c	2006-07-12 11:35:00.710827712 +0100
    19.7 -+++ ioemu/target-i386-dm/helper2.c	2006-07-12 11:35:02.419613627 +0100
    19.8 +--- ioemu.orig/target-i386-dm/helper2.c	2006-07-27 11:16:57.527492229 +0100
    19.9 ++++ ioemu/target-i386-dm/helper2.c	2006-07-27 11:16:59.381287013 +0100
   19.10  @@ -123,6 +123,25 @@
   19.11   /* called from main_cpu_reset */
   19.12   void cpu_reset(CPUX86State *env)
   19.13 @@ -41,9 +41,9 @@ Index: ioemu/target-i386-dm/helper2.c
   19.14           /* Wait up to 10 msec. */
   19.15  Index: ioemu/vl.c
   19.16  ===================================================================
   19.17 ---- ioemu.orig/vl.c	2006-07-12 11:35:02.273631916 +0100
   19.18 -+++ ioemu/vl.c	2006-07-12 11:35:02.421613376 +0100
   19.19 -@@ -4411,7 +4411,7 @@
   19.20 +--- ioemu.orig/vl.c	2006-07-27 11:16:59.317294097 +0100
   19.21 ++++ ioemu/vl.c	2006-07-27 11:16:59.384286681 +0100
   19.22 +@@ -4412,7 +4412,7 @@
   19.23   } QEMUResetEntry;
   19.24   
   19.25   static QEMUResetEntry *first_reset_entry;
   19.26 @@ -54,8 +54,8 @@ Index: ioemu/vl.c
   19.27   
   19.28  Index: ioemu/vl.h
   19.29  ===================================================================
   19.30 ---- ioemu.orig/vl.h	2006-07-12 11:35:01.454734511 +0100
   19.31 -+++ ioemu/vl.h	2006-07-12 11:35:02.422613251 +0100
   19.32 +--- ioemu.orig/vl.h	2006-07-27 11:16:58.127425816 +0100
   19.33 ++++ ioemu/vl.h	2006-07-27 11:16:59.384286681 +0100
   19.34  @@ -122,6 +122,7 @@
   19.35   
   19.36   void qemu_register_reset(QEMUResetHandler *func, void *opaque);

    20.1 --- a/tools/ioemu/patches/domain-timeoffset	Thu Jul 27 17:44:14 2006 -0500
    20.2 +++ b/tools/ioemu/patches/domain-timeoffset	Fri Jul 28 10:51:38 2006 +0100
    20.3 @@ -1,7 +1,7 @@
    20.4  Index: ioemu/hw/mc146818rtc.c
    20.5  ===================================================================
    20.6 ---- ioemu.orig/hw/mc146818rtc.c	2006-07-26 15:17:35.110819901 +0100
    20.7 -+++ ioemu/hw/mc146818rtc.c	2006-07-26 15:17:40.292255496 +0100
    20.8 +--- ioemu.orig/hw/mc146818rtc.c	2006-07-27 11:17:18.007225084 +0100
    20.9 ++++ ioemu/hw/mc146818rtc.c	2006-07-27 11:17:48.250876949 +0100
   20.10  @@ -178,10 +178,27 @@
   20.11       }
   20.12   }
   20.13 @@ -46,8 +46,8 @@ Index: ioemu/hw/mc146818rtc.c
   20.14   static void rtc_copy_date(RTCState *s)
   20.15  Index: ioemu/hw/pc.c
   20.16  ===================================================================
   20.17 ---- ioemu.orig/hw/pc.c	2006-07-26 15:17:39.820306906 +0100
   20.18 -+++ ioemu/hw/pc.c	2006-07-26 15:17:40.293255388 +0100
   20.19 +--- ioemu.orig/hw/pc.c	2006-07-27 11:17:47.993905398 +0100
   20.20 ++++ ioemu/hw/pc.c	2006-07-27 11:17:48.251876839 +0100
   20.21  @@ -151,7 +151,7 @@
   20.22   }
   20.23   
   20.24 @@ -117,8 +117,8 @@ Index: ioemu/hw/pc.c
   20.25   QEMUMachine pc_machine = {
   20.26  Index: ioemu/vl.c
   20.27  ===================================================================
   20.28 ---- ioemu.orig/vl.c	2006-07-26 15:17:40.169268893 +0100
   20.29 -+++ ioemu/vl.c	2006-07-26 15:17:40.296255061 +0100
   20.30 +--- ioemu.orig/vl.c	2006-07-27 11:17:48.126890676 +0100
   20.31 ++++ ioemu/vl.c	2006-07-27 11:17:48.254876507 +0100
   20.32  @@ -164,6 +164,8 @@
   20.33   
   20.34   int xc_handle;
   20.35 @@ -128,7 +128,7 @@ Index: ioemu/vl.c
   20.36   char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
   20.37   extern int domid;
   20.38   
   20.39 -@@ -4799,6 +4801,7 @@
   20.40 +@@ -4800,6 +4802,7 @@
   20.41   #endif
   20.42              "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
   20.43   	   "-vnc display    start a VNC server on display\n"
   20.44 @@ -136,7 +136,7 @@ Index: ioemu/vl.c
   20.45              "\n"
   20.46              "During emulation, the following keys are useful:\n"
   20.47              "ctrl-alt-f      toggle full screen\n"
   20.48 -@@ -4889,6 +4892,7 @@
   20.49 +@@ -4890,6 +4893,7 @@
   20.50   
   20.51       QEMU_OPTION_d,
   20.52       QEMU_OPTION_vcpus,
   20.53 @@ -144,7 +144,7 @@ Index: ioemu/vl.c
   20.54   };
   20.55   
   20.56   typedef struct QEMUOption {
   20.57 -@@ -4967,6 +4971,7 @@
   20.58 +@@ -4968,6 +4972,7 @@
   20.59       
   20.60       { "d", HAS_ARG, QEMU_OPTION_d },
   20.61       { "vcpus", 1, QEMU_OPTION_vcpus },
   20.62 @@ -152,7 +152,7 @@ Index: ioemu/vl.c
   20.63       { NULL },
   20.64   };
   20.65   
   20.66 -@@ -5669,6 +5674,9 @@
   20.67 +@@ -5670,6 +5675,9 @@
   20.68                   vcpus = atoi(optarg);
   20.69                   fprintf(logfile, "qemu: the number of cpus is %d\n", vcpus);
   20.70                   break;
   20.71 @@ -162,7 +162,7 @@ Index: ioemu/vl.c
   20.72               }
   20.73           }
   20.74       }
   20.75 -@@ -5992,7 +6000,8 @@
   20.76 +@@ -5993,7 +6001,8 @@
   20.77   
   20.78       machine->init(ram_size, vga_ram_size, boot_device,
   20.79                     ds, fd_filename, snapshot,
   20.80 @@ -174,8 +174,8 @@ Index: ioemu/vl.c
   20.81       qemu_mod_timer(gui_timer, qemu_get_clock(rt_clock));
   20.82  Index: ioemu/vl.h
   20.83  ===================================================================
   20.84 ---- ioemu.orig/vl.h	2006-07-26 15:17:39.825306361 +0100
   20.85 -+++ ioemu/vl.h	2006-07-26 15:17:40.297254952 +0100
   20.86 +--- ioemu.orig/vl.h	2006-07-27 11:17:47.998904845 +0100
   20.87 ++++ ioemu/vl.h	2006-07-27 11:17:48.254876507 +0100
   20.88  @@ -556,7 +556,7 @@
   20.89                                    int boot_device,
   20.90                DisplayState *ds, const char **fd_filename, int snapshot,

    21.1 --- a/tools/ioemu/patches/hypervisor-pit	Thu Jul 27 17:44:14 2006 -0500
    21.2 +++ b/tools/ioemu/patches/hypervisor-pit	Fri Jul 28 10:51:38 2006 +0100
    21.3 @@ -1,7 +1,7 @@
    21.4  Index: ioemu/Makefile.target
    21.5  ===================================================================
    21.6 ---- ioemu.orig/Makefile.target	2006-07-12 11:35:01.899678766 +0100
    21.7 -+++ ioemu/Makefile.target	2006-07-12 11:35:02.711577049 +0100
    21.8 +--- ioemu.orig/Makefile.target	2006-07-27 11:16:58.970332506 +0100
    21.9 ++++ ioemu/Makefile.target	2006-07-27 11:16:59.758245283 +0100
   21.10  @@ -333,7 +333,7 @@
   21.11   ifeq ($(TARGET_BASE_ARCH), i386)
   21.12   # Hardware support
   21.13 @@ -13,8 +13,8 @@ Index: ioemu/Makefile.target
   21.14   endif
   21.15  Index: ioemu/hw/pc.c
   21.16  ===================================================================
   21.17 ---- ioemu.orig/hw/pc.c	2006-07-12 11:35:02.059658723 +0100
   21.18 -+++ ioemu/hw/pc.c	2006-07-12 11:35:02.712576924 +0100
   21.19 +--- ioemu.orig/hw/pc.c	2006-07-27 11:16:59.036325200 +0100
   21.20 ++++ ioemu/hw/pc.c	2006-07-27 11:16:59.759245173 +0100
   21.21  @@ -38,7 +38,9 @@
   21.22   
   21.23   static fdctrl_t *floppy_controller;
   21.24 @@ -38,9 +38,9 @@ Index: ioemu/hw/pc.c
   21.25           pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
   21.26  Index: ioemu/vl.c
   21.27  ===================================================================
   21.28 ---- ioemu.orig/vl.c	2006-07-12 11:35:02.649584815 +0100
   21.29 -+++ ioemu/vl.c	2006-07-12 11:35:02.715576548 +0100
   21.30 -@@ -5033,6 +5033,7 @@
   21.31 +--- ioemu.orig/vl.c	2006-07-27 11:16:59.614261222 +0100
   21.32 ++++ ioemu/vl.c	2006-07-27 11:16:59.762244841 +0100
   21.33 +@@ -5034,6 +5034,7 @@
   21.34   
   21.35   #ifdef HAS_AUDIO
   21.36   struct soundhw soundhw[] = {
   21.37 @@ -48,7 +48,7 @@ Index: ioemu/vl.c
   21.38   #ifdef TARGET_I386
   21.39       {
   21.40           "pcspk",
   21.41 -@@ -5042,6 +5043,7 @@
   21.42 +@@ -5043,6 +5044,7 @@
   21.43           { .init_isa = pcspk_audio_init }
   21.44       },
   21.45   #endif

    22.1 --- a/tools/ioemu/patches/ioemu-ia64	Thu Jul 27 17:44:14 2006 -0500
    22.2 +++ b/tools/ioemu/patches/ioemu-ia64	Fri Jul 28 10:51:38 2006 +0100
    22.3 @@ -1,7 +1,7 @@
    22.4  Index: ioemu/hw/iommu.c
    22.5  ===================================================================
    22.6 ---- ioemu.orig/hw/iommu.c	2006-07-26 15:17:35.639762285 +0100
    22.7 -+++ ioemu/hw/iommu.c	2006-07-26 15:17:39.078387722 +0100
    22.8 +--- ioemu.orig/hw/iommu.c	2006-07-28 09:56:58.571272016 +0100
    22.9 ++++ ioemu/hw/iommu.c	2006-07-28 10:02:10.171049510 +0100
   22.10  @@ -82,7 +82,11 @@
   22.11   #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
   22.12   #define IOPTE_WAZ           0x00000001 /* Write as zeros */
   22.13 @@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
   22.14   
   22.15  Index: ioemu/cpu-all.h
   22.16  ===================================================================
   22.17 ---- ioemu.orig/cpu-all.h	2006-07-26 15:17:38.728425843 +0100
   22.18 -+++ ioemu/cpu-all.h	2006-07-26 15:17:39.079387613 +0100
   22.19 +--- ioemu.orig/cpu-all.h	2006-07-28 09:58:38.815935452 +0100
   22.20 ++++ ioemu/cpu-all.h	2006-07-28 10:02:10.171049510 +0100
   22.21  @@ -835,6 +835,31 @@
   22.22                   :"=m" (*(volatile long *)addr)
   22.23                   :"dIr" (nr));
   22.24 @@ -52,9 +52,9 @@ Index: ioemu/cpu-all.h
   22.25   /* memory API */
   22.26  Index: ioemu/vl.c
   22.27  ===================================================================
   22.28 ---- ioemu.orig/vl.c	2006-07-26 15:17:39.011395020 +0100
   22.29 -+++ ioemu/vl.c	2006-07-26 21:11:35.957492161 +0100
   22.30 -@@ -5577,6 +5577,7 @@
   22.31 +--- ioemu.orig/vl.c	2006-07-28 09:58:59.672577418 +0100
   22.32 ++++ ioemu/vl.c	2006-07-28 10:02:10.174049171 +0100
   22.33 +@@ -5578,6 +5578,7 @@
   22.34           exit(-1);
   22.35       }
   22.36   
   22.37 @@ -62,7 +62,7 @@ Index: ioemu/vl.c
   22.38       if (xc_get_pfn_list(xc_handle, domid, page_array, nr_pages) != nr_pages) {
   22.39           fprintf(logfile, "xc_get_pfn_list returned error %d\n", errno);
   22.40           exit(-1);
   22.41 -@@ -5597,6 +5598,34 @@
   22.42 +@@ -5598,6 +5599,34 @@
   22.43       fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", nr_pages - 1,
   22.44               (uint64_t)(page_array[nr_pages - 1]));
   22.45   
   22.46 @@ -99,9 +99,9 @@ Index: ioemu/vl.c
   22.47   #ifdef CONFIG_SOFTMMU
   22.48  Index: ioemu/target-i386-dm/exec-dm.c
   22.49  ===================================================================
   22.50 ---- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-26 15:17:38.283474311 +0100
   22.51 -+++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 15:17:39.081387395 +0100
   22.52 -@@ -340,6 +340,23 @@
   22.53 +--- ioemu.orig/target-i386-dm/exec-dm.c	2006-07-28 09:58:22.882736989 +0100
   22.54 ++++ ioemu/target-i386-dm/exec-dm.c	2006-07-28 10:03:19.972165675 +0100
   22.55 +@@ -341,6 +341,23 @@
   22.56       return io_mem_read[io_index >> IO_MEM_SHIFT];
   22.57   }
   22.58   
   22.59 @@ -125,20 +125,20 @@ Index: ioemu/target-i386-dm/exec-dm.c
   22.60   /* physical memory access (slow version, mainly for debug) */
   22.61   #if defined(CONFIG_USER_ONLY)
   22.62   void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
   22.63 -@@ -455,6 +472,9 @@
   22.64 +@@ -456,6 +473,9 @@
   22.65                   ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
   22.66                       (addr & ~TARGET_PAGE_MASK);
   22.67                   memcpy(buf, ptr, l);
   22.68  +#ifdef __ia64__
   22.69  +                sync_icache((unsigned long)ptr, l);
   22.70  +#endif 
   22.71 -             }
   22.72 -         }
   22.73 -         len -= l;
   22.74 +             } else {
   22.75 +                 /* unreported MMIO space */
   22.76 +                 memset(buf, 0xff, len);
   22.77  Index: ioemu/exec-all.h
   22.78  ===================================================================
   22.79 ---- ioemu.orig/exec-all.h	2006-07-26 15:17:38.200483351 +0100
   22.80 -+++ ioemu/exec-all.h	2006-07-26 21:11:41.262898983 +0100
   22.81 +--- ioemu.orig/exec-all.h	2006-07-28 09:56:58.572271903 +0100
   22.82 ++++ ioemu/exec-all.h	2006-07-28 10:02:10.175049059 +0100
   22.83  @@ -462,12 +462,13 @@
   22.84   }
   22.85   #endif
   22.86 @@ -158,8 +158,8 @@ Index: ioemu/exec-all.h
   22.87   
   22.88  Index: ioemu/target-i386-dm/cpu.h
   22.89  ===================================================================
   22.90 ---- ioemu.orig/target-i386-dm/cpu.h	2006-07-26 15:17:38.282474420 +0100
   22.91 -+++ ioemu/target-i386-dm/cpu.h	2006-07-26 15:17:39.082387287 +0100
   22.92 +--- ioemu.orig/target-i386-dm/cpu.h	2006-07-28 09:56:58.572271903 +0100
   22.93 ++++ ioemu/target-i386-dm/cpu.h	2006-07-28 10:02:10.175049059 +0100
   22.94  @@ -80,7 +80,11 @@
   22.95   /* helper2.c */
   22.96   int main_loop(void);
   22.97 @@ -175,7 +175,7 @@ Index: ioemu/target-i386-dm/cpu.h
   22.98  Index: ioemu/ia64_intrinsic.h
   22.99  ===================================================================
  22.100  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
  22.101 -+++ ioemu/ia64_intrinsic.h	2006-07-26 15:17:39.083387178 +0100
  22.102 ++++ ioemu/ia64_intrinsic.h	2006-07-28 10:02:10.176048946 +0100
  22.103  @@ -0,0 +1,276 @@
  22.104  +#ifndef IA64_INTRINSIC_H
  22.105  +#define IA64_INTRINSIC_H

    23.1 --- a/tools/ioemu/patches/qemu-bugfixes	Thu Jul 27 17:44:14 2006 -0500
    23.2 +++ b/tools/ioemu/patches/qemu-bugfixes	Fri Jul 28 10:51:38 2006 +0100
    23.3 @@ -1,7 +1,7 @@
    23.4  Index: ioemu/console.c
    23.5  ===================================================================
    23.6 ---- ioemu.orig/console.c	2006-07-26 13:39:11.999009495 +0100
    23.7 -+++ ioemu/console.c	2006-07-26 14:15:19.413719225 +0100
    23.8 +--- ioemu.orig/console.c	2006-07-27 11:16:53.732912290 +0100
    23.9 ++++ ioemu/console.c	2006-07-27 11:16:57.753467214 +0100
   23.10  @@ -449,7 +449,7 @@
   23.11               c++;
   23.12           }
   23.13 @@ -50,8 +50,8 @@ Index: ioemu/console.c
   23.14       s->y_base = 0;
   23.15  Index: ioemu/usb-linux.c
   23.16  ===================================================================
   23.17 ---- ioemu.orig/usb-linux.c	2006-07-26 13:39:11.999009495 +0100
   23.18 -+++ ioemu/usb-linux.c	2006-07-26 13:39:16.622514851 +0100
   23.19 +--- ioemu.orig/usb-linux.c	2006-07-27 11:16:53.732912290 +0100
   23.20 ++++ ioemu/usb-linux.c	2006-07-27 11:16:57.754467103 +0100
   23.21  @@ -26,6 +26,7 @@
   23.22   #if defined(__linux__)
   23.23   #include <dirent.h>
   23.24 @@ -60,3 +60,15 @@ Index: ioemu/usb-linux.c
   23.25   #include <linux/usbdevice_fs.h>
   23.26   #include <linux/version.h>
   23.27   
   23.28 +Index: ioemu/vl.c
   23.29 +===================================================================
   23.30 +--- ioemu.orig/vl.c	2006-07-27 11:16:57.681475183 +0100
   23.31 ++++ ioemu/vl.c	2006-07-27 11:17:33.279534373 +0100
   23.32 +@@ -3201,6 +3201,7 @@
   23.33 +             if (net_tap_fd_init(vlan, fd))
   23.34 +                 ret = 0;
   23.35 +         } else {
   23.36 ++            ifname[0] = '\0';
   23.37 +             get_param_value(ifname, sizeof(ifname), "ifname", p);
   23.38 +             if (get_param_value(setup_script, sizeof(setup_script), "script", p) == 0) {
   23.39 +                 pstrcpy(setup_script, sizeof(setup_script), DEFAULT_NETWORK_SCRIPT);

    24.1 --- a/tools/ioemu/patches/qemu-logging	Thu Jul 27 17:44:14 2006 -0500
    24.2 +++ b/tools/ioemu/patches/qemu-logging	Fri Jul 28 10:51:38 2006 +0100
    24.3 @@ -1,8 +1,8 @@
    24.4  Index: ioemu/vl.c
    24.5  ===================================================================
    24.6 ---- ioemu.orig/vl.c	2006-07-14 15:55:59.491503372 +0100
    24.7 -+++ ioemu/vl.c	2006-07-14 15:55:59.693480386 +0100
    24.8 -@@ -4697,7 +4697,7 @@
    24.9 +--- ioemu.orig/vl.c	2006-07-27 11:16:57.756466882 +0100
   24.10 ++++ ioemu/vl.c	2006-07-27 11:16:57.828458912 +0100
   24.11 +@@ -4698,7 +4698,7 @@
   24.12              "-S              freeze CPU at startup (use 'c' to start execution)\n"
   24.13              "-s              wait gdb connection to port %d\n"
   24.14              "-p port         change gdb connection port\n"
   24.15 @@ -11,7 +11,7 @@ Index: ioemu/vl.c
   24.16              "-hdachs c,h,s[,t]  force hard disk 0 physical geometry and the optional BIOS\n"
   24.17              "                translation (t=none or lba) (usually qemu can guess them)\n"
   24.18              "-L path         set the directory for the BIOS and VGA BIOS\n"
   24.19 -@@ -4775,7 +4775,7 @@
   24.20 +@@ -4776,7 +4776,7 @@
   24.21       QEMU_OPTION_S,
   24.22       QEMU_OPTION_s,
   24.23       QEMU_OPTION_p,
   24.24 @@ -20,7 +20,7 @@ Index: ioemu/vl.c
   24.25       QEMU_OPTION_hdachs,
   24.26       QEMU_OPTION_L,
   24.27   #ifdef USE_CODE_COPY
   24.28 -@@ -4844,7 +4844,7 @@
   24.29 +@@ -4845,7 +4845,7 @@
   24.30       { "S", 0, QEMU_OPTION_S },
   24.31       { "s", 0, QEMU_OPTION_s },
   24.32       { "p", HAS_ARG, QEMU_OPTION_p },
   24.33 @@ -29,7 +29,7 @@ Index: ioemu/vl.c
   24.34       { "hdachs", HAS_ARG, QEMU_OPTION_hdachs },
   24.35       { "L", HAS_ARG, QEMU_OPTION_L },
   24.36   #ifdef USE_CODE_COPY
   24.37 -@@ -5095,6 +5095,8 @@
   24.38 +@@ -5096,6 +5096,8 @@
   24.39       char usb_devices[MAX_VM_USB_PORTS][128];
   24.40       int usb_devices_index;
   24.41   
   24.42 @@ -38,7 +38,7 @@ Index: ioemu/vl.c
   24.43       LIST_INIT (&vm_change_state_head);
   24.44   #if !defined(CONFIG_SOFTMMU)
   24.45       /* we never want that malloc() uses mmap() */
   24.46 -@@ -5144,6 +5146,11 @@
   24.47 +@@ -5145,6 +5147,11 @@
   24.48       nb_nics = 0;
   24.49       /* default mac address of the first network interface */
   24.50       
   24.51 @@ -50,7 +50,7 @@ Index: ioemu/vl.c
   24.52       optind = 1;
   24.53       for(;;) {
   24.54           if (optind >= argc)
   24.55 -@@ -5329,7 +5336,7 @@
   24.56 +@@ -5330,7 +5337,7 @@
   24.57                       exit(1);
   24.58                   }
   24.59                   break;
   24.60 @@ -59,7 +59,7 @@ Index: ioemu/vl.c
   24.61                   {
   24.62                       int mask;
   24.63                       CPULogItem *item;
   24.64 -@@ -5700,7 +5707,7 @@
   24.65 +@@ -5701,7 +5708,7 @@
   24.66           stk.ss_flags = 0;
   24.67   
   24.68           if (sigaltstack(&stk, NULL) < 0) {

    25.1 --- a/tools/ioemu/patches/qemu-smp	Thu Jul 27 17:44:14 2006 -0500
    25.2 +++ b/tools/ioemu/patches/qemu-smp	Fri Jul 28 10:51:38 2006 +0100
    25.3 @@ -1,7 +1,7 @@
    25.4  Index: ioemu/vl.c
    25.5  ===================================================================
    25.6 ---- ioemu.orig/vl.c	2006-07-12 11:35:01.687705323 +0100
    25.7 -+++ ioemu/vl.c	2006-07-12 11:35:01.753697055 +0100
    25.8 +--- ioemu.orig/vl.c	2006-07-27 11:16:58.619371357 +0100
    25.9 ++++ ioemu/vl.c	2006-07-27 11:16:58.823348777 +0100
   25.10  @@ -159,6 +159,8 @@
   25.11   #define MAX_CPUS 1
   25.12   #endif
   25.13 @@ -11,7 +11,7 @@ Index: ioemu/vl.c
   25.14   int xc_handle;
   25.15   
   25.16   char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
   25.17 -@@ -4635,6 +4637,7 @@
   25.18 +@@ -4636,6 +4638,7 @@
   25.19              "-m megs         set virtual RAM size to megs MB [default=%d]\n"
   25.20              "-smp n          set the number of CPUs to 'n' [default=1]\n"
   25.21              "-nographic      disable graphical output and redirect serial I/Os to console\n"
   25.22 @@ -19,7 +19,7 @@ Index: ioemu/vl.c
   25.23   #ifndef _WIN32
   25.24   	   "-k language     use keyboard layout (for example \"fr\" for French)\n"
   25.25   #endif
   25.26 -@@ -4809,6 +4812,7 @@
   25.27 +@@ -4810,6 +4813,7 @@
   25.28       QEMU_OPTION_vnc,
   25.29   
   25.30       QEMU_OPTION_d,
   25.31 @@ -27,7 +27,7 @@ Index: ioemu/vl.c
   25.32   };
   25.33   
   25.34   typedef struct QEMUOption {
   25.35 -@@ -4886,6 +4890,7 @@
   25.36 +@@ -4887,6 +4891,7 @@
   25.37       { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
   25.38       
   25.39       { "d", HAS_ARG, QEMU_OPTION_d },
   25.40 @@ -35,7 +35,7 @@ Index: ioemu/vl.c
   25.41       { NULL },
   25.42   };
   25.43   
   25.44 -@@ -5508,6 +5513,10 @@
   25.45 +@@ -5509,6 +5514,10 @@
   25.46                   domid = atoi(optarg);
   25.47                   fprintf(logfile, "domid: %d\n", domid);
   25.48                   break;

    26.1 --- a/tools/ioemu/patches/qemu-target-i386-dm	Thu Jul 27 17:44:14 2006 -0500
    26.2 +++ b/tools/ioemu/patches/qemu-target-i386-dm	Fri Jul 28 10:51:38 2006 +0100
    26.3 @@ -1,7 +1,7 @@
    26.4  Index: ioemu/Makefile.target
    26.5  ===================================================================
    26.6 ---- ioemu.orig/Makefile.target	2006-07-26 11:45:57.572129351 +0100
    26.7 -+++ ioemu/Makefile.target	2006-07-26 11:45:57.589127569 +0100
    26.8 +--- ioemu.orig/Makefile.target	2006-07-28 09:56:49.468301708 +0100
    26.9 ++++ ioemu/Makefile.target	2006-07-28 09:56:58.486281629 +0100
   26.10  @@ -57,6 +57,8 @@
   26.11   QEMU_SYSTEM=qemu-fast
   26.12   endif
   26.13 @@ -32,8 +32,8 @@ Index: ioemu/Makefile.target
   26.14   endif
   26.15  Index: ioemu/configure
   26.16  ===================================================================
   26.17 ---- ioemu.orig/configure	2006-07-26 11:45:57.573129246 +0100
   26.18 -+++ ioemu/configure	2006-07-26 11:45:57.590127464 +0100
   26.19 +--- ioemu.orig/configure	2006-07-28 09:56:49.469301595 +0100
   26.20 ++++ ioemu/configure	2006-07-28 09:56:49.486299672 +0100
   26.21  @@ -359,6 +359,8 @@
   26.22       if [ "$user" = "yes" ] ; then
   26.23           target_list="i386-user arm-user armeb-user sparc-user ppc-user mips-user mipsel-user $target_list"
   26.24 @@ -45,8 +45,8 @@ Index: ioemu/configure
   26.25   fi
   26.26  Index: ioemu/monitor.c
   26.27  ===================================================================
   26.28 ---- ioemu.orig/monitor.c	2006-07-26 11:45:57.576128931 +0100
   26.29 -+++ ioemu/monitor.c	2006-07-26 11:45:57.591127359 +0100
   26.30 +--- ioemu.orig/monitor.c	2006-07-28 09:56:49.472301255 +0100
   26.31 ++++ ioemu/monitor.c	2006-07-28 09:56:58.720255164 +0100
   26.32  @@ -1142,6 +1142,10 @@
   26.33         "", "show host USB devices", },
   26.34       { "profile", "", do_info_profile,
   26.35 @@ -60,8 +60,8 @@ Index: ioemu/monitor.c
   26.36   
   26.37  Index: ioemu/vl.c
   26.38  ===================================================================
   26.39 ---- ioemu.orig/vl.c	2006-07-26 11:45:57.579128617 +0100
   26.40 -+++ ioemu/vl.c	2006-07-26 11:45:57.593127149 +0100
   26.41 +--- ioemu.orig/vl.c	2006-07-28 09:56:49.475300916 +0100
   26.42 ++++ ioemu/vl.c	2006-07-28 09:56:58.917232883 +0100
   26.43  @@ -87,7 +87,7 @@
   26.44   
   26.45   #include "exec-all.h"
   26.46 @@ -98,8 +98,8 @@ Index: ioemu/vl.c
   26.47   {
   26.48  Index: ioemu/vl.h
   26.49  ===================================================================
   26.50 ---- ioemu.orig/vl.h	2006-07-26 11:45:39.289045710 +0100
   26.51 -+++ ioemu/vl.h	2006-07-26 11:45:57.594127044 +0100
   26.52 +--- ioemu.orig/vl.h	2006-07-28 09:56:49.281322859 +0100
   26.53 ++++ ioemu/vl.h	2006-07-28 09:56:58.917232883 +0100
   26.54  @@ -38,6 +38,8 @@
   26.55   #include <fcntl.h>
   26.56   #include <sys/stat.h>
   26.57 @@ -132,7 +132,7 @@ Index: ioemu/vl.h
   26.58  Index: ioemu/target-i386-dm/cpu.h
   26.59  ===================================================================
   26.60  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   26.61 -+++ ioemu/target-i386-dm/cpu.h	2006-07-26 11:45:57.594127044 +0100
   26.62 ++++ ioemu/target-i386-dm/cpu.h	2006-07-28 09:56:58.572271903 +0100
   26.63  @@ -0,0 +1,86 @@
   26.64  +/*
   26.65  + * i386 virtual CPU header
   26.66 @@ -223,8 +223,8 @@ Index: ioemu/target-i386-dm/cpu.h
   26.67  Index: ioemu/target-i386-dm/exec-dm.c
   26.68  ===================================================================
   26.69  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
   26.70 -+++ ioemu/target-i386-dm/exec-dm.c	2006-07-26 11:46:01.059763730 +0100
   26.71 -@@ -0,0 +1,512 @@
   26.72 ++++ ioemu/target-i386-dm/exec-dm.c	2006-07-28 09:58:22.882736989 +0100
   26.73 +@@ -0,0 +1,516 @@
   26.74  +/*
   26.75  + *  virtual page mapping and translated block handling
   26.76  + * 
   26.77 @@ -291,6 +291,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
   26.78  +#endif /* !CONFIG_DM */
   26.79  +
   26.80  +uint64_t phys_ram_size;
   26.81 ++extern uint64_t ram_size;
   26.82  +int phys_ram_fd;
   26.83  +uint8_t *phys_ram_base;
   26.84  +uint8_t *phys_ram_dirty;
   26.85 @@ -632,7 +633,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
   26.86  +            l = len;
   26.87  +	
   26.88  +        pd = page;
   26.89 -+        io_index = iomem_index(page);
   26.90 ++        io_index = iomem_index(addr);
   26.91  +        if (is_write) {
   26.92  +            if (io_index) {
   26.93  +                if (l >= 4 && ((addr & 3) == 0)) {
   26.94 @@ -677,11 +678,14 @@ Index: ioemu/target-i386-dm/exec-dm.c
   26.95  +                    stb_raw(buf, val);
   26.96  +                    l = 1;
   26.97  +                }
   26.98 -+            } else {
   26.99 ++            } else if (addr < ram_size) {
  26.100  +                /* RAM case */
  26.101  +                ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
  26.102  +                    (addr & ~TARGET_PAGE_MASK);
  26.103  +                memcpy(buf, ptr, l);
  26.104 ++            } else {
  26.105 ++                /* unreported MMIO space */
  26.106 ++                memset(buf, 0xff, len);
  26.107  +            }
  26.108  +        }
  26.109  +        len -= l;
  26.110 @@ -740,7 +744,7 @@ Index: ioemu/target-i386-dm/exec-dm.c
  26.111  Index: ioemu/target-i386-dm/helper2.c
  26.112  ===================================================================
  26.113  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
  26.114 -+++ ioemu/target-i386-dm/helper2.c	2006-07-26 11:45:57.596126835 +0100
  26.115 ++++ ioemu/target-i386-dm/helper2.c	2006-07-28 09:56:58.312301309 +0100
  26.116  @@ -0,0 +1,464 @@
  26.117  +/*
  26.118  + *  i386 helpers (without register variable usage)
  26.119 @@ -1209,7 +1213,7 @@ Index: ioemu/target-i386-dm/helper2.c
  26.120  Index: ioemu/target-i386-dm/i8259-dm.c
  26.121  ===================================================================
  26.122  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
  26.123 -+++ ioemu/target-i386-dm/i8259-dm.c	2006-07-26 11:45:57.596126835 +0100
  26.124 ++++ ioemu/target-i386-dm/i8259-dm.c	2006-07-28 09:56:49.492298993 +0100
  26.125  @@ -0,0 +1,107 @@
  26.126  +/* Xen 8259 stub for interrupt controller emulation
  26.127  + * 
  26.128 @@ -1321,7 +1325,7 @@ Index: ioemu/target-i386-dm/i8259-dm.c
  26.129  Index: ioemu/target-i386-dm/qemu-dm.debug
  26.130  ===================================================================
  26.131  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
  26.132 -+++ ioemu/target-i386-dm/qemu-dm.debug	2006-07-26 11:45:57.596126835 +0100
  26.133 ++++ ioemu/target-i386-dm/qemu-dm.debug	2006-07-28 09:56:49.493298880 +0100
  26.134  @@ -0,0 +1,5 @@
  26.135  +#!/bin/sh
  26.136  +
  26.137 @@ -1331,7 +1335,7 @@ Index: ioemu/target-i386-dm/qemu-dm.debu
  26.138  Index: ioemu/target-i386-dm/qemu-ifup
  26.139  ===================================================================
  26.140  --- /dev/null	1970-01-01 00:00:00.000000000 +0000
  26.141 -+++ ioemu/target-i386-dm/qemu-ifup	2006-07-26 11:45:57.597126730 +0100
  26.142 ++++ ioemu/target-i386-dm/qemu-ifup	2006-07-28 09:56:49.493298880 +0100
  26.143  @@ -0,0 +1,10 @@
  26.144  +#!/bin/sh
  26.145  +

    27.1 --- a/tools/ioemu/patches/shared-vram	Thu Jul 27 17:44:14 2006 -0500
    27.2 +++ b/tools/ioemu/patches/shared-vram	Fri Jul 28 10:51:38 2006 +0100
    27.3 @@ -1,7 +1,7 @@
    27.4  Index: ioemu/hw/cirrus_vga.c
    27.5  ===================================================================
    27.6 ---- ioemu.orig/hw/cirrus_vga.c	2006-07-26 15:17:35.230806831 +0100
    27.7 -+++ ioemu/hw/cirrus_vga.c	2006-07-26 15:17:39.819307015 +0100
    27.8 +--- ioemu.orig/hw/cirrus_vga.c	2006-07-27 11:16:53.059986783 +0100
    27.9 ++++ ioemu/hw/cirrus_vga.c	2006-07-27 11:16:59.923227020 +0100
   27.10  @@ -28,6 +28,9 @@
   27.11    */
   27.12   #include "vl.h"
   27.13 @@ -176,8 +176,8 @@ Index: ioemu/hw/cirrus_vga.c
   27.14   }
   27.15  Index: ioemu/hw/pc.c
   27.16  ===================================================================
   27.17 ---- ioemu.orig/hw/pc.c	2006-07-26 15:17:39.752314312 +0100
   27.18 -+++ ioemu/hw/pc.c	2006-07-26 15:17:39.820306906 +0100
   27.19 +--- ioemu.orig/hw/pc.c	2006-07-27 11:16:59.759245173 +0100
   27.20 ++++ ioemu/hw/pc.c	2006-07-27 11:16:59.924226909 +0100
   27.21  @@ -783,14 +783,14 @@
   27.22       if (cirrus_vga_enabled) {
   27.23           if (pci_enabled) {
   27.24 @@ -198,8 +198,8 @@ Index: ioemu/hw/pc.c
   27.25   
   27.26  Index: ioemu/hw/vga.c
   27.27  ===================================================================
   27.28 ---- ioemu.orig/hw/vga.c	2006-07-26 15:17:39.352357879 +0100
   27.29 -+++ ioemu/hw/vga.c	2006-07-26 15:17:39.821306797 +0100
   27.30 +--- ioemu.orig/hw/vga.c	2006-07-27 11:16:59.103317784 +0100
   27.31 ++++ ioemu/hw/vga.c	2006-07-27 11:16:59.925226798 +0100
   27.32  @@ -1799,6 +1799,7 @@
   27.33       /* TODO: add vbe support if enabled */
   27.34   }
   27.35 @@ -217,7 +217,7 @@ Index: ioemu/hw/vga.c
   27.36       s->vram_offset = vga_ram_offset;
   27.37       s->vram_size = vga_ram_size;
   27.38       s->ds = ds;
   27.39 -@@ -1941,6 +1942,31 @@
   27.40 +@@ -1943,6 +1944,31 @@
   27.41       return 0;
   27.42   }
   27.43   
   27.44 @@ -251,8 +251,8 @@ Index: ioemu/hw/vga.c
   27.45   
   27.46  Index: ioemu/hw/vga_int.h
   27.47  ===================================================================
   27.48 ---- ioemu.orig/hw/vga_int.h	2006-07-26 15:17:38.201483242 +0100
   27.49 -+++ ioemu/hw/vga_int.h	2006-07-26 15:17:39.822306688 +0100
   27.50 +--- ioemu.orig/hw/vga_int.h	2006-07-27 11:16:57.447501084 +0100
   27.51 ++++ ioemu/hw/vga_int.h	2006-07-27 11:16:59.925226798 +0100
   27.52  @@ -166,5 +166,6 @@
   27.53                                unsigned int color0, unsigned int color1,
   27.54                                unsigned int color_xor);
   27.55 @@ -262,9 +262,9 @@ Index: ioemu/hw/vga_int.h
   27.56   extern const uint8_t gr_mask[16];
   27.57  Index: ioemu/vl.c
   27.58  ===================================================================
   27.59 ---- ioemu.orig/vl.c	2006-07-26 15:17:39.755313985 +0100
   27.60 -+++ ioemu/vl.c	2006-07-26 15:17:39.824306470 +0100
   27.61 -@@ -5148,6 +5148,78 @@
   27.62 +--- ioemu.orig/vl.c	2006-07-27 11:16:59.762244841 +0100
   27.63 ++++ ioemu/vl.c	2006-07-27 11:16:59.928226466 +0100
   27.64 +@@ -5149,6 +5149,78 @@
   27.65   
   27.66   #define MAX_NET_CLIENTS 32
   27.67   
   27.68 @@ -345,8 +345,8 @@ Index: ioemu/vl.c
   27.69   #ifdef CONFIG_GDBSTUB
   27.70  Index: ioemu/vl.h
   27.71  ===================================================================
   27.72 ---- ioemu.orig/vl.h	2006-07-26 15:17:39.621328580 +0100
   27.73 -+++ ioemu/vl.h	2006-07-26 15:17:39.825306361 +0100
   27.74 +--- ioemu.orig/vl.h	2006-07-27 11:16:59.549268417 +0100
   27.75 ++++ ioemu/vl.h	2006-07-27 11:16:59.929226356 +0100
   27.76  @@ -136,6 +136,13 @@
   27.77   
   27.78   void main_loop_wait(int timeout);

    28.1 --- a/tools/ioemu/patches/support-xm-console	Thu Jul 27 17:44:14 2006 -0500
    28.2 +++ b/tools/ioemu/patches/support-xm-console	Fri Jul 28 10:51:38 2006 +0100
    28.3 @@ -1,7 +1,8 @@
    28.4 -diff -r d08c08f8fbf3 vl.c
    28.5 ---- a/vl.c	Mon Jun 26 15:18:25 2006 +0100
    28.6 -+++ b/vl.c	Mon Jun 26 15:18:37 2006 +0100
    28.7 -@@ -1535,26 +1535,65 @@ CharDriverState *qemu_chr_open_stdio(voi
    28.8 +Index: ioemu/vl.c
    28.9 +===================================================================
   28.10 +--- ioemu.orig/vl.c	2006-07-27 11:16:59.384286681 +0100
   28.11 ++++ ioemu/vl.c	2006-07-27 11:16:59.614261222 +0100
   28.12 +@@ -1535,26 +1535,65 @@
   28.13       return chr;
   28.14   }
   28.15   
   28.16 @@ -65,19 +66,18 @@ diff -r d08c08f8fbf3 vl.c
   28.17  -    tty.c_cc[VMIN] = 1;
   28.18  -    tty.c_cc[VTIME] = 0;
   28.19  -    tcsetattr (master_fd, TCSAFLUSH, &tty);
   28.20 --
   28.21 --    fprintf(stderr, "char device redirected to %s\n", slave_name);
   28.22  +    /* Set raw attributes on the pty. */
   28.23  +    cfmakeraw(&tty);
   28.24  +    tcsetattr(slave_fd, TCSAFLUSH, &tty);
   28.25  +    
   28.26  +    fprintf(stderr, "char device redirected to %s\n", ptsname(master_fd));
   28.27  +    store_console_dev(domid, ptsname(master_fd));
   28.28 -+
   28.29 + 
   28.30 +-    fprintf(stderr, "char device redirected to %s\n", slave_name);
   28.31       return qemu_chr_open_fd(master_fd, master_fd);
   28.32   }
   28.33   
   28.34 -@@ -5297,7 +5336,9 @@ int main(int argc, char **argv)
   28.35 +@@ -5298,7 +5337,9 @@
   28.36                   break;
   28.37               case QEMU_OPTION_nographic:
   28.38                   pstrcpy(monitor_device, sizeof(monitor_device), "stdio");

    29.1 --- a/tools/ioemu/patches/vnc-cleanup	Thu Jul 27 17:44:14 2006 -0500
    29.2 +++ b/tools/ioemu/patches/vnc-cleanup	Fri Jul 28 10:51:38 2006 +0100
    29.3 @@ -1,7 +1,8 @@
    29.4 -diff -r c84300f3abc2 vnc.c
    29.5 ---- a/vnc.c	Wed Jul 05 18:11:23 2006 +0100
    29.6 -+++ b/vnc.c	Thu Jul 06 14:27:28 2006 +0100
    29.7 -@@ -83,13 +83,16 @@ static void vnc_dpy_update(DisplayState 
    29.8 +Index: ioemu/vnc.c
    29.9 +===================================================================
   29.10 +--- ioemu.orig/vnc.c	2006-07-27 11:16:52.783017443 +0100
   29.11 ++++ ioemu/vnc.c	2006-07-27 11:17:00.722138579 +0100
   29.12 +@@ -83,13 +83,16 @@
   29.13   static void vnc_dpy_update(DisplayState *ds, int x, int y, int w, int h)
   29.14   {
   29.15       VncState *vs = ds->opaque;
   29.16 @@ -21,7 +22,7 @@ diff -r c84300f3abc2 vnc.c
   29.17   }
   29.18   
   29.19   static void vnc_framebuffer_update(VncState *vs, int x, int y, int w, int h,
   29.20 -@@ -262,6 +265,7 @@ static void vnc_update_client(void *opaq
   29.21 +@@ -262,6 +265,7 @@
   29.22   static void vnc_update_client(void *opaque)
   29.23   {
   29.24       VncState *vs = opaque;
   29.25 @@ -29,7 +30,7 @@ diff -r c84300f3abc2 vnc.c
   29.26   
   29.27       if (vs->need_update && vs->csock != -1) {
   29.28   	int y;
   29.29 -@@ -282,7 +286,7 @@ static void vnc_update_client(void *opaq
   29.30 +@@ -282,7 +286,7 @@
   29.31   	row = vs->ds->data;
   29.32   	old_row = vs->old_data;
   29.33   
   29.34 @@ -38,7 +39,7 @@ diff -r c84300f3abc2 vnc.c
   29.35   	    if (vs->dirty_row[y] & width_mask) {
   29.36   		int x;
   29.37   		char *ptr, *old_ptr;
   29.38 -@@ -307,10 +311,8 @@ static void vnc_update_client(void *opaq
   29.39 +@@ -307,10 +311,8 @@
   29.40   	    old_row += vs->ds->linesize;
   29.41   	}
   29.42   
   29.43 @@ -51,7 +52,7 @@ diff -r c84300f3abc2 vnc.c
   29.44   
   29.45   	/* Count rectangles */
   29.46   	n_rectangles = 0;
   29.47 -@@ -348,7 +350,9 @@ static void vnc_update_client(void *opaq
   29.48 +@@ -348,7 +350,9 @@
   29.49   	vnc_flush(vs);
   29.50   
   29.51       }
   29.52 @@ -62,10 +63,11 @@ diff -r c84300f3abc2 vnc.c
   29.53   }
   29.54   
   29.55   static void vnc_timer_init(VncState *vs)
   29.56 -diff -r c84300f3abc2 vl.c
   29.57 ---- a/vl.c	Wed Jul 05 18:11:23 2006 +0100
   29.58 -+++ b/vl.c	Thu Jul 06 14:27:28 2006 +0100
   29.59 -@@ -4586,10 +4586,10 @@ void main_loop_wait(int timeout)
   29.60 +Index: ioemu/vl.c
   29.61 +===================================================================
   29.62 +--- ioemu.orig/vl.c	2006-07-27 11:17:00.311184072 +0100
   29.63 ++++ ioemu/vl.c	2006-07-27 11:17:00.724138358 +0100
   29.64 +@@ -4587,10 +4587,10 @@
   29.65           /* XXX: better handling of removal */
   29.66           for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
   29.67               ioh_next = ioh->next;

    30.1 --- a/tools/ioemu/patches/vnc-fixes	Thu Jul 27 17:44:14 2006 -0500
    30.2 +++ b/tools/ioemu/patches/vnc-fixes	Fri Jul 28 10:51:38 2006 +0100
    30.3 @@ -1,8 +1,8 @@
    30.4  Index: ioemu/vl.c
    30.5  ===================================================================
    30.6 ---- ioemu.orig/vl.c	2006-07-26 14:29:04.481598583 +0100
    30.7 -+++ ioemu/vl.c	2006-07-26 14:31:22.668325993 +0100
    30.8 -@@ -6003,8 +6003,10 @@
    30.9 +--- ioemu.orig/vl.c	2006-07-27 11:17:00.724138358 +0100
   30.10 ++++ ioemu/vl.c	2006-07-27 11:17:00.874121755 +0100
   30.11 +@@ -6004,8 +6004,10 @@
   30.12                     kernel_filename, kernel_cmdline, initrd_filename,
   30.13                     timeoffset);
   30.14   
   30.15 @@ -17,8 +17,8 @@ Index: ioemu/vl.c
   30.16       if (use_gdbstub) {
   30.17  Index: ioemu/vnc.c
   30.18  ===================================================================
   30.19 ---- ioemu.orig/vnc.c	2006-07-26 14:29:04.479598804 +0100
   30.20 -+++ ioemu/vnc.c	2006-07-26 14:31:22.669325883 +0100
   30.21 +--- ioemu.orig/vnc.c	2006-07-27 11:17:00.722138579 +0100
   30.22 ++++ ioemu/vnc.c	2006-07-27 11:17:00.875121644 +0100
   30.23  @@ -3,6 +3,7 @@
   30.24    * 
   30.25    * Copyright (C) 2006 Anthony Liguori <anthony@codemonkey.ws>
   30.26 @@ -493,8 +493,8 @@ Index: ioemu/vnc.c
   30.27   }
   30.28  Index: ioemu/vl.h
   30.29  ===================================================================
   30.30 ---- ioemu.orig/vl.h	2006-07-26 14:31:22.669325883 +0100
   30.31 -+++ ioemu/vl.h	2006-07-26 14:32:44.505279724 +0100
   30.32 +--- ioemu.orig/vl.h	2006-07-27 11:17:00.311184072 +0100
   30.33 ++++ ioemu/vl.h	2006-07-27 11:17:00.875121644 +0100
   30.34  @@ -301,6 +301,7 @@
   30.35   int is_graphic_console(void);
   30.36   CharDriverState *text_console_init(DisplayState *ds);

    31.1 --- a/tools/ioemu/patches/vnc-start-vncviewer	Thu Jul 27 17:44:14 2006 -0500
    31.2 +++ b/tools/ioemu/patches/vnc-start-vncviewer	Fri Jul 28 10:51:38 2006 +0100
    31.3 @@ -1,7 +1,7 @@
    31.4  Index: ioemu/vnc.c
    31.5  ===================================================================
    31.6 ---- ioemu.orig/vnc.c	2006-07-26 14:33:08.166663983 +0100
    31.7 -+++ ioemu/vnc.c	2006-07-26 14:33:08.225657462 +0100
    31.8 +--- ioemu.orig/vnc.c	2006-07-27 11:17:00.875121644 +0100
    31.9 ++++ ioemu/vnc.c	2006-07-27 11:17:01.032104266 +0100
   31.10  @@ -1002,3 +1002,25 @@
   31.11   
   31.12       vnc_dpy_resize(vs->ds, 640, 400);
   31.13 @@ -30,8 +30,8 @@ Index: ioemu/vnc.c
   31.14  +}
   31.15  Index: ioemu/vl.c
   31.16  ===================================================================
   31.17 ---- ioemu.orig/vl.c	2006-07-26 14:33:08.165664094 +0100
   31.18 -+++ ioemu/vl.c	2006-07-26 14:33:08.227657240 +0100
   31.19 +--- ioemu.orig/vl.c	2006-07-27 11:17:00.874121755 +0100
   31.20 ++++ ioemu/vl.c	2006-07-27 11:17:01.035103934 +0100
   31.21  @@ -121,6 +121,7 @@
   31.22   int bios_size;
   31.23   static DisplayState display_state;
   31.24 @@ -40,7 +40,7 @@ Index: ioemu/vl.c
   31.25   const char* keyboard_layout = NULL;
   31.26   int64_t ticks_per_sec;
   31.27   int boot_device = 'c';
   31.28 -@@ -4801,6 +4802,7 @@
   31.29 +@@ -4802,6 +4803,7 @@
   31.30   #endif
   31.31              "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
   31.32   	   "-vnc display    start a VNC server on display\n"
   31.33 @@ -48,7 +48,7 @@ Index: ioemu/vl.c
   31.34              "-timeoffset     time offset (in seconds) from local time\n"
   31.35              "\n"
   31.36              "During emulation, the following keys are useful:\n"
   31.37 -@@ -4889,6 +4891,7 @@
   31.38 +@@ -4890,6 +4892,7 @@
   31.39       QEMU_OPTION_usbdevice,
   31.40       QEMU_OPTION_smp,
   31.41       QEMU_OPTION_vnc,
   31.42 @@ -56,7 +56,7 @@ Index: ioemu/vl.c
   31.43   
   31.44       QEMU_OPTION_d,
   31.45       QEMU_OPTION_vcpus,
   31.46 -@@ -4964,6 +4967,7 @@
   31.47 +@@ -4965,6 +4968,7 @@
   31.48       { "usbdevice", HAS_ARG, QEMU_OPTION_usbdevice },
   31.49       { "smp", HAS_ARG, QEMU_OPTION_smp },
   31.50       { "vnc", HAS_ARG, QEMU_OPTION_vnc },
   31.51 @@ -64,7 +64,7 @@ Index: ioemu/vl.c
   31.52       
   31.53       /* temporary options */
   31.54       { "usb", 0, QEMU_OPTION_usb },
   31.55 -@@ -5294,6 +5298,7 @@
   31.56 +@@ -5295,6 +5299,7 @@
   31.57   #endif
   31.58       snapshot = 0;
   31.59       nographic = 0;
   31.60 @@ -72,7 +72,7 @@ Index: ioemu/vl.c
   31.61       kernel_filename = NULL;
   31.62       kernel_cmdline = "";
   31.63   #ifdef TARGET_PPC
   31.64 -@@ -5663,6 +5668,9 @@
   31.65 +@@ -5664,6 +5669,9 @@
   31.66   		    exit(1);
   31.67   		}
   31.68   		break;
   31.69 @@ -82,7 +82,7 @@ Index: ioemu/vl.c
   31.70               case QEMU_OPTION_domainname:
   31.71                   strncat(domain_name, optarg, sizeof(domain_name) - 20);
   31.72                   break;
   31.73 -@@ -5910,6 +5918,8 @@
   31.74 +@@ -5911,6 +5919,8 @@
   31.75           dumb_display_init(ds);
   31.76       } else if (vnc_display != -1) {
   31.77   	vnc_display_init(ds, vnc_display);
   31.78 @@ -93,8 +93,8 @@ Index: ioemu/vl.c
   31.79           sdl_display_init(ds, full_screen);
   31.80  Index: ioemu/vl.h
   31.81  ===================================================================
   31.82 ---- ioemu.orig/vl.h	2006-07-26 14:33:08.167663873 +0100
   31.83 -+++ ioemu/vl.h	2006-07-26 14:33:08.228657130 +0100
   31.84 +--- ioemu.orig/vl.h	2006-07-27 11:17:00.875121644 +0100
   31.85 ++++ ioemu/vl.h	2006-07-27 11:17:01.036103823 +0100
   31.86  @@ -733,6 +733,7 @@
   31.87   
   31.88   /* vnc.c */

    32.1 --- a/tools/ioemu/patches/xen-domain-name	Thu Jul 27 17:44:14 2006 -0500
    32.2 +++ b/tools/ioemu/patches/xen-domain-name	Fri Jul 28 10:51:38 2006 +0100
    32.3 @@ -1,7 +1,7 @@
    32.4  Index: ioemu/sdl.c
    32.5  ===================================================================
    32.6 ---- ioemu.orig/sdl.c	2006-07-12 11:33:54.665109493 +0100
    32.7 -+++ ioemu/sdl.c	2006-07-12 11:35:01.450735012 +0100
    32.8 +--- ioemu.orig/sdl.c	2006-07-27 11:16:53.590928008 +0100
    32.9 ++++ ioemu/sdl.c	2006-07-27 11:16:58.124426148 +0100
   32.10  @@ -268,14 +268,14 @@
   32.11   static void sdl_update_caption(void)
   32.12   {
   32.13 @@ -21,8 +21,8 @@ Index: ioemu/sdl.c
   32.14   static void sdl_hide_cursor(void)
   32.15  Index: ioemu/vl.c
   32.16  ===================================================================
   32.17 ---- ioemu.orig/vl.c	2006-07-12 11:35:01.094779608 +0100
   32.18 -+++ ioemu/vl.c	2006-07-12 11:35:01.453734636 +0100
   32.19 +--- ioemu.orig/vl.c	2006-07-27 11:16:57.828458912 +0100
   32.20 ++++ ioemu/vl.c	2006-07-27 11:16:58.126425927 +0100
   32.21  @@ -159,6 +159,8 @@
   32.22   #define MAX_CPUS 1
   32.23   #endif
   32.24 @@ -32,7 +32,7 @@ Index: ioemu/vl.c
   32.25   /***********************************************************/
   32.26   /* x86 ISA bus support */
   32.27   
   32.28 -@@ -4698,6 +4700,7 @@
   32.29 +@@ -4699,6 +4701,7 @@
   32.30              "-s              wait gdb connection to port %d\n"
   32.31              "-p port         change gdb connection port\n"
   32.32              "-l item1,...    output log to %s (use -d ? for a list of log items)\n"
   32.33 @@ -40,7 +40,7 @@ Index: ioemu/vl.c
   32.34              "-hdachs c,h,s[,t]  force hard disk 0 physical geometry and the optional BIOS\n"
   32.35              "                translation (t=none or lba) (usually qemu can guess them)\n"
   32.36              "-L path         set the directory for the BIOS and VGA BIOS\n"
   32.37 -@@ -4787,6 +4790,7 @@
   32.38 +@@ -4788,6 +4791,7 @@
   32.39       QEMU_OPTION_g,
   32.40       QEMU_OPTION_std_vga,
   32.41       QEMU_OPTION_monitor,
   32.42 @@ -48,7 +48,7 @@ Index: ioemu/vl.c
   32.43       QEMU_OPTION_serial,
   32.44       QEMU_OPTION_parallel,
   32.45       QEMU_OPTION_loadvm,
   32.46 -@@ -4860,6 +4864,7 @@
   32.47 +@@ -4861,6 +4865,7 @@
   32.48       { "localtime", 0, QEMU_OPTION_localtime },
   32.49       { "std-vga", 0, QEMU_OPTION_std_vga },
   32.50       { "monitor", 1, QEMU_OPTION_monitor },
   32.51 @@ -56,7 +56,7 @@ Index: ioemu/vl.c
   32.52       { "serial", 1, QEMU_OPTION_serial },
   32.53       { "parallel", 1, QEMU_OPTION_parallel },
   32.54       { "loadvm", HAS_ARG, QEMU_OPTION_loadvm },
   32.55 -@@ -5483,6 +5488,9 @@
   32.56 +@@ -5484,6 +5489,9 @@
   32.57   		    exit(1);
   32.58   		}
   32.59   		break;
   32.60 @@ -68,8 +68,8 @@ Index: ioemu/vl.c
   32.61       }
   32.62  Index: ioemu/vl.h
   32.63  ===================================================================
   32.64 ---- ioemu.orig/vl.h	2006-07-12 11:35:00.955797021 +0100
   32.65 -+++ ioemu/vl.h	2006-07-12 11:35:01.454734511 +0100
   32.66 +--- ioemu.orig/vl.h	2006-07-27 11:16:57.682475072 +0100
   32.67 ++++ ioemu/vl.h	2006-07-27 11:16:58.127425816 +0100
   32.68  @@ -1094,4 +1094,5 @@
   32.69   
   32.70   void kqemu_record_dump(void);

    33.1 --- a/tools/ioemu/patches/xen-domid	Thu Jul 27 17:44:14 2006 -0500
    33.2 +++ b/tools/ioemu/patches/xen-domid	Fri Jul 28 10:51:38 2006 +0100
    33.3 @@ -1,7 +1,8 @@
    33.4 -diff -r 03705e837ce8 vl.c
    33.5 ---- a/vl.c	Tue May 30 14:10:44 2006 +0100
    33.6 -+++ b/vl.c	Tue May 30 14:11:16 2006 +0100
    33.7 -@@ -160,6 +160,7 @@ int vnc_display = -1;
    33.8 +Index: ioemu/vl.c
    33.9 +===================================================================
   33.10 +--- ioemu.orig/vl.c	2006-07-27 11:16:58.126425927 +0100
   33.11 ++++ ioemu/vl.c	2006-07-27 11:16:58.296407110 +0100
   33.12 +@@ -160,6 +160,7 @@
   33.13   #endif
   33.14   
   33.15   char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
   33.16 @@ -9,7 +10,7 @@ diff -r 03705e837ce8 vl.c
   33.17   
   33.18   /***********************************************************/
   33.19   /* x86 ISA bus support */
   33.20 -@@ -4700,6 +4701,7 @@ void help(void)
   33.21 +@@ -4701,6 +4702,7 @@
   33.22              "-s              wait gdb connection to port %d\n"
   33.23              "-p port         change gdb connection port\n"
   33.24              "-l item1,...    output log to %s (use -d ? for a list of log items)\n"
   33.25 @@ -17,7 +18,7 @@ diff -r 03705e837ce8 vl.c
   33.26              "-domain-name    domain name that we're serving\n"
   33.27              "-hdachs c,h,s[,t]  force hard disk 0 physical geometry and the optional BIOS\n"
   33.28              "                translation (t=none or lba) (usually qemu can guess them)\n"
   33.29 -@@ -4803,6 +4805,8 @@ enum {
   33.30 +@@ -4804,6 +4806,8 @@
   33.31       QEMU_OPTION_usbdevice,
   33.32       QEMU_OPTION_smp,
   33.33       QEMU_OPTION_vnc,
   33.34 @@ -26,7 +27,7 @@ diff -r 03705e837ce8 vl.c
   33.35   };
   33.36   
   33.37   typedef struct QEMUOption {
   33.38 -@@ -4878,6 +4882,8 @@ const QEMUOption qemu_options[] = {
   33.39 +@@ -4879,6 +4883,8 @@
   33.40       /* temporary options */
   33.41       { "usb", 0, QEMU_OPTION_usb },
   33.42       { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
   33.43 @@ -35,7 +36,7 @@ diff -r 03705e837ce8 vl.c
   33.44       { NULL },
   33.45   };
   33.46   
   33.47 -@@ -5491,6 +5497,10 @@ int main(int argc, char **argv)
   33.48 +@@ -5492,6 +5498,10 @@
   33.49               case QEMU_OPTION_domainname:
   33.50                   strncat(domain_name, optarg, sizeof(domain_name) - 20);
   33.51                   break;

    34.1 --- a/tools/ioemu/patches/xen-mm	Thu Jul 27 17:44:14 2006 -0500
    34.2 +++ b/tools/ioemu/patches/xen-mm	Fri Jul 28 10:51:38 2006 +0100
    34.3 @@ -1,7 +1,7 @@
    34.4  Index: ioemu/hw/pc.c
    34.5  ===================================================================
    34.6 ---- ioemu.orig/hw/pc.c	2006-07-14 15:55:59.489503600 +0100
    34.7 -+++ ioemu/hw/pc.c	2006-07-14 15:56:00.354405169 +0100
    34.8 +--- ioemu.orig/hw/pc.c	2006-07-27 11:16:57.678475515 +0100
    34.9 ++++ ioemu/hw/pc.c	2006-07-27 11:16:58.447390396 +0100
   34.10  @@ -639,7 +639,9 @@
   34.11       }
   34.12   
   34.13 @@ -25,8 +25,8 @@ Index: ioemu/hw/pc.c
   34.14       isa_bios_size = bios_size;
   34.15  Index: ioemu/vl.c
   34.16  ===================================================================
   34.17 ---- ioemu.orig/vl.c	2006-07-14 15:56:00.271414614 +0100
   34.18 -+++ ioemu/vl.c	2006-07-14 15:56:00.358404714 +0100
   34.19 +--- ioemu.orig/vl.c	2006-07-27 11:16:58.296407110 +0100
   34.20 ++++ ioemu/vl.c	2006-07-27 11:16:58.450390064 +0100
   34.21  @@ -159,6 +159,8 @@
   34.22   #define MAX_CPUS 1
   34.23   #endif
   34.24 @@ -36,7 +36,7 @@ Index: ioemu/vl.c
   34.25   char domain_name[1024] = { 'H','V', 'M', 'X', 'E', 'N', '-'};
   34.26   extern int domid;
   34.27   
   34.28 -@@ -5105,6 +5107,9 @@
   34.29 +@@ -5106,6 +5108,9 @@
   34.30       QEMUMachine *machine;
   34.31       char usb_devices[MAX_VM_USB_PORTS][128];
   34.32       int usb_devices_index;
   34.33 @@ -46,7 +46,7 @@ Index: ioemu/vl.c
   34.34   
   34.35       char qemu_dm_logfilename[64];
   34.36   
   34.37 -@@ -5341,11 +5346,13 @@
   34.38 +@@ -5342,11 +5347,13 @@
   34.39                   ram_size = atol(optarg) * 1024 * 1024;
   34.40                   if (ram_size <= 0)
   34.41                       help();
   34.42 @@ -60,7 +60,7 @@ Index: ioemu/vl.c
   34.43                   break;
   34.44               case QEMU_OPTION_l:
   34.45                   {
   34.46 -@@ -5559,6 +5566,39 @@
   34.47 +@@ -5560,6 +5567,39 @@
   34.48       /* init the memory */
   34.49       phys_ram_size = ram_size + vga_ram_size + bios_size;
   34.50   
   34.51 @@ -100,7 +100,7 @@ Index: ioemu/vl.c
   34.52   #ifdef CONFIG_SOFTMMU
   34.53       phys_ram_base = qemu_vmalloc(phys_ram_size);
   34.54       if (!phys_ram_base) {
   34.55 -@@ -5599,6 +5639,8 @@
   34.56 +@@ -5600,6 +5640,8 @@
   34.57       }
   34.58   #endif
   34.59   

    35.1 --- a/tools/ioemu/patches/xen-network	Thu Jul 27 17:44:14 2006 -0500
    35.2 +++ b/tools/ioemu/patches/xen-network	Fri Jul 28 10:51:38 2006 +0100
    35.3 @@ -1,7 +1,7 @@
    35.4  Index: ioemu/vl.c
    35.5  ===================================================================
    35.6 ---- ioemu.orig/vl.c	2006-07-12 11:35:01.753697055 +0100
    35.7 -+++ ioemu/vl.c	2006-07-12 11:35:02.126650330 +0100
    35.8 +--- ioemu.orig/vl.c	2006-07-27 11:16:58.823348777 +0100
    35.9 ++++ ioemu/vl.c	2006-07-27 11:16:59.169310479 +0100
   35.10  @@ -89,6 +89,7 @@
   35.11   #include "exec-all.h"
   35.12   
   35.13 @@ -40,7 +40,7 @@ Index: ioemu/vl.c
   35.14           int fd;
   35.15           if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
   35.16               fd = strtol(buf, NULL, 0);
   35.17 -@@ -3212,7 +3215,10 @@
   35.18 +@@ -3213,7 +3216,10 @@
   35.19               if (get_param_value(setup_script, sizeof(setup_script), "script", p) == 0) {
   35.20                   pstrcpy(setup_script, sizeof(setup_script), DEFAULT_NETWORK_SCRIPT);
   35.21               }
   35.22 @@ -52,7 +52,7 @@ Index: ioemu/vl.c
   35.23           }
   35.24       } else
   35.25   #endif
   35.26 -@@ -4671,7 +4677,7 @@
   35.27 +@@ -4672,7 +4678,7 @@
   35.28              "-net tap[,vlan=n],ifname=name\n"
   35.29              "                connect the host TAP network interface to VLAN 'n'\n"
   35.30   #else

    36.1 --- a/tools/ioemu/target-i386-dm/exec-dm.c	Thu Jul 27 17:44:14 2006 -0500
    36.2 +++ b/tools/ioemu/target-i386-dm/exec-dm.c	Fri Jul 28 10:51:38 2006 +0100
    36.3 @@ -64,6 +64,7 @@ uint8_t *code_gen_ptr;
    36.4  #endif /* !CONFIG_DM */
    36.5  
    36.6  uint64_t phys_ram_size;
    36.7 +extern uint64_t ram_size;
    36.8  int phys_ram_fd;
    36.9  uint8_t *phys_ram_base;
   36.10  uint8_t *phys_ram_dirty;
   36.11 @@ -422,7 +423,7 @@ void cpu_physical_memory_rw(target_phys_
   36.12              l = len;
   36.13  	
   36.14          pd = page;
   36.15 -        io_index = iomem_index(page);
   36.16 +        io_index = iomem_index(addr);
   36.17          if (is_write) {
   36.18              if (io_index) {
   36.19                  if (l >= 4 && ((addr & 3) == 0)) {
   36.20 @@ -467,7 +468,7 @@ void cpu_physical_memory_rw(target_phys_
   36.21                      stb_raw(buf, val);
   36.22                      l = 1;
   36.23                  }
   36.24 -            } else {
   36.25 +            } else if (addr < ram_size) {
   36.26                  /* RAM case */
   36.27                  ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + 
   36.28                      (addr & ~TARGET_PAGE_MASK);
   36.29 @@ -475,6 +476,9 @@ void cpu_physical_memory_rw(target_phys_
   36.30  #ifdef __ia64__
   36.31                  sync_icache((unsigned long)ptr, l);
   36.32  #endif 
   36.33 +            } else {
   36.34 +                /* unreported MMIO space */
   36.35 +                memset(buf, 0xff, len);
   36.36              }
   36.37          }
   36.38          len -= l;

    37.1 --- a/tools/ioemu/vl.c	Thu Jul 27 17:44:14 2006 -0500
    37.2 +++ b/tools/ioemu/vl.c	Fri Jul 28 10:51:38 2006 +0100
    37.3 @@ -3284,6 +3284,7 @@ int net_client_init(const char *str)
    37.4              if (net_tap_fd_init(vlan, fd))
    37.5                  ret = 0;
    37.6          } else {
    37.7 +            ifname[0] = '\0';
    37.8              get_param_value(ifname, sizeof(ifname), "ifname", p);
    37.9              if (get_param_value(setup_script, sizeof(setup_script), "script", p) == 0) {
   37.10                  pstrcpy(setup_script, sizeof(setup_script), DEFAULT_NETWORK_SCRIPT);

    38.1 --- a/tools/libxc/Makefile	Thu Jul 27 17:44:14 2006 -0500
    38.2 +++ b/tools/libxc/Makefile	Fri Jul 28 10:51:38 2006 +0100
    38.3 @@ -31,10 +31,13 @@ GUEST_SRCS-y += xc_load_elf.c
    38.4  GUEST_SRCS-y += xg_private.c
    38.5  GUEST_SRCS-$(CONFIG_POWERPC) += xc_ppc_linux_build.c
    38.6  GUEST_SRCS-$(CONFIG_X86) += xc_linux_build.c
    38.7 -GUEST_SRCS-$(CONFIG_IA64) += xc_ia64_stubs.c xc_linux_build.c
    38.8 +GUEST_SRCS-$(CONFIG_IA64) += xc_linux_build.c
    38.9  GUEST_SRCS-$(CONFIG_MIGRATE) += xc_linux_restore.c xc_linux_save.c
   38.10  GUEST_SRCS-$(CONFIG_HVM) += xc_hvm_build.c
   38.11  
   38.12 +# This Makefile only adds files if CONFIG_IA64 is y.
   38.13 +include ia64/Makefile
   38.14 +
   38.15  CFLAGS   += -Werror
   38.16  CFLAGS   += -fno-strict-aliasing
   38.17  CFLAGS   += $(INCLUDES) -I.
   38.18 @@ -99,6 +102,7 @@ TAGS:
   38.19  .PHONY: clean
   38.20  clean:
   38.21  	rm -rf *.a *.so* *.o *.opic *.rpm $(LIB) *~ $(DEPS) xen
   38.22 +	rm -rf ia64/*.o ia64/*.opic
   38.23  
   38.24  .PHONY: rpm
   38.25  rpm: build

    39.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.2 +++ b/tools/libxc/ia64/Makefile	Fri Jul 28 10:51:38 2006 +0100
    39.3 @@ -0,0 +1,5 @@
    39.4 +CTRL_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_stubs.c
    39.5 +
    39.6 +GUEST_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_hvm_build.c
    39.7 +GUEST_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_linux_save.c
    39.8 +GUEST_SRCS-$(CONFIG_IA64) += ia64/xc_ia64_linux_restore.c

    40.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.2 +++ b/tools/libxc/ia64/xc_ia64_hvm_build.c	Fri Jul 28 10:51:38 2006 +0100
    40.3 @@ -0,0 +1,673 @@
    40.4 +#include "xg_private.h"
    40.5 +#include "xenguest.h"
    40.6 +#include "xc_private.h"
    40.7 +#include "xc_elf.h"
    40.8 +#include <stdlib.h>
    40.9 +#include <zlib.h>
   40.10 +#include "xen/arch-ia64.h"
   40.11 +#include <xen/hvm/ioreq.h>
   40.12 +
   40.13 +static int
   40.14 +xc_ia64_copy_to_domain_pages(int xc_handle, uint32_t domid, void* src_page,
   40.15 +                             unsigned long dst_pfn, int nr_pages)
   40.16 +{
   40.17 +    // N.B. gva should be page aligned
   40.18 +
   40.19 +    xen_pfn_t *page_array = NULL;
   40.20 +    int i;
   40.21 +
   40.22 +    page_array = malloc(nr_pages * sizeof(xen_pfn_t));
   40.23 +    if (page_array == NULL) {
   40.24 +        PERROR("Could not allocate memory");
   40.25 +        goto error_out;
   40.26 +    }
   40.27 +    if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
   40.28 +                             dst_pfn, nr_pages) != nr_pages) {
   40.29 +        PERROR("Could not get the page frame list");
   40.30 +        goto error_out;
   40.31 +    }
   40.32 +
   40.33 +    for (i = 0; i < nr_pages; i++) {
   40.34 +        if (xc_copy_to_domain_page(xc_handle, domid, page_array[i],
   40.35 +                                   src_page + (i << PAGE_SHIFT)))
   40.36 +            goto error_out;
   40.37 +    }
   40.38 +    free(page_array);
   40.39 +    return 0;
   40.40 +
   40.41 +error_out:
   40.42 +    free(page_array);
   40.43 +    return -1;
   40.44 +}
   40.45 +
   40.46 +
   40.47 +#define HOB_SIGNATURE         0x3436474953424f48        // "HOBSIG64"
   40.48 +#define GFW_HOB_START         ((4UL<<30)-(14UL<<20))    // 4G - 14M
   40.49 +#define GFW_HOB_SIZE          (1UL<<20)                 // 1M
   40.50 +
   40.51 +typedef struct {
   40.52 +    unsigned long signature;
   40.53 +    unsigned int  type;
   40.54 +    unsigned int  length;
   40.55 +} HOB_GENERIC_HEADER;
   40.56 +
   40.57 +/*
   40.58 + * INFO HOB is the first data data in one HOB list
   40.59 + * it contains the control information of the HOB list
   40.60 + */
   40.61 +typedef struct {
   40.62 +    HOB_GENERIC_HEADER  header;
   40.63 +    unsigned long       length;    // current length of hob
   40.64 +    unsigned long       cur_pos;   // current poisiton of hob
   40.65 +    unsigned long       buf_size;  // size of hob buffer
   40.66 +} HOB_INFO;
   40.67 +
   40.68 +typedef struct{
   40.69 +    unsigned long start;
   40.70 +    unsigned long size;
   40.71 +} hob_mem_t;
   40.72 +
   40.73 +typedef enum {
   40.74 +    HOB_TYPE_INFO=0,
   40.75 +    HOB_TYPE_TERMINAL,
   40.76 +    HOB_TYPE_MEM,
   40.77 +    HOB_TYPE_PAL_BUS_GET_FEATURES_DATA,
   40.78 +    HOB_TYPE_PAL_CACHE_SUMMARY,
   40.79 +    HOB_TYPE_PAL_MEM_ATTRIB,
   40.80 +    HOB_TYPE_PAL_CACHE_INFO,
   40.81 +    HOB_TYPE_PAL_CACHE_PROT_INFO,
   40.82 +    HOB_TYPE_PAL_DEBUG_INFO,
   40.83 +    HOB_TYPE_PAL_FIXED_ADDR,
   40.84 +    HOB_TYPE_PAL_FREQ_BASE,
   40.85 +    HOB_TYPE_PAL_FREQ_RATIOS,
   40.86 +    HOB_TYPE_PAL_HALT_INFO,
   40.87 +    HOB_TYPE_PAL_PERF_MON_INFO,
   40.88 +    HOB_TYPE_PAL_PROC_GET_FEATURES,
   40.89 +    HOB_TYPE_PAL_PTCE_INFO,
   40.90 +    HOB_TYPE_PAL_REGISTER_INFO,
   40.91 +    HOB_TYPE_PAL_RSE_INFO,
   40.92 +    HOB_TYPE_PAL_TEST_INFO,
   40.93 +    HOB_TYPE_PAL_VM_SUMMARY,
   40.94 +    HOB_TYPE_PAL_VM_INFO,
   40.95 +    HOB_TYPE_PAL_VM_PAGE_SIZE,
   40.96 +    HOB_TYPE_NR_VCPU,
   40.97 +    HOB_TYPE_MAX
   40.98 +} hob_type_t;
   40.99 +
  40.100 +static int hob_init(void  *buffer ,unsigned long buf_size);
  40.101 +static int add_pal_hob(void* hob_buf);
  40.102 +static int add_mem_hob(void* hob_buf, unsigned long dom_mem_size);
  40.103 +static int add_vcpus_hob(void* hob_buf, unsigned long nr_vcpu);
  40.104 +static int build_hob(void* hob_buf, unsigned long hob_buf_size,
  40.105 +                     unsigned long dom_mem_size, unsigned long vcpus);
  40.106 +static int load_hob(int xc_handle,uint32_t dom, void *hob_buf,
  40.107 +                    unsigned long dom_mem_size);
  40.108 +
  40.109 +static int
  40.110 +xc_ia64_build_hob(int xc_handle, uint32_t dom,
  40.111 +                  unsigned long memsize, unsigned long vcpus)
  40.112 +{
  40.113 +    char   *hob_buf;
  40.114 +
  40.115 +    hob_buf = malloc(GFW_HOB_SIZE);
  40.116 +    if (hob_buf == NULL) {
  40.117 +        PERROR("Could not allocate hob");
  40.118 +        return -1;
  40.119 +    }
  40.120 +
  40.121 +    if (build_hob(hob_buf, GFW_HOB_SIZE, memsize, vcpus) < 0) {
  40.122 +        free(hob_buf);
  40.123 +        PERROR("Could not build hob");
  40.124 +        return -1;
  40.125 +    }
  40.126 +
  40.127 +    if (load_hob(xc_handle, dom, hob_buf, memsize) < 0) {
  40.128 +        free(hob_buf);
  40.129 +        PERROR("Could not load hob");
  40.130 +        return -1;
  40.131 +    }
  40.132 +    free(hob_buf);
  40.133 +    return 0;
  40.134 +
  40.135 +}
  40.136 +
  40.137 +static int
  40.138 +hob_init(void *buffer, unsigned long buf_size)
  40.139 +{
  40.140 +    HOB_INFO *phit;
  40.141 +    HOB_GENERIC_HEADER *terminal;
  40.142 +
  40.143 +    if (sizeof(HOB_INFO) + sizeof(HOB_GENERIC_HEADER) > buf_size) {
  40.144 +        // buffer too small
  40.145 +        return -1;
  40.146 +    }
  40.147 +
  40.148 +    phit = (HOB_INFO*)buffer;
  40.149 +    phit->header.signature = HOB_SIGNATURE;
  40.150 +    phit->header.type = HOB_TYPE_INFO;
  40.151 +    phit->header.length = sizeof(HOB_INFO);
  40.152 +    phit->length = sizeof(HOB_INFO) + sizeof(HOB_GENERIC_HEADER);
  40.153 +    phit->cur_pos = 0;
  40.154 +    phit->buf_size = buf_size;
  40.155 +
  40.156 +    terminal = (HOB_GENERIC_HEADER*)(buffer + sizeof(HOB_INFO));
  40.157 +    terminal->signature = HOB_SIGNATURE;
  40.158 +    terminal->type = HOB_TYPE_TERMINAL;
  40.159 +    terminal->length = sizeof(HOB_GENERIC_HEADER);
  40.160 +
  40.161 +    return 0;
  40.162 +}
  40.163 +
  40.164 +/*
  40.165 + *  Add a new HOB to the HOB List.
  40.166 + *
  40.167 + *  hob_start  -  start address of hob buffer
  40.168 + *  type       -  type of the hob to be added
  40.169 + *  data       -  data of the hob to be added
  40.170 + *  data_size  -  size of the data
  40.171 + */
  40.172 +static int
  40.173 +hob_add(void* hob_start, int type, void* data, int data_size)
  40.174 +{
  40.175 +    HOB_INFO *phit;
  40.176 +    HOB_GENERIC_HEADER *newhob, *tail;
  40.177 +
  40.178 +    phit = (HOB_INFO*)hob_start;
  40.179 +
  40.180 +    if (phit->length + data_size > phit->buf_size) {
  40.181 +        // no space for new hob
  40.182 +        return -1;
  40.183 +    }
  40.184 +
  40.185 +    //append new HOB
  40.186 +    newhob = (HOB_GENERIC_HEADER*)(hob_start + phit->length -
  40.187 +                                   sizeof(HOB_GENERIC_HEADER));
  40.188 +    newhob->signature = HOB_SIGNATURE;
  40.189 +    newhob->type = type;
  40.190 +    newhob->length = data_size + sizeof(HOB_GENERIC_HEADER);
  40.191 +    memcpy((void*)newhob + sizeof(HOB_GENERIC_HEADER), data, data_size);
  40.192 +
  40.193 +    // append terminal HOB
  40.194 +    tail = (HOB_GENERIC_HEADER*)(hob_start + phit->length + data_size);
  40.195 +    tail->signature = HOB_SIGNATURE;
  40.196 +    tail->type = HOB_TYPE_TERMINAL;
  40.197 +    tail->length = sizeof(HOB_GENERIC_HEADER);
  40.198 +
  40.199 +    // adjust HOB list length
  40.200 +    phit->length += sizeof(HOB_GENERIC_HEADER) + data_size;
  40.201 +
  40.202 +    return 0;
  40.203 +}
  40.204 +
  40.205 +static int
  40.206 +get_hob_size(void* hob_buf)
  40.207 +{
  40.208 +    HOB_INFO *phit = (HOB_INFO*)hob_buf;
  40.209 +
  40.210 +    if (phit->header.signature != HOB_SIGNATURE) {
  40.211 +        PERROR("xc_get_hob_size:Incorrect signature");
  40.212 +        return -1;
  40.213 +    }
  40.214 +    return phit->length;
  40.215 +}
  40.216 +
  40.217 +static int
  40.218 +build_hob(void* hob_buf, unsigned long hob_buf_size,
  40.219 +          unsigned long dom_mem_size, unsigned long vcpus)
  40.220 +{
  40.221 +    //Init HOB List
  40.222 +    if (hob_init(hob_buf, hob_buf_size) < 0) {
  40.223 +        PERROR("buffer too small");
  40.224 +        goto err_out;
  40.225 +    }
  40.226 +
  40.227 +    if (add_mem_hob(hob_buf,dom_mem_size) < 0) {
  40.228 +        PERROR("Add memory hob failed, buffer too small");
  40.229 +        goto err_out;
  40.230 +    }
  40.231 +
  40.232 +    if (add_vcpus_hob(hob_buf, vcpus) < 0) {
  40.233 +        PERROR("Add NR_VCPU hob failed, buffer too small");
  40.234 +        goto err_out;
  40.235 +    }
  40.236 +
  40.237 +    if (add_pal_hob( hob_buf ) < 0) {
  40.238 +        PERROR("Add PAL hob failed, buffer too small");
  40.239 +        goto err_out;
  40.240 +    }
  40.241 +
  40.242 +    return 0;
  40.243 +
  40.244 +err_out:
  40.245 +    return -1;
  40.246 +}
  40.247 +
  40.248 +static int
  40.249 +load_hob(int xc_handle, uint32_t dom, void *hob_buf,
  40.250 +         unsigned long dom_mem_size)
  40.251 +{
  40.252 +    // hob_buf should be page aligned
  40.253 +    int hob_size;
  40.254 +    int nr_pages;
  40.255 +
  40.256 +    hob_size = get_hob_size(hob_buf);
  40.257 +    if (hob_size < 0) {
  40.258 +        PERROR("Invalid hob data");
  40.259 +        return -1;
  40.260 +    }
  40.261 +
  40.262 +    if (hob_size > GFW_HOB_SIZE) {
  40.263 +        PERROR("No enough memory for hob data");
  40.264 +        return -1;
  40.265 +    }
  40.266 +
  40.267 +    nr_pages = (hob_size + PAGE_SIZE -1) >> PAGE_SHIFT;
  40.268 +
  40.269 +    return xc_ia64_copy_to_domain_pages(xc_handle, dom, hob_buf,
  40.270 +                                        GFW_HOB_START >> PAGE_SHIFT, nr_pages);
  40.271 +}
  40.272 +
  40.273 +#define MIN(x, y) ((x) < (y)) ? (x) : (y)
  40.274 +static int
  40.275 +add_mem_hob(void* hob_buf, unsigned long dom_mem_size)
  40.276 +{
  40.277 +    hob_mem_t memhob;
  40.278 +
  40.279 +    // less than 3G
  40.280 +    memhob.start = 0;
  40.281 +    memhob.size = MIN(dom_mem_size, 0xC0000000);
  40.282 +
  40.283 +    if (hob_add(hob_buf, HOB_TYPE_MEM, &memhob, sizeof(memhob)) < 0)
  40.284 +        return -1;
  40.285 +
  40.286 +    if (dom_mem_size > 0xC0000000) {
  40.287 +        // 4G ~ 4G+remain
  40.288 +        memhob.start = 0x100000000; //4G
  40.289 +        memhob.size = dom_mem_size - 0xC0000000;
  40.290 +        if (hob_add(hob_buf, HOB_TYPE_MEM, &memhob, sizeof(memhob)) < 0)
  40.291 +            return -1;
  40.292 +    }
  40.293 +    return 0;
  40.294 +}
  40.295 +
  40.296 +static int 
  40.297 +add_vcpus_hob(void* hob_buf, unsigned long vcpus)
  40.298 +{
  40.299 +    return hob_add(hob_buf, HOB_TYPE_NR_VCPU, &vcpus, sizeof(vcpus));
  40.300 +}
  40.301 +
  40.302 +static const unsigned char config_pal_bus_get_features_data[24] = {
  40.303 +    0, 0, 0, 32, 0, 0, 240, 189, 0, 0, 0, 0, 0, 0,
  40.304 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0
  40.305 +};
  40.306 +
  40.307 +static const unsigned char config_pal_cache_summary[16] = {
  40.308 +    3, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0
  40.309 +};
  40.310 +
  40.311 +static const unsigned char config_pal_mem_attrib[8] = {
  40.312 +    241, 0, 0, 0, 0, 0, 0, 0
  40.313 +};
  40.314 +
  40.315 +static const unsigned char config_pal_cache_info[152] = {
  40.316 +    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.317 +    6, 4, 6, 7, 255, 1, 0, 1, 0, 64, 0, 0, 12, 12,
  40.318 +    49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 6, 7, 0, 1,
  40.319 +    0, 1, 0, 64, 0, 0, 12, 12, 49, 0, 0, 0, 0, 0, 0,
  40.320 +    0, 0, 0, 6, 8, 7, 7, 255, 7, 0, 11, 0, 0, 16, 0,
  40.321 +    12, 17, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 8, 7,
  40.322 +    7, 7, 5, 9, 11, 0, 0, 4, 0, 12, 15, 49, 0, 254, 255,
  40.323 +    255, 255, 255, 255, 255, 255, 2, 8, 7, 7, 7, 5, 9,
  40.324 +    11, 0, 0, 4, 0, 12, 15, 49, 0, 0, 0, 0, 0, 0, 0, 0,
  40.325 +    0, 3, 12, 7, 7, 7, 14, 1, 3, 0, 0, 192, 0, 12, 20, 49, 0
  40.326 +};
  40.327 +
  40.328 +static const unsigned char config_pal_cache_prot_info[200] = {
  40.329 +    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.330 +    45, 0, 16, 8, 0, 76, 12, 64, 0, 0, 0, 0, 0, 0, 0,
  40.331 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.332 +    8, 0, 16, 4, 0, 76, 44, 68, 0, 0, 0, 0, 0, 0, 0, 0,
  40.333 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32,
  40.334 +    0, 16, 8, 0, 81, 44, 72, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.335 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 0,
  40.336 +    112, 12, 0, 79, 124, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.337 +    0, 0, 0, 0, 0, 0, 254, 255, 255, 255, 255, 255, 255, 255,
  40.338 +    32, 0, 112, 12, 0, 79, 124, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.339 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 0, 160,
  40.340 +    12, 0, 84, 124, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.341 +    0, 0, 0
  40.342 +};
  40.343 +
  40.344 +static const unsigned char config_pal_debug_info[16] = {
  40.345 +    2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0
  40.346 +};
  40.347 +
  40.348 +static const unsigned char config_pal_fixed_addr[8] = {
  40.349 +    0, 0, 0, 0, 0, 0, 0, 0
  40.350 +};
  40.351 +
  40.352 +static const unsigned char config_pal_freq_base[8] = {
  40.353 +    109, 219, 182, 13, 0, 0, 0, 0
  40.354 +};
  40.355 +
  40.356 +static const unsigned char config_pal_freq_ratios[24] = {
  40.357 +    11, 1, 0, 0, 77, 7, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 4,
  40.358 +    0, 0, 0, 7, 0, 0, 0
  40.359 +};
  40.360 +
  40.361 +static const unsigned char config_pal_halt_info[64] = {
  40.362 +    0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, 0,
  40.363 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.364 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.365 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
  40.366 +};
  40.367 +
  40.368 +static const unsigned char config_pal_perf_mon_info[136] = {
  40.369 +    12, 47, 18, 8, 0, 0, 0, 0, 241, 255, 0, 0, 255, 7, 0, 0,
  40.370 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.371 +    0, 0, 0, 0, 0, 0, 0, 0, 241, 255, 0, 0, 223, 0, 255, 255,
  40.372 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.373 +    0, 0, 0, 0, 0, 0, 0, 0, 240, 255, 0, 0, 0, 0, 0, 0,
  40.374 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.375 +    0, 0, 0, 0, 0, 0, 0, 0, 240, 255, 0, 0, 0, 0, 0, 0,
  40.376 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.377 +    0, 0, 0, 0, 0, 0, 0, 0
  40.378 +};
  40.379 +
  40.380 +static const unsigned char config_pal_proc_get_features[104] = {
  40.381 +    3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.382 +    0, 0, 0, 0, 64, 6, 64, 49, 0, 0, 0, 0, 64, 6, 0, 0,
  40.383 +    0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0,
  40.384 +    231, 0, 0, 0, 0, 0, 0, 0, 228, 0, 0, 0, 0, 0, 0, 0,
  40.385 +    0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0,
  40.386 +    63, 0, 0, 0, 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, 0, 0,
  40.387 +    0, 0, 0, 0, 0, 0, 0, 0
  40.388 +};
  40.389 +
  40.390 +static const unsigned char config_pal_ptce_info[24] = {
  40.391 +    0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
  40.392 +    0, 0, 0, 0, 0, 0, 0, 0
  40.393 +};
  40.394 +
  40.395 +static const unsigned char config_pal_register_info[64] = {
  40.396 +    255, 0, 47, 127, 17, 17, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,
  40.397 +    255, 208, 128, 238, 238, 0, 0, 248, 255, 255, 255, 255, 255, 0, 0, 7, 3,
  40.398 +    251, 3, 0, 0, 0, 0, 255, 7, 3, 0, 0, 0, 0, 0, 248, 252, 4,
  40.399 +    252, 255, 255, 255, 255, 2, 248, 252, 255, 255, 255, 255, 255
  40.400 +};
  40.401 +
  40.402 +static const unsigned char config_pal_rse_info[16] = {
  40.403 +    96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
  40.404 +};
  40.405 +
  40.406 +static const unsigned char config_pal_test_info[48] = {
  40.407 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.408 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.409 +    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
  40.410 +};
  40.411 +
  40.412 +static const unsigned char config_pal_vm_summary[16] = {
  40.413 +    101, 18, 15, 2, 7, 7, 4, 2, 59, 18, 0, 0, 0, 0, 0, 0
  40.414 +};
  40.415 +
  40.416 +static const unsigned char config_pal_vm_info[104] = {
  40.417 +    2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
  40.418 +    32, 32, 0, 0, 0, 0, 0, 0, 112, 85, 21, 0, 0, 0, 0, 0, 0,
  40.419 +    0, 0, 0, 0, 0, 0, 1, 32, 32, 0, 0, 0, 0, 0, 0, 112, 85,
  40.420 +    21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 128, 128, 0,
  40.421 +    4, 0, 0, 0, 0, 112, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
  40.422 +    0, 0, 0, 1, 128, 128, 0, 4, 0, 0, 0, 0, 112, 85, 0, 0, 0, 0, 0
  40.423 +};
  40.424 +
  40.425 +static const unsigned char config_pal_vm_page_size[16] = {
  40.426 +    0, 112, 85, 21, 0, 0, 0, 0, 0, 112, 85, 21, 0, 0, 0, 0
  40.427 +};
  40.428 +
  40.429 +typedef struct{
  40.430 +    hob_type_t type;
  40.431 +    void* data;
  40.432 +    unsigned long size;
  40.433 +} hob_batch_t;
  40.434 +
  40.435 +static const hob_batch_t hob_batch[]={
  40.436 +    {   HOB_TYPE_PAL_BUS_GET_FEATURES_DATA,
  40.437 +        &config_pal_bus_get_features_data,
  40.438 +        sizeof(config_pal_bus_get_features_data)
  40.439 +    },
  40.440 +    {   HOB_TYPE_PAL_CACHE_SUMMARY,
  40.441 +        &config_pal_cache_summary,
  40.442 +        sizeof(config_pal_cache_summary)
  40.443 +    },
  40.444 +    {   HOB_TYPE_PAL_MEM_ATTRIB,
  40.445 +        &config_pal_mem_attrib,
  40.446 +        sizeof(config_pal_mem_attrib)
  40.447 +    },
  40.448 +    {   HOB_TYPE_PAL_CACHE_INFO,
  40.449 +        &config_pal_cache_info,
  40.450 +        sizeof(config_pal_cache_info)
  40.451 +    },
  40.452 +    {   HOB_TYPE_PAL_CACHE_PROT_INFO,
  40.453 +        &config_pal_cache_prot_info,
  40.454 +        sizeof(config_pal_cache_prot_info)
  40.455 +    },
  40.456 +    {   HOB_TYPE_PAL_DEBUG_INFO,
  40.457 +        &config_pal_debug_info,
  40.458 +        sizeof(config_pal_debug_info)
  40.459 +    },
  40.460 +    {   HOB_TYPE_PAL_FIXED_ADDR,
  40.461 +        &config_pal_fixed_addr,
  40.462 +        sizeof(config_pal_fixed_addr)
  40.463 +    },
  40.464 +    {   HOB_TYPE_PAL_FREQ_BASE,
  40.465 +        &config_pal_freq_base,
  40.466 +        sizeof(config_pal_freq_base)
  40.467 +    },
  40.468 +    {   HOB_TYPE_PAL_FREQ_RATIOS,
  40.469 +        &config_pal_freq_ratios,
  40.470 +        sizeof(config_pal_freq_ratios)
  40.471 +    },
  40.472 +    {   HOB_TYPE_PAL_HALT_INFO,
  40.473 +        &config_pal_halt_info,
  40.474 +        sizeof(config_pal_halt_info)
  40.475 +    },
  40.476 +    {   HOB_TYPE_PAL_PERF_MON_INFO,
  40.477 +        &config_pal_perf_mon_info,
  40.478 +        sizeof(config_pal_perf_mon_info)
  40.479 +    },
  40.480 +    {   HOB_TYPE_PAL_PROC_GET_FEATURES,
  40.481 +        &config_pal_proc_get_features,
  40.482 +        sizeof(config_pal_proc_get_features)
  40.483 +    },
  40.484 +    {   HOB_TYPE_PAL_PTCE_INFO,
  40.485 +        &config_pal_ptce_info,
  40.486 +        sizeof(config_pal_ptce_info)
  40.487 +    },
  40.488 +    {   HOB_TYPE_PAL_REGISTER_INFO,
  40.489 +        &config_pal_register_info,
  40.490 +        sizeof(config_pal_register_info)
  40.491 +    },
  40.492 +    {   HOB_TYPE_PAL_RSE_INFO,
  40.493 +        &config_pal_rse_info,
  40.494 +        sizeof(config_pal_rse_info)
  40.495 +    },
  40.496 +    {   HOB_TYPE_PAL_TEST_INFO,
  40.497 +        &config_pal_test_info,
  40.498 +        sizeof(config_pal_test_info)
  40.499 +    },
  40.500 +    {   HOB_TYPE_PAL_VM_SUMMARY,
  40.501 +        &config_pal_vm_summary,
  40.502 +        sizeof(config_pal_vm_summary)
  40.503 +    },
  40.504 +    {   HOB_TYPE_PAL_VM_INFO,
  40.505 +        &config_pal_vm_info,
  40.506 +        sizeof(config_pal_vm_info)
  40.507 +    },
  40.508 +    {   HOB_TYPE_PAL_VM_PAGE_SIZE,
  40.509 +        &config_pal_vm_page_size,
  40.510 +        sizeof(config_pal_vm_page_size)
  40.511 +    },
  40.512 +};
  40.513 +
  40.514 +static int
  40.515 +add_pal_hob(void* hob_buf)
  40.516 +{
  40.517 +    int i;
  40.518 +    for (i = 0; i < sizeof(hob_batch)/sizeof(hob_batch_t); i++) {
  40.519 +        if (hob_add(hob_buf, hob_batch[i].type, hob_batch[i].data,
  40.520 +                    hob_batch[i].size) < 0)
  40.521 +            return -1;
  40.522 +    }
  40.523 +    return 0;
  40.524 +}
  40.525 +
  40.526 +static int
  40.527 +setup_guest(int xc_handle, uint32_t dom, unsigned long memsize,
  40.528 +            char *image, unsigned long image_size, uint32_t vcpus,
  40.529 +            unsigned int store_evtchn, unsigned long *store_mfn)
  40.530 +{
  40.531 +    unsigned long page_array[2];
  40.532 +    shared_iopage_t *sp;
  40.533 +    int i;
  40.534 +    unsigned long dom_memsize = (memsize << 20);
  40.535 +    DECLARE_DOM0_OP;
  40.536 +
  40.537 +    if ((image_size > 12 * MEM_M) || (image_size & (PAGE_SIZE - 1))) {
  40.538 +        PERROR("Guest firmware size is incorrect [%ld]?", image_size);
  40.539 +        return -1;
  40.540 +    }
  40.541 +
  40.542 +    /* This will creates the physmap.  */
  40.543 +    op.u.domain_setup.flags = XEN_DOMAINSETUP_hvm_guest;
  40.544 +    op.u.domain_setup.domain = (domid_t)dom;
  40.545 +    op.u.domain_setup.bp = 0;
  40.546 +    op.u.domain_setup.maxmem = 0;
  40.547 +    
  40.548 +    op.cmd = DOM0_DOMAIN_SETUP;
  40.549 +    if (xc_dom0_op(xc_handle, &op))
  40.550 +        goto error_out;
  40.551 +
  40.552 +    /* Load guest firmware */
  40.553 +    if (xc_ia64_copy_to_domain_pages(xc_handle, dom, image,
  40.554 +                            (GFW_START + GFW_SIZE - image_size) >> PAGE_SHIFT,
  40.555 +                            image_size >> PAGE_SHIFT)) {
  40.556 +        PERROR("Could not load guest firmware into domain");
  40.557 +        goto error_out;
  40.558 +    }
  40.559 +
  40.560 +    /* Hand-off state passed to guest firmware */
  40.561 +    if (xc_ia64_build_hob(xc_handle, dom, dom_memsize,
  40.562 +                          (unsigned long)vcpus) < 0) {
  40.563 +        PERROR("Could not build hob\n");
  40.564 +        goto error_out;
  40.565 +    }
  40.566 +
  40.567 +    /* Retrieve special pages like io, xenstore, etc. */
  40.568 +    if (xc_ia64_get_pfn_list(xc_handle, dom, page_array,
  40.569 +                             IO_PAGE_START>>PAGE_SHIFT, 2) != 2) {
  40.570 +        PERROR("Could not get the page frame list");
  40.571 +        goto error_out;
  40.572 +    }
  40.573 +
  40.574 +    *store_mfn = page_array[1];
  40.575 +    sp = (shared_iopage_t *)xc_map_foreign_range(xc_handle, dom,
  40.576 +                               PAGE_SIZE, PROT_READ|PROT_WRITE, page_array[0]);
  40.577 +    if (sp == 0)
  40.578 +        goto error_out;
  40.579 +
  40.580 +    memset(sp, 0, PAGE_SIZE);
  40.581 +
  40.582 +    for (i = 0; i < vcpus; i++) {
  40.583 +        uint32_t vp_eport;
  40.584 +
  40.585 +        vp_eport = xc_evtchn_alloc_unbound(xc_handle, dom, 0);
  40.586 +        if (vp_eport < 0) {
  40.587 +            DPRINTF("Couldn't get unbound port from VMX guest.\n");
  40.588 +            goto error_out;
  40.589 +        }
  40.590 +        sp->vcpu_iodata[i].vp_eport = vp_eport;
  40.591 +    }
  40.592 +
  40.593 +    munmap(sp, PAGE_SIZE);
  40.594 +
  40.595 +    return 0;
  40.596 +
  40.597 +error_out:
  40.598 +    return -1;
  40.599 +}
  40.600 +
  40.601 +int
  40.602 +xc_hvm_build(int xc_handle, uint32_t domid, int memsize,
  40.603 +             const char *image_name, unsigned int vcpus, unsigned int pae,
  40.604 +             unsigned int acpi, unsigned int apic, unsigned int store_evtchn,
  40.605 +             unsigned long *store_mfn)
  40.606 +{
  40.607 +    dom0_op_t launch_op, op;
  40.608 +    int rc;
  40.609 +    vcpu_guest_context_t st_ctxt, *ctxt = &st_ctxt;
  40.610 +    char *image = NULL;
  40.611 +    unsigned long image_size;
  40.612 +    unsigned long nr_pages;
  40.613 +
  40.614 +    nr_pages = xc_get_max_pages(xc_handle, domid);
  40.615 +    if (nr_pages < 0) {
  40.616 +        PERROR("Could not find total pages for domain");
  40.617 +        goto error_out;
  40.618 +    }
  40.619 +
  40.620 +    image = xc_read_image(image_name, &image_size);
  40.621 +    if (image == NULL) {
  40.622 +        PERROR("Could not read guest firmware image %s", image_name);
  40.623 +        goto error_out;
  40.624 +    }
  40.625 +
  40.626 +    image_size = (image_size + PAGE_SIZE - 1) & PAGE_MASK;
  40.627 +
  40.628 +    if (mlock(&st_ctxt, sizeof(st_ctxt))) {
  40.629 +        PERROR("Unable to mlock ctxt");
  40.630 +        return 1;
  40.631 +    }
  40.632 +
  40.633 +    op.cmd = DOM0_GETDOMAININFO;
  40.634 +    op.u.getdomaininfo.domain = (domid_t)domid;
  40.635 +    if (do_dom0_op(xc_handle, &op) < 0 ||
  40.636 +        (uint16_t)op.u.getdomaininfo.domain != domid) {
  40.637 +        PERROR("Could not get info on domain");
  40.638 +        goto error_out;
  40.639 +    }
  40.640 +
  40.641 +    memset(ctxt, 0, sizeof(*ctxt));
  40.642 +
  40.643 +    if (setup_guest(xc_handle, domid, (unsigned long)memsize, image,
  40.644 +                    image_size, vcpus, store_evtchn, store_mfn) < 0) {
  40.645 +        ERROR("Error constructing guest OS");
  40.646 +        goto error_out;
  40.647 +    }
  40.648 +
  40.649 +    free(image);
  40.650 +
  40.651 +    ctxt->user_regs.cr_iip = 0x80000000ffffffb0UL;
  40.652 +
  40.653 +    memset(&launch_op, 0, sizeof(launch_op));
  40.654 +
  40.655 +    launch_op.u.setvcpucontext.domain = (domid_t)domid;
  40.656 +    launch_op.u.setvcpucontext.vcpu = 0;
  40.657 +    set_xen_guest_handle(launch_op.u.setvcpucontext.ctxt, ctxt);
  40.658 +
  40.659 +    launch_op.cmd = DOM0_SETVCPUCONTEXT;
  40.660 +    rc = do_dom0_op(xc_handle, &launch_op);
  40.661 +    return rc;
  40.662 +
  40.663 +error_out:
  40.664 +    free(image);
  40.665 +    return -1;
  40.666 +}
  40.667 +
  40.668 +/*
  40.669 + * Local variables:
  40.670 + * mode: C
  40.671 + * c-set-style: "BSD"
  40.672 + * c-basic-offset: 4
  40.673 + * tab-width: 4
  40.674 + * indent-tabs-mode: nil
  40.675 + * End:
  40.676 + */

    41.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    41.2 +++ b/tools/libxc/ia64/xc_ia64_linux_restore.c	Fri Jul 28 10:51:38 2006 +0100
    41.3 @@ -0,0 +1,320 @@
    41.4 +/******************************************************************************
    41.5 + * xc_ia64_linux_restore.c
    41.6 + *
    41.7 + * Restore the state of a Linux session.
    41.8 + *
    41.9 + * Copyright (c) 2003, K A Fraser.
   41.10 + *  Rewritten for ia64 by Tristan Gingold <tristan.gingold@bull.net>
   41.11 + */
   41.12 +
   41.13 +#include <stdlib.h>
   41.14 +#include <unistd.h>
   41.15 +
   41.16 +#include "xg_private.h"
   41.17 +
   41.18 +#define PFN_TO_KB(_pfn) ((_pfn) << (PAGE_SHIFT - 10))
   41.19 +
   41.20 +/* total number of pages used by the current guest */
   41.21 +static unsigned long max_pfn;
   41.22 +
   41.23 +static ssize_t
   41.24 +read_exact(int fd, void *buf, size_t count)
   41.25 +{
   41.26 +    int r = 0, s;
   41.27 +    unsigned char *b = buf;
   41.28 +
   41.29 +    while (r < count) {
   41.30 +        s = read(fd, &b[r], count - r);
   41.31 +        if ((s == -1) && (errno == EINTR))
   41.32 +            continue;
   41.33 +        if (s <= 0) {
   41.34 +            break;
   41.35 +        }
   41.36 +        r += s;
   41.37 +    }
   41.38 +
   41.39 +    return (r == count) ? 1 : 0;
   41.40 +}
   41.41 +
   41.42 +static int
   41.43 +read_page(int xc_handle, int io_fd, uint32_t dom, unsigned long pfn)
   41.44 +{
   41.45 +    void *mem;
   41.46 +
   41.47 +    mem = xc_map_foreign_range(xc_handle, dom, PAGE_SIZE,
   41.48 +                               PROT_READ|PROT_WRITE, pfn);
   41.49 +    if (mem == NULL) {
   41.50 +            ERR("cannot map page");
   41.51 +	    return -1;
   41.52 +    }
   41.53 +    if (!read_exact(io_fd, mem, PAGE_SIZE)) {
   41.54 +            ERR("Error when reading from state file (5)");
   41.55 +            return -1;
   41.56 +    }
   41.57 +    munmap(mem, PAGE_SIZE);
   41.58 +    return 0;
   41.59 +}
   41.60 +
   41.61 +int
   41.62 +xc_linux_restore(int xc_handle, int io_fd, uint32_t dom,
   41.63 +                 unsigned long nr_pfns, unsigned int store_evtchn,
   41.64 +                 unsigned long *store_mfn, unsigned int console_evtchn,
   41.65 +                 unsigned long *console_mfn)
   41.66 +{
   41.67 +    DECLARE_DOM0_OP;
   41.68 +    int rc = 1, i;
   41.69 +    unsigned long mfn, pfn;
   41.70 +    unsigned long ver;
   41.71 +
   41.72 +    /* The new domain's shared-info frame number. */
   41.73 +    unsigned long shared_info_frame;
   41.74 +    unsigned char shared_info_page[PAGE_SIZE]; /* saved contents from file */
   41.75 +    shared_info_t *shared_info = (shared_info_t *)shared_info_page;
   41.76 +
   41.77 +    /* A copy of the CPU context of the guest. */
   41.78 +    vcpu_guest_context_t ctxt;
   41.79 +
   41.80 +    unsigned long *page_array = NULL;
   41.81 +
   41.82 +    /* A temporary mapping of the guest's start_info page. */
   41.83 +    start_info_t *start_info;
   41.84 +
   41.85 +    max_pfn = nr_pfns;
   41.86 +
   41.87 +    DPRINTF("xc_linux_restore start: max_pfn = %ld\n", max_pfn);
   41.88 +
   41.89 +
   41.90 +    if (!read_exact(io_fd, &ver, sizeof(unsigned long))) {
   41.91 +	ERR("Error when reading version");
   41.92 +	goto out;
   41.93 +    }
   41.94 +    if (ver != 1) {
   41.95 +	ERR("version of save doesn't match");
   41.96 +	goto out;
   41.97 +    }
   41.98 +
   41.99 +    if (mlock(&ctxt, sizeof(ctxt))) {
  41.100 +        /* needed for build dom0 op, but might as well do early */
  41.101 +        ERR("Unable to mlock ctxt");
  41.102 +        return 1;
  41.103 +    }
  41.104 +
  41.105 +    /* Get the domain's shared-info frame. */
  41.106 +    op.cmd = DOM0_GETDOMAININFO;
  41.107 +    op.u.getdomaininfo.domain = (domid_t)dom;
  41.108 +    if (xc_dom0_op(xc_handle, &op) < 0) {
  41.109 +        ERR("Could not get information on new domain");
  41.110 +        goto out;
  41.111 +    }
  41.112 +    shared_info_frame = op.u.getdomaininfo.shared_info_frame;
  41.113 +
  41.114 +    if (xc_domain_setmaxmem(xc_handle, dom, PFN_TO_KB(max_pfn)) != 0) {
  41.115 +        errno = ENOMEM;
  41.116 +        goto out;
  41.117 +    }
  41.118 +
  41.119 +    if (xc_domain_memory_increase_reservation(xc_handle, dom, max_pfn,
  41.120 +                                              0, 0, NULL) != 0) {
  41.121 +        ERR("Failed to increase reservation by %ld KB", PFN_TO_KB(max_pfn));
  41.122 +        errno = ENOMEM;
  41.123 +        goto out;
  41.124 +    }
  41.125 +
  41.126 +    DPRINTF("Increased domain reservation by %ld KB\n", PFN_TO_KB(max_pfn));
  41.127 +
  41.128 +    if (!read_exact(io_fd, &op.u.domain_setup, sizeof(op.u.domain_setup))) {
  41.129 +        ERR("read: domain setup");
  41.130 +        goto out;
  41.131 +    }
  41.132 +
  41.133 +    /* Build firmware (will be overwritten).  */
  41.134 +    op.u.domain_setup.domain = (domid_t)dom;
  41.135 +    op.u.domain_setup.flags &= ~XEN_DOMAINSETUP_query;
  41.136 +    op.u.domain_setup.bp = ((nr_pfns - 3) << PAGE_SHIFT)
  41.137 +                           + sizeof (start_info_t);
  41.138 +    op.u.domain_setup.maxmem = (nr_pfns - 3) << PAGE_SHIFT;
  41.139 +    
  41.140 +    op.cmd = DOM0_DOMAIN_SETUP;
  41.141 +    if (xc_dom0_op(xc_handle, &op))
  41.142 +        goto out;
  41.143 +
  41.144 +    /* Get pages.  */
  41.145 +    page_array = malloc(max_pfn * sizeof(unsigned long));
  41.146 +    if (page_array == NULL ) {
  41.147 +        ERR("Could not allocate memory");
  41.148 +        goto out;
  41.149 +    }
  41.150 +
  41.151 +    if (xc_ia64_get_pfn_list(xc_handle, dom, page_array,
  41.152 +                             0, max_pfn) != max_pfn) {
  41.153 +        ERR("Could not get the page frame list");
  41.154 +        goto out;
  41.155 +    }
  41.156 +
  41.157 +    DPRINTF("Reloading memory pages:   0%%\n");
  41.158 +
  41.159 +    while (1) {
  41.160 +        if (!read_exact(io_fd, &mfn, sizeof(unsigned long))) {
  41.161 +            ERR("Error when reading batch size");
  41.162 +            goto out;
  41.163 +        }
  41.164 +	if (mfn == INVALID_MFN)
  41.165 +		break;
  41.166 +
  41.167 +	pfn = page_array[mfn];
  41.168 +
  41.169 +        //DPRINTF("xc_linux_restore: page %lu/%lu at %lx\n", mfn, max_pfn, pfn);
  41.170 +
  41.171 +	if (read_page(xc_handle, io_fd, dom, page_array[mfn]) < 0)
  41.172 +		goto out;
  41.173 +    }
  41.174 +
  41.175 +    DPRINTF("Received all pages\n");
  41.176 +
  41.177 +    /* Get the list of PFNs that are not in the psuedo-phys map */
  41.178 +    {
  41.179 +        unsigned int count;
  41.180 +        unsigned long *pfntab;
  41.181 +        int rc;
  41.182 +
  41.183 +        if (!read_exact(io_fd, &count, sizeof(count))) {
  41.184 +            ERR("Error when reading pfn count");
  41.185 +            goto out;
  41.186 +        }
  41.187 +
  41.188 +        pfntab = malloc(sizeof(unsigned long) * count);
  41.189 +        if (!pfntab) {
  41.190 +            ERR("Out of memory");
  41.191 +            goto out;
  41.192 +        }
  41.193 +
  41.194 +        if (!read_exact(io_fd, pfntab, sizeof(unsigned long)*count)) {
  41.195 +            ERR("Error when reading pfntab");
  41.196 +            goto out;
  41.197 +        }
  41.198 +
  41.199 +	DPRINTF ("Try to free %u pages\n", count);
  41.200 +
  41.201 +        for (i = 0; i < count; i++) {
  41.202 +
  41.203 +	    volatile unsigned long pfn;
  41.204 +
  41.205 +            struct xen_memory_reservation reservation = {
  41.206 +                .nr_extents   = 1,
  41.207 +                .extent_order = 0,
  41.208 +                .domid        = dom
  41.209 +            };
  41.210 +            set_xen_guest_handle(reservation.extent_start,
  41.211 +				 (unsigned long *)&pfn);
  41.212 +
  41.213 +	    pfn = pfntab[i];
  41.214 +            rc = xc_memory_op(xc_handle, XENMEM_decrease_reservation,
  41.215 +                              &reservation);
  41.216 +            if (rc != 1) {
  41.217 +                ERR("Could not decrease reservation : %d", rc);
  41.218 +                goto out;
  41.219 +            }
  41.220 +        }
  41.221 +
  41.222 +	DPRINTF("Decreased reservation by %d pages\n", count);
  41.223 +    }
  41.224 +
  41.225 +
  41.226 +    if (!read_exact(io_fd, &ctxt, sizeof(ctxt))) {
  41.227 +        ERR("Error when reading ctxt");
  41.228 +        goto out;
  41.229 +    }
  41.230 +
  41.231 +    /* First to initialize.  */
  41.232 +    op.cmd = DOM0_SETVCPUCONTEXT;
  41.233 +    op.u.setvcpucontext.domain = (domid_t)dom;
  41.234 +    op.u.setvcpucontext.vcpu   = 0;
  41.235 +    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
  41.236 +    if (xc_dom0_op(xc_handle, &op) != 0) {
  41.237 +	    ERR("Couldn't set vcpu context");
  41.238 +	    goto out;
  41.239 +    }
  41.240 +
  41.241 +    /* Second to set registers...  */
  41.242 +    ctxt.flags = VGCF_EXTRA_REGS;
  41.243 +    op.cmd = DOM0_SETVCPUCONTEXT;
  41.244 +    op.u.setvcpucontext.domain = (domid_t)dom;
  41.245 +    op.u.setvcpucontext.vcpu   = 0;
  41.246 +    set_xen_guest_handle(op.u.setvcpucontext.ctxt, &ctxt);
  41.247 +    if (xc_dom0_op(xc_handle, &op) != 0) {
  41.248 +	    ERR("Couldn't set vcpu context");
  41.249 +	    goto out;
  41.250 +    }
  41.251 +
  41.252 +    /* Just a check.  */
  41.253 +    if (xc_vcpu_getcontext(xc_handle, dom, 0 /* XXX */, &ctxt)) {
  41.254 +        ERR("Could not get vcpu context");
  41.255 +	goto out;
  41.256 +    }
  41.257 +
  41.258 +    /* Then get privreg page.  */
  41.259 +    if (read_page(xc_handle, io_fd, dom, ctxt.privregs_pfn) < 0) {
  41.260 +	    ERR("Could not read vcpu privregs");
  41.261 +	    goto out;
  41.262 +    }
  41.263 +
  41.264 +    /* Read shared info.  */
  41.265 +    shared_info = xc_map_foreign_range(xc_handle, dom, PAGE_SIZE,
  41.266 +                                       PROT_READ|PROT_WRITE, shared_info_frame);
  41.267 +    if (shared_info == NULL) {
  41.268 +            ERR("cannot map page");
  41.269 +	    goto out;
  41.270 +    }
  41.271 +    if (!read_exact(io_fd, shared_info, PAGE_SIZE)) {
  41.272 +            ERR("Error when reading shared_info page");
  41.273 +	    goto out;
  41.274 +    }
  41.275 +
  41.276 +    /* clear any pending events and the selector */
  41.277 +    memset(&(shared_info->evtchn_pending[0]), 0,
  41.278 +           sizeof (shared_info->evtchn_pending));
  41.279 +    for (i = 0; i < MAX_VIRT_CPUS; i++)
  41.280 +        shared_info->vcpu_info[i].evtchn_pending_sel = 0;
  41.281 +
  41.282 +    mfn = page_array[shared_info->arch.start_info_pfn];
  41.283 +
  41.284 +    munmap (shared_info, PAGE_SIZE);
  41.285 +
  41.286 +    /* Uncanonicalise the suspend-record frame number and poke resume rec. */
  41.287 +    start_info = xc_map_foreign_range(xc_handle, dom, PAGE_SIZE,
  41.288 +                                      PROT_READ | PROT_WRITE, mfn);
  41.289 +    start_info->nr_pages = max_pfn;
  41.290 +    start_info->shared_info = shared_info_frame << PAGE_SHIFT;
  41.291 +    start_info->flags = 0;
  41.292 +    *store_mfn = page_array[start_info->store_mfn];
  41.293 +    start_info->store_evtchn = store_evtchn;
  41.294 +    *console_mfn = page_array[start_info->console_mfn];
  41.295 +    start_info->console_evtchn = console_evtchn;
  41.296 +    munmap(start_info, PAGE_SIZE);
  41.297 +
  41.298 +    /*
  41.299 +     * Safety checking of saved context:
  41.300 +     *  1. user_regs is fine, as Xen checks that on context switch.
  41.301 +     *  2. fpu_ctxt is fine, as it can't hurt Xen.
  41.302 +     *  3. trap_ctxt needs the code selectors checked.
  41.303 +     *  4. ldt base must be page-aligned, no more than 8192 ents, ...
  41.304 +     *  5. gdt already done, and further checking is done by Xen.
  41.305 +     *  6. check that kernel_ss is safe.
  41.306 +     *  7. pt_base is already done.
  41.307 +     *  8. debugregs are checked by Xen.
  41.308 +     *  9. callback code selectors need checking.
  41.309 +     */
  41.310 +    DPRINTF("Domain ready to be built.\n");
  41.311 +
  41.312 +    rc = 0;
  41.313 +
  41.314 + out:
  41.315 +    if ((rc != 0) && (dom != 0))
  41.316 +        xc_domain_destroy(xc_handle, dom);
  41.317 +
  41.318 +    free (page_array);
  41.319 +
  41.320 +    DPRINTF("Restore exit with rc=%d\n", rc);
  41.321 +
  41.322 +    return rc;
  41.323 +}

    42.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.2 +++ b/tools/libxc/ia64/xc_ia64_linux_save.c	Fri Jul 28 10:51:38 2006 +0100
    42.3 @@ -0,0 +1,509 @@
    42.4 +/******************************************************************************
    42.5 + * xc_ia64_linux_save.c
    42.6 + *
    42.7 + * Save the state of a running Linux session.
    42.8 + *
    42.9 + * Copyright (c) 2003, K A Fraser.
   42.10 + *  Rewritten for ia64 by Tristan Gingold <tristan.gingold@bull.net>
   42.11 + */
   42.12 +
   42.13 +#include <inttypes.h>
   42.14 +#include <time.h>
   42.15 +#include <stdlib.h>
   42.16 +#include <unistd.h>
   42.17 +#include <sys/time.h>
   42.18 +
   42.19 +#include "xg_private.h"
   42.20 +
   42.21 +/*
   42.22 +** Default values for important tuning parameters. Can override by passing
   42.23 +** non-zero replacement values to xc_linux_save().
   42.24 +**
   42.25 +** XXX SMH: should consider if want to be able to override MAX_MBIT_RATE too.
   42.26 +**
   42.27 +*/
   42.28 +#define DEF_MAX_ITERS    (4 - 1)	/* limit us to 4 times round loop  */
   42.29 +#define DEF_MAX_FACTOR   3		/* never send more than 3x nr_pfns */
   42.30 +
   42.31 +/*
   42.32 +** During (live) save/migrate, we maintain a number of bitmaps to track
   42.33 +** which pages we have to send, and to skip.
   42.34 +*/
   42.35 +
   42.36 +#define BITS_PER_LONG (sizeof(unsigned long) * 8)
   42.37 +
   42.38 +#define BITMAP_ENTRY(_nr,_bmap) \
   42.39 +   ((unsigned long *)(_bmap))[(_nr)/BITS_PER_LONG]
   42.40 +
   42.41 +#define BITMAP_SHIFT(_nr) ((_nr) % BITS_PER_LONG)
   42.42 +
   42.43 +static inline int test_bit (int nr, volatile void * addr)
   42.44 +{
   42.45 +    return (BITMAP_ENTRY(nr, addr) >> BITMAP_SHIFT(nr)) & 1;
   42.46 +}
   42.47 +
   42.48 +static inline void clear_bit (int nr, volatile void * addr)
   42.49 +{
   42.50 +    BITMAP_ENTRY(nr, addr) &= ~(1UL << BITMAP_SHIFT(nr));
   42.51 +}
   42.52 +
   42.53 +static inline void set_bit ( int nr, volatile void * addr)
   42.54 +{
   42.55 +    BITMAP_ENTRY(nr, addr) |= (1UL << BITMAP_SHIFT(nr));
   42.56 +}
   42.57 +
   42.58 +/* total number of pages used by the current guest */
   42.59 +static unsigned long max_pfn;
   42.60 +
   42.61 +static int xc_ia64_shadow_control(int xc_handle,
   42.62 +                                  uint32_t domid,
   42.63 +                                  unsigned int sop,
   42.64 +                                  unsigned long *dirty_bitmap,
   42.65 +                                  unsigned long pages,
   42.66 +                                  xc_shadow_control_stats_t *stats)
   42.67 +{
   42.68 +    if (dirty_bitmap != NULL && pages > 0) {
   42.69 +        int i;
   42.70 +        unsigned char *bmap = (unsigned char *)dirty_bitmap;
   42.71 +        unsigned long bmap_bytes =
   42.72 +            ((pages + BITS_PER_LONG - 1) & ~(BITS_PER_LONG - 1)) / 8;
   42.73 +        unsigned int bmap_pages = (bmap_bytes + PAGE_SIZE - 1) / PAGE_SIZE; 
   42.74 +
   42.75 +        /* Touch the page so that it is in the TC.
   42.76 +           FIXME: use a more reliable method.  */
   42.77 +        for (i = 0 ; i < bmap_pages ; i++)
   42.78 +            bmap[i * PAGE_SIZE] = 0;
   42.79 +        /* Because bmap is not page aligned (allocated by malloc), be sure the
   42.80 +           last page is touched.  */
   42.81 +        bmap[bmap_bytes - 1] = 0;
   42.82 +    }
   42.83 +
   42.84 +    return xc_shadow_control(xc_handle, domid, sop,
   42.85 +                             dirty_bitmap, pages, stats);
   42.86 +}
   42.87 +
   42.88 +static inline ssize_t
   42.89 +write_exact(int fd, void *buf, size_t count)
   42.90 +{
   42.91 +    if (write(fd, buf, count) != count)
   42.92 +        return 0;
   42.93 +    return 1;
   42.94 +}
   42.95 +
   42.96 +static int
   42.97 +suspend_and_state(int (*suspend)(int), int xc_handle, int io_fd,
   42.98 +                  int dom, xc_dominfo_t *info)
   42.99 +{
  42.100 +    int i = 0;
  42.101 +
  42.102 +    if (!(*suspend)(dom)) {
  42.103 +        ERR("Suspend request failed");
  42.104 +        return -1;
  42.105 +    }
  42.106 +
  42.107 +retry:
  42.108 +
  42.109 +    if (xc_domain_getinfo(xc_handle, dom, 1, info) != 1) {
  42.110 +        ERR("Could not get domain info");
  42.111 +        return -1;
  42.112 +    }
  42.113 +
  42.114 +    if (info->shutdown && info->shutdown_reason == SHUTDOWN_suspend)
  42.115 +        return 0; // success
  42.116 +
  42.117 +    if (info->paused) {
  42.118 +        // try unpausing domain, wait, and retest
  42.119 +        xc_domain_unpause(xc_handle, dom);
  42.120 +
  42.121 +        ERR("Domain was paused. Wait and re-test.");
  42.122 +        usleep(10000);  // 10ms
  42.123 +
  42.124 +        goto retry;
  42.125 +    }
  42.126 +
  42.127 +
  42.128 +    if(++i < 100) {
  42.129 +        ERR("Retry suspend domain.");
  42.130 +        usleep(10000);  // 10ms
  42.131 +        goto retry;
  42.132 +    }
  42.133 +
  42.134 +    ERR("Unable to suspend domain.");
  42.135 +
  42.136 +    return -1;
  42.137 +}
  42.138 +
  42.139 +int
  42.140 +xc_linux_save(int xc_handle, int io_fd, uint32_t dom, uint32_t max_iters,
  42.141 +              uint32_t max_factor, uint32_t flags, int (*suspend)(int))
  42.142 +{
  42.143 +    DECLARE_DOM0_OP;
  42.144 +    xc_dominfo_t info;
  42.145 +
  42.146 +    int rc = 1;
  42.147 +
  42.148 +    //int live  = (flags & XCFLAGS_LIVE);
  42.149 +    int debug = (flags & XCFLAGS_DEBUG);
  42.150 +    int live  = (flags & XCFLAGS_LIVE);
  42.151 +
  42.152 +    /* The new domain's shared-info frame number. */
  42.153 +    unsigned long shared_info_frame;
  42.154 +
  42.155 +    /* A copy of the CPU context of the guest. */
  42.156 +    vcpu_guest_context_t ctxt;
  42.157 +
  42.158 +    unsigned long *page_array = NULL;
  42.159 +
  42.160 +    /* Live mapping of shared info structure */
  42.161 +    shared_info_t *live_shinfo = NULL;
  42.162 +
  42.163 +    /* Iteration number.  */
  42.164 +    int iter;
  42.165 +
  42.166 +    /* Number of pages sent in the last iteration (live only).  */
  42.167 +    unsigned int sent_last_iter;
  42.168 +
  42.169 +    /* Number of pages sent (live only).  */
  42.170 +    unsigned int total_sent;
  42.171 +
  42.172 +    /* Size of the shadow bitmap (live only).  */
  42.173 +    unsigned int bitmap_size = 0;
  42.174 +
  42.175 +    /* True if last iteration.  */
  42.176 +    int last_iter;
  42.177 +
  42.178 +    /* Bitmap of pages to be sent.  */
  42.179 +    unsigned long *to_send = NULL;
  42.180 +    /* Bitmap of pages not to be sent (because dirtied).  */
  42.181 +    unsigned long *to_skip = NULL;
  42.182 +
  42.183 +    char *mem;
  42.184 +
  42.185 +    if (debug)
  42.186 +        fprintf (stderr, "xc_linux_save (ia64): started dom=%d\n", dom);
  42.187 +
  42.188 +    /* If no explicit control parameters given, use defaults */
  42.189 +    if (!max_iters)
  42.190 +        max_iters = DEF_MAX_ITERS;
  42.191 +    if (!max_factor)
  42.192 +        max_factor = DEF_MAX_FACTOR;
  42.193 +
  42.194 +    //initialize_mbit_rate();
  42.195 +
  42.196 +    if (xc_domain_getinfo(xc_handle, dom, 1, &info) != 1) {
  42.197 +        ERR("Could not get domain info");
  42.198 +        return 1;
  42.199 +    }
  42.200 +
  42.201 +    shared_info_frame = info.shared_info_frame;
  42.202 +
  42.203 +#if 0
  42.204 +    /* cheesy sanity check */
  42.205 +    if ((info.max_memkb >> (PAGE_SHIFT - 10)) > max_mfn) {
  42.206 +        ERR("Invalid state record -- pfn count out of range: %lu",
  42.207 +            (info.max_memkb >> (PAGE_SHIFT - 10)));
  42.208 +        goto out;
  42.209 +     }
  42.210 +#endif
  42.211 +
  42.212 +    /* Map the shared info frame */
  42.213 +    live_shinfo = xc_map_foreign_range(xc_handle, dom, PAGE_SIZE,
  42.214 +                                       PROT_READ, shared_info_frame);
  42.215 +    if (!live_shinfo) {
  42.216 +        ERR("Couldn't map live_shinfo");
  42.217 +        goto out;
  42.218 +    }
  42.219 +
  42.220 +    max_pfn = info.max_memkb >> (PAGE_SHIFT - 10);
  42.221 +
  42.222 +    page_array = malloc(max_pfn * sizeof(unsigned long));
  42.223 +    if (page_array == NULL) {
  42.224 +        ERR("Could not allocate memory");
  42.225 +        goto out;
  42.226 +    }
  42.227 +
  42.228 +    /* This is expected by xm restore.  */
  42.229 +    if (!write_exact(io_fd, &max_pfn, sizeof(unsigned long))) {
  42.230 +        ERR("write: max_pfn");
  42.231 +        goto out;
  42.232 +    }
  42.233 +
  42.234 +    /* xc_linux_restore starts to read here.  */
  42.235 +    /* Write a version number.  This can avoid searching for a stupid bug
  42.236 +       if the format change.
  42.237 +       The version is hard-coded, don't forget to change the restore code
  42.238 +       too!  */
  42.239 +    {
  42.240 +        unsigned long version = 1;
  42.241 +
  42.242 +        if (!write_exact(io_fd, &version, sizeof(unsigned long))) {
  42.243 +            ERR("write: version");
  42.244 +            goto out;
  42.245 +        }
  42.246 +    }
  42.247 +
  42.248 +    op.cmd = DOM0_DOMAIN_SETUP;
  42.249 +    op.u.domain_setup.domain = (domid_t)dom;
  42.250 +    op.u.domain_setup.flags = XEN_DOMAINSETUP_query;
  42.251 +    if (xc_dom0_op(xc_handle, &op) < 0) {
  42.252 +        ERR("Could not get domain setup");
  42.253 +        goto out;
  42.254 +    }
  42.255 +    op.u.domain_setup.domain = 0;
  42.256 +    if (!write_exact(io_fd, &op.u.domain_setup, sizeof(op.u.domain_setup))) {
  42.257 +        ERR("write: domain setup");
  42.258 +        goto out;
  42.259 +    }
  42.260 +
  42.261 +    /* Domain is still running at this point */
  42.262 +    if (live) {
  42.263 +
  42.264 +        if (xc_ia64_shadow_control(xc_handle, dom,
  42.265 +                                   DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
  42.266 +                                   NULL, 0, NULL ) < 0) {
  42.267 +            ERR("Couldn't enable shadow mode");
  42.268 +            goto out;
  42.269 +        }
  42.270 +
  42.271 +        last_iter = 0;
  42.272 +
  42.273 +        bitmap_size = ((max_pfn + BITS_PER_LONG-1) & ~(BITS_PER_LONG-1)) / 8;
  42.274 +        to_send = malloc(bitmap_size);
  42.275 +        to_skip = malloc(bitmap_size);
  42.276 +
  42.277 +        if (!to_send || !to_skip) {
  42.278 +            ERR("Couldn't allocate bitmap array");
  42.279 +            goto out;
  42.280 +        }
  42.281 +
  42.282 +        /* Initially all the pages must be sent.  */
  42.283 +        memset(to_send, 0xff, bitmap_size);
  42.284 +
  42.285 +        if (mlock(to_send, bitmap_size)) {
  42.286 +            ERR("Unable to mlock to_send");
  42.287 +            goto out;
  42.288 +        }
  42.289 +        if (mlock(to_skip, bitmap_size)) {
  42.290 +            ERR("Unable to mlock to_skip");
  42.291 +            goto out;
  42.292 +        }
  42.293 +        
  42.294 +    } else {
  42.295 +
  42.296 +        /* This is a non-live suspend. Issue the call back to get the
  42.297 +           domain suspended */
  42.298 +
  42.299 +        last_iter = 1;
  42.300 +
  42.301 +        if (suspend_and_state(suspend, xc_handle, io_fd, dom, &info)) {
  42.302 +            ERR("Domain appears not to have suspended");
  42.303 +            goto out;
  42.304 +        }
  42.305 +
  42.306 +    }
  42.307 +
  42.308 +    sent_last_iter = max_pfn;
  42.309 +    total_sent = 0;
  42.310 +
  42.311 +    for (iter = 1; ; iter++) {
  42.312 +        unsigned int sent_this_iter, skip_this_iter;
  42.313 +        unsigned long N;
  42.314 +
  42.315 +        sent_this_iter = 0;
  42.316 +        skip_this_iter = 0;
  42.317 +
  42.318 +        /* Get the pfn list, as it may change.  */
  42.319 +        if (xc_ia64_get_pfn_list(xc_handle, dom, page_array,
  42.320 +                                 0, max_pfn) != max_pfn) {
  42.321 +            ERR("Could not get the page frame list");
  42.322 +            goto out;
  42.323 +        }
  42.324 +
  42.325 +        /* Dirtied pages won't be saved.
  42.326 +           slightly wasteful to peek the whole array evey time,
  42.327 +           but this is fast enough for the moment. */
  42.328 +        if (!last_iter) {
  42.329 +            if (xc_ia64_shadow_control(xc_handle, dom,
  42.330 +                                       DOM0_SHADOW_CONTROL_OP_PEEK,
  42.331 +                                       to_skip, max_pfn, NULL) != max_pfn) {
  42.332 +                ERR("Error peeking shadow bitmap");
  42.333 +                goto out;
  42.334 +            }
  42.335 +        }
  42.336 +
  42.337 +        /* Start writing out the saved-domain record. */
  42.338 +        for (N = 0; N < max_pfn; N++) {
  42.339 +            if (page_array[N] == INVALID_MFN)
  42.340 +                continue;
  42.341 +            if (!last_iter) {
  42.342 +                if (test_bit(N, to_skip) && test_bit(N, to_send))
  42.343 +                    skip_this_iter++;
  42.344 +                if (test_bit(N, to_skip) || !test_bit(N, to_send))
  42.345 +                    continue;
  42.346 +            }
  42.347 +
  42.348 +            if (debug)
  42.349 +                fprintf(stderr, "xc_linux_save: page %lx (%lu/%lu)\n",
  42.350 +                        page_array[N], N, max_pfn);
  42.351 +
  42.352 +            mem = xc_map_foreign_range(xc_handle, dom, PAGE_SIZE,
  42.353 +                                       PROT_READ|PROT_WRITE, page_array[N]);
  42.354 +            if (mem == NULL) {
  42.355 +                /* The page may have move.
  42.356 +                   It will be remarked dirty.
  42.357 +                   FIXME: to be tracked.  */
  42.358 +                fprintf(stderr, "cannot map page %lx: %s\n",
  42.359 +                        page_array[N], strerror (errno));
  42.360 +                continue;
  42.361 +            }
  42.362 +
  42.363 +            if (!write_exact(io_fd, &N, sizeof(N))) {
  42.364 +                ERR("write: max_pfn");
  42.365 +                goto out;
  42.366 +            }
  42.367 +
  42.368 +            if (write(io_fd, mem, PAGE_SIZE) != PAGE_SIZE) {
  42.369 +                ERR("Error when writing to state file (5)");
  42.370 +                goto out;
  42.371 +            }
  42.372 +            munmap(mem, PAGE_SIZE);
  42.373 +            sent_this_iter++;
  42.374 +            total_sent++;
  42.375 +        }
  42.376 +
  42.377 +        if (last_iter)
  42.378 +            break;
  42.379 +
  42.380 +        DPRINTF(" %d: sent %d, skipped %d\n",
  42.381 +                iter, sent_this_iter, skip_this_iter );
  42.382 +
  42.383 +        if (live) {
  42.384 +            if ( /* ((sent_this_iter > sent_last_iter) && RATE_IS_MAX()) || */
  42.385 +                (iter >= max_iters) || (sent_this_iter+skip_this_iter < 50) ||
  42.386 +                (total_sent > max_pfn*max_factor)) {
  42.387 +                DPRINTF("Start last iteration\n");
  42.388 +                last_iter = 1;
  42.389 +
  42.390 +                if (suspend_and_state(suspend, xc_handle, io_fd, dom, &info)) {
  42.391 +                    ERR("Domain appears not to have suspended");
  42.392 +                    goto out;
  42.393 +                }
  42.394 +            }
  42.395 +
  42.396 +            /* Pages to be sent are pages which were dirty.  */
  42.397 +            if (xc_ia64_shadow_control(xc_handle, dom,
  42.398 +                                       DOM0_SHADOW_CONTROL_OP_CLEAN,
  42.399 +                                       to_send, max_pfn, NULL ) != max_pfn) {
  42.400 +                ERR("Error flushing shadow PT");
  42.401 +                goto out;
  42.402 +            }
  42.403 +
  42.404 +            sent_last_iter = sent_this_iter;
  42.405 +
  42.406 +            //print_stats(xc_handle, dom, sent_this_iter, &stats, 1);
  42.407 +        }
  42.408 +
  42.409 +    }
  42.410 +
  42.411 +    fprintf (stderr, "All memory is saved\n");
  42.412 +
  42.413 +    /* terminate */
  42.414 +    {
  42.415 +        unsigned long pfn = INVALID_MFN;
  42.416 +        if (!write_exact(io_fd, &pfn, sizeof(pfn))) {
  42.417 +            ERR("Error when writing to state file (6)");
  42.418 +            goto out;
  42.419 +        }
  42.420 +    }
  42.421 +
  42.422 +    /* Send through a list of all the PFNs that were not in map at the close */
  42.423 +    {
  42.424 +        unsigned int i,j;
  42.425 +        unsigned long pfntab[1024];
  42.426 +
  42.427 +        for (i = 0, j = 0; i < max_pfn; i++) {
  42.428 +            if (page_array[i] == INVALID_MFN)
  42.429 +                j++;
  42.430 +        }
  42.431 +
  42.432 +        if (!write_exact(io_fd, &j, sizeof(unsigned int))) {
  42.433 +            ERR("Error when writing to state file (6a)");
  42.434 +            goto out;
  42.435 +        }
  42.436 +
  42.437 +        for (i = 0, j = 0; i < max_pfn; ) {
  42.438 +
  42.439 +            if (page_array[i] == INVALID_MFN)
  42.440 +                pfntab[j++] = i;
  42.441 +
  42.442 +            i++;
  42.443 +            if (j == 1024 || i == max_pfn) {
  42.444 +                if (!write_exact(io_fd, &pfntab, sizeof(unsigned long)*j)) {
  42.445 +                    ERR("Error when writing to state file (6b)");
  42.446 +                    goto out;
  42.447 +                }
  42.448 +                j = 0;
  42.449 +            }
  42.450 +        }
  42.451 +
  42.452 +    }
  42.453 +
  42.454 +    if (xc_vcpu_getcontext(xc_handle, dom, 0, &ctxt)) {
  42.455 +        ERR("Could not get vcpu context");
  42.456 +        goto out;
  42.457 +    }
  42.458 +
  42.459 +    if (!write_exact(io_fd, &ctxt, sizeof(ctxt))) {
  42.460 +        ERR("Error when writing to state file (1)");
  42.461 +        goto out;
  42.462 +    }
  42.463 +
  42.464 +    mem = xc_map_foreign_range(xc_handle, dom, PAGE_SIZE,
  42.465 +                               PROT_READ|PROT_WRITE, ctxt.privregs_pfn);
  42.466 +    if (mem == NULL) {
  42.467 +        ERR("cannot map privreg page");
  42.468 +        goto out;
  42.469 +    }
  42.470 +    if (write(io_fd, mem, PAGE_SIZE) != PAGE_SIZE) {
  42.471 +        ERR("Error when writing privreg to state file (5)");
  42.472 +        goto out;
  42.473 +    }
  42.474 +    munmap(mem, PAGE_SIZE);    
  42.475 +
  42.476 +    if (!write_exact(io_fd, live_shinfo, PAGE_SIZE)) {
  42.477 +        ERR("Error when writing to state file (1)");
  42.478 +        goto out;
  42.479 +    }
  42.480 +
  42.481 +    /* Success! */
  42.482 +    rc = 0;
  42.483 +
  42.484 + out:
  42.485 +
  42.486 +    if (live) {
  42.487 +        if (xc_ia64_shadow_control(xc_handle, dom, DOM0_SHADOW_CONTROL_OP_OFF,
  42.488 +                                   NULL, 0, NULL ) < 0) {
  42.489 +            DPRINTF("Warning - couldn't disable shadow mode");
  42.490 +        }
  42.491 +    }
  42.492 +
  42.493 +    free(page_array);
  42.494 +    free(to_send);
  42.495 +    free(to_skip);
  42.496 +    if (live_shinfo)
  42.497 +        munmap(live_shinfo, PAGE_SIZE);
  42.498 +
  42.499 +    fprintf(stderr,"Save exit rc=%d\n",rc);
  42.500 +
  42.501 +    return !!rc;
  42.502 +}
  42.503 +
  42.504 +/*
  42.505 + * Local variables:
  42.506 + * mode: C
  42.507 + * c-set-style: "BSD"
  42.508 + * c-basic-offset: 4
  42.509 + * tab-width: 4
  42.510 + * indent-tabs-mode: nil
  42.511 + * End:
  42.512 + */

    43.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.2 +++ b/tools/libxc/ia64/xc_ia64_stubs.c	Fri Jul 28 10:51:38 2006 +0100
    43.3 @@ -0,0 +1,106 @@
    43.4 +#include "xg_private.h"
    43.5 +#include "xenguest.h"
    43.6 +#include "xc_private.h"
    43.7 +#include "xc_elf.h"
    43.8 +#include <stdlib.h>
    43.9 +#include <zlib.h>
   43.10 +#include "xen/arch-ia64.h"
   43.11 +#include <xen/hvm/ioreq.h>
   43.12 +
   43.13 +/* this is a very ugly way of getting FPSR_DEFAULT.  struct ia64_fpreg is
   43.14 + * mysteriously declared in two places: /usr/include/asm/fpu.h and
   43.15 + * /usr/include/bits/sigcontext.h.  The former also defines FPSR_DEFAULT,
   43.16 + * the latter doesn't but is included (indirectly) by xg_private.h */
   43.17 +#define __ASSEMBLY__
   43.18 +#include <asm/fpu.h>
   43.19 +#undef __IA64_UL
   43.20 +#define __IA64_UL(x)           ((unsigned long)(x))
   43.21 +#undef __ASSEMBLY__
   43.22 +
   43.23 +unsigned long
   43.24 +xc_ia64_fpsr_default(void)
   43.25 +{
   43.26 +    return FPSR_DEFAULT;
   43.27 +}
   43.28 +
   43.29 +/*  
   43.30 +    VMM uses put_user to copy pfn_list to guest buffer, this maybe fail,
   43.31 +    VMM doesn't handle this now.
   43.32 +    This method will touch guest buffer to make sure the buffer's mapping
   43.33 +    is tracked by VMM,
   43.34 + */
   43.35 +int
   43.36 +xc_ia64_get_pfn_list(int xc_handle, uint32_t domid, xen_pfn_t *pfn_buf,
   43.37 +                     unsigned int start_page, unsigned int nr_pages)
   43.38 +{
   43.39 +    dom0_op_t op;
   43.40 +    int num_pfns,ret;
   43.41 +    unsigned int __start_page, __nr_pages;
   43.42 +    unsigned long max_pfns;
   43.43 +    xen_pfn_t *__pfn_buf;
   43.44 +
   43.45 +    __start_page = start_page;
   43.46 +    __nr_pages = nr_pages;
   43.47 +    __pfn_buf = pfn_buf;
   43.48 +  
   43.49 +    while (__nr_pages) {
   43.50 +        max_pfns = ((unsigned long)__start_page << 32) | __nr_pages;
   43.51 +        op.cmd = DOM0_GETMEMLIST;
   43.52 +        op.u.getmemlist.domain   = (domid_t)domid;
   43.53 +        op.u.getmemlist.max_pfns = max_pfns;
   43.54 +        op.u.getmemlist.num_pfns = 0;
   43.55 +        set_xen_guest_handle(op.u.getmemlist.buffer, __pfn_buf);
   43.56 +
   43.57 +        if ((max_pfns != -1UL)
   43.58 +            && mlock(__pfn_buf, __nr_pages * sizeof(xen_pfn_t)) != 0) {
   43.59 +            PERROR("Could not lock pfn list buffer");
   43.60 +            return -1;
   43.61 +        }
   43.62 +
   43.63 +        ret = do_dom0_op(xc_handle, &op);
   43.64 +
   43.65 +        if (max_pfns != -1UL)
   43.66 +            (void)munlock(__pfn_buf, __nr_pages * sizeof(xen_pfn_t));
   43.67 +
   43.68 +        if (max_pfns == -1UL)
   43.69 +            return 0;
   43.70 +        
   43.71 +        num_pfns = op.u.getmemlist.num_pfns;
   43.72 +        __start_page += num_pfns;
   43.73 +        __nr_pages -= num_pfns;
   43.74 +        __pfn_buf += num_pfns;
   43.75 +
   43.76 +        if (ret < 0)
   43.77 +            // dummy write to make sure this tlb mapping is tracked by VMM
   43.78 +            *__pfn_buf = 0;
   43.79 +        else
   43.80 +            return nr_pages;
   43.81 +    }
   43.82 +    return nr_pages;
   43.83 +}
   43.84 +
   43.85 +int
   43.86 +xc_get_pfn_list(int xc_handle, uint32_t domid, xen_pfn_t *pfn_buf,
   43.87 +                unsigned long max_pfns)
   43.88 +{
   43.89 +    return xc_ia64_get_pfn_list (xc_handle, domid, pfn_buf, 0, max_pfns);
   43.90 +}
   43.91 +
   43.92 +long
   43.93 +xc_get_max_pages(int xc_handle, uint32_t domid)
   43.94 +{
   43.95 +    dom0_op_t op;
   43.96 +    op.cmd = DOM0_GETDOMAININFO;
   43.97 +    op.u.getdomaininfo.domain = (domid_t)domid;
   43.98 +    return (do_dom0_op(xc_handle, &op) < 0) ? -1 : op.u.getdomaininfo.max_pages;
   43.99 +}
  43.100 +
  43.101 +/*
  43.102 + * Local variables:
  43.103 + * mode: C
  43.104 + * c-set-style: "BSD"
  43.105 + * c-basic-offset: 4
  43.106 + * tab-width: 4
  43.107 + * indent-tabs-mode: nil
  43.108 + * End:
  43.109 + */