From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axGfF-0003Ts-83 for qemu-devel@nongnu.org; Mon, 02 May 2016 12:25:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axGf3-0006FF-19 for qemu-devel@nongnu.org; Mon, 02 May 2016 12:25:35 -0400 Received: from mail-oi0-f43.google.com ([209.85.218.43]:34942) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axGf2-0006Av-R9 for qemu-devel@nongnu.org; Mon, 02 May 2016 12:25:28 -0400 Received: by mail-oi0-f43.google.com with SMTP id x19so196196891oix.2 for ; Mon, 02 May 2016 09:25:20 -0700 (PDT) MIME-Version: 1.0 Date: Mon, 2 May 2016 21:55:17 +0530 Message-ID: From: Vikhyat Umrao Content-Type: multipart/alternative; boundary=001a1136e6422083230531de7043 Subject: [Qemu-devel] [PATCH] rbd:change error_setg() to error_setg_errno() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jcody@redhat.com --001a1136e6422083230531de7043 Content-Type: text/plain; charset=UTF-8 >>From 1c63c246f47a1a65d8740d7ce3725fe3820c0a37 Mon Sep 17 00:00:00 2001 From: Vikhyat Umrao Date: Mon, 2 May 2016 21:47:31 +0530 Subject: [PATCH] rbd:change error_setg() to error_setg_errno() Ceph RBD block driver does not use error_setg_errno() where it is possible to use. This patch replaces error_setg() from error_setg_errno(). Signed-off-by: Vikhyat Umrao --- block/rbd.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 5bc5b32..c286b32 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -290,7 +290,7 @@ static int qemu_rbd_set_conf(rados_t cluster, const char *conf, if (only_read_conf_file) { ret = rados_conf_read_file(cluster, value); if (ret < 0) { - error_setg(errp, "error reading conf file %s", value); + error_setg_errno(errp, -ret, "error reading conf file %s", value); break; } } @@ -299,7 +299,7 @@ static int qemu_rbd_set_conf(rados_t cluster, const char *conf, } else if (!only_read_conf_file) { ret = rados_conf_set(cluster, name, value); if (ret < 0) { - error_setg(errp, "invalid conf option %s", name); + error_setg_errno(errp, -ret, "invalid conf option %s", name); ret = -EINVAL; break; } @@ -354,9 +354,10 @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp) } clientname = qemu_rbd_parse_clientname(conf, clientname_buf); - if (rados_create(&cluster, clientname) < 0) { - error_setg(errp, "error initializing"); - return -EIO; + ret = rados_create(&cluster, clientname); + if (ret < 0) { + error_setg_errno(errp, -ret, "error initializing"); + return ret; } if (strstr(conf, "conf=") == NULL) { @@ -381,21 +382,27 @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp) return -EIO; } - if (rados_connect(cluster) < 0) { - error_setg(errp, "error connecting"); + ret = rados_connect(cluster); + if (ret < 0) { + error_setg_errno(errp, -ret, "error connecting"); rados_shutdown(cluster); - return -EIO; + return ret; } - if (rados_ioctx_create(cluster, pool, &io_ctx) < 0) { - error_setg(errp, "error opening pool %s", pool); + ret = rados_ioctx_create(cluster, pool, &io_ctx); + if (ret < 0) { + error_setg_errno(errp, -ret, "error opening pool %s", pool); rados_shutdown(cluster); - return -EIO; + return ret; } ret = rbd_create(io_ctx, name, bytes, &obj_order); rados_ioctx_destroy(io_ctx); rados_shutdown(cluster); + if (ret < 0) { + error_setg_errno(errp, -ret, "error rbd create"); + return ret; + } return ret; } @@ -500,7 +507,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, clientname = qemu_rbd_parse_clientname(conf, clientname_buf); r = rados_create(&s->cluster, clientname); if (r < 0) { - error_setg(errp, "error initializing"); + error_setg_errno(errp, -r, "error initializing"); goto failed_opts; } @@ -546,19 +553,19 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, r = rados_connect(s->cluster); if (r < 0) { - error_setg(errp, "error connecting"); + error_setg_errno(errp, -r, "error connecting"); goto failed_shutdown; } r = rados_ioctx_create(s->cluster, pool, &s->io_ctx); if (r < 0) { - error_setg(errp, "error opening pool %s", pool); + error_setg_errno(errp, -r, "error opening pool %s", pool); goto failed_shutdown; } r = rbd_open(s->io_ctx, s->name, &s->image, s->snap); if (r < 0) { - error_setg(errp, "error reading header from %s", s->name); + error_setg_errno(errp, -r, "error reading header from %s", s->name); goto failed_open; } -- 2.4.11 --001a1136e6422083230531de7043 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: base64 PGRpdiBkaXI9Imx0ciI+RnJvbSAxYzYzYzI0NmY0N2ExYTY1ZDg3NDBkN2NlMzcyNWZlMzgyMGMw YTM3IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMTxicj5Gcm9tOiBWaWtoeWF0IFVtcmFvICZsdDs8 YSBocmVmPSJtYWlsdG86dnVtcmFvQHJlZGhhdC5jb20iPnZ1bXJhb0ByZWRoYXQuY29tPC9hPiZn dDs8YnI+RGF0ZTogTW9uLCAyIE1heSAyMDE2IDIxOjQ3OjMxICswNTMwPGJyPlN1YmplY3Q6IFtQ QVRDSF0gcmJkOmNoYW5nZSBlcnJvcl9zZXRnKCkgdG8gZXJyb3Jfc2V0Z19lcnJubygpPGJyPjxi cj5DZXBoIFJCRCBibG9jayBkcml2ZXIgZG9lcyBub3QgdXNlIGVycm9yX3NldGdfZXJybm8oKSB3 aGVyZTxicj5pdCBpcyBwb3NzaWJsZSB0byB1c2UuIFRoaXMgcGF0Y2ggcmVwbGFjZXMgZXJyb3Jf c2V0ZygpPGJyPmZyb20gZXJyb3Jfc2V0Z19lcnJubygpLjxicj48YnI+U2lnbmVkLW9mZi1ieTog VmlraHlhdCBVbXJhbyAmbHQ7PGEgaHJlZj0ibWFpbHRvOnZ1bXJhb0ByZWRoYXQuY29tIj52dW1y YW9AcmVkaGF0LmNvbTwvYT4mZ3Q7PGJyPi0tLTxicj7CoGJsb2NrL3JiZC5jIHwgMzcgKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLTxicj7CoDEgZmlsZSBjaGFuZ2VkLCAyMiBp bnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSk8YnI+PGJyPmRpZmYgLS1naXQgYS9ibG9jay9y YmQuYyBiL2Jsb2NrL3JiZC5jPGJyPmluZGV4IDViYzViMzIuLmMyODZiMzIgMTAwNjQ0PGJyPi0t LSBhL2Jsb2NrL3JiZC5jPGJyPisrKyBiL2Jsb2NrL3JiZC5jPGJyPkBAIC0yOTAsNyArMjkwLDcg QEAgc3RhdGljIGludCBxZW11X3JiZF9zZXRfY29uZihyYWRvc190IGNsdXN0ZXIsIGNvbnN0IGNo YXIgKmNvbmYsPGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBpZiAob25seV9yZWFkX2NvbmZf ZmlsZSkgezxicj7CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCByZXQgPSByYWRvc19j b25mX3JlYWRfZmlsZShjbHVzdGVyLCB2YWx1ZSk7PGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIGlmIChyZXQgJmx0OyAwKSB7PGJyPi3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoCBlcnJvcl9zZXRnKGVycnAsICZxdW90O2Vycm9yIHJlYWRpbmcgY29uZiBm aWxlICVzJnF1b3Q7LCB2YWx1ZSk7PGJyPivCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCBlcnJvcl9zZXRnX2Vycm5vKGVycnAsIC1yZXQsICZxdW90O2Vycm9yIHJlYWRpbmcg Y29uZiBmaWxlICVzJnF1b3Q7LCB2YWx1ZSk7PGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgYnJlYWs7PGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IH08YnI+wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIH08YnI+QEAgLTI5OSw3ICsyOTksNyBAQCBz dGF0aWMgaW50IHFlbXVfcmJkX3NldF9jb25mKHJhZG9zX3QgY2x1c3RlciwgY29uc3QgY2hhciAq Y29uZiw8YnI+wqDCoMKgwqDCoMKgwqDCoCB9IGVsc2UgaWYgKCFvbmx5X3JlYWRfY29uZl9maWxl KSB7PGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCByZXQgPSByYWRvc19jb25mX3NldChjbHVz dGVyLCBuYW1lLCB2YWx1ZSk7PGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBpZiAocmV0ICZs dDsgMCkgezxicj4twqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIGVycm9yX3NldGcoZXJy cCwgJnF1b3Q7aW52YWxpZCBjb25mIG9wdGlvbiAlcyZxdW90OywgbmFtZSk7PGJyPivCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgZXJyb3Jfc2V0Z19lcnJubyhlcnJwLCAtcmV0LCAmcXVv dDtpbnZhbGlkIGNvbmYgb3B0aW9uICVzJnF1b3Q7LCBuYW1lKTs8YnI+wqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgcmV0ID0gLUVJTlZBTDs8YnI+wqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqAgYnJlYWs7PGJyPsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB9PGJyPkBAIC0z NTQsOSArMzU0LDEwIEBAIHN0YXRpYyBpbnQgcWVtdV9yYmRfY3JlYXRlKGNvbnN0IGNoYXIgKmZp bGVuYW1lLCBRZW11T3B0cyAqb3B0cywgRXJyb3IgKiplcnJwKTxicj7CoMKgwqDCoCB9PGJyPjxi cj7CoMKgwqDCoCBjbGllbnRuYW1lID0gcWVtdV9yYmRfcGFyc2VfY2xpZW50bmFtZShjb25mLCBj bGllbnRuYW1lX2J1Zik7PGJyPi3CoMKgwqAgaWYgKHJhZG9zX2NyZWF0ZSgmYW1wO2NsdXN0ZXIs IGNsaWVudG5hbWUpICZsdDsgMCkgezxicj4twqDCoMKgwqDCoMKgwqAgZXJyb3Jfc2V0ZyhlcnJw LCAmcXVvdDtlcnJvciBpbml0aWFsaXppbmcmcXVvdDspOzxicj4twqDCoMKgwqDCoMKgwqAgcmV0 dXJuIC1FSU87PGJyPivCoMKgwqAgcmV0ID0gcmFkb3NfY3JlYXRlKCZhbXA7Y2x1c3RlciwgY2xp ZW50bmFtZSk7PGJyPivCoMKgwqAgaWYgKHJldCAmbHQ7IDApIHs8YnI+K8KgwqDCoMKgwqDCoMKg IGVycm9yX3NldGdfZXJybm8oZXJycCwgLXJldCwgJnF1b3Q7ZXJyb3IgaW5pdGlhbGl6aW5nJnF1 b3Q7KTs8YnI+K8KgwqDCoMKgwqDCoMKgIHJldHVybiByZXQ7PGJyPsKgwqDCoMKgIH08YnI+PGJy PsKgwqDCoMKgIGlmIChzdHJzdHIoY29uZiwgJnF1b3Q7Y29uZj0mcXVvdDspID09IE5VTEwpIHs8 YnI+QEAgLTM4MSwyMSArMzgyLDI3IEBAIHN0YXRpYyBpbnQgcWVtdV9yYmRfY3JlYXRlKGNvbnN0 IGNoYXIgKmZpbGVuYW1lLCBRZW11T3B0cyAqb3B0cywgRXJyb3IgKiplcnJwKTxicj7CoMKgwqDC oMKgwqDCoMKgIHJldHVybiAtRUlPOzxicj7CoMKgwqDCoCB9PGJyPjxicj4twqDCoMKgIGlmIChy YWRvc19jb25uZWN0KGNsdXN0ZXIpICZsdDsgMCkgezxicj4twqDCoMKgwqDCoMKgwqAgZXJyb3Jf c2V0ZyhlcnJwLCAmcXVvdDtlcnJvciBjb25uZWN0aW5nJnF1b3Q7KTs8YnI+K8KgwqDCoCByZXQg PSByYWRvc19jb25uZWN0KGNsdXN0ZXIpOzxicj4rwqDCoMKgIGlmIChyZXQgJmx0OyAwKSB7PGJy PivCoMKgwqDCoMKgwqDCoCBlcnJvcl9zZXRnX2Vycm5vKGVycnAsIC1yZXQsICZxdW90O2Vycm9y IGNvbm5lY3RpbmcmcXVvdDspOzxicj7CoMKgwqDCoMKgwqDCoMKgIHJhZG9zX3NodXRkb3duKGNs dXN0ZXIpOzxicj4twqDCoMKgwqDCoMKgwqAgcmV0dXJuIC1FSU87PGJyPivCoMKgwqDCoMKgwqDC oCByZXR1cm4gcmV0Ozxicj7CoMKgwqDCoCB9PGJyPjxicj4twqDCoMKgIGlmIChyYWRvc19pb2N0 eF9jcmVhdGUoY2x1c3RlciwgcG9vbCwgJmFtcDtpb19jdHgpICZsdDsgMCkgezxicj4twqDCoMKg wqDCoMKgwqAgZXJyb3Jfc2V0ZyhlcnJwLCAmcXVvdDtlcnJvciBvcGVuaW5nIHBvb2wgJXMmcXVv dDssIHBvb2wpOzxicj4rwqDCoMKgIHJldCA9IHJhZG9zX2lvY3R4X2NyZWF0ZShjbHVzdGVyLCBw b29sLCAmYW1wO2lvX2N0eCk7PGJyPivCoMKgwqAgaWYgKHJldCAmbHQ7IDApIHs8YnI+K8KgwqDC oMKgwqDCoMKgIGVycm9yX3NldGdfZXJybm8oZXJycCwgLXJldCwgJnF1b3Q7ZXJyb3Igb3Blbmlu ZyBwb29sICVzJnF1b3Q7LCBwb29sKTs8YnI+wqDCoMKgwqDCoMKgwqDCoCByYWRvc19zaHV0ZG93 bihjbHVzdGVyKTs8YnI+LcKgwqDCoMKgwqDCoMKgIHJldHVybiAtRUlPOzxicj4rwqDCoMKgwqDC oMKgwqAgcmV0dXJuIHJldDs8YnI+wqDCoMKgwqAgfTxicj48YnI+wqDCoMKgwqAgcmV0ID0gcmJk X2NyZWF0ZShpb19jdHgsIG5hbWUsIGJ5dGVzLCAmYW1wO29ial9vcmRlcik7PGJyPsKgwqDCoMKg IHJhZG9zX2lvY3R4X2Rlc3Ryb3koaW9fY3R4KTs8YnI+wqDCoMKgwqAgcmFkb3Nfc2h1dGRvd24o Y2x1c3Rlcik7PGJyPivCoMKgwqAgaWYgKHJldCAmbHQ7IDApIHs8YnI+K8KgwqDCoMKgwqDCoMKg IGVycm9yX3NldGdfZXJybm8oZXJycCwgLXJldCwgJnF1b3Q7ZXJyb3IgcmJkIGNyZWF0ZSZxdW90 Oyk7PGJyPivCoMKgwqDCoMKgwqDCoCByZXR1cm4gcmV0Ozxicj4rwqDCoMKgIH08YnI+PGJyPsKg wqDCoMKgIHJldHVybiByZXQ7PGJyPsKgfTxicj5AQCAtNTAwLDcgKzUwNyw3IEBAIHN0YXRpYyBp bnQgcWVtdV9yYmRfb3BlbihCbG9ja0RyaXZlclN0YXRlICpicywgUURpY3QgKm9wdGlvbnMsIGlu dCBmbGFncyw8YnI+wqDCoMKgwqAgY2xpZW50bmFtZSA9IHFlbXVfcmJkX3BhcnNlX2NsaWVudG5h bWUoY29uZiwgY2xpZW50bmFtZV9idWYpOzxicj7CoMKgwqDCoCByID0gcmFkb3NfY3JlYXRlKCZh bXA7cy0mZ3Q7Y2x1c3RlciwgY2xpZW50bmFtZSk7PGJyPsKgwqDCoMKgIGlmIChyICZsdDsgMCkg ezxicj4twqDCoMKgwqDCoMKgwqAgZXJyb3Jfc2V0ZyhlcnJwLCAmcXVvdDtlcnJvciBpbml0aWFs aXppbmcmcXVvdDspOzxicj4rwqDCoMKgwqDCoMKgwqAgZXJyb3Jfc2V0Z19lcnJubyhlcnJwLCAt ciwgJnF1b3Q7ZXJyb3IgaW5pdGlhbGl6aW5nJnF1b3Q7KTs8YnI+wqDCoMKgwqDCoMKgwqDCoCBn b3RvIGZhaWxlZF9vcHRzOzxicj7CoMKgwqDCoCB9PGJyPjxicj5AQCAtNTQ2LDE5ICs1NTMsMTkg QEAgc3RhdGljIGludCBxZW11X3JiZF9vcGVuKEJsb2NrRHJpdmVyU3RhdGUgKmJzLCBRRGljdCAq b3B0aW9ucywgaW50IGZsYWdzLDxicj48YnI+wqDCoMKgwqAgciA9IHJhZG9zX2Nvbm5lY3Qocy0m Z3Q7Y2x1c3Rlcik7PGJyPsKgwqDCoMKgIGlmIChyICZsdDsgMCkgezxicj4twqDCoMKgwqDCoMKg wqAgZXJyb3Jfc2V0ZyhlcnJwLCAmcXVvdDtlcnJvciBjb25uZWN0aW5nJnF1b3Q7KTs8YnI+K8Kg wqDCoMKgwqDCoMKgIGVycm9yX3NldGdfZXJybm8oZXJycCwgLXIsICZxdW90O2Vycm9yIGNvbm5l Y3RpbmcmcXVvdDspOzxicj7CoMKgwqDCoMKgwqDCoMKgIGdvdG8gZmFpbGVkX3NodXRkb3duOzxi cj7CoMKgwqDCoCB9PGJyPjxicj7CoMKgwqDCoCByID0gcmFkb3NfaW9jdHhfY3JlYXRlKHMtJmd0 O2NsdXN0ZXIsIHBvb2wsICZhbXA7cy0mZ3Q7aW9fY3R4KTs8YnI+wqDCoMKgwqAgaWYgKHIgJmx0 OyAwKSB7PGJyPi3CoMKgwqDCoMKgwqDCoCBlcnJvcl9zZXRnKGVycnAsICZxdW90O2Vycm9yIG9w ZW5pbmcgcG9vbCAlcyZxdW90OywgcG9vbCk7PGJyPivCoMKgwqDCoMKgwqDCoCBlcnJvcl9zZXRn X2Vycm5vKGVycnAsIC1yLCAmcXVvdDtlcnJvciBvcGVuaW5nIHBvb2wgJXMmcXVvdDssIHBvb2wp Ozxicj7CoMKgwqDCoMKgwqDCoMKgIGdvdG8gZmFpbGVkX3NodXRkb3duOzxicj7CoMKgwqDCoCB9 PGJyPjxicj7CoMKgwqDCoCByID0gcmJkX29wZW4ocy0mZ3Q7aW9fY3R4LCBzLSZndDtuYW1lLCAm YW1wO3MtJmd0O2ltYWdlLCBzLSZndDtzbmFwKTs8YnI+wqDCoMKgwqAgaWYgKHIgJmx0OyAwKSB7 PGJyPi3CoMKgwqDCoMKgwqDCoCBlcnJvcl9zZXRnKGVycnAsICZxdW90O2Vycm9yIHJlYWRpbmcg aGVhZGVyIGZyb20gJXMmcXVvdDssIHMtJmd0O25hbWUpOzxicj4rwqDCoMKgwqDCoMKgwqAgZXJy b3Jfc2V0Z19lcnJubyhlcnJwLCAtciwgJnF1b3Q7ZXJyb3IgcmVhZGluZyBoZWFkZXIgZnJvbSAl cyZxdW90Oywgcy0mZ3Q7bmFtZSk7PGJyPsKgwqDCoMKgwqDCoMKgwqAgZ290byBmYWlsZWRfb3Bl bjs8YnI+wqDCoMKgwqAgfTxicj48YnI+LS0gPGJyPjIuNC4xMTxicj48YnI+PC9kaXY+DQo= --001a1136e6422083230531de7043--