git.ucc.asn.au
/
tpg
/
acess2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6397a74
9a13554
)
Merge branch 'master' of git://localhost/acess2
author
John Hodge
<
[email protected]
>
Sun, 12 May 2013 11:08:28 +0000
(19:08 +0800)
committer
John Hodge
<
[email protected]
>
Sun, 12 May 2013 11:08:28 +0000
(19:08 +0800)
1
2
KernelLand/Modules/Network/E1000/e1000.c
patch
|
diff1
|
diff2
|
blob
|
history
RunQemu
patch
|
diff1
|
diff2
|
blob
|
history
Usermode/Applications/axwin3_src/Interface/main.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
KernelLand/Modules/Network/E1000/e1000.c
Simple merge
diff --cc
RunQemu
index
07980b6
,
c34d963
..
68f6efc
---
1
/
RunQemu
---
2
/
RunQemu
+++ b/
RunQemu
@@@
-9,11
-9,12
+9,13
@@@
QEMU_PARAMS="
QEMU_PARAMS=$QEMU_PARAMS" -hda AcessHDD.img"
QEMU_PARAMS=$QEMU_PARAMS" -vga std"
QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
-QEMU_PARAMS=$QEMU_PARAMS" -net nic"
+QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=e1000"
+#QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=rtl8139"
-_NETTYPE="user"
+_NETTYPE="user
,hostfwd=tcp::5555-:23
"
+ _EVAL=eval
+
while [ $# -ne 0 ]; do
case $1 in
-gdb)
diff --cc
Usermode/Applications/axwin3_src/Interface/main.c
Simple merge
UCC
git Repository :: git.ucc.asn.au