JehanneOS/devtools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

QA.sh & runOver9P.sh: introduce qemu-user boot parameter

Browse Source
This commit is contained in:
Giacomo Tesio 2017-08-30 23:15:17 +02:00
parent 7b8ebef97c
commit b7a9f208c3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QA.sh
View File

@ -37,7 +37,9 @@ if [ "$CPU_MODEL" = "" ]; then
CPU_MODEL=Opteron_G1 CPU_MODEL=Opteron_G1
fi fi
appendLine="console=0 nobootprompt=tcp maxcores=1024 fs=10.0.2.2 auth=10.0.2.2 nvram=/boot/nvram nvrlen=512 nvroff=0 $KAPPEND" QEMU_USER=`whoami`
appendLine="console=0 nobootprompt=tcp maxcores=1024 fs=10.0.2.2 auth=10.0.2.2 nvram=/boot/nvram nvrlen=512 nvroff=0 qemu-user=$QEMU_USER $KAPPEND"
appendLine="-append '$appendLine'" appendLine="-append '$appendLine'"
kernelLine="-kernel $KERNEL $*" kernelLine="-kernel $KERNEL $*"
if [ "$DISK" = "" ]; then if [ "$DISK" = "" ]; then

4
runOver9P.sh
View File

@ -49,6 +49,8 @@ if [ "$NCPU" = "" ]; then
NCPU=4 NCPU=4
fi fi
QEMU_USER=`whoami`
cd $KERNDIR cd $KERNDIR
read -r cmd <<EOF read -r cmd <<EOF
$kvmdo qemu-system-x86_64 -s -cpu Haswell -smp $NCPU -m 2048 $kvmflag \ $kvmdo qemu-system-x86_64 -s -cpu Haswell -smp $NCPU -m 2048 $kvmflag \
@ -63,7 +65,7 @@ $bootDisk \
-redir tcp:17010::17010 \ -redir tcp:17010::17010 \
-redir tcp:17013::17013 \ -redir tcp:17013::17013 \
$usbDev \ $usbDev \
-append "maxcores=1024 nvram=$NVRAM nvrlen=512 nvroff=0 console=0 *acpi= $FS $KAPPEND" \ -append "maxcores=1024 nvram=$NVRAM nvrlen=512 nvroff=0 console=0 qemu-user=$QEMU_USER *acpi= $FS $KAPPEND" \
-initrd ./initrd \ -initrd ./initrd \
-kernel $KERNEL $* -kernel $KERNEL $*
EOF EOF