|
 |
05bba0 |
From 7074c0e6d1de6b9861e176ea70a2f16cd7a93df1 Mon Sep 17 00:00:00 2001
|
|
|
05bba0 |
From: Richard Jones <rjones@redhat.com>
|
|
|
05bba0 |
Date: Thu, 11 Jun 2015 11:40:08 +0200
|
|
|
05bba0 |
Subject: [PATCH 08/30] curl: Replaced old error handling with error reporting
|
|
|
05bba0 |
API.
|
|
|
05bba0 |
|
|
|
05bba0 |
Message-id: <1434022828-13037-2-git-send-email-rjones@redhat.com>
|
|
|
05bba0 |
Patchwork-id: 65836
|
|
|
05bba0 |
O-Subject: [RHEL-7.2 qemu-kvm v3 PATCH 01/21] curl: Replaced old error handling with error reporting API.
|
|
|
05bba0 |
Bugzilla: 1226684
|
|
|
05bba0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
05bba0 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
From: Maria Kustova <maxa@catit.be>
|
|
|
05bba0 |
|
|
|
05bba0 |
Signed-off-by: Maria Kustova <maria.k@catit.be>
|
|
|
05bba0 |
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
05bba0 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
05bba0 |
|
|
|
05bba0 |
Upstream-status: acd7fdc6d80711371d7a1507a22438d9465da63c)
|
|
|
05bba0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
05bba0 |
---
|
|
|
05bba0 |
block/curl.c | 2 +-
|
|
|
05bba0 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
05bba0 |
|
|
|
05bba0 |
diff --git a/block/curl.c b/block/curl.c
|
|
|
05bba0 |
index b3d948e..a877dea 100644
|
|
|
05bba0 |
--- a/block/curl.c
|
|
|
05bba0 |
+++ b/block/curl.c
|
|
|
05bba0 |
@@ -476,7 +476,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
05bba0 |
return 0;
|
|
|
05bba0 |
|
|
|
05bba0 |
out:
|
|
|
05bba0 |
- fprintf(stderr, "CURL: Error opening file: %s\n", state->errmsg);
|
|
|
05bba0 |
+ error_setg(errp, "CURL: Error opening file: %s", state->errmsg);
|
|
|
05bba0 |
curl_easy_cleanup(state->curl);
|
|
|
05bba0 |
state->curl = NULL;
|
|
|
05bba0 |
out_noclean:
|
|
|
05bba0 |
--
|
|
|
05bba0 |
1.8.3.1
|
|
|
05bba0 |
|