From 38a48278440eeee78449093de2a770c3d1fcb4cf Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 17 Apr 2009 17:10:51 +0000 Subject: [PATCH] Remove some useless malloc() checking (Mark McLoughlin) Now that we abort() on malloc, neither qemu_find_vlan() nor net_tap_fd_init() can fail. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7146 c046a42c-6fe2-441c-8c8c-71466251a162 --- net.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/net.c b/net.c index 2383b10..34ec4c8 100644 --- a/net.c +++ b/net.c @@ -1015,8 +1015,6 @@ static int net_tap_init(VLANState *vlan, const char *model, return -1; } s = net_tap_fd_init(vlan, model, name, fd); - if (!s) - return -1; snprintf(s->vc->info_str, sizeof(s->vc->info_str), "ifname=%s,script=%s,downscript=%s", ifname, setup_script, down_script); @@ -1596,10 +1594,7 @@ int net_client_init(const char *device, const char *p) vlan_id = strtol(buf, NULL, 0); } vlan = qemu_find_vlan(vlan_id); - if (!vlan) { - fprintf(stderr, "Could not create vlan %d\n", vlan_id); - return -1; - } + if (get_param_value(buf, sizeof(buf), "name", p)) { name = strdup(buf); } @@ -1707,9 +1702,8 @@ int net_client_init(const char *device, const char *p) if (get_param_value(buf, sizeof(buf), "fd", p) > 0) { fd = strtol(buf, NULL, 0); fcntl(fd, F_SETFL, O_NONBLOCK); - ret = -1; - if (net_tap_fd_init(vlan, device, name, fd)) - ret = 0; + net_tap_fd_init(vlan, device, name, fd); + ret = 0; } else { if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) { ifname[0] = '\0'; @@ -1825,10 +1819,6 @@ void net_host_device_remove(Monitor *mon, int vlan_id, const char *device) VLANClientState *vc; vlan = qemu_find_vlan(vlan_id); - if (!vlan) { - monitor_printf(mon, "can't find vlan %d\n", vlan_id); - return; - } for(vc = vlan->first_client; vc != NULL; vc = vc->next) if (!strcmp(vc->name, device)) -- 2.7.4