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

diff --git a/exec-all.h b/exec-all.h
index 2efccfe9835075e8d190aedc758e0b43b1e10304..d98b91d3f3573caf17a45e1e6b1fd4de3e09d614 100644 (file)
--- 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 f752a3b741a5ba99b0864ef542ee10893653e9ca..ea8c63c5dbd8aee62da847b109fb6001ddc8192d 100644 (file)
--- 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);