#include "virtio.h"
#include "net.h"
#include "net/checksum.h"
+#include "net/tap.h"
#include "qemu-timer.h"
#include "virtio-net.h"
#include "qemu-common.h"
#include "net.h"
+#include "net/tap.h"
#include "monitor.h"
#include "sysemu.h"
#include "qemu-timer.h"
#endif /* CONFIG_SLIRP */
-#if defined(_WIN32)
-int tap_has_ufo(VLANClientState *vc)
-{
- return 0;
-}
-int tap_has_vnet_hdr(VLANClientState *vc)
-{
- return 0;
-}
-void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr)
-{
-}
-void tap_set_offload(VLANClientState *vc, int csum, int tso4,
- int tso6, int ecn, int ufo)
-{
-}
-#else /* !defined(_WIN32) */
+#if !defined(_WIN32) && !defined(_AIX)
/* Maximum GSO packet size (64k) plus plenty of room for
* the ethernet and virtio_net headers
return fd;
}
-#endif /* !_WIN32 */
+#endif /* !defined(_WIN32) && !defined(_AIX) */
#if defined(CONFIG_VDE)
typedef struct VDEState {
}
#endif /* CONFIG_SLIRP */
-#ifdef _WIN32
-static int net_init_tap_win32(QemuOpts *opts,
- Monitor *mon,
- const char *name,
- VLANState *vlan)
-{
- const char *ifname;
-
- ifname = qemu_opt_get(opts, "ifname");
-
- if (!ifname) {
- qemu_error("tap: no interface name\n");
- return -1;
- }
-
- if (tap_win32_init(vlan, "tap", name, ifname) == -1) {
- return -1;
- }
-
- if (vlan) {
- vlan->nb_host_devs++;
- }
-
- return 0;
-}
-#elif !defined(_AIX)
-static int net_init_tap(QemuOpts *opts,
- Monitor *mon,
- const char *name,
- VLANState *vlan)
+#if !defined(_WIN32) && !defined(_AIX)
+int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
{
TAPState *s;
int fd, vnet_hdr;
return 0;
}
-#endif
+#endif /* !defined(_WIN32) && !defined(_AIX) */
static int net_init_socket(QemuOpts *opts,
Monitor *mon,
{ /* end of list */ }
},
#endif
-#ifdef _WIN32
+#ifndef _AIX
}, {
.type = "tap",
- .init = net_init_tap_win32,
+ .init = net_init_tap,
.desc = {
NET_COMMON_PARAMS_DESC,
{
.type = QEMU_OPT_STRING,
.help = "interface name",
},
- { /* end of list */ }
- },
-#elif !defined(_AIX)
- }, {
- .type = "tap",
- .init = net_init_tap,
- .desc = {
- NET_COMMON_PARAMS_DESC,
+#ifndef _WIN32
{
.name = "fd",
.type = QEMU_OPT_STRING,
.help = "file descriptor of an already opened tap",
}, {
- .name = "ifname",
- .type = QEMU_OPT_STRING,
- .help = "interface name",
- }, {
.name = "script",
.type = QEMU_OPT_STRING,
.help = "script to initialize the interface",
.type = QEMU_OPT_BOOL,
.help = "enable the IFF_VNET_HDR flag on the tap interface"
},
+#endif /* _WIN32 */
{ /* end of list */ }
},
-#endif
+#endif /* _AIX */
}, {
.type = "socket",
.init = net_init_socket,
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
-int tap_has_ufo(VLANClientState *vc);
-int tap_has_vnet_hdr(VLANClientState *vc);
-void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);
-void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int ecn, int ufo);
-
#endif
* along with this program (see the file COPYING included with this
* distribution); if not, see <http://www.gnu.org/licenses/>.
*/
+
+#include "net/tap.h"
+
#include "qemu-common.h"
#include "net.h"
#include "sysemu.h"
}
}
-int tap_win32_init(VLANState *vlan, const char *model,
- const char *name, const char *ifname)
+static int tap_win32_init(VLANState *vlan, const char *model,
+ const char *name, const char *ifname)
{
TAPState *s;
qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s);
return 0;
}
+
+int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
+{
+ const char *ifname;
+
+ ifname = qemu_opt_get(opts, "ifname");
+
+ if (!ifname) {
+ qemu_error("tap: no interface name\n");
+ return -1;
+ }
+
+ if (tap_win32_init(vlan, "tap", name, ifname) == -1) {
+ return -1;
+ }
+
+ if (vlan) {
+ vlan->nb_host_devs++;
+ }
+
+ return 0;
+}
+
+int tap_has_ufo(VLANClientState *vc)
+{
+ return 0;
+}
+
+int tap_has_vnet_hdr(VLANClientState *vc)
+{
+ return 0;
+}
+
+void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr)
+{
+}
+
+void tap_set_offload(VLANClientState *vc, int csum, int tso4,
+ int tso6, int ecn, int ufo)
+{
+}
--- /dev/null
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ * Copyright (c) 2009 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef QEMU_NET_TAP_H
+#define QEMU_NET_TAP_H
+
+#include "qemu-common.h"
+#include "qemu-option.h"
+
+#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
+#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
+
+int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
+
+int tap_has_ufo(VLANClientState *vc);
+int tap_has_vnet_hdr(VLANClientState *vc);
+void tap_using_vnet_hdr(VLANClientState *vc, int using_vnet_hdr);
+void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int ecn, int ufo);
+
+#endif /* QEMU_NET_TAP_H */
void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque);
#endif
-/* TAP win32 */
-int tap_win32_init(VLANState *vlan, const char *model,
- const char *name, const char *ifname);
-
/* SLIRP */
void do_info_slirp(Monitor *mon);