From nobody Sat Dec 21 15:03:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1539865794312247.70468574994004; Thu, 18 Oct 2018 05:29:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48F023002A8A; Thu, 18 Oct 2018 12:29:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0F27057CA7; Thu, 18 Oct 2018 12:29:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ADAF13D60; Thu, 18 Oct 2018 12:29:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w9ICRAvv025916 for ; Thu, 18 Oct 2018 08:27:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id DA21D611BC; Thu, 18 Oct 2018 12:27:10 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C0AC60D58 for ; Thu, 18 Oct 2018 12:27:10 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Thu, 18 Oct 2018 14:26:43 +0200 Message-Id: <68e0962efcded5c7166a74df6b9fb606e49e452e.1539865556.git.mprivozn@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [snmp PATCH 05/20] showError: Switch to less ancient error reporting 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 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 18 Oct 2018 12:29:53 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" So far, the function calls virConnCopyLastError() which is suboptimal since we have virGetLastErrorMessage(). Switch to that. Signed-off-by: Michal Privoznik --- configure.ac | 2 +- src/libvirtSnmp.c | 31 +++---------------------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index 1b4112e..baac0e1 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl =20 =20 dnl do we have libvirt installed? -LIBVIRT_REQUIRED=3D0.9.0 +LIBVIRT_REQUIRED=3D1.0.6 =20 PKG_CHECK_MODULES(LIBVIRT, libvirt >=3D $LIBVIRT_REQUIRED) AC_SUBST(LIBVIRT_LIBS) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index 111c97b..22cf8f0 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -76,36 +76,11 @@ stop(int sig) static void showError(virConnectPtr conn) { - int ret; - virErrorPtr err; + const char *err =3D virGetLastErrorMessage(); =20 - err =3D malloc(sizeof(*err)); - if (NULL =3D=3D err) { - printf("Could not allocate memory for error data\n"); - goto out; - } + snmp_log(LOG_ERR, "libvirt reported: \"%s\"\n", err); =20 - ret =3D virConnCopyLastError(conn, err); - - switch (ret) { - case 0: - snmp_log(LOG_ERR, "No error found\n"); - break; - - case -1: - snmp_log(LOG_ERR, "Parameter error when attempting to get last err= or\n"); - break; - - default: - snmp_log(LOG_ERR, "libvirt reported: \"%s\"\n", err->message); - break; - } - - virResetError(err); - free(err); - - out: - return; + virResetLastError(); } =20 =20 --=20 2.18.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list