From nobody Wed May 14 16:24:20 2025 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 1520871730783191.17934311408806; Mon, 12 Mar 2018 09:22:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A376C04B923; Mon, 12 Mar 2018 16:22:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1642717AD3; Mon, 12 Mar 2018 16:22:09 +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 A7C20180BAE6; Mon, 12 Mar 2018 16:22:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2CGLvEi025045 for ; Mon, 12 Mar 2018 12:21:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 66D0B215CDAC; Mon, 12 Mar 2018 16:21:57 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DFD3215CDAE for ; Mon, 12 Mar 2018 16:21:56 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 12 Mar 2018 17:21:43 +0100 Message-Id: <0978d50626b5fd61458af25b6205109742f07f82.1520871530.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 13/18] domain: ensure connection to libvirt 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.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 12 Mar 2018 16:22:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Fixes an bug that was introduced by <8e24f602>. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 --- src/connect.c | 2 +- src/connect.h | 4 ++++ src/domain.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/connect.c b/src/connect.c index e93111f..b31f08e 100644 --- a/src/connect.c +++ b/src/connect.c @@ -53,7 +53,7 @@ virtDBusConnectClose(virtDBusConnect *connect, connect->connection =3D NULL; } =20 -static int +int virtDBusConnectOpen(virtDBusConnect *connect, sd_bus_error *error) { diff --git a/src/connect.h b/src/connect.h index 1086bc6..9e5f533 100644 --- a/src/connect.h +++ b/src/connect.h @@ -26,6 +26,10 @@ virtDBusConnectNew(virtDBusConnect **connectp, const char *uri, const char *connectPath); =20 +int +virtDBusConnectOpen(virtDBusConnect *connect, + sd_bus_error *error); + virtDBusConnect * virtDBusConnectFree(virtDBusConnect *connect); =20 diff --git a/src/domain.c b/src/domain.c index 8e6489a..3df9113 100644 --- a/src/domain.c +++ b/src/domain.c @@ -19,6 +19,9 @@ virtDBusDomainGetName(sd_bus *bus VIRT_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; const char *name =3D ""; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -44,6 +47,9 @@ virtDBusDomainGetUUID(sd_bus *bus VIRT_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -66,6 +72,9 @@ virtDBusDomainGetId(sd_bus *bus VIRT_ATTR_UNUSED, virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -86,6 +95,9 @@ virtDBusDomainGetVcpus(sd_bus *bus VIRT_ATTR_UNUSED, virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -107,6 +119,9 @@ virtDBusDomainGetOsType(sd_bus *bus VIRT_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusUtilFreep) char *os_type =3D NULL; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -132,6 +147,9 @@ virtDBusDomainGetActive(sd_bus *bus VIRT_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int active; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -157,6 +175,9 @@ virtDBusDomainGetPersistent(sd_bus *bus VIRT_ATTR_UNUSE= D, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int persistent; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -183,6 +204,9 @@ virtDBusDomainGetState(sd_bus *bus VIRT_ATTR_UNUSED, int state =3D 0; const char *string; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -234,6 +258,9 @@ virtDBusDomainGetAutostart(sd_bus *bus VIRT_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int autostart =3D 0; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, connect->domainPath); if (domain =3D=3D NULL) @@ -255,6 +282,9 @@ virtDBusDomainGetXMLDesc(sd_bus_message *message, uint32_t flags; int r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -300,6 +330,9 @@ virtDBusDomainGetStats(sd_bus_message *message, if (r < 0) return r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -336,6 +369,9 @@ virtDBusDomainShutdown(sd_bus_message *message, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -362,6 +398,9 @@ virtDBusDomainDestroy(sd_bus_message *message, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -393,6 +432,9 @@ virtDBusDomainReboot(sd_bus_message *message, if (r < 0) return r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -424,6 +466,9 @@ virtDBusDomainReset(sd_bus_message *message, if (r < 0) return r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -450,6 +495,9 @@ virtDBusDomainCreate(sd_bus_message *message, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); @@ -476,6 +524,9 @@ virtDBusDomainUndefine(sd_bus_message *message, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 + if (virtDBusConnectOpen(connect, error) < 0) + return -1; + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age), connect->domainPath); --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list