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

Merge branch 'master' of github.com:redox-os/redox

Browse source
This commit is contained in:
Jeremy Soller 2018-05-30 09:19:38 -06:00
commit dd170473f9
1 changed files with 2 additions and 1 deletions
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),) ifneq ($(bridge),)
QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0 QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0
else 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 endif
ifeq ($(net),redir) ifeq ($(net),redir)
QEMUFLAGS+=-redir tcp:8023::8023 -redir tcp:8080::8080 QEMUFLAGS+=-redir tcp:8023::8023 -redir tcp:8080::8080