From: Mark McLoughlin <markmc@redhat.com>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>,
qemu-devel@nongnu.org, Mark McLoughlin <markmc@redhat.com>
Subject: [Qemu-devel] [PATCH 5/9] Remove some useless malloc() checking
Date: Wed, 15 Apr 2009 17:29:25 +0100 [thread overview]
Message-ID: <1239812969-8320-6-git-send-email-markmc@redhat.com> (raw)
In-Reply-To: <1239812969-8320-5-git-send-email-markmc@redhat.com>
Now that we abort() on malloc, neither qemu_find_vlan() nor
net_tap_fd_init() can fail.
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
---
net.c | 16 +++-------------
1 files 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))
--
1.6.0.6
next prev parent reply other threads:[~2009-04-15 16:29 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-15 16:29 [Qemu-devel] [PATCH 0/9] Misc networking fixes Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 1/9] Remove stray GSO code from virtio_net Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 2/9] struct iovec is now universally available Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 3/9] Fix error handling in net_client_init() Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 4/9] Don't fail PCI hotplug if no NIC model is supplied Mark McLoughlin
2009-04-15 16:29 ` Mark McLoughlin [this message]
2009-04-15 16:29 ` [Qemu-devel] [PATCH 6/9] Remove NICInfo from e1000 and mipsnet state Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 7/9] Add unregister_savevm() Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 8/9] Use NICInfo::model for eepro100 savevm ID string Mark McLoughlin
2009-04-15 16:29 ` [Qemu-devel] [PATCH 9/9] Introduce VLANClientState::cleanup() Mark McLoughlin
2009-04-15 17:34 ` [Qemu-devel] " Jan Kiszka
2009-04-16 1:07 ` Marcelo Tosatti
2009-04-16 3:24 ` M. Warner Losh
2009-04-16 14:49 ` Mark McLoughlin
2009-04-16 14:52 ` [Qemu-devel] [PATCH 09/09 v2] " Mark McLoughlin
2009-04-16 14:53 ` [Qemu-devel] [PATCH 10/09] Free VLANClientState using qemu_free() Mark McLoughlin
2009-04-16 20:44 ` [Qemu-devel] Re: [PATCH 9/9] Introduce VLANClientState::cleanup() Marcelo Tosatti
2009-04-28 12:08 ` Paul Brook
2009-04-28 16:46 ` Anthony Liguori
2009-04-28 17:17 ` Paul Brook
2009-04-28 17:25 ` Anthony Liguori
2009-04-28 17:46 ` Paul Brook
2009-04-28 17:49 ` Anthony Liguori
2009-04-28 18:28 ` Paul Brook
2009-04-28 21:38 ` Anthony Liguori
2009-04-29 10:37 ` Paul Brook
2009-04-30 13:45 ` Avi Kivity
2009-04-30 16:02 ` Paul Brook
2009-04-30 16:20 ` Avi Kivity
2009-04-30 16:31 ` Paul Brook
2009-04-30 16:32 ` Avi Kivity
2009-04-30 16:37 ` Anthony Liguori
2009-04-30 16:41 ` Anthony Liguori
2009-04-30 16:58 ` Paul Brook
2009-04-30 17:51 ` Avi Kivity
2009-04-30 16:33 ` Anthony Liguori
2009-04-30 16:32 ` Anthony Liguori
2009-04-30 16:57 ` Blue Swirl
2009-04-30 17:11 ` Anthony Liguori
2009-04-30 17:45 ` Jan Kiszka
2009-04-30 17:48 ` Avi Kivity
2009-04-30 18:17 ` Jan Kiszka
2009-04-30 18:19 ` Avi Kivity
2009-04-30 18:22 ` Anthony Liguori
2009-04-30 17:59 ` Anthony Liguori
2009-04-30 18:10 ` Blue Swirl
2009-04-30 18:20 ` Jan Kiszka
2009-04-30 18:32 ` Anthony Liguori
2009-04-30 18:57 ` Blue Swirl
2009-04-30 18:16 ` Jan Kiszka
2009-04-29 7:36 ` Markus Armbruster
2009-04-16 14:49 ` Mark McLoughlin
2009-04-15 17:13 ` [Qemu-devel] Re: [PATCH 5/9] Remove some useless malloc() checking Jan Kiszka
2009-04-15 16:55 ` [Qemu-devel] [PATCH 2/9] struct iovec is now universally available Christoph Hellwig
2009-04-15 17:25 ` Mark McLoughlin
2009-04-15 17:27 ` Christoph Hellwig
2009-04-15 21:18 ` François Revol
2009-04-15 21:52 ` M. Warner Losh
2009-04-15 17:44 ` M. Warner Losh
2009-04-17 18:06 ` [Qemu-devel] [PATCH 1/9] Remove stray GSO code from virtio_net Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1239812969-8320-6-git-send-email-markmc@redhat.com \
--to=markmc@redhat.com \
--cc=aliguori@us.ibm.com \
--cc=jan.kiszka@siemens.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).