aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-05 21:33:45 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-05-05 21:33:45 +0000
commitcb7cca1a1c2ff60330b7216c86e1d188f5ab2b11 (patch)
tree647e0af4d02b782db3dbeada29072d33ad162e47
parentfd501a05c6024f1d0c8963c139093848465b3aba (diff)
Revert commit r4342 and r4343, wasn't intended to be committed
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4346 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--exec-all.h2
-rw-r--r--vl.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/exec-all.h b/exec-all.h
index 2efccfe983..d98b91d3f3 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -19,7 +19,7 @@
*/
/* allow to see translation results - the slowdown should be negligible, so we leave it */
-//#define DEBUG_DISAS
+#define DEBUG_DISAS
/* is_jmp field values */
#define DISAS_NEXT 0 /* next instruction can be analyzed */
diff --git a/vl.c b/vl.c
index f752a3b741..ea8c63c5db 100644
--- a/vl.c
+++ b/vl.c
@@ -4030,7 +4030,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
if (!s)
return NULL;
s->fd = fd;
- enable_sigio_timer(fd);
s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s);
qemu_set_fd_handler(s->fd, tap_send, NULL, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd);