Attachment 298573 Details for Bug 435744 – Patch to fix FV SMP boot on intel

[patch] Patch to fix FV SMP boot on intel

xen-3.1.0-hvm-smp-boot.patch (text/plain), 2.42 KB, created by Chris Lalancette on 2008-03-19 19:07:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2008-03-19 19:07:31 UTC

Size: 2.42 KB

patch

obsolete

>diff -urp xen-3.1.0-src/tools/firmware/vmxassist/vm86.c xen-3.1.0-src.new/tools/firmware/vmxassist/vm86.c
>--- xen-3.1.0-src/tools/firmware/vmxassist/vm86.c	2007-05-18 10:45:21.000000000 -0400
>+++ xen-3.1.0-src.new/tools/firmware/vmxassist/vm86.c	2008-03-19 13:31:01.000000000 -0400
>@@ -927,6 +927,7 @@ load_or_clear_seg(unsigned long sel, uin
> 		load_seg(0, base, limit, arbytes);
> }
> 
>+static unsigned char rm_irqbase[2];
> 
> /*
>  * Transition to protected mode
>@@ -936,6 +937,9 @@ protected_mode(struct regs *regs)
> {
> 	extern char stack_top[];
> 
>+	oldctx.rm_irqbase[0] = rm_irqbase[0];
>+	oldctx.rm_irqbase[1] = rm_irqbase[1];
>+
> 	regs->eflags &= ~(EFLAGS_TF|EFLAGS_VM);
> 
> 	oldctx.eip = regs->eip;
>@@ -1187,6 +1191,7 @@ outbyte(struct regs *regs, unsigned pref
> 			icw2[0] = 0;
> 			printf("Remapping master: ICW2 0x%x -> 0x%x\n",
> 				al, NR_EXCEPTION_HANDLER);
>+			rm_irqbase[0] = al;
> 			al = NR_EXCEPTION_HANDLER;
> 		}
> 		break;
>@@ -1200,6 +1205,7 @@ outbyte(struct regs *regs, unsigned pref
> 			icw2[1] = 0;
> 			printf("Remapping slave: ICW2 0x%x -> 0x%x\n",
> 				al, NR_EXCEPTION_HANDLER+8);
>+			rm_irqbase[1] = al;
> 			al = NR_EXCEPTION_HANDLER+8;
> 		}
> 		break;
>diff -urp xen-3.1.0-src/tools/firmware/vmxassist/vm86.h xen-3.1.0-src.new/tools/firmware/vmxassist/vm86.h
>--- xen-3.1.0-src/tools/firmware/vmxassist/vm86.h	2007-05-18 10:45:21.000000000 -0400
>+++ xen-3.1.0-src.new/tools/firmware/vmxassist/vm86.h	2008-03-19 13:31:37.000000000 -0400
>@@ -26,10 +26,6 @@
> 
> #include <xen/hvm/vmx_assist.h>
> 
>-#define	NR_EXCEPTION_HANDLER	32
>-#define	NR_INTERRUPT_HANDLERS	16
>-#define	NR_TRAPS		(NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
>-
> #ifndef __ASSEMBLY__
> 
> struct regs {
>diff -urp xen-3.1.0-src/xen/include/public/hvm/vmx_assist.h xen-3.1.0-src.new/xen/include/public/hvm/vmx_assist.h
>--- xen-3.1.0-src/xen/include/public/hvm/vmx_assist.h	2007-05-18 10:45:21.000000000 -0400
>+++ xen-3.1.0-src.new/xen/include/public/hvm/vmx_assist.h	2008-03-19 13:36:23.000000000 -0400
>@@ -35,6 +35,10 @@
> 
> #ifndef __ASSEMBLY__
> 
>+#define NR_EXCEPTION_HANDLER 32
>+#define NR_INTERRUPT_HANDLERS 16
>+#define NR_TRAPS	(NR_EXCEPTION_HANDLER+NR_INTERRUPT_HANDLERS)
>+
> union vmcs_arbytes {
>     struct arbyte_fields {
>         unsigned int seg_type : 4,
>@@ -98,6 +102,8 @@ struct vmx_assist_context {
>     uint32_t  ldtr_limit;
>     uint32_t  ldtr_base;
>     union vmcs_arbytes ldtr_arbytes;
>+
>+    unsigned char rm_irqbase[2];
> };
> typedef struct vmx_assist_context vmx_assist_context_t;
>

Actions: View | Diff

Attachments on bug 435744: 298573