vl: list user creatable properties when 'help' is argument

[qemu.git] / net / hub.c

diff --git a/net/hub.c b/net/hub.c
index 2b60ab9a6075af549688140ab46bb1b0fdf6810c..78b671ed9583cfba182e96fcf70ed3b5fe9b0b9d 100644 (file)
--- a/net/hub.c
+++ b/net/hub.c
@@ -12,16 +12,18 @@
  *
  */
 
  *
  */
 

+#include "qemu/osdep.h"
+#include "qapi/error.h"

 #include "monitor/monitor.h"
 #include "net/net.h"
 #include "clients.h"
 #include "hub.h"
 #include "qemu/iov.h"
 #include "monitor/monitor.h"
 #include "net/net.h"
 #include "clients.h"
 #include "hub.h"
 #include "qemu/iov.h"

+#include "qemu/error-report.h"

 
 /*
  * A hub broadcasts incoming packets to all its ports except the source port.
 
 /*
  * A hub broadcasts incoming packets to all its ports except the source port.

- * Hubs can be used to provide independent network segments, also confusingly
- * named the QEMU 'vlan' feature.
+ * Hubs can be used to provide independent emulated network segments.

  */
 
 typedef struct NetHub NetHub;
  */
 
 typedef struct NetHub NetHub;


@@ -130,7 +132,7 @@ static void net_hub_port_cleanup(NetClientState *nc)
 }
 
 static NetClientInfo net_hub_port_info = {
 }
 
 static NetClientInfo net_hub_port_info = {

-    .type = NET_CLIENT_OPTIONS_KIND_HUBPORT,
+    .type = NET_CLIENT_DRIVER_HUBPORT,

     .size = sizeof(NetHubPort),
     .can_receive = net_hub_port_can_receive,
     .receive = net_hub_port_receive,
     .size = sizeof(NetHubPort),
     .can_receive = net_hub_port_can_receive,
     .receive = net_hub_port_receive,


@@ -138,7 +140,8 @@ static NetClientInfo net_hub_port_info = {
     .cleanup = net_hub_port_cleanup,
 };
 
     .cleanup = net_hub_port_cleanup,
 };
 

-static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
+static NetHubPort *net_hub_port_new(NetHub *hub, const char *name,
+                                    NetClientState *hubpeer)

 {
     NetClientState *nc;
     NetHubPort *port;
 {
     NetClientState *nc;
     NetHubPort *port;


@@ -151,7 +154,7 @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
         name = default_name;
     }
 
         name = default_name;
     }
 

-    nc = qemu_new_net_client(&net_hub_port_info, NULL, "hub", name);
+    nc = qemu_new_net_client(&net_hub_port_info, hubpeer, "hub", name);

     port = DO_UPCAST(NetHubPort, nc, nc);
     port->id = id;
     port->hub = hub;
     port = DO_UPCAST(NetHubPort, nc, nc);
     port->id = id;
     port->hub = hub;


@@ -163,11 +166,14 @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
 
 /**
  * Create a port on a given hub
 
 /**
  * Create a port on a given hub

+ * @hub_id: Number of the hub

  * @name: Net client name or NULL for default name.
  * @name: Net client name or NULL for default name.

+ * @hubpeer: Peer to use (if "netdev=id" has been specified)

  *
  * If there is no existing hub with the given id then a new hub is created.
  */
  *
  * If there is no existing hub with the given id then a new hub is created.
  */

-NetClientState *net_hub_add_port(int hub_id, const char *name)
+NetClientState *net_hub_add_port(int hub_id, const char *name,
+                                 NetClientState *hubpeer)

 {
     NetHub *hub;
     NetHubPort *port;
 {
     NetHub *hub;
     NetHubPort *port;


@@ -182,7 +188,7 @@ NetClientState *net_hub_add_port(int hub_id, const char *name)
         hub = net_hub_new(hub_id);
     }
 
         hub = net_hub_new(hub_id);
     }
 

-    port = net_hub_port_new(hub, name);
+    port = net_hub_port_new(hub, name, hubpeer);

     return &port->nc;
 }
 
     return &port->nc;
 }
 


@@ -230,7 +236,7 @@ NetClientState *net_hub_port_find(int hub_id)
         }
     }
 
         }
     }
 

-    nc = net_hub_add_port(hub_id, NULL);
+    nc = net_hub_add_port(hub_id, NULL, NULL);

     return nc;
 }
 
     return nc;
 }
 


