From patchwork Mon Apr 25 18:46:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 66601 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1196438qge; Mon, 25 Apr 2016 11:49:31 -0700 (PDT) X-Received: by 10.28.158.15 with SMTP id h15mr13452981wme.35.1461610170975; Mon, 25 Apr 2016 11:49:30 -0700 (PDT) Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com. [209.132.183.39]) by mx.google.com with ESMTPS id b83si20747284wme.3.2016.04.25.11.49.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Apr 2016 11:49:30 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3PIkwiJ028994; Mon, 25 Apr 2016 14:46:58 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u3PIkeW4022107 for ; Mon, 25 Apr 2016 14:46:40 -0400 Received: from colepc.redhat.com (ovpn-113-101.phx2.redhat.com [10.3.113.101]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3PIkcl8012964; Mon, 25 Apr 2016 14:46:39 -0400 From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 25 Apr 2016 14:46:28 -0400 Message-Id: <6dd39d0b06005ff277b3416871fcde3b1733a14e.1461609759.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/9] fdstream: Report error with virProcessTranslateStatus X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com Rather than poorly duplicate it --- src/fdstream.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.7.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/fdstream.c b/src/fdstream.c index 681b90e..b0a46e9 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -43,6 +43,7 @@ #include "configmake.h" #include "virstring.h" #include "virtime.h" +#include "virprocess.h" #define VIR_FROM_THIS VIR_FROM_STREAMS @@ -263,13 +264,12 @@ virFDStreamCloseCommand(struct virFDStreamData *fdst) if (status != 0) { if (buf[0] != '\0') { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", buf); - } else if (WIFEXITED(status)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("I/O helper exited with status %d"), - WEXITSTATUS(status)); } else { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("I/O helper exited abnormally")); + char *str = virProcessTranslateStatus(status); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("I/O helper exited with %s"), + NULLSTR(str)); + VIR_FREE(str); } goto error; }