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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Giacomo Tesio 2017-09-14 01:08:53 +02:00
parent 5d8c601184 d4017ca6a9
commit 4970422b30
5 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
QA.sh
View File

@ -66,12 +66,8 @@ $kvmdo qemu-system-x86_64 -s -cpu $CPU_MODEL -smp $NCPU -m 2048 $kvmflag \
--monitor /dev/null \
--machine $machineflag \
$bootDisk \
-net nic,model=rtl8139 \
-net user,hostfwd=tcp::5555-:1522 \
-net dump,file=/tmp/vm0.pcap \
-netdev user,id=tcp9,hostfwd=tcp::9999-:9 \
-netdev user,id=tcp17010,hostfwd=tcp::17010-:17010 \
-netdev user,id=tcp17013,hostfwd=tcp::17013-:17013 \
-netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 \
-device rtl8139,netdev=ethernet.0 \
$appendLine $kernelLine
EOF

2
cross/pkgs/mksh/src

@ -1 +1 @@
Subproject commit af47ee8d8e192240698959d418840cb9d8a8f645
Subproject commit 8debd3a2024a5733b8b4688f94399b4e1ff87df0

2
cross/pkgs/newlib/src

@ -1 +1 @@
Subproject commit bae05fec4e6f51181a47798030abd942477142fa
Subproject commit cb02879013de4aef03460a5a7cffcba516eef295

8
runDisk.sh
View File

@ -58,12 +58,8 @@ $kvmdo qemu-system-x86_64 -s -cpu Haswell -smp $NCPU -m 2048 $kvmflag \
-no-reboot -serial mon:stdio \
--machine $machineflag \
$bootDisk \
-net nic,model=rtl8139 \
-net user,hostfwd=tcp::5555-:1522 \
-net dump,file=/tmp/vm0.pcap \
-netdev user,id=tcp9,hostfwd=tcp::9999-:9 \
-netdev user,id=tcp17010,hostfwd=tcp::17010-:17010 \
-netdev user,id=tcp17013,hostfwd=tcp::17013-:17013
-netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 \
-device rtl8139,netdev=ethernet.0
EOF
# To enable qemu log:

10
runOver9P.sh
View File

@ -58,12 +58,8 @@ $kvmdo qemu-system-x86_64 -s -cpu Haswell -smp $NCPU -m 2048 $kvmflag \
-no-reboot -serial mon:stdio \
--machine $machineflag \
$bootDisk \
-net nic,model=rtl8139 \
-net user,hostfwd=tcp::5555-:1522 \
-net dump,file=/tmp/vm0.pcap \
-netdev user,id=tcp9,hostfwd=tcp::9999-:9 \
-netdev user,id=tcp17010,hostfwd=tcp::17010-:17010 \
-netdev user,id=tcp17013,hostfwd=tcp::17013-:17013 \
-netdev user,id=ethernet.0,hostfwd=tcp::5555-:1522,hostfwd=tcp::9999-:9,hostfwd=tcp::17010-:17010,hostfwd=tcp::17013-:17013 \
-device rtl8139,netdev=ethernet.0 \
$usbDev \
-append "maxcores=1024 nvram=$NVRAM nvrlen=512 nvroff=0 console=0 qemu-user=$QEMU_USER *acpi= $FS $KAPPEND" \
-initrd ./initrd \
@ -73,6 +69,8 @@ EOF
# To enable qemu log:
#-D $JEHANNE/../qemu.log -d int,cpu_reset,in_asm \
#-net dump,file=/tmp/vm0.pcap \
echo $cmd
eval $cmd