diff options
author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-05-17 21:13:42 +0000 |
---|---|---|
committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2004-05-17 21:13:42 +0000 |
commit | 158156d13df1828b9ee7def9c14688285900c2dc (patch) | |
tree | 110c30303331065f068f2deb6ff459a9141a13ac | |
parent | e63c59cb34fdad20f70c83dd4bfe938fb37433ab (diff) | |
download | hqemu-158156d13df1828b9ee7def9c14688285900c2dc.zip hqemu-158156d13df1828b9ee7def9c14688285900c2dc.tar.gz |
-user-net is optional - EAGAIN fix
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@817 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r-- | vl.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1820,7 +1820,7 @@ int main_loop(void) n = read(ioh->fd, buf, ioh->max_size); if (n >= 0) { ioh->fd_read(ioh->opaque, buf, n); - } else if (errno != -EAGAIN) { + } else if (errno != EAGAIN) { ioh->fd_read(ioh->opaque, NULL, -errno); } } @@ -2001,7 +2001,9 @@ const QEMUOption qemu_options[] = { { "macaddr", HAS_ARG, QEMU_OPTION_macaddr}, { "n", HAS_ARG, QEMU_OPTION_d }, { "tun-fd", HAS_ARG, QEMU_OPTION_tun_fd }, +#ifdef CONFIG_SLIRP { "user-net", 0, QEMU_OPTION_user_net }, +#endif { "dummy-net", 0, QEMU_OPTION_dummy_net }, { "kernel", HAS_ARG, QEMU_OPTION_kernel }, |