CVS commit: src/sys/arch/i386/i386

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Thu Jul  6 20:23:57 UTC 2017

Modified Files:
        src/sys/arch/i386/i386: gdt.c

Log Message:
gdt_size is now in bytes, but the HYPERVISOR_set_gdt() expects a number
of entries and has not been converted.
Xen/i386 now boots again.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/i386/i386/gdt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/i386/i386/gdt.c
diff -u src/sys/arch/i386/i386/gdt.c:1.64 src/sys/arch/i386/i386/gdt.c:1.65
--- src/sys/arch/i386/i386/gdt.c:1.64	Sun Jul  2 11:21:13 2017
+++ src/sys/arch/i386/i386/gdt.c	Thu Jul  6 20:23:57 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.64 2017/07/02 11:21:13 maxv Exp $	*/
+/*	$NetBSD: gdt.c,v 1.65 2017/07/06 20:23:57 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.64 2017/07/02 11:21:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.65 2017/07/06 20:23:57 bouyer Exp $");
 
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
@@ -202,13 +202,14 @@ gdt_init_cpu(struct cpu_info *ci)
 	setregion(&region, ci->ci_gdt, max_len - 1);
 	lgdt(&region);
 #else
-	size_t len = gdt_size;
+	size_t len = roundup(gdt_size, PAGE_SIZE);
 	unsigned long frames[len >> PAGE_SHIFT];
 	vaddr_t va;
 	pt_entry_t *ptp;
 	size_t f;
 
-	for (va = (vaddr_t)ci->ci_gdt, f = 0; va < (vaddr_t)ci->ci_gdt + len;
+	for (va = (vaddr_t)ci->ci_gdt, f = 0;
+	    va < (vaddr_t)ci->ci_gdt + gdt_size;
 	    va += PAGE_SIZE, f++) {
 		KASSERT(va >= VM_MIN_KERNEL_ADDRESS);
 		ptp = kvtopte(va);
@@ -226,7 +227,7 @@ gdt_init_cpu(struct cpu_info *ci)
 		}
 	}
 
-	if (HYPERVISOR_set_gdt(frames, gdt_size))
+	if (HYPERVISOR_set_gdt(frames, gdt_size / sizeof(gdtstore[0])))
 		panic("HYPERVISOR_set_gdt failed!\n");
 	lgdt_finish();
 #endif