Browse Source

kernel: default kernel name is "harvey"
use amd64 to qualify the architecture in file names.

k* names are gone replaced by amd64, including kernel dir.
Some other places affected and changed.

Change-Id: I39ac8e3e3b8d2fea90cfed22d8551c07b5a9e0e3

Elbing Miss 3 years ago
parent
commit
094c54cc21
100 changed files with 86 additions and 71 deletions
  1. 5 1
      build.json
  2. 2 2
      clean.json
  3. 13 0
      sys/src/9/amd64/.gitignore
  4. 0 0
      sys/src/9/amd64/FIX.sed
  5. 0 0
      sys/src/9/amd64/Linux
  6. 0 0
      sys/src/9/amd64/acore.c
  7. 0 0
      sys/src/9/amd64/acore.c.old
  8. 0 0
      sys/src/9/amd64/acpi.h
  9. 0 0
      sys/src/9/amd64/amd64.h
  10. 20 20
      sys/src/9/k10/k8coreboot.json
  11. 20 20
      sys/src/9/k10/k8cpu.json
  12. 0 0
      sys/src/9/amd64/apic.c
  13. 0 0
      sys/src/9/amd64/apic.h
  14. 0 0
      sys/src/9/amd64/arch.c
  15. 0 0
      sys/src/9/amd64/archamd64.c
  16. 0 0
      sys/src/9/amd64/asm.c
  17. 0 0
      sys/src/9/amd64/backtrace.c
  18. 0 0
      sys/src/9/amd64/backtrace.h
  19. 0 0
      sys/src/9/amd64/boot.fs
  20. 0 0
      sys/src/9/amd64/cga.c
  21. 0 0
      sys/src/9/amd64/clean.json
  22. 4 4
      sys/src/9/k10/core.json
  23. 0 0
      sys/src/9/amd64/coreboot.c
  24. 0 0
      sys/src/9/amd64/cpuidamd64.S
  25. 0 0
      sys/src/9/amd64/ctype.c
  26. 0 0
      sys/src/9/amd64/dat.h
  27. 0 0
      sys/src/9/amd64/devacpi.c
  28. 0 0
      sys/src/9/amd64/devarch.c
  29. 0 0
      sys/src/9/amd64/devusb.c
  30. 0 0
      sys/src/9/amd64/devvga.c
  31. 0 0
      sys/src/9/amd64/entry.S
  32. 0 0
      sys/src/9/amd64/ether8139.c
  33. 0 0
      sys/src/9/amd64/ether82563.c
  34. 0 0
      sys/src/9/amd64/etherbcm.c.NO
  35. 0 0
      sys/src/9/amd64/etherif.h
  36. 1 1
      sys/src/9/k10/fns.h
  37. 0 0
      sys/src/9/amd64/fpu.c
  38. 0 0
      sys/src/9/amd64/fpu.c.old
  39. 0 0
      sys/src/9/amd64/i8254.c
  40. 0 0
      sys/src/9/amd64/i8259.c
  41. 0 0
      sys/src/9/amd64/init9.c
  42. 0 0
      sys/src/9/amd64/inith.json
  43. 0 0
      sys/src/9/amd64/io.h
  44. 0 0
      sys/src/9/amd64/ioapic.c
  45. 0 0
      sys/src/9/amd64/iob.h
  46. 0 0
      sys/src/9/amd64/k8cpu
  47. 0 0
      sys/src/9/amd64/k8cpufs
  48. 0 0
      sys/src/9/amd64/k8cpukexec
  49. 0 0
      sys/src/9/amd64/kernel.ld
  50. 0 0
      sys/src/9/amd64/l64acidt.S
  51. 0 0
      sys/src/9/amd64/l64fpu.S
  52. 0 0
      sys/src/9/amd64/l64idt.S
  53. 0 0
      sys/src/9/amd64/l64syscall.s
  54. 0 0
      sys/src/9/amd64/l64v.S
  55. 0 0
      sys/src/9/amd64/l64vsyscall.S
  56. 1 1
      sys/src/9/k10/main.c
  57. 0 0
      sys/src/9/amd64/map.c
  58. 0 0
      sys/src/9/amd64/mem.h
  59. 0 0
      sys/src/9/amd64/memory.c
  60. 0 0
      sys/src/9/amd64/mmu.c
  61. 0 0
      sys/src/9/amd64/mouse.c
  62. 0 0
      sys/src/9/amd64/mp.c
  63. 0 0
      sys/src/9/amd64/msi.c
  64. 0 0
      sys/src/9/amd64/multiboot.c
  65. 0 0
      sys/src/9/amd64/nixtype
  66. 0 0
      sys/src/9/amd64/physalloc.c
  67. 0 0
      sys/src/9/amd64/pmcio.c
  68. 0 0
      sys/src/9/amd64/qmalloc.c
  69. 0 0
      sys/src/9/amd64/ratrace.c
  70. 0 0
      sys/src/9/amd64/root/cpu.c
  71. 0 0
      sys/src/9/amd64/root/k8root.namespace
  72. 0 0
      sys/src/9/amd64/root/k8root.proto
  73. 0 0
      sys/src/9/amd64/root/k8root.rc
  74. 0 0
      sys/src/9/amd64/root/mkfile
  75. 0 0
      sys/src/9/amd64/root/tcp17010
  76. 0 0
      sys/src/9/amd64/screen.c
  77. 0 0
      sys/src/9/amd64/screen.h
  78. 0 0
      sys/src/9/amd64/sdata.c
  79. 0 0
      sys/src/9/amd64/sipi.c
  80. 0 0
      sys/src/9/amd64/startdisk
  81. 0 0
      sys/src/9/amd64/syscall.c
  82. 0 0
      sys/src/9/amd64/tcore.c
  83. 0 0
      sys/src/9/amd64/trap.c
  84. 0 0
      sys/src/9/amd64/uncached.h
  85. 0 0
      sys/src/9/amd64/usbehci.h
  86. 0 0
      sys/src/9/amd64/usbehcipc.c
  87. 0 0
      sys/src/9/amd64/usbohci.c
  88. 0 0
      sys/src/9/amd64/usbuhci.c
  89. 0 0
      sys/src/9/amd64/vga.c
  90. 0 0
      sys/src/9/amd64/vgax.c
  91. 0 0
      sys/src/9/amd64/vsvm.c
  92. 3 3
      sys/src/9/boot/boot.json
  93. 4 4
      sys/src/9/boot/bootconf.json
  94. 0 10
      sys/src/9/k10/.gitignore
  95. 5 1
      util/GO9PRUN
  96. 1 1
      util/GO9PRUN8
  97. 1 1
      util/QRUN
  98. 5 1
      util/REGRESS
  99. 1 1
      util/SERIALKVM
  100. 0 0
      util/SYSLINUX

