summaryrefslogtreecommitdiffstats
path: root/util/qemu-sockets.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-03-05 23:21:16 +0530
committerAnthony Liguori <aliguori@us.ibm.com>2013-03-08 13:57:12 -0600
commitbaca6f183d78a0c864a5ccc0ec64e26ba960e604 (patch)
tree24fdd8f553c0af3a4e92ccaa7e318601c1793113 /util/qemu-sockets.c
parent0bc472a9d6b80567c212023c5eae413f4dfb53ad (diff)
downloadhqemu-baca6f183d78a0c864a5ccc0ec64e26ba960e604.zip
hqemu-baca6f183d78a0c864a5ccc0ec64e26ba960e604.tar.gz
char-socket: fix error reporting
Right now the inet connect code tries all available addresses but until one doesn't fail. It passes local_err each time without clearing it from the previous failure. This can trigger an assert since the inet connect code tries to set an error on an object != NULL. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Amit Shah <amit.shah@redhat.com> Message-id: 16c806d60aa5e9660ed7751bb4e37dcd278f97f0.1362505276.git.amit.shah@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'util/qemu-sockets.c')
-rw-r--r--util/qemu-sockets.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 1350ccc..3f12296 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -373,6 +373,10 @@ int inet_connect_opts(QemuOpts *opts, Error **errp,
}
for (e = res; e != NULL; e = e->ai_next) {
+ if (error_is_set(errp)) {
+ error_free(*errp);
+ *errp = NULL;
+ }
if (connect_state != NULL) {
connect_state->current_addr = e;
}
OpenPOWER on IntegriCloud