[Qemu-devel] [6247] Add 'set_link' monitor command (Mark McLoughlin)

[Qemu-devel] [6247] Add 'set_link' monitor command (Mark McLoughlin)

[Anthony Liguori]

Revision: 6247
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6247
Author:   aliguori
Date:     2009-01-08 19:44:06 +0000 (Thu, 08 Jan 2009)

Log Message:
-----------
Add 'set_link' monitor command (Mark McLoughlin)

Add a monitor command to setting a given network device's link status
to 'up' or 'down'.

Allows simulation of network cable disconnect.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/monitor.c
    trunk/net.c
    trunk/net.h

Modified: trunk/monitor.c
===================================================================
--- trunk/monitor.c	2009-01-08 19:34:35 UTC (rev 6246)
+++ trunk/monitor.c	2009-01-08 19:44:06 UTC (rev 6247)
@@ -1516,6 +1516,7 @@
       "value", "set maximum speed (in bytes) for migrations" },
     { "balloon", "i", do_balloon,
       "target", "request VM to change it's memory allocation (in MB)" },
+    { "set_link", "ss", do_set_link, "name [up|down]" },
     { NULL, NULL, },
 };
 

Modified: trunk/net.c
===================================================================
--- trunk/net.c	2009-01-08 19:34:35 UTC (rev 6246)
+++ trunk/net.c	2009-01-08 19:44:06 UTC (rev 6247)
@@ -387,12 +387,15 @@
     VLANState *vlan = vc1->vlan;
     VLANClientState *vc;
 
+    if (vc1->link_down)
+        return;
+
 #ifdef DEBUG_NET
     printf("vlan %d send:\n", vlan->id);
     hex_dump(stdout, buf, size);
 #endif
     for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
-        if (vc != vc1) {
+        if (vc != vc1 && !vc->link_down) {
             vc->fd_read(vc->opaque, buf, size);
         }
     }
@@ -1692,6 +1695,32 @@
     }
 }
 