+ 5 - 1
build.json

@@ -7,7 +7,11 @@
 	},
 	"kregress": {
 		"Projects": [
-			"/sys/src/9/k10/k8cpu.json",
+			"/sys/src/klibs.json",
+			"/sys/src/libs.json",
+			"/sys/src/cmd/kcmds.json",
+			"/sys/src/cmd/cmds.json",
+			"/sys/src/9/amd64/amd64cpu.json",
 			"/sys/src/regress/regress.json"
 		]
 	},

+ 2 - 2
clean.json

@@ -1,5 +1,5 @@
 {
-	"k8cpu": {
-		"Projects": ["/sys/src/9/k10/clean.json"]
+	"amd64cpu": {
+		"Projects": ["/sys/src/9/amd64/clean.json"]
 	}
 }

+ 13 - 0
sys/src/9/amd64/.gitignore

@@ -0,0 +1,13 @@
+/init.h
+/init
+/systab.c
+/bootamd64cpu.c
+/tags
+/amd64l.h
+/harvey
+/harvey.32bit
+/harvey.asm
+/amd64cpu.c
+/errstr.h
+/ksyms.map
+/nvram

sys/src/9/k10/FIX.sed → sys/src/9/amd64/FIX.sed


sys/src/9/k10/Linux → sys/src/9/amd64/Linux


sys/src/9/k10/acore.c → sys/src/9/amd64/acore.c


sys/src/9/k10/acore.c.old → sys/src/9/amd64/acore.c.old


sys/src/9/k10/acpi.h → sys/src/9/amd64/acpi.h


sys/src/9/k10/amd64.h → sys/src/9/amd64/amd64.h


+ 20 - 20
sys/src/9/k10/k8coreboot.json

@@ -1,7 +1,7 @@
 {
-	"k8cpu": {
+	"amd64cpu": {
 		"Env": [
-			"CONF=k8cpu"
+			"CONF=amd64cpu"
 		],
 		"Include": [
 			"core.json",
@@ -77,28 +77,28 @@
 				]
 			},
 			"Ramfiles": {
-				"bind": "/amd64/bin/bind",
-				"boot": "/sys/src/9/boot/bootk8cpu.elf.out",
-				"cat": "/amd64/bin/cat",
-				"date": "/amd64/bin/date",
-				"echo": "/amd64/bin/echo",
-				"factotum": "/amd64/bin/auth/factotum",
-				"ipconfig": "/amd64/bin/ip/ipconfig",
-				"ls": "/amd64/bin/ls",
-				"mount": "/amd64/bin/mount",
+				"bind": "/$ARCH/bin/bind",
+				"boot": "/sys/src/9/boot/bootamd64cpu.elf.out",
+				"cat": "/$ARCH/bin/cat",
+				"date": "/$ARCH/bin/date",
+				"echo": "/$ARCH/bin/echo",
+				"factotum": "/$ARCH/bin/auth/factotum",
+				"ipconfig": "/$ARCH/bin/ip/ipconfig",
+				"ls": "/$ARCH/bin/ls",
+				"mount": "/$ARCH/bin/mount",
 				"nvram": "/util/nvram",
-				"rc": "/amd64/bin/rc",
+				"rc": "/$ARCH/bin/rc",
 				"rcmain": "/rc/lib/rcmain",
-				"screenconsole": "/amd64/bin/aux/screenconsole",
-				"srv": "/amd64/bin/srv",
-				"fdisk": "/amd64/bin/disk/fdisk",
-				"prep": "/amd64/bin/disk/prep",
-				"venti": "/amd64/bin/venti/venti",
-				"fossil": "/amd64/bin/fossil/fossil",
+				"screenconsole": "/$ARCH/bin/aux/screenconsole",
+				"srv": "/$ARCH/bin/srv",
+				"fdisk": "/$ARCH/bin/disk/fdisk",
+				"prep": "/$ARCH/bin/disk/prep",
+				"venti": "/$ARCH/bin/venti/venti",
+				"fossil": "/$ARCH/bin/fossil/fossil",
 				"startdisk" : "startdisk"
 			}
 		},
-		"Program": "9k8cpu",
+		"Program": "harvey",
 		"SourceFiles": [
 		        "../port/corebootscreen.c",
 			"cga.c",
@@ -106,7 +106,7 @@
 			"devusb.c",
 			"ether8139.c",
 			"ether82563.c",
-			"k8cpu.c",
+			"amd64cpu.c",
 			"mouse.c",
 			"sdata.c",
 			"usbehcipc.c",

+ 20 - 20
sys/src/9/k10/k8cpu.json

@@ -1,7 +1,7 @@
 {
-	"k8cpu": {
+	"amd64cpu": {
 		"Env": [
-			"CONF=k8cpu"
+			"CONF=amd64cpu"
 		],
 		"Include": [
 			"core.json",
@@ -79,28 +79,28 @@
 			},
 			"Systab": "/sys/src/libc/9syscall/sys.h",
 			"Ramfiles": {
-				"bind": "/amd64/bin/bind",
-				"boot": "/sys/src/9/boot/bootk8cpu.elf.out",
-				"cat": "/amd64/bin/cat",
-				"date": "/amd64/bin/date",
-				"echo": "/amd64/bin/echo",
-				"factotum": "/amd64/bin/auth/factotum",
-				"ipconfig": "/amd64/bin/ip/ipconfig",
-				"ls": "/amd64/bin/ls",
-				"mount": "/amd64/bin/mount",
+				"bind": "/$ARCH/bin/bind",
+				"boot": "/sys/src/9/boot/bootamd64cpu.elf.out",
+				"cat": "/$ARCH/bin/cat",
+				"date": "/$ARCH/bin/date",
+				"echo": "/$ARCH/bin/echo",
+				"factotum": "/$ARCH/bin/auth/factotum",
+				"ipconfig": "/$ARCH/bin/ip/ipconfig",
+				"ls": "/$ARCH/bin/ls",
+				"mount": "/$ARCH/bin/mount",
 				"nvram": "/util/nvram",
-				"rc": "/amd64/bin/rc",
+				"rc": "/$ARCH/bin/rc",
 				"rcmain": "/rc/lib/rcmain",
-				"screenconsole": "/amd64/bin/aux/screenconsole",
-				"srv": "/amd64/bin/srv",
-				"fdisk": "/amd64/bin/disk/fdisk",
-				"prep": "/amd64/bin/disk/prep",
-				"venti": "/amd64/bin/venti/venti",
-				"fossil": "/amd64/bin/fossil/fossil",
+				"screenconsole": "/$ARCH/bin/aux/screenconsole",
+				"srv": "/$ARCH/bin/srv",
+				"fdisk": "/$ARCH/bin/disk/fdisk",
+				"prep": "/$ARCH/bin/disk/prep",
+				"venti": "/$ARCH/bin/venti/venti",
+				"fossil": "/$ARCH/bin/fossil/fossil",
 				"startdisk" : "startdisk"
 			}
 		},
-		"Program": "9k8cpu",
+		"Program": "harvey",
 		"SourceFiles": [
 			"cga.c",
 			"devacpi.c",
@@ -108,7 +108,7 @@
 			"devvga.c",
 			"ether8139.c",
 			"ether82563.c",
-			"k8cpu.c",
+			"amd64cpu.c",
 			"mouse.c",
 			"screen.c",
 			"sdata.c",

sys/src/9/k10/apic.c → sys/src/9/amd64/apic.c


sys/src/9/k10/apic.h → sys/src/9/amd64/apic.h


sys/src/9/k10/arch.c → sys/src/9/amd64/arch.c


sys/src/9/k10/archk10.c → sys/src/9/amd64/archamd64.c


sys/src/9/k10/asm.c → sys/src/9/amd64/asm.c


sys/src/9/k10/backtrace.c → sys/src/9/amd64/backtrace.c


sys/src/9/k10/backtrace.h → sys/src/9/amd64/backtrace.h


sys/src/9/k10/boot.fs → sys/src/9/amd64/boot.fs


sys/src/9/k10/cga.c → sys/src/9/amd64/cga.c


sys/src/9/k10/clean.json → sys/src/9/amd64/clean.json


+ 4 - 4
sys/src/9/k10/core.json

@@ -38,9 +38,9 @@
 			"kernel.ld"
 		],
 		"Post": [
-			"${TOOLPREFIX}objcopy -I elf64-x86-64 -O elf32-i386 9$CONF 9$CONF.32bit",
-			"cp 9$CONF.32bit $HARVEY/cfg/pxe/tftpboot",
-			"${TOOLPREFIX}objdump -S 9$CONF > 9$CONF.asm"
+			"OBJCOPY=objcopy; $TOOLPREFIX$OBJCOPY -I elf64-x86-64 -O elf32-i386 harvey harvey.32bit",
+			"cp harvey.32bit $HARVEY/cfg/pxe/tftpboot",
+			"OBJDUMP=objdump; $TOOLPREFIX$OBJDUMP -S harvey > harvey.asm"
 		],
 		"Pre": [
 			"mksys -o systab.c -mode=systab.c $HARVEY/sys/src/sysconf.json",
@@ -63,7 +63,7 @@
 			"acore.c",
 			"apic.c",
 			"arch.c",
-			"archk10.c",
+			"archamd64.c",
 			"asm.c",
 			"backtrace.c",
 		        "coreboot.c",

sys/src/9/k10/coreboot.c → sys/src/9/amd64/coreboot.c


sys/src/9/k10/cpuidamd64.S → sys/src/9/amd64/cpuidamd64.S


sys/src/9/k10/ctype.c → sys/src/9/amd64/ctype.c


sys/src/9/k10/dat.h → sys/src/9/amd64/dat.h


sys/src/9/k10/devacpi.c → sys/src/9/amd64/devacpi.c


sys/src/9/k10/devarch.c → sys/src/9/amd64/devarch.c


sys/src/9/k10/devusb.c → sys/src/9/amd64/devusb.c


sys/src/9/k10/devvga.c → sys/src/9/amd64/devvga.c


sys/src/9/k10/entry.S → sys/src/9/amd64/entry.S


sys/src/9/k10/ether8139.c → sys/src/9/amd64/ether8139.c


sys/src/9/k10/ether82563.c → sys/src/9/amd64/ether82563.c


sys/src/9/k10/etherbcm.c.NO → sys/src/9/amd64/etherbcm.c.NO


sys/src/9/k10/etherif.h → sys/src/9/amd64/etherif.h


+ 1 - 1
sys/src/9/k10/fns.h

@@ -240,7 +240,7 @@ extern void ioapicintrinit(int, int, int, int, uint32_t);
 extern void ioapiconline(void);
 
 /*
- * archk10.c
+ * archamd64.c
  */
 extern void millidelay(int);
 extern void k10mwait(void*);

sys/src/9/k10/fpu.c → sys/src/9/amd64/fpu.c


sys/src/9/k10/fpu.c.old → sys/src/9/amd64/fpu.c.old


sys/src/9/k10/i8254.c → sys/src/9/amd64/i8254.c


sys/src/9/k10/i8259.c → sys/src/9/amd64/i8259.c


sys/src/9/k10/init9.c → sys/src/9/amd64/init9.c


sys/src/9/k10/inith.json → sys/src/9/amd64/inith.json


sys/src/9/k10/io.h → sys/src/9/amd64/io.h


sys/src/9/k10/ioapic.c → sys/src/9/amd64/ioapic.c


sys/src/9/k10/iob.h → sys/src/9/amd64/iob.h


sys/src/9/k10/k8cpu → sys/src/9/amd64/k8cpu


sys/src/9/k10/k8cpufs → sys/src/9/amd64/k8cpufs


sys/src/9/k10/k8cpukexec → sys/src/9/amd64/k8cpukexec


sys/src/9/k10/kernel.ld → sys/src/9/amd64/kernel.ld


sys/src/9/k10/l64acidt.S → sys/src/9/amd64/l64acidt.S


sys/src/9/k10/l64fpu.S → sys/src/9/amd64/l64fpu.S


sys/src/9/k10/l64idt.S → sys/src/9/amd64/l64idt.S


sys/src/9/k10/l64syscall.s → sys/src/9/amd64/l64syscall.s


sys/src/9/k10/l64v.S → sys/src/9/amd64/l64v.S


sys/src/9/k10/l64vsyscall.S → sys/src/9/amd64/l64vsyscall.S


+ 1 - 1
sys/src/9/k10/main.c

@@ -203,7 +203,7 @@ squidboy(int apicno, Mach *mach)
 	 * Beware the Curse of The Non-Interruptable Were-Temporary.
 	 */
 	hz = archhz();
-	/* Intel cpu's in archk10 must be reviewed */
+	/* Intel cpu's in archamd64.c must be reviewed */
 	if(hz == 0)
 		hz = 2000000000ll;
 	mach->cpuhz = hz;

sys/src/9/k10/map.c → sys/src/9/amd64/map.c


sys/src/9/k10/mem.h → sys/src/9/amd64/mem.h


sys/src/9/k10/memory.c → sys/src/9/amd64/memory.c


sys/src/9/k10/mmu.c → sys/src/9/amd64/mmu.c


sys/src/9/k10/mouse.c → sys/src/9/amd64/mouse.c


sys/src/9/k10/mp.c → sys/src/9/amd64/mp.c


sys/src/9/k10/msi.c → sys/src/9/amd64/msi.c


sys/src/9/k10/multiboot.c → sys/src/9/amd64/multiboot.c


sys/src/9/k10/nixtype → sys/src/9/amd64/nixtype


sys/src/9/k10/physalloc.c → sys/src/9/amd64/physalloc.c


sys/src/9/k10/pmcio.c → sys/src/9/amd64/pmcio.c


sys/src/9/k10/qmalloc.c → sys/src/9/amd64/qmalloc.c


sys/src/9/k10/ratrace.c → sys/src/9/amd64/ratrace.c


sys/src/9/k10/root/cpu.c → sys/src/9/amd64/root/cpu.c


sys/src/9/k10/root/k8root.namespace → sys/src/9/amd64/root/k8root.namespace


sys/src/9/k10/root/k8root.proto → sys/src/9/amd64/root/k8root.proto


sys/src/9/k10/root/k8root.rc → sys/src/9/amd64/root/k8root.rc


sys/src/9/k10/root/mkfile → sys/src/9/amd64/root/mkfile


sys/src/9/k10/root/tcp17010 → sys/src/9/amd64/root/tcp17010


sys/src/9/k10/screen.c → sys/src/9/amd64/screen.c


sys/src/9/k10/screen.h → sys/src/9/amd64/screen.h


sys/src/9/k10/sdata.c → sys/src/9/amd64/sdata.c


sys/src/9/k10/sipi.c → sys/src/9/amd64/sipi.c


sys/src/9/k10/startdisk → sys/src/9/amd64/startdisk


sys/src/9/k10/syscall.c → sys/src/9/amd64/syscall.c


sys/src/9/k10/tcore.c → sys/src/9/amd64/tcore.c


sys/src/9/k10/trap.c → sys/src/9/amd64/trap.c


sys/src/9/k10/uncached.h → sys/src/9/amd64/uncached.h


sys/src/9/k10/usbehci.h → sys/src/9/amd64/usbehci.h


sys/src/9/k10/usbehcipc.c → sys/src/9/amd64/usbehcipc.c


sys/src/9/k10/usbohci.c → sys/src/9/amd64/usbohci.c


sys/src/9/k10/usbuhci.c → sys/src/9/amd64/usbuhci.c


sys/src/9/k10/vga.c → sys/src/9/amd64/vga.c


sys/src/9/k10/vgax.c → sys/src/9/amd64/vgax.c


sys/src/9/k10/vsvm.c → sys/src/9/amd64/vsvm.c


+ 3 - 3
sys/src/9/boot/boot.json

@@ -20,8 +20,8 @@
 		"Install": "/sys/src/9/boot",
 		"Library": "libboot.a",
 		"Pre": [
-			"mksys -o bootk8cpu.c -mode=bootk8cpu.c $HARVEY/sys/src/sysconf.json",
-			"[ ! -f bootk8cpu.elf.out ] || rm *.elf.out"
+			"mksys -o bootamd64cpu.c '-mode=bootamd64cpu.c' $HARVEY/sys/src/sysconf.json",
+			"[ ! -f bootamd64cpu.elf.out ] || rm *.elf.out"
 		],
 		"SourceFiles": [
 			"aux.c",
@@ -29,7 +29,7 @@
 			"boot.c",
 			"bootcache.c",
 			"bootip.c",
-			"bootk8cpu.c",
+			"bootamd64cpu.c",
 			"bootrc.c",
 			"embed.c",
 			"local.c",

+ 4 - 4
sys/src/9/boot/bootconf.json

@@ -1,5 +1,5 @@
 {
-	"bootk8cpu": {
+	"bootamd64cpu": {
 		"Include": [
 			"/amd64/include/cflags.json"
 		],
@@ -15,15 +15,15 @@
 		],
 		"Post": [
 			"rm *.o *.a",
-			"data2c ramfs_bootk8cpu_ ../boot/bootk8cpu.elf.out >> ../k10/k8cpu.c"
+			"data2c ramfs_bootamd64cpu_ ../boot/bootamd64cpu.elf.out >> ../amd64/amd64cpu.c"
 		],
-		"Program": "bootk8cpu.elf.out",
+		"Program": "bootamd64cpu.elf.out",
 		"Projects": [
 			"boot.json"
 		],
 		"SourceFiles": [
 			"printstub.c",
-			"bootk8cpu.c"
+			"bootamd64cpu.c"
 		]
 	}
 }

+ 0 - 10
sys/src/9/k10/.gitignore

@@ -1,10 +0,0 @@
-/init.h
-/systab.c
-/bootk8cpu.c
-/tags
-/amd64l.h
-/k8cpu.c
-/9k.asm
-/errstr.h
-/ksyms.map
-/nvram

+ 5 - 1
util/GO9PRUN

@@ -25,7 +25,11 @@ $kvmdo qemu-system-x86_64 -s -cpu Opteron_G1 -smp 1 -m 2048 $kvmflag \
 -redir tcp:17010::17010 \
 -redir tcp:17013::17013 \
 -append "nobootprompt=tcp maxcores=1024 fs=10.0.2.2 auth=10.0.2.2 nvram=/boot/nvram nvrlen=512 nvroff=0" \
--kernel 9k8cpu.32bit $*
+-kernel harvey.32bit $*
+EOF
+
+echo $cmd
+eval $cmd
 
 kill $ufspid
 wait

+ 1 - 1
util/GO9PRUN8

@@ -9,7 +9,7 @@ for port in `seq 5550 5557`; do
 		--machine pc \
 		-net nic,model=rtl8139 \
 		-net user,hostfwd=tcp::"$port"-:1522 \
-		-kernel 9k8cpu.32bit $* </dev/null &
+		-kernel harvey.32bit $* </dev/null &
 	pids="$! $pids"
 done
 

+ 1 - 1
util/QRUN

@@ -3,7 +3,7 @@ sudo qemu-system-x86_64 -s -cpu Opteron_G1 -smp 8 -m 2048  \
 --machine pc \
 -net nic,model=rtl8139 \
 -net user,hostfwd=tcp::5555-:1522 \
--kernel 9k8cpu.32bit $*
+-kernel harvey.32bit $*
 
 # -nographic \
 #-S -gdb tcp::1234 \

+ 5 - 1
util/REGRESS

@@ -28,7 +28,11 @@ $kvmflag \
 --machine pc \
 -net nic,model=rtl8139 \
 -net user,hostfwd=tcp::5555-:1522 \
--kernel $HARVEY/sys/src/9/k10/9k8cpu.32bit $* 
+-net dump,file=/tmp/vm0.pcap \
+-redir tcp:17010::17010 \
+-redir tcp:17013::17013 \
+-append "nobootprompt=tcp maxcores=1024 fs=10.0.2.2 auth=10.0.2.2 param" \
+-kernel harvey.32bit $*
 
 kill $pids
 wait

+ 1 - 1
util/SERIALKVM

@@ -4,7 +4,7 @@ sudo qemu-system-x86_64 -s -cpu kvm64,+vmx -smp 8 -m 2048  \
 -net nic,model=rtl8139 \
 -net user,hostfwd=tcp::5555-:23 \
  -nographic \
--kernel 9k8cpu.32bit $*
+-kernel harvey.32bit $*
 
 #-S -gdb tcp::1234 \
 # -nographic \

+ 0 - 0
util/SYSLINUX


Some files were not shown because too many files changed in this diff