Add VirtualBox support

Run hyperStart on VirtualBox

Signed-off-by: Gao feng <[email protected]>

Author: Gao feng

.gitignore

@@ -11,6 +11,7 @@ init
 build/hyper_daemon
 build/hyper-initrd.img
 build/root/*
+build/*iso
 build/daemon
 build/.*
 src/.*

Makefile.am

@@ -1 +1,4 @@
 SUBDIRS=src build
+
+initrd-local:
+	@echo finish make initrd

README.md

@@ -11,3 +11,13 @@ clone this repo, and make sure have build-essentials installed. Go into the work
     > make
 
 Then you can find `hyper-initrd.img` in build directory, together with a pre-build kernel.
+
+If you want to get the boot disk file for VirtaulBox, please reconfigure with flag --with-vbox,
+
+    > ./configure --with-vbox
+    > make
+
+Note: This will need you to input your password to mount pseudo vbox image.
+
+Then you can find `hyper-vbox-bootimage.iso` in build directory, booting from this iso will
+bring you to the hyper world.

build/Makefile.am

@@ -1,7 +1,13 @@
 bin_PROGRAMS=hyper_daemon
 hyper_daemon_SOURCES=hyper_daemon.c ../src/net.c
-all-local:
-	bash ./make-initrd.sh
+all-local: initrd
 
-cbfs-local:
+if WITH_VBOX
+initrd-local:
+	bash ./make-initrd.sh vbox
+else
+initrd-local:
+	bash ./make-initrd.sh
+cbfs:
 	bash ./make-initrd.sh cbfs
+endif

build/kernel

@@ -432,9 +432,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+# CONFIG_MTRR_SANITIZER is not set
 CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
@@ -585,29 +583,24 @@ CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
 # CONFIG_UNIX_DIAG is not set
-CONFIG_XFRM=y
 # CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
 # CONFIG_IP_MULTICAST is not set
 # CONFIG_IP_ADVANCED_ROUTER is not set
 # CONFIG_IP_PNP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IP_TUNNEL=y
+# CONFIG_NET_IP_TUNNEL is not set
 # CONFIG_SYN_COOKIES is not set
 # CONFIG_NET_UDP_TUNNEL is not set
 # CONFIG_NET_FOU is not set
-# CONFIG_NET_FOU_IP_TUNNELS is not set
 # CONFIG_GENEVE is not set
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
 # CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=y
+# CONFIG_INET_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
@@ -626,14 +619,11 @@ CONFIG_IPV6=y
 # CONFIG_IPV6_MIP6 is not set
 # CONFIG_INET6_XFRM_TUNNEL is not set
 # CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET6_XFRM_MODE_BEET is not set
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-# CONFIG_IPV6_VTI is not set
-CONFIG_IPV6_SIT=y
-# CONFIG_IPV6_SIT_6RD is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_SIT is not set
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_GRE is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
@@ -730,7 +720,7 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 # CONFIG_PARPORT is not set
 CONFIG_PNP=y
-CONFIG_PNP_DEBUG_MESSAGES=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
 
 #
 # Protocols
@@ -758,7 +748,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
 CONFIG_XEN_BLKDEV_FRONTEND=y
-# CONFIG_XEN_BLKDEV_BACKEND is not set
 CONFIG_VIRTIO_BLK=y
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
@@ -943,7 +932,69 @@ CONFIG_VIRTIO_NET=y
 # CONFIG_NET_DSA_MV88E6171 is not set
 # CONFIG_NET_DSA_MV88E6352 is not set
 # CONFIG_NET_DSA_BCM_SF2 is not set
-# CONFIG_ETHERNET is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_AGERE is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_ALTERA_TSE is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_XGENE is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_CX_ECAT is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_HP is not set
+CONFIG_NET_VENDOR_INTEL=y
+# CONFIG_E100 is not set
+CONFIG_E1000=y
+# CONFIG_E1000E is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_IXGB is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGBEVF is not set
+# CONFIG_I40E is not set
+# CONFIG_I40EVF is not set
+# CONFIG_FM10K is not set
+# CONFIG_NET_VENDOR_I825XX is not set
+# CONFIG_IP1000 is not set
+# CONFIG_JME is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_ETHOC is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_ROCKER is not set
+# CONFIG_NET_VENDOR_SAMSUNG is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_SFC is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
 # CONFIG_NET_SB1000 is not set
@@ -961,7 +1012,6 @@ CONFIG_VIRTIO_NET=y
 #
 # CONFIG_WAN is not set
 CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_BACKEND is not set
 # CONFIG_VMXNET3 is not set
 # CONFIG_ISDN is not set
 
@@ -995,17 +1045,8 @@ CONFIG_INPUT=y
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
+# CONFIG_SERIO is not set
 CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-# CONFIG_SERIO_ALTERA_PS2 is not set
-# CONFIG_SERIO_PS2MULT is not set
-# CONFIG_SERIO_ARC_PS2 is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -1216,14 +1257,13 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 #
 # CONFIG_XEN_BALLOON is not set
 # CONFIG_XEN_DEV_EVTCHN is not set
-CONFIG_XEN_BACKEND=y
+# CONFIG_XEN_BACKEND is not set
 # CONFIG_XENFS is not set
 # CONFIG_XEN_SYS_HYPERVISOR is not set
 CONFIG_XEN_XENBUS_FRONTEND=y
 # CONFIG_XEN_GNTDEV is not set
 # CONFIG_XEN_GRANT_DEV_ALLOC is not set
 CONFIG_SWIOTLB_XEN=y
-CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_HAVE_PVMMU=y
 # CONFIG_STAGING is not set
@@ -1385,7 +1425,7 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -1433,7 +1473,7 @@ CONFIG_NLS_CODEPAGE_437=m
 # CONFIG_NLS_MAC_INUIT is not set
 # CONFIG_NLS_MAC_ROMANIAN is not set
 # CONFIG_NLS_MAC_TURKISH is not set
-CONFIG_NLS_UTF8=m
+# CONFIG_NLS_UTF8 is not set
 
 #
 # Kernel hacking

build/kernel_config

@@ -18,23 +18,55 @@ do
 		fi
 	done
 done
+
+if [ "$1"x = "vbox"x ]; then
+	echo "build initrd for vbox"
+	cp ./vbox/driver/* ./root
+fi
+
 cd ./root && find . | cpio -H newc -o | gzip -9 > ../hyper-initrd.img
 
+cd ../
+rm -rf ./root
+
+if [ "$1"x = "cbfs"x ]; then
+	echo "build cbfs"
+	rm -rf .cbfs
+	rm -rf cbfs.rom
 
-if [ "$1" != "cbfs" ]; then
+	mkdir .cbfs
+	dd if=/dev/zero of=.cbfs/boot.bin bs=4096 count=1
+	cbfstool .cbfs/cbfs.rom create -s 4096k -B .cbfs/boot.bin -m x86  0x1000
+	cbfstool .cbfs/cbfs.rom add -f kernel -n vmlinuz -t raw
+	cbfstool .cbfs/cbfs.rom add -f hyper-initrd.img -n initrd -t raw
+	cp .cbfs/cbfs.rom ./
+	rm -rf .cbfs
 	exit 0
 fi
 
-cd ../
+if [ "$1"x = "vbox"x ]; then
+	mkdir tmp
+	mkdir -p tmp/images
+	mkdir -p tmp/kernel
+	mkdir -p tmp/isolinux
 
-echo "build cbfs"
-rm -rf .cbfs
-rm -rf cbfs.rom
-
-mkdir .cbfs
-dd if=/dev/zero of=.cbfs/boot.bin bs=4096 count=1
-cbfstool .cbfs/cbfs.rom create -s 4096k -B .cbfs/boot.bin -m x86  0x1000
-cbfstool .cbfs/cbfs.rom add -f kernel -n vmlinuz -t raw
-cbfstool .cbfs/cbfs.rom add -f hyper-initrd.img -n initrd -t raw
-cp .cbfs/cbfs.rom ./
-rm -rf .cbfs
+	cd tmp
+	cp ../vbox/kernel ./kernel/
+	cp ../hyper-initrd.img ./images/initrd.img
+	cp ../vbox/isolinux/isolinux.bin ./isolinux/
+	cp ../vbox/isolinux/ldlinux.c32 ./isolinux/
+
+cat > isolinux/syslinux.cfg <<EOF
+DEFAULT linux
+LABEL linux
+  SAY Now booting the kernel from SYSLINUX...
+  KERNEL /kernel/kernel
+  APPEND initrd=/images/initrd.img
+EOF
+
+	cd ../
+
+	mkisofs -o hyper-vbox-boot.iso -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table tmp 
+
+	rm -fr tmp
+fi