From nobody Wed May 14 23:22:28 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1516641401626721.7488527554041; Mon, 22 Jan 2018 09:16:41 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E6C45F7AD; Mon, 22 Jan 2018 17:16:40 +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 370979F52; Mon, 22 Jan 2018 17:16:40 +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 F38994EA1B; Mon, 22 Jan 2018 17:16:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0MHGTCB028747 for ; Mon, 22 Jan 2018 12:16:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 018B85F704; Mon, 22 Jan 2018 17:16:29 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2AEB45E1D3; Mon, 22 Jan 2018 17:16:27 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 22 Jan 2018 18:16:07 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: lars@karlitski.net Subject: [libvirt] [dbus RFC 09/11] domain: derive domain path from connect path 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 22 Jan 2018 17:16:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Each connection have its own domains so we must make the domain path as a sub-path of the specific connection. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrange --- src/connect.c | 12 +++++++---- src/connect.h | 1 + src/domain.c | 64 ++++++++++++++++++++++++++++++++++++++++---------------= ---- src/events.c | 10 +++++----- src/util.c | 10 ++++++---- src/util.h | 6 ++++-- 6 files changed, 68 insertions(+), 35 deletions(-) diff --git a/src/connect.c b/src/connect.c index 3aec99e..5249eba 100644 --- a/src/connect.c +++ b/src/connect.c @@ -100,7 +100,8 @@ virtDBusConnectEnumarateDomains(sd_bus *bus VIR_ATTR_UN= USED, paths =3D calloc(n_domains + 1, sizeof(char *)); =20 for (int i =3D 0; i < n_domains; i +=3D 1) - paths[i] =3D virtDBusUtilBusPathForVirDomain(domains[i]); + paths[i] =3D virtDBusUtilBusPathForVirDomain(domains[i], + connect->domainPath); =20 *nodes =3D paths; paths =3D NULL; @@ -142,7 +143,8 @@ virtDBusConnectListDomains(sd_bus_message *message, for (int i =3D 0; domains[i] !=3D NULL; i +=3D 1) { _cleanup_(virtDBusUtilFreep) char *path =3D NULL; =20 - path =3D virtDBusUtilBusPathForVirDomain(domains[i]); + path =3D virtDBusUtilBusPathForVirDomain(domains[i], + connect->domainPath); =20 r =3D sd_bus_message_append(reply, "o", path); if (r < 0) @@ -180,7 +182,7 @@ virtDBusConnectCreateXML(sd_bus_message *message, if (!domain) return virtDBusUtilSetLastVirtError(error); =20 - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 return sd_bus_reply_method_return(message, "o", path); } @@ -208,7 +210,7 @@ virtDBusConnectDefineXML(sd_bus_message *message, if (!domain) return virtDBusUtilSetLastVirtError(error); =20 - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 return sd_bus_reply_method_return(message, "o", path); } @@ -278,6 +280,8 @@ virtDBusConnectFree(virtDBusConnect *connect) if (connect->connection) virtDBusConnectClose(connect, true); =20 + free(connect->domainPath); + free(connect); =20 return NULL; diff --git a/src/connect.h b/src/connect.h index 489ce84..bed2c7e 100644 --- a/src/connect.h +++ b/src/connect.h @@ -9,6 +9,7 @@ struct virtDBusConnect { sd_bus *bus; const char *uri; const char *connectPath; + char *domainPath; virConnectPtr connection; =20 sd_bus_node_enumerator_t enumerateDomains; diff --git a/src/domain.c b/src/domain.c index bc465b0..33ed2b3 100644 --- a/src/domain.c +++ b/src/domain.c @@ -1,6 +1,9 @@ +#define _GNU_SOURCE #include "domain.h" #include "util.h" =20 +#include + static int virtDBusDomainGetName(sd_bus *bus VIR_ATTR_UNUSED, const char *path, @@ -14,7 +17,8 @@ virtDBusDomainGetName(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; const char *name =3D ""; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -38,7 +42,8 @@ virtDBusDomainGetUUID(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -59,7 +64,8 @@ virtDBusDomainGetId(sd_bus *bus VIR_ATTR_UNUSED, virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -78,7 +84,8 @@ virtDBusDomainGetVcpus(sd_bus *bus VIR_ATTR_UNUSED, virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -98,7 +105,8 @@ virtDBusDomainGetOsType(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusUtilFreep) char *os_type =3D NULL; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -122,7 +130,8 @@ virtDBusDomainGetActive(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int active; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -146,7 +155,8 @@ virtDBusDomainGetPersistent(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int persistent; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -171,7 +181,8 @@ virtDBusDomainGetState(sd_bus *bus VIR_ATTR_UNUSED, int state =3D 0; const char *string; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -221,7 +232,8 @@ virtDBusDomainGetAutostart(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int autostart =3D 0; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path, + connect->domainPath); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -242,7 +254,8 @@ virtDBusDomainGetXMLDesc(sd_bus_message *message, int r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -286,7 +299,8 @@ virtDBusDomainGetStats(sd_bus_message *message, return r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -321,7 +335,8 @@ virtDBusDomainShutdown(sd_bus_message *message, int r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -346,7 +361,8 @@ virtDBusDomainDestroy(sd_bus_message *message, int r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -376,7 +392,8 @@ virtDBusDomainReboot(sd_bus_message *message, return r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -406,7 +423,8 @@ virtDBusDomainReset(sd_bus_message *message, return r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -431,7 +449,8 @@ virtDBusDomainCreate(sd_bus_message *message, int r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -456,7 +475,8 @@ virtDBusDomainUndefine(sd_bus_message *message, int r; =20 domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, - sd_bus_message_get_path(mess= age)); + sd_bus_message_get_path(mess= age), + connect->domainPath); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -514,7 +534,7 @@ virtDBusDomainLookup(sd_bus *bus VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); + r =3D sd_bus_path_decode(path, connect->domainPath, &name); if (r < 0) return r; =20 @@ -541,14 +561,18 @@ virtDBusDomainRegister(virtDBusConnect *connect, { int r; =20 - r =3D sd_bus_add_node_enumerator(bus, NULL, "/org/libvirt/domain", + r =3D asprintf(&connect->domainPath, "%s/domain", connect->connectPath= ); + if (r < 0) + return r; + + r =3D sd_bus_add_node_enumerator(bus, NULL, connect->domainPath, connect->enumerateDomains, connect); if (r < 0) return r; =20 return sd_bus_add_fallback_vtable(bus, NULL, - "/org/libvirt/domain", + connect->domainPath, "org.libvirt.Domain", virt_domain_vtable, virtDBusDomainLookup, diff --git a/src/events.c b/src/events.c index d2d7f6b..05d5940 100644 --- a/src/events.c +++ b/src/events.c @@ -60,7 +60,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection VI= R_ATTR_UNUSED, return r; =20 name =3D virDomainGetName(domain); - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 r =3D sd_bus_message_append(message, "so", name ? : "", path); if (r < 0) @@ -80,7 +80,7 @@ virtDBusEventsDomainDeviceAdded(virConnectPtr connection = VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilFreep) char *path =3D NULL; int r; =20 - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 r =3D sd_bus_message_new_signal(connect->bus, &message, @@ -108,7 +108,7 @@ virtDBusEventsDomainDeviceRemoved(virConnectPtr connect= ion VIR_ATTR_UNUSED, _cleanup_(virtDBusUtilFreep) char *path =3D NULL; int r; =20 - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 r =3D sd_bus_message_new_signal(connect->bus, &message, @@ -138,7 +138,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection= VIR_ATTR_UNUSED, const char *reasonstr; int r; =20 - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 r =3D sd_bus_message_new_signal(connect->bus, &message, @@ -182,7 +182,7 @@ virtDBusEventsDomainTrayChange(virConnectPtr connection= VIR_ATTR_UNUSED, const char *reasonstr; int r; =20 - path =3D virtDBusUtilBusPathForVirDomain(domain); + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 r =3D sd_bus_message_new_signal(connect->bus, &message, diff --git a/src/util.c b/src/util.c index 6636d0a..d0649fa 100644 --- a/src/util.c +++ b/src/util.c @@ -77,25 +77,27 @@ virtDBusUtilSetError(sd_bus_error *error, } =20 char * -virtDBusUtilBusPathForVirDomain(virDomainPtr domain) +virtDBusUtilBusPathForVirDomain(virDomainPtr domain, + const char *domainPath) { char *path =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 virDomainGetUUIDString(domain, uuid); - sd_bus_path_encode("/org/libvirt/domain", uuid, &path); + sd_bus_path_encode(domainPath, uuid, &path); =20 return path; } =20 virDomainPtr virtDBusUtilVirDomainFromBusPath(virConnectPtr connection, - const char *path) + const char *path, + const char *domainPath) { _cleanup_(virtDBusUtilFreep) char *name =3D NULL; int r; =20 - r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); + r =3D sd_bus_path_decode(path, domainPath, &name); if (r < 0) return NULL; =20 diff --git a/src/util.h b/src/util.h index cb8447d..14b1e9a 100644 --- a/src/util.h +++ b/src/util.h @@ -24,11 +24,13 @@ virtDBusUtilSetError(sd_bus_error *error, const char *message); =20 char * -virtDBusUtilBusPathForVirDomain(virDomainPtr domain); +virtDBusUtilBusPathForVirDomain(virDomainPtr domain, + const char *domainPath); =20 virDomainPtr virtDBusUtilVirDomainFromBusPath(virConnectPtr connection, - const char *path); + const char *path, + const char *domainPath); =20 static inline void virtDBusUtilFreep(void *p) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list