qxl/update_area_io: guest_bug on invalid parameters

[qemu.git] / hw / vhost_net.c

diff --git a/hw/vhost_net.c b/hw/vhost_net.c
index c068be1f54944c26c61d0283a7553da7aae224da..ecaa22dfb4e28b4cfcc4508e4a1b1ca451da8c93 100644 (file)
--- a/hw/vhost_net.c
+++ b/hw/vhost_net.c
@@ -8,6 +8,9 @@
  *
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
  *
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.

+ *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.

  */
 
 #include "net.h"
  */
 
 #include "net.h"


@@ -15,6 +18,7 @@
 
 #include "virtio-net.h"
 #include "vhost_net.h"
 
 #include "virtio-net.h"
 #include "vhost_net.h"

+#include "qemu-error.h"

 
 #include "config.h"
 
 
 #include "config.h"
 


@@ -38,7 +42,7 @@ struct vhost_net {
     struct vhost_dev dev;
     struct vhost_virtqueue vqs[2];
     int backend;
     struct vhost_dev dev;
     struct vhost_virtqueue vqs[2];
     int backend;

-    VLANClientState *vc;
+    NetClientState *nc;

 };
 
 unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
 };
 
 unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)


@@ -50,6 +54,9 @@ unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
     if (!(net->dev.features & (1 << VIRTIO_RING_F_INDIRECT_DESC))) {
         features &= ~(1 << VIRTIO_RING_F_INDIRECT_DESC);
     }
     if (!(net->dev.features & (1 << VIRTIO_RING_F_INDIRECT_DESC))) {
         features &= ~(1 << VIRTIO_RING_F_INDIRECT_DESC);
     }

+    if (!(net->dev.features & (1 << VIRTIO_RING_F_EVENT_IDX))) {
+        features &= ~(1 << VIRTIO_RING_F_EVENT_IDX);
+    }

     if (!(net->dev.features & (1 << VIRTIO_NET_F_MRG_RXBUF))) {
         features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
     }
     if (!(net->dev.features & (1 << VIRTIO_NET_F_MRG_RXBUF))) {
         features &= ~(1 << VIRTIO_NET_F_MRG_RXBUF);
     }


@@ -65,15 +72,18 @@ void vhost_net_ack_features(struct vhost_net *net, unsigned features)
     if (features & (1 << VIRTIO_RING_F_INDIRECT_DESC)) {
         net->dev.acked_features |= (1 << VIRTIO_RING_F_INDIRECT_DESC);
     }
     if (features & (1 << VIRTIO_RING_F_INDIRECT_DESC)) {
         net->dev.acked_features |= (1 << VIRTIO_RING_F_INDIRECT_DESC);
     }

+    if (features & (1 << VIRTIO_RING_F_EVENT_IDX)) {
+        net->dev.acked_features |= (1 << VIRTIO_RING_F_EVENT_IDX);
+    }

     if (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {
         net->dev.acked_features |= (1 << VIRTIO_NET_F_MRG_RXBUF);
     }
 }
 
     if (features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {
         net->dev.acked_features |= (1 << VIRTIO_NET_F_MRG_RXBUF);
     }
 }
 

-static int vhost_net_get_fd(VLANClientState *backend)
+static int vhost_net_get_fd(NetClientState *backend)

 {
     switch (backend->info->type) {
 {
     switch (backend->info->type) {

-    case NET_CLIENT_TYPE_TAP:
+    case NET_CLIENT_OPTIONS_KIND_TAP:

         return tap_get_fd(backend);
     default:
         fprintf(stderr, "vhost-net requires tap backend\n");
         return tap_get_fd(backend);
     default:
         fprintf(stderr, "vhost-net requires tap backend\n");


@@ -81,10 +91,11 @@ static int vhost_net_get_fd(VLANClientState *backend)
     }
 }
 
     }
 }
 

