From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LMqk1-0000S9-6W for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:05 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LMqjz-0000PO-HF for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:04 -0500 Received: from [199.232.76.173] (port=47228 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LMqjz-0000PE-Bs for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:03 -0500 Received: from g5t0007.atlanta.hp.com ([15.192.0.44]:3645) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LMqjy-0000v6-UF for qemu-devel@nongnu.org; Tue, 13 Jan 2009 16:24:03 -0500 From: Alex Williamson Content-Type: text/plain Date: Tue, 13 Jan 2009 14:23:51 -0700 Message-Id: <1231881831.9095.192.camel@bling> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 2/5] virtio-net: Add a virtqueue for control commands from the guest Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm Cc: Mark McLoughlin , qemu-devel 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(-) 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