+int do_set_link(const char *name, const char *up_or_down)
+{
+    VLANState *vlan;
+    VLANClientState *vc = NULL;
+
+    for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
+        for (vc = vlan->first_client; vc != NULL; vc = vc->next)
+            if (strcmp(vc->name, name) == 0)
+                break;
+
+    if (!vc) {
+        term_printf("could not find network device '%s'", name);
+        return 0;
+    }
+
+    if (strcmp(up_or_down, "up") == 0)
+        vc->link_down = 0;
+    else if (strcmp(up_or_down, "down") == 0)
+        vc->link_down = 1;
+    else
+        term_printf("invalid link status '%s'; only 'up' or 'down' valid\n",
+                    up_or_down);
+
+    return 1;
+}
+
 void net_cleanup(void)
 {
     VLANState *vlan;

Modified: trunk/net.h
===================================================================
--- trunk/net.h	2009-01-08 19:34:35 UTC (rev 6246)
+++ trunk/net.h	2009-01-08 19:44:06 UTC (rev 6247)
@@ -15,6 +15,7 @@
     /* Packets may still be sent if this returns zero.  It's used to
        rate-limit the slirp code.  */
     IOCanRWHandler *fd_can_read;
+    int link_down;
     void *opaque;
     struct VLANClientState *next;
     struct VLANState *vlan;
@@ -46,6 +47,7 @@
 void qemu_handler_true(void *opaque);
 
 void do_info_network(void);
+int do_set_link(const char *name, const char *up_or_down);
 
 /* NIC info */
 

Re: [Qemu-devel] [6247] Add 'set_link' monitor command (Mark McLoughlin)

[Edgar E. Iglesias]

On Thu, Jan 08, 2009 at 07:44:06PM +0000, Anthony Liguori wrote:
> Revision: 6247
>           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6247
> Author:   aliguori
> Date:     2009-01-08 19:44:06 +0000 (Thu, 08 Jan 2009)
> 
> Log Message:
> -----------
> Add 'set_link' monitor command (Mark McLoughlin)
> 
> Add a monitor command to setting a given network device's link status
> to 'up' or 'down'.
> 
> Allows simulation of network cable disconnect.
> 
> Signed-off-by: Mark McLoughlin <markmc@redhat.com>
> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> 
> Modified Paths:
> --------------
>     trunk/monitor.c
>     trunk/net.c
>     trunk/net.h
> 
  
> +int do_set_link(const char *name, const char *up_or_down)
> +{
> +    VLANState *vlan;
> +    VLANClientState *vc = NULL;
> +
> +    for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
> +        for (vc = vlan->first_client; vc != NULL; vc = vc->next)
> +            if (strcmp(vc->name, name) == 0)
> +                break;

Hello,

I ran into an issue here with the etrax boards. set_link does not
handle multiple nics on the same vlan.

I'd like to apply the following soon unless someone objects.

Best regards

diff --git a/net.c b/net.c
index fa9fa94..0bb38e4 100644
--- a/net.c
+++ b/net.c
@@ -1703,7 +1703,8 @@ int do_set_link(const char *name, const char *up_or_down)
     for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
         for (vc = vlan->first_client; vc != NULL; vc = vc->next)
             if (strcmp(vc->name, name) == 0)
-                break;
+                goto done;
+done:
 
     if (!vc) {
         term_printf("could not find network device '%s'", name);

Re: [Qemu-devel] [6247] Add 'set_link' monitor command (Mark McLoughlin)

[Edgar E. Iglesias]

On Fri, Jan 09, 2009 at 01:19:51AM +0100, Edgar E. Iglesias wrote:
> On Thu, Jan 08, 2009 at 07:44:06PM +0000, Anthony Liguori wrote:
> > Revision: 6247
> >           http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6247
> > Author:   aliguori
> > Date:     2009-01-08 19:44:06 +0000 (Thu, 08 Jan 2009)
> > 
> > Log Message:
> > -----------
> > Add 'set_link' monitor command (Mark McLoughlin)
> > 
> > Add a monitor command to setting a given network device's link status
> > to 'up' or 'down'.
> > 
> > Allows simulation of network cable disconnect.
> > 
> > Signed-off-by: Mark McLoughlin <markmc@redhat.com>
> > Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
> > 
> > Modified Paths:
> > --------------
> >     trunk/monitor.c
> >     trunk/net.c
> >     trunk/net.h
> > 
>   
> > +int do_set_link(const char *name, const char *up_or_down)
> > +{
> > +    VLANState *vlan;
> > +    VLANClientState *vc = NULL;
> > +
> > +    for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
> > +        for (vc = vlan->first_client; vc != NULL; vc = vc->next)
> > +            if (strcmp(vc->name, name) == 0)
> > +                break;
> 
> Hello,
> 
> I ran into an issue here with the etrax boards. set_link does not
> handle multiple nics on the same vlan.
                              ^^^^
                           different vlans


> I'd like to apply the following soon unless someone objects.
> 
> Best regards
> 
> diff --git a/net.c b/net.c
> index fa9fa94..0bb38e4 100644
> --- a/net.c
> +++ b/net.c
> @@ -1703,7 +1703,8 @@ int do_set_link(const char *name, const char *up_or_down)
>      for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
>          for (vc = vlan->first_client; vc != NULL; vc = vc->next)
>              if (strcmp(vc->name, name) == 0)
> -                break;
> +                goto done;
> +done:
>  
>      if (!vc) {
>          term_printf("could not find network device '%s'", name);
> 

Re: [Qemu-devel] [6247] Add 'set_link' monitor command (Mark McLoughlin)

[Anthony Liguori]

Edgar E. Iglesias wrote:
> Hello,
>
> I ran into an issue here with the etrax boards. set_link does not
> handle multiple nics on the same vlan
> I'd like to apply the following soon unless someone objects.
>   

Looks good to me.

Regards,

Anthony Liguori

> Best regards
>
> diff --git a/net.c b/net.c
> index fa9fa94..0bb38e4 100644
> --- a/net.c
> +++ b/net.c
> @@ -1703,7 +1703,8 @@ int do_set_link(const char *name, const char *up_or_down)
>      for (vlan = first_vlan; vlan != NULL; vlan = vlan->next)
>          for (vc = vlan->first_client; vc != NULL; vc = vc->next)
>              if (strcmp(vc->name, name) == 0)
> -                break;
> +                goto done;
> +done:
>  
>      if (!vc) {
>          term_printf("could not find network device '%s'", name);
>