-struct vhost_net *vhost_net_init(VLANClientState *backend, int devfd)
+struct vhost_net *vhost_net_init(NetClientState *backend, int devfd,
+                                 bool force)

 {
     int r;
 {
     int r;

-    struct vhost_net *net = qemu_malloc(sizeof *net);
+    struct vhost_net *net = g_malloc(sizeof *net);

     if (!backend) {
         fprintf(stderr, "vhost-net requires backend to be setup\n");
         goto fail;
     if (!backend) {
         fprintf(stderr, "vhost-net requires backend to be setup\n");
         goto fail;


@@ -93,12 +104,12 @@ struct vhost_net *vhost_net_init(VLANClientState *backend, int devfd)
     if (r < 0) {
         goto fail;
     }
     if (r < 0) {
         goto fail;
     }

-    net->vc = backend;
+    net->nc = backend;

     net->dev.backend_features = tap_has_vnet_hdr(backend) ? 0 :
         (1 << VHOST_NET_F_VIRTIO_NET_HDR);
     net->backend = r;
 
     net->dev.backend_features = tap_has_vnet_hdr(backend) ? 0 :
         (1 << VHOST_NET_F_VIRTIO_NET_HDR);
     net->backend = r;
 

-    r = vhost_dev_init(&net->dev, devfd);
+    r = vhost_dev_init(&net->dev, devfd, force);

     if (r < 0) {
         goto fail;
     }
     if (r < 0) {
         goto fail;
     }


@@ -117,28 +128,39 @@ struct vhost_net *vhost_net_init(VLANClientState *backend, int devfd)
     vhost_net_ack_features(net, 0);
     return net;
 fail:
     vhost_net_ack_features(net, 0);
     return net;
 fail:

-    qemu_free(net);
+    g_free(net);

     return NULL;
 }
 
     return NULL;
 }
 

+bool vhost_net_query(VHostNetState *net, VirtIODevice *dev)
+{
+    return vhost_dev_query(&net->dev, dev);
+}
+

 int vhost_net_start(struct vhost_net *net,
                     VirtIODevice *dev)
 {
     struct vhost_vring_file file = { };
     int r;
 int vhost_net_start(struct vhost_net *net,
                     VirtIODevice *dev)
 {
     struct vhost_vring_file file = { };
     int r;

+
+    net->dev.nvqs = 2;
+    net->dev.vqs = net->vqs;
+
+    r = vhost_dev_enable_notifiers(&net->dev, dev);
+    if (r < 0) {
+        goto fail_notifiers;
+    }

     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {

-        tap_set_vnet_hdr_len(net->vc,
+        tap_set_vnet_hdr_len(net->nc,

                              sizeof(struct virtio_net_hdr_mrg_rxbuf));
     }
 
                              sizeof(struct virtio_net_hdr_mrg_rxbuf));
     }
 

-    net->dev.nvqs = 2;
-    net->dev.vqs = net->vqs;

     r = vhost_dev_start(&net->dev, dev);
     if (r < 0) {
     r = vhost_dev_start(&net->dev, dev);
     if (r < 0) {

-        return r;
+        goto fail_start;

     }
 
     }
 

-    net->vc->info->poll(net->vc, false);
+    net->nc->info->poll(net->nc, false);

     qemu_set_fd_handler(net->backend, NULL, NULL, NULL);
     file.fd = net->backend;
     for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {
     qemu_set_fd_handler(net->backend, NULL, NULL, NULL);
     file.fd = net->backend;
     for (file.index = 0; file.index < net->dev.nvqs; ++file.index) {


@@ -155,11 +177,14 @@ fail:
         int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file);
         assert(r >= 0);
     }
         int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file);
         assert(r >= 0);
     }

-    net->vc->info->poll(net->vc, true);
+    net->nc->info->poll(net->nc, true);

     vhost_dev_stop(&net->dev, dev);
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {
     vhost_dev_stop(&net->dev, dev);
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {

-        tap_set_vnet_hdr_len(net->vc, sizeof(struct virtio_net_hdr));
+        tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr));

     }
     }

+fail_start:
+    vhost_dev_disable_notifiers(&net->dev, dev);
+fail_notifiers:

     return r;
 }
 
     return r;
 }
 


@@ -172,31 +197,39 @@ void vhost_net_stop(struct vhost_net *net,
         int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file);
         assert(r >= 0);
     }
         int r = ioctl(net->dev.control, VHOST_NET_SET_BACKEND, &file);
         assert(r >= 0);
     }

-    net->vc->info->poll(net->vc, true);
+    net->nc->info->poll(net->nc, true);

     vhost_dev_stop(&net->dev, dev);
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {
     vhost_dev_stop(&net->dev, dev);
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {

-        tap_set_vnet_hdr_len(net->vc, sizeof(struct virtio_net_hdr));
+        tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr));

     }
     }

+    vhost_dev_disable_notifiers(&net->dev, dev);

 }
 
 void vhost_net_cleanup(struct vhost_net *net)
 {
     vhost_dev_cleanup(&net->dev);
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {
 }
 
 void vhost_net_cleanup(struct vhost_net *net)
 {
     vhost_dev_cleanup(&net->dev);
     if (net->dev.acked_features & (1 << VIRTIO_NET_F_MRG_RXBUF)) {

-        tap_set_vnet_hdr_len(net->vc, sizeof(struct virtio_net_hdr));
+        tap_set_vnet_hdr_len(net->nc, sizeof(struct virtio_net_hdr));

     }
     }

-    qemu_free(net);
+    g_free(net);

 }
 #else
 }
 #else

-struct vhost_net *vhost_net_init(VLANClientState *backend, int devfd)
+struct vhost_net *vhost_net_init(NetClientState *backend, int devfd,
+                                 bool force)

 {
 {

-       return NULL;
+    error_report("vhost-net support is not compiled in");
+    return NULL;
+}
+
+bool vhost_net_query(VHostNetState *net, VirtIODevice *dev)
+{
+    return false;

 }
 
 int vhost_net_start(struct vhost_net *net,
                    VirtIODevice *dev)
 {
 }
 
 int vhost_net_start(struct vhost_net *net,
                    VirtIODevice *dev)
 {

-       return -ENOSYS;
+    return -ENOSYS;

 }
 void vhost_net_stop(struct vhost_net *net,
                    VirtIODevice *dev)
 }
 void vhost_net_stop(struct vhost_net *net,
                    VirtIODevice *dev)


@@ -209,7 +242,7 @@ void vhost_net_cleanup(struct vhost_net *net)
 
 unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
 {
 
 unsigned vhost_net_get_features(struct vhost_net *net, unsigned features)
 {

-       return features;
+    return features;

 }
 void vhost_net_ack_features(struct vhost_net *net, unsigned features)
 {
 }
 void vhost_net_ack_features(struct vhost_net *net, unsigned features)
 {