vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1186 from sajattack/patch-4

Browse source 
Fix for qemu 2.12
This commit is contained in:
Jeremy Soller 2018-05-26 20:12:00 -06:00 committed by GitHub
parent 4c5d2a17a6 67740defa8
commit 87753f8a23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mk/qemu.mk
View file

@ -15,7 +15,8 @@ else
ifneq ($(bridge),)
QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0
else
QEMUFLAGS+=-net nic,model=e1000 -net user -net dump,file=build/network.pcap
QEMUFLAGS+=-netdev user,id=net0 -device e1000,netdev=net0 \
-object filter-dump,id=f1,netdev=net0,file=build/network.pcap
endif
ifeq ($(net),redir)
QEMUFLAGS+=-redir tcp:8023::8023 -redir tcp:8080::8080