From patchwork Tue Jan 13 21:23:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 2220 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0DLKkoq012171 for ; Tue, 13 Jan 2009 13:20:46 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757033AbZAMVYH (ORCPT ); Tue, 13 Jan 2009 16:24:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757097AbZAMVYE (ORCPT ); Tue, 13 Jan 2009 16:24:04 -0500 Received: from g5t0007.atlanta.hp.com ([15.192.0.44]:3644 "EHLO g5t0007.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757033AbZAMVYB (ORCPT ); Tue, 13 Jan 2009 16:24:01 -0500 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g5t0007.atlanta.hp.com (Postfix) with ESMTP id 14B8714487; Tue, 13 Jan 2009 21:24:01 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g1t0038.austin.hp.com (Postfix) with ESMTP id D730C30055; Tue, 13 Jan 2009 21:24:00 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl.fc.hp.com (Postfix) with ESMTP id 383D039C001; Tue, 13 Jan 2009 14:24:00 -0700 (MST) X-Virus-Scanned: Debian amavisd-new at ldl.fc.hp.com Received: from ldl.fc.hp.com ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KQGov8EuN1Vh; Tue, 13 Jan 2009 14:23:58 -0700 (MST) Received: from [192.168.1.60] (squirrel.fc.hp.com [15.11.146.57]) by ldl.fc.hp.com (Postfix) with ESMTP id 9E72339C003; Tue, 13 Jan 2009 14:23:57 -0700 (MST) Subject: [PATCH 2/5] virtio-net: Add a virtqueue for control commands from the guest From: Alex Williamson To: kvm Cc: qemu-devel , Mark McLoughlin Organization: HP OSLO R&D Date: Tue, 13 Jan 2009 14:23:51 -0700 Message-Id: <1231881831.9095.192.camel@bling> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This will be used for RX mode, MAC table, VLAN table control, etc... Signed-off-by: Alex Williamson --- qemu/hw/virtio-net.c | 32 ++++++++++++++++++++++++++++++++ qemu/hw/virtio-net.h | 3 +++ 2 files changed, 35 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/qemu/hw/virtio-net.c b/qemu/hw/virtio-net.c index e9b3d46..99f91f2 100644 --- a/qemu/hw/virtio-net.c +++ b/qemu/hw/virtio-net.c @@ -27,6 +27,7 @@ typedef struct VirtIONet uint8_t mac[6]; VirtQueue *rx_vq; VirtQueue *tx_vq; + VirtQueue *ctrl_vq; VLANClientState *vc; QEMUTimer *tx_timer; int tx_timer_active; @@ -110,6 +111,36 @@ static void virtio_net_set_features(VirtIODevice *vdev, uint32_t features) #endif } +static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) +{ + struct { + uint8_t class; + uint8_t cmd; + } *ctrl; + uint8_t *status; + VirtQueueElement elem; + + while (virtqueue_pop(vq, &elem)) { + if ((elem.in_num < 1) | (elem.out_num < 1)) { + fprintf(stderr, "virtio-net ctrl missing headers\n"); + exit(1); + } + + if (elem.out_sg[0].iov_len < sizeof(*ctrl) || + elem.out_sg[elem.in_num - 1].iov_len < sizeof(*status)) { + fprintf(stderr, "virtio-net ctrl header not in correct element\n"); + exit(1); + } + + ctrl = (void *)elem.out_sg[0].iov_base; + status = (void *)elem.in_sg[elem.in_num - 1].iov_base; + *status = VIRTIO_NET_ERR; + + virtqueue_push(vq, &elem, sizeof(*status)); + virtio_notify(vdev, vq); + } +} + /* RX */ static void virtio_net_handle_rx(VirtIODevice *vdev, VirtQueue *vq) @@ -424,6 +455,7 @@ PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn) n->vdev.set_features = virtio_net_set_features; n->rx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_rx); n->tx_vq = virtio_add_queue(&n->vdev, 256, virtio_net_handle_tx); + n->ctrl_vq = virtio_add_queue(&n->vdev, 16, virtio_net_handle_ctrl); memcpy(n->mac, nd->macaddr, 6); n->vc = qemu_new_vlan_client(nd->vlan, nd->model, nd->name, virtio_net_receive, virtio_net_can_receive, n); diff --git a/qemu/hw/virtio-net.h b/qemu/hw/virtio-net.h index 0d9f71b..1f13123 100644 --- a/qemu/hw/virtio-net.h +++ b/qemu/hw/virtio-net.h @@ -77,4 +77,7 @@ struct virtio_net_hdr_mrg_rxbuf PCIDevice *virtio_net_init(PCIBus *bus, NICInfo *nd, int devfn); +#define VIRTIO_NET_OK 0 +#define VIRTIO_NET_ERR 1 + #endif