Commit cb7cca1a1c2ff60330b7216c86e1d188f5ab2b11
1 parent
fd501a05
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
Showing
2 changed files
with
1 additions
and
2 deletions
exec-all.h
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | /* allow to see translation results - the slowdown should be negligible, so we leave it */ | 21 | /* allow to see translation results - the slowdown should be negligible, so we leave it */ |
| 22 | -//#define DEBUG_DISAS | 22 | +#define DEBUG_DISAS |
| 23 | 23 | ||
| 24 | /* is_jmp field values */ | 24 | /* is_jmp field values */ |
| 25 | #define DISAS_NEXT 0 /* next instruction can be analyzed */ | 25 | #define DISAS_NEXT 0 /* next instruction can be analyzed */ |
vl.c
| @@ -4030,7 +4030,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd) | @@ -4030,7 +4030,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan, int fd) | ||
| 4030 | if (!s) | 4030 | if (!s) |
| 4031 | return NULL; | 4031 | return NULL; |
| 4032 | s->fd = fd; | 4032 | s->fd = fd; |
| 4033 | - enable_sigio_timer(fd); | ||
| 4034 | s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s); | 4033 | s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s); |
| 4035 | qemu_set_fd_handler(s->fd, tap_send, NULL, s); | 4034 | qemu_set_fd_handler(s->fd, tap_send, NULL, s); |
| 4036 | snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd); | 4035 | snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd); |