@@ -265,10 +271,10 @@ int net_hub_id_for_client(NetClientState *nc, int *id)
 {
     NetHubPort *port;
 
 {
     NetHubPort *port;
 

-    if (nc->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT) {
+    if (nc->info->type == NET_CLIENT_DRIVER_HUBPORT) {

         port = DO_UPCAST(NetHubPort, nc, nc);
     } else if (nc->peer != NULL && nc->peer->info->type ==
         port = DO_UPCAST(NetHubPort, nc, nc);
     } else if (nc->peer != NULL && nc->peer->info->type ==

-            NET_CLIENT_OPTIONS_KIND_HUBPORT) {
+            NET_CLIENT_DRIVER_HUBPORT) {

         port = DO_UPCAST(NetHubPort, nc, nc->peer);
     } else {
         return -ENOENT;
         port = DO_UPCAST(NetHubPort, nc, nc->peer);
     } else {
         return -ENOENT;


@@ -280,19 +286,26 @@ int net_hub_id_for_client(NetClientState *nc, int *id)
     return 0;
 }
 
     return 0;
 }
 

-int net_init_hubport(const NetClientOptions *opts, const char *name,
-                     NetClientState *peer)
+int net_init_hubport(const Netdev *netdev, const char *name,
+                     NetClientState *peer, Error **errp)

 {
     const NetdevHubPortOptions *hubport;
 {
     const NetdevHubPortOptions *hubport;

+    NetClientState *hubpeer = NULL;

 
 

-    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_HUBPORT);
-    hubport = opts->hubport;
+    assert(netdev->type == NET_CLIENT_DRIVER_HUBPORT);
+    assert(!peer);
+    hubport = &netdev->u.hubport;

 
 

-    if (peer) {
-        return -EINVAL;
+    if (hubport->has_netdev) {
+        hubpeer = qemu_find_netdev(hubport->netdev);
+        if (!hubpeer) {
+            error_setg(errp, "netdev '%s' not found", hubport->netdev);
+            return -1;
+        }

     }
 
     }
 

-    net_hub_add_port(hubport->hubid, name);
+    net_hub_add_port(hubport->hubid, name, hubpeer);
+

     return 0;
 }
 
     return 0;
 }
 


@@ -311,20 +324,19 @@ void net_hub_check_clients(void)
         QLIST_FOREACH(port, &hub->ports, next) {
             peer = port->nc.peer;
             if (!peer) {
         QLIST_FOREACH(port, &hub->ports, next) {
             peer = port->nc.peer;
             if (!peer) {

-                fprintf(stderr, "Warning: hub port %s has no peer\n",
-                        port->nc.name);
+                warn_report("hub port %s has no peer", port->nc.name);

                 continue;
             }
 
             switch (peer->info->type) {
                 continue;
             }
 
             switch (peer->info->type) {

-            case NET_CLIENT_OPTIONS_KIND_NIC:
+            case NET_CLIENT_DRIVER_NIC:

                 has_nic = 1;
                 break;
                 has_nic = 1;
                 break;

-            case NET_CLIENT_OPTIONS_KIND_USER:
-            case NET_CLIENT_OPTIONS_KIND_TAP:
-            case NET_CLIENT_OPTIONS_KIND_SOCKET:
-            case NET_CLIENT_OPTIONS_KIND_VDE:
-            case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
+            case NET_CLIENT_DRIVER_USER:
+            case NET_CLIENT_DRIVER_TAP:
+            case NET_CLIENT_DRIVER_SOCKET:
+            case NET_CLIENT_DRIVER_VDE:
+            case NET_CLIENT_DRIVER_VHOST_USER:

                 has_host_dev = 1;
                 break;
             default:
                 has_host_dev = 1;
                 break;
             default:


@@ -332,12 +344,10 @@ void net_hub_check_clients(void)
             }
         }
         if (has_host_dev && !has_nic) {
             }
         }
         if (has_host_dev && !has_nic) {

-            fprintf(stderr, "Warning: vlan %d with no nics\n", hub->id);
+            warn_report("hub %d with no nics", hub->id);

         }
         if (has_nic && !has_host_dev) {
         }
         if (has_nic && !has_host_dev) {

-            fprintf(stderr,
-                    "Warning: vlan %d is not connected to host network\n",
-                    hub->id);
+            warn_report("hub %d is not connected to host network", hub->id);

         }
     }
 }
         }
     }
 }