* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
-#include "net/vde.h"
-
#include "config-host.h"
#include <libvdeplug.h>
-#include "net.h"
-#include "qemu-char.h"
+#include "net/net.h"
+#include "clients.h"
#include "qemu-common.h"
-#include "qemu-option.h"
-#include "sysemu.h"
+#include "qemu/option.h"
+#include "qemu/main-loop.h"
typedef struct VDEState {
- VLANClientState *vc;
+ NetClientState nc;
VDECONN *vde;
} VDEState;
static void vde_to_qemu(void *opaque)
{
VDEState *s = opaque;
- uint8_t buf[4096];
+ uint8_t buf[NET_BUFSIZE];
int size;
size = vde_recv(s->vde, (char *)buf, sizeof(buf), 0);
if (size > 0) {
- qemu_send_packet(s->vc, buf, size);
+ qemu_send_packet(&s->nc, buf, size);
}
}
-static ssize_t vde_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
+static ssize_t vde_receive(NetClientState *nc, const uint8_t *buf, size_t size)
{
- VDEState *s = vc->opaque;
+ VDEState *s = DO_UPCAST(VDEState, nc, nc);
ssize_t ret;
do {
return ret;
}
-static void vde_cleanup(VLANClientState *vc)
+static void vde_cleanup(NetClientState *nc)
{
- VDEState *s = vc->opaque;
+ VDEState *s = DO_UPCAST(VDEState, nc, nc);
qemu_set_fd_handler(vde_datafd(s->vde), NULL, NULL, NULL);
vde_close(s->vde);
- qemu_free(s);
}
-static int net_vde_init(VLANState *vlan, const char *model,
+static NetClientInfo net_vde_info = {
+ .type = NET_CLIENT_OPTIONS_KIND_VDE,
+ .size = sizeof(VDEState),
+ .receive = vde_receive,
+ .cleanup = vde_cleanup,
+};
+
+static int net_vde_init(NetClientState *peer, const char *model,
const char *name, const char *sock,
int port, const char *group, int mode)
{
+ NetClientState *nc;
VDEState *s;
+ VDECONN *vde;
char *init_group = (char *)group;
char *init_sock = (char *)sock;
.mode = mode,
};
- s = qemu_mallocz(sizeof(VDEState));
- s->vde = vde_open(init_sock, (char *)"QEMU", &args);
- if (!s->vde){
- free(s);
+ vde = vde_open(init_sock, (char *)"QEMU", &args);
+ if (!vde){
return -1;
}
- s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_VDE,
- vlan, NULL, model, name, NULL,
- vde_receive, NULL, NULL,
- vde_cleanup, s);
+
+ nc = qemu_new_net_client(&net_vde_info, peer, model, name);
+
+ snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d",
+ sock, vde_datafd(vde));
+
+ s = DO_UPCAST(VDEState, nc, nc);
+
+ s->vde = vde;
+
qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
- snprintf(s->vc->info_str, sizeof(s->vc->info_str), "sock=%s,fd=%d",
- sock, vde_datafd(s->vde));
+
return 0;
}
-int net_init_vde(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
+int net_init_vde(const NetClientOptions *opts, const char *name,
+ NetClientState *peer)
{
- const char *sock;
- const char *group;
- int port, mode;
+ const NetdevVdeOptions *vde;
- sock = qemu_opt_get(opts, "sock");
- group = qemu_opt_get(opts, "group");
+ assert(opts->kind == NET_CLIENT_OPTIONS_KIND_VDE);
+ vde = opts->vde;
- port = qemu_opt_get_number(opts, "port", 0);
- mode = qemu_opt_get_number(opts, "mode", 0700);
-
- if (net_vde_init(vlan, "vde", name, sock, port, group, mode) == -1) {
+ /* missing optional values have been initialized to "all bits zero" */
+ if (net_vde_init(peer, "vde", name, vde->sock, vde->port, vde->group,
+ vde->has_mode ? vde->mode : 0700) == -1) {
return -1;
}
- if (vlan) {
- vlan->nb_host_devs++;
- }
-
return 0;
}