Patchwork [02/25] net: Fix do_set_link() return type

login
register
mail settings
Submitter Luiz Capitulino
Date Aug. 3, 2009, 4:56 p.m.
Message ID <1249318642-19324-3-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/30655/
State Superseded
Headers show

Comments

Luiz Capitulino - Aug. 3, 2009, 4:56 p.m.
do_set_link() returns int, but Monitor handler functions should
always return void.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 net.c |    6 ++----
 net.h |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

Patch

diff --git a/net.c b/net.c
index b5e8c9f..1b531e7 100644
--- a/net.c
+++ b/net.c
@@ -2905,7 +2905,7 @@  void do_info_network(Monitor *mon)
     }
 }
 
-int do_set_link(Monitor *mon, const char *name, const char *up_or_down)
+void do_set_link(Monitor *mon, const char *name, const char *up_or_down)
 {
     VLANState *vlan;
     VLANClientState *vc = NULL;
@@ -2918,7 +2918,7 @@  done:
 
     if (!vc) {
         monitor_printf(mon, "could not find network device '%s'", name);
-        return 0;
+        return;
     }
 
     if (strcmp(up_or_down, "up") == 0)
@@ -2931,8 +2931,6 @@  done:
 
     if (vc->link_status_changed)
         vc->link_status_changed(vc);
-
-    return 1;
 }
 
 void net_cleanup(void)
diff --git a/net.h b/net.h
index 188fa39..3ac9e8c 100644
--- a/net.h
+++ b/net.h
@@ -79,7 +79,7 @@  void qemu_check_nic_model_list(NICInfo *nd, const char * const *models,
 void qemu_handler_true(void *opaque);
 
 void do_info_network(Monitor *mon);
-int do_set_link(Monitor *mon, const char *name, const char *up_or_down);
+void do_set_link(Monitor *mon, const char *name, const char *up_or_down);
 
 void do_info_usernet(Monitor *mon);