Merge commit '72c61d0bf4f1e014ce662f70b459c5a8abd7190d' into upstream-merge

* commit '72c61d0bf4f1e014ce662f70b459c5a8abd7190d': (33 commits)
  qdev/prop: convert virtio-pci.c to helper macros.
  qdev/prop: convert vga.c to helper macros.
  qdev/prop: convert tcx.c to helper macros.
  qdev/prop: convert syborg_timer.c to helper macros.
  qdev/prop: convert syborg_serial.c to helper macros.
  qdev/prop: convert syborg_pointer.c to helper macros.
  qdev/prop: convert syborg_keyboard.c to helper macros.
  qdev/prop: convert syborg_interrupt.c to helper macros.
  qdev/prop: convert syborg_fb.c to helper macros.
  qdev/prop: convert sun4u.c to helper macros.
  qdev/prop: convert sun4m.c to helper macros.
  qdev/prop: convert sparc32_dma.c to helper macros.
  qdev/prop: convert smbus_eeprom.c to helper macros.
  qdev/prop: convert slavio_timer.c to helper macros.
  qdev/prop: convert slavio_intctl.c to helper macros.
  qdev/prop: convert pcnet.c to helper macros.
  qdev/prop: convert m48t59.c to helper macros.
  qdev/prop: convert iommu.c to helper macros.
  qdev/prop: convert integratorcp.c to helper macros.
  qdev/prop: convert i2c.c to helper macros.
  ...

  - hw/qdev.h: add missing DEFINE_PROP_DRIVE

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/net.c b/net.c
index 281b0d256..1e845cf00 100644
--- a/net.c
+++ b/net.c
@@ -3076,7 +3076,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;
@@ -3089,7 +3089,7 @@ done:
 
     if (!vc) {
         monitor_printf(mon, "could not find network device '%s'", name);
-        return 0;
+        return;
     }
 
     if (strcmp(up_or_down, "up") == 0)
@@ -3102,8 +3102,6 @@ done:
 
     if (vc->link_status_changed)
         vc->link_status_changed(vc);
-
-    return 1;
 }
 
 void net_cleanup(void)