diff --git a/QA.sh b/QA.sh index 4e67f6c..8132dd1 100755 --- a/QA.sh +++ b/QA.sh @@ -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 diff --git a/runDisk.sh b/runDisk.sh index 5ca3b2a..3556894 100755 --- a/runDisk.sh +++ b/runDisk.sh @@ -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: diff --git a/runOver9P.sh b/runOver9P.sh index 4fb44b0..e5b0bf9 100755 --- a/runOver9P.sh +++ b/runOver9P.sh @@ -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