From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903560939871.7496273617143; Mon, 24 Jul 2017 06:39:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03C16356D6; Mon, 24 Jul 2017 13:39:18 +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 CE33617190; Mon, 24 Jul 2017 13:39:17 +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 89BE814B25; Mon, 24 Jul 2017 13:39:17 +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 v6ODd7Hs001747 for ; Mon, 24 Jul 2017 09:39:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5F1D17AF7; Mon, 24 Jul 2017 13:39:07 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2524B17190 for ; Mon, 24 Jul 2017 13:39:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 03C16356D6 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 03C16356D6 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:38:54 +0200 Message-Id: <7d1357a7800c56e8db9903070d24915e065d1c46.1500647204.git.phrdina@redhat.com> 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 Subject: [libvirt] [dbus PATCH 1/9] util: move bus_path_for_domain and domain_from_bus_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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 24 Jul 2017 13:39:18 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" These functions don't require anything from libvirt-dbus. Make them generic and move them into util. Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/manager.c | 68 ++++++++++++++++++++++---------------------------------= ---- src/util.c | 26 +++++++++++++++++++++++ src/util.h | 7 ++++++ 3 files changed, 58 insertions(+), 43 deletions(-) diff --git a/src/manager.c b/src/manager.c index f541287..6459ec9 100644 --- a/src/manager.c +++ b/src/manager.c @@ -12,32 +12,6 @@ struct VirtManager { int callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; }; =20 -static char * -bus_path_for_domain(virDomainPtr domain) -{ - char *path =3D NULL; - char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; - - virDomainGetUUIDString(domain, uuid); - sd_bus_path_encode("/org/libvirt/domain", uuid, &path); - - return path; -} - -static virDomainPtr -domain_from_bus_path(VirtManager *manager, - const char *path) -{ - _cleanup_(freep) char *name =3D NULL; - int r; - - r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); - if (r < 0) - return NULL; - - return virDomainLookupByUUIDString(manager->connection, name); -} - static void virDomainsFreep(virDomainPtr **domainsp) { @@ -65,7 +39,7 @@ domain_get_name(sd_bus *bus, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; const char *name =3D ""; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -89,7 +63,7 @@ domain_get_uuid(sd_bus *bus, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -110,7 +84,7 @@ domain_get_id(sd_bus *bus, VirtManager *manager =3D userdata; _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -129,7 +103,7 @@ domain_get_vcpus(sd_bus *bus, VirtManager *manager =3D userdata; _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -149,7 +123,7 @@ domain_get_os_type(sd_bus *bus, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(freep) char *os_type =3D NULL; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -173,7 +147,7 @@ domain_get_active(sd_bus *bus, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int active; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -197,7 +171,7 @@ domain_get_persistent(sd_bus *bus, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int persistent; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -222,7 +196,7 @@ domain_get_state(sd_bus *bus, int state =3D 0; const char *string; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -272,7 +246,7 @@ domain_get_autostart(sd_bus *bus, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int autostart =3D 0; =20 - domain =3D domain_from_bus_path(manager, path); + domain =3D domain_from_bus_path(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -292,7 +266,8 @@ domain_get_xml_desc(sd_bus_message *message, uint32_t flags; int r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -335,7 +310,8 @@ domain_get_stats(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -369,7 +345,8 @@ domain_shutdown(sd_bus_message *message, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -393,7 +370,8 @@ domain_destroy(sd_bus_message *message, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -422,7 +400,8 @@ domain_reboot(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -451,7 +430,8 @@ domain_reset(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -475,7 +455,8 @@ domain_create(sd_bus_message *message, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -499,7 +480,8 @@ domain_undefine(sd_bus_message *message, _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager, sd_bus_message_get_path(messa= ge)); + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, diff --git a/src/util.c b/src/util.c index caf552d..99cd6b5 100644 --- a/src/util.c +++ b/src/util.c @@ -67,3 +67,29 @@ int bus_error_set_last_virt_error(sd_bus_error *error) =20 return sd_bus_error_set(error, "org.libvirt.Error", vir_error->message= ); } + +char * +bus_path_for_domain(virDomainPtr domain) +{ + char *path =3D NULL; + char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; + + virDomainGetUUIDString(domain, uuid); + sd_bus_path_encode("/org/libvirt/domain", uuid, &path); + + return path; +} + +virDomainPtr +domain_from_bus_path(virConnectPtr connection, + const char *path) +{ + _cleanup_(freep) char *name =3D NULL; + int r; + + r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); + if (r < 0) + return NULL; + + return virDomainLookupByUUIDString(connection, name); +} diff --git a/src/util.h b/src/util.h index 1f34582..91e35d6 100644 --- a/src/util.h +++ b/src/util.h @@ -13,6 +13,13 @@ int bus_message_append_typed_parameters(sd_bus_message *= message, =20 int bus_error_set_last_virt_error(sd_bus_error *error); =20 +char * +bus_path_for_domain(virDomainPtr domain); + +virDomainPtr +domain_from_bus_path(virConnectPtr connection, + const char *path); + static inline void freep(void *p) { --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903632424130.73959829625505; Mon, 24 Jul 2017 06:40:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C8688125F; Mon, 24 Jul 2017 13:40:29 +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 5A7C16933D; Mon, 24 Jul 2017 13:40:29 +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 F3C9D180B467; Mon, 24 Jul 2017 13:40:28 +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 v6ODd9cs001755 for ; Mon, 24 Jul 2017 09:39:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 133D54DA74; Mon, 24 Jul 2017 13:39:09 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E48B17AF7 for ; Mon, 24 Jul 2017 13:39:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8C8688125F Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8C8688125F From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:38:55 +0200 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 Subject: [libvirt] [dbus PATCH 2/9] util: move and rename virDomainsFreep 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 24 Jul 2017 13:40:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Move it to the same place as virDomainFreep(). Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/manager.c | 18 ++---------------- src/util.h | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/manager.c b/src/manager.c index 6459ec9..0cf0f8e 100644 --- a/src/manager.c +++ b/src/manager.c @@ -12,20 +12,6 @@ struct VirtManager { int callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; }; =20 -static void -virDomainsFreep(virDomainPtr **domainsp) -{ - virDomainPtr *domains =3D *domainsp; - - if (!domains) - return; - - for (int i =3D 0; domains[i] !=3D NULL; i +=3D 1) - virDomainFree(domains[i]); - - free(domains); -} - static int domain_get_name(sd_bus *bus, const char *path, @@ -504,7 +490,7 @@ enumerate_domains(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainsFreep) virDomainPtr *domains =3D NULL; + _cleanup_(virDomainListFreep) virDomainPtr *domains =3D NULL; _cleanup_(strv_freep) char **paths =3D NULL; int n_domains; =20 @@ -530,7 +516,7 @@ virt_manager_list_domains(sd_bus_message *message, { VirtManager *manager =3D userdata; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; - _cleanup_(virDomainsFreep) virDomainPtr *domains =3D NULL; + _cleanup_(virDomainListFreep) virDomainPtr *domains =3D NULL; uint32_t flags; int r; =20 diff --git a/src/util.h b/src/util.h index 91e35d6..bc39f44 100644 --- a/src/util.h +++ b/src/util.h @@ -53,3 +53,17 @@ virDomainFreep(virDomainPtr *domainp) if (*domainp) virDomainFree(*domainp); } + +static inline void +virDomainListFreep(virDomainPtr **domainsp) +{ + virDomainPtr *domains =3D *domainsp; + + if (!domains) + return; + + for (int i =3D 0; domains[i] !=3D NULL; i +=3D 1) + virDomainFree(domains[i]); + + free(domains); +} --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150090363605733.240203965095475; Mon, 24 Jul 2017 06:40:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 63C11C00DB96; Mon, 24 Jul 2017 13:40:33 +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 3F4376DA99; Mon, 24 Jul 2017 13:40:33 +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 E28201805981; Mon, 24 Jul 2017 13:40:32 +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 v6ODdA0I001769 for ; Mon, 24 Jul 2017 09:39:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 35ED74DA74; Mon, 24 Jul 2017 13:39:10 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6055217AF7 for ; Mon, 24 Jul 2017 13:39:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 63C11C00DB96 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 63C11C00DB96 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:38:56 +0200 Message-Id: <58ee79da0ad9283d246e4f74f526d7901947e175.1500647204.git.phrdina@redhat.com> 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 Subject: [libvirt] [dbus PATCH 3/9] domain: split domain code into separate file 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 24 Jul 2017 13:40:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of having all code only in one file split it logically to have one file for D-Bus object. Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/Makefile.am | 3 +- src/domain.c | 549 ++++++++++++++++++++++++++++++++++++++++++++++++++++= +++ src/domain.h | 9 + src/manager.c | 551 +---------------------------------------------------= ---- src/manager.h | 6 + 5 files changed, 568 insertions(+), 550 deletions(-) create mode 100644 src/domain.c create mode 100644 src/domain.h diff --git a/src/Makefile.am b/src/Makefile.am index e60f250..f066ed3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,7 +4,8 @@ AM_CPPFLAGS =3D \ DAEMON_SOURCES =3D \ main.c \ manager.c manager.h \ - util.c util.h + util.c util.h \ + domain.c domain.h =20 EXTRA_DIST =3D \ $(DAEMON_SOURCES) diff --git a/src/domain.c b/src/domain.c new file mode 100644 index 0000000..1bda3b8 --- /dev/null +++ b/src/domain.c @@ -0,0 +1,549 @@ +#include "domain.h" +#include "util.h" + +static int +domain_get_name(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + const char *name =3D ""; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "s", ""); + + name =3D virDomainGetName(domain); + if (name =3D=3D NULL) + return sd_bus_message_append(reply, "s", ""); + + return sd_bus_message_append(reply, "s", name); +} + +static int +domain_get_uuid(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "s", ""); + + virDomainGetUUIDString(domain, uuid); + + return sd_bus_message_append(reply, "s", uuid); +} + +static int +domain_get_id(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "u", 0); + + return sd_bus_message_append(reply, "u", virDomainGetID(domain)); +} + +static int +domain_get_vcpus(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "u", 0); + + return sd_bus_message_append(reply, "u", virDomainGetVcpusFlags(domain= , VIR_DOMAIN_VCPU_CURRENT)); +} + +static int +domain_get_os_type(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(freep) char *os_type =3D NULL; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "s", ""); + + os_type =3D virDomainGetOSType(domain); + if (os_type =3D=3D NULL) + return sd_bus_message_append(reply, "s", ""); + + return sd_bus_message_append(reply, "s", os_type); +} + +static int +domain_get_active(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int active; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "b", 0); + + active =3D virDomainIsActive(domain); + if (active < 0) + return sd_bus_message_append(reply, "b", 0); + + return sd_bus_message_append(reply, "b", active); +} + +static int +domain_get_persistent(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int persistent; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "b", 0); + + persistent =3D virDomainIsPersistent(domain); + if (persistent < 0) + return sd_bus_message_append(reply, "b", 0); + + return sd_bus_message_append(reply, "b", persistent); +} + +static int +domain_get_state(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int state =3D 0; + const char *string; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "s", ""); + + virDomainGetState(domain, &state, NULL, 0); + + switch (state) { + case VIR_DOMAIN_NOSTATE: + default: + string =3D "nostate"; + break; + case VIR_DOMAIN_RUNNING: + string =3D "running"; + break; + case VIR_DOMAIN_BLOCKED: + string =3D "blocked"; + break; + case VIR_DOMAIN_PAUSED: + string =3D "paused"; + break; + case VIR_DOMAIN_SHUTDOWN: + string =3D "shutdown"; + break; + case VIR_DOMAIN_SHUTOFF: + string =3D "shutoff"; + break; + case VIR_DOMAIN_CRASHED: + string =3D "crashed"; + break; + case VIR_DOMAIN_PMSUSPENDED: + string =3D "pmsuspended"; + break; + } + + return sd_bus_message_append(reply, "s", string); +} + +static int +domain_get_autostart(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int autostart =3D 0; + + domain =3D domain_from_bus_path(manager->connection, path); + if (domain =3D=3D NULL) + return sd_bus_message_append(reply, "b", 0); + + virDomainGetAutostart(domain, &autostart); + + return sd_bus_message_append(reply, "b", autostart); +} + +static int +domain_get_xml_desc(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(freep) char *description =3D NULL; + uint32_t flags; + int r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D sd_bus_message_read(message, "u", &flags); + if (r < 0) + return r; + + description =3D virDomainGetXMLDesc(domain, flags); + if (!description) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, "s", description); +} + +static void +virDomainStatsRecordListFreep(virDomainStatsRecordPtr **statsp) +{ + if (*statsp) + virDomainStatsRecordListFree(*statsp); +} + +static int +domain_get_stats(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + virDomainPtr domains[2]; + _cleanup_(virDomainStatsRecordListFreep) virDomainStatsRecordPtr *reco= rds =3D NULL; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; + uint32_t flags, stats; + int r; + + r =3D sd_bus_message_read(message, "uu", &stats, &flags); + if (r < 0) + return r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + domains[0] =3D domain; + domains[1] =3D NULL; + + if (virDomainListGetStats(domains, stats, &records, flags) !=3D 1) + return bus_error_set_last_virt_error(error); + + r =3D sd_bus_message_new_method_return(message, &reply); + if (r < 0) + return r; + + r =3D bus_message_append_typed_parameters(reply, records[0]->params, r= ecords[0]->nparams); + if (r < 0) + return r; + + return sd_bus_send(NULL, reply, NULL); +} + +static int +domain_shutdown(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D virDomainShutdown(domain); + if (r < 0) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, ""); +} + +static int +domain_destroy(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D virDomainDestroy(domain); + if (r < 0) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, ""); +} + +static int +domain_reboot(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + uint32_t flags; + int r; + + r =3D sd_bus_message_read(message, "u", &flags); + if (r < 0) + return r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D virDomainReboot(domain, flags); + if (r < 0) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, ""); +} + +static int +domain_reset(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + uint32_t flags; + int r; + + r =3D sd_bus_message_read(message, "u", &flags); + if (r < 0) + return r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D virDomainReset(domain, flags); + if (r < 0) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, ""); +} + +static int +domain_create(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D virDomainCreate(domain); + if (r < 0) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, ""); +} + +static int +domain_undefine(sd_bus_message *message, + void *userdata, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int r; + + domain =3D domain_from_bus_path(manager->connection, + sd_bus_message_get_path(message)); + if (domain =3D=3D NULL) { + return sd_bus_reply_method_errorf(message, + SD_BUS_ERROR_UNKNOWN_OBJECT, + "Unknown object '%s'.", + sd_bus_message_get_path(message)= ); + } + + r =3D virDomainUndefine(domain); + if (r < 0) + return bus_error_set_last_virt_error(error); + + return sd_bus_reply_method_return(message, ""); +} + +static const sd_bus_vtable virt_domain_vtable[] =3D { + SD_BUS_VTABLE_START(0), + + SD_BUS_PROPERTY("Name", "s", domain_get_name, 0, 0), + SD_BUS_PROPERTY("UUID", "s", domain_get_uuid, 0, 0), + SD_BUS_PROPERTY("Id", "u", domain_get_id, 0, 0), + SD_BUS_PROPERTY("Vcpus", "u", domain_get_vcpus, 0, 0), + SD_BUS_PROPERTY("OSType", "s", domain_get_os_type, 0, 0), + SD_BUS_PROPERTY("Active", "b", domain_get_active, 0, 0), + SD_BUS_PROPERTY("Persistent", "b", domain_get_persistent, 0, 0), + SD_BUS_PROPERTY("State", "s", domain_get_state, 0, 0), + SD_BUS_PROPERTY("Autostart", "b", domain_get_autostart, 0, 0), + + SD_BUS_METHOD("GetXMLDesc", "u", "s", domain_get_xml_desc, SD_BUS_VTAB= LE_UNPRIVILEGED), + SD_BUS_METHOD("GetStats", "uu", "a{sv}", domain_get_stats, SD_BUS_VTAB= LE_UNPRIVILEGED), + SD_BUS_METHOD("Shutdown", "", "", domain_shutdown, SD_BUS_VTABLE_UNPRI= VILEGED), + SD_BUS_METHOD("Destroy", "", "", domain_destroy, SD_BUS_VTABLE_UNPRIVI= LEGED), + SD_BUS_METHOD("Reboot", "u", "", domain_reboot, SD_BUS_VTABLE_UNPRIVIL= EGED), + SD_BUS_METHOD("Reset", "u", "", domain_reset, SD_BUS_VTABLE_UNPRIVILEG= ED), + SD_BUS_METHOD("Create", "", "", domain_create, SD_BUS_VTABLE_UNPRIVILE= GED), + SD_BUS_METHOD("Undefine", "", "", domain_undefine, SD_BUS_VTABLE_UNPRI= VILEGED), + + SD_BUS_SIGNAL("DeviceAdded", "s", 0), + SD_BUS_SIGNAL("DeviceRemoved", "s", 0), + SD_BUS_SIGNAL("DiskChange", "ssss", 0), + SD_BUS_SIGNAL("TrayChange", "ss", 0), + + SD_BUS_VTABLE_END +}; + +static int +lookup_domain(sd_bus *bus, + const char *path, + const char *interface, + void *userdata, + void **found, + sd_bus_error *error) +{ + VirtManager *manager =3D userdata; + _cleanup_(freep) char *name =3D NULL; + _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + int r; + + r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); + if (r < 0) + return r; + + if (*name =3D=3D '\0') + return 0; + + domain =3D virDomainLookupByUUIDString(manager->connection, name); + if (!domain) + return 0; + + /* + * There's no way to unref the pointer we're returning here. So, + * return the manager object and look up the domain again in the + * domain_* callbacks. + */ + *found =3D manager; + + return 1; +} + +int +domain_register(VirtManager *manager, + sd_bus *bus) +{ + return sd_bus_add_fallback_vtable(bus, + NULL, + "/org/libvirt/domain", + "org.libvirt.Domain", + virt_domain_vtable, + lookup_domain, + manager); +} diff --git a/src/domain.h b/src/domain.h new file mode 100644 index 0000000..3f347e8 --- /dev/null +++ b/src/domain.h @@ -0,0 +1,9 @@ +#pragma once + +#include "manager.h" + +#include +#include + +int domain_register(VirtManager *manager, + sd_bus *bus); diff --git a/src/manager.c b/src/manager.c index 0cf0f8e..a2709b4 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1,3 +1,4 @@ +#include "domain.h" #include "manager.h" #include "util.h" =20 @@ -5,483 +6,6 @@ #include #include =20 -struct VirtManager { - sd_bus *bus; - virConnectPtr connection; - - int callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; -}; - -static int -domain_get_name(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - const char *name =3D ""; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "s", ""); - - name =3D virDomainGetName(domain); - if (name =3D=3D NULL) - return sd_bus_message_append(reply, "s", ""); - - return sd_bus_message_append(reply, "s", name); -} - -static int -domain_get_uuid(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "s", ""); - - virDomainGetUUIDString(domain, uuid); - - return sd_bus_message_append(reply, "s", uuid); -} - -static int -domain_get_id(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "u", 0); - - return sd_bus_message_append(reply, "u", virDomainGetID(domain)); -} - -static int -domain_get_vcpus(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "u", 0); - - return sd_bus_message_append(reply, "u", virDomainGetVcpusFlags(domain= , VIR_DOMAIN_VCPU_CURRENT)); -} - -static int -domain_get_os_type(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - _cleanup_(freep) char *os_type =3D NULL; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "s", ""); - - os_type =3D virDomainGetOSType(domain); - if (os_type =3D=3D NULL) - return sd_bus_message_append(reply, "s", ""); - - return sd_bus_message_append(reply, "s", os_type); -} - -static int -domain_get_active(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int active; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "b", 0); - - active =3D virDomainIsActive(domain); - if (active < 0) - return sd_bus_message_append(reply, "b", 0); - - return sd_bus_message_append(reply, "b", active); -} - -static int -domain_get_persistent(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int persistent; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "b", 0); - - persistent =3D virDomainIsPersistent(domain); - if (persistent < 0) - return sd_bus_message_append(reply, "b", 0); - - return sd_bus_message_append(reply, "b", persistent); -} - -static int -domain_get_state(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int state =3D 0; - const char *string; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "s", ""); - - virDomainGetState(domain, &state, NULL, 0); - - switch (state) { - case VIR_DOMAIN_NOSTATE: - default: - string =3D "nostate"; - break; - case VIR_DOMAIN_RUNNING: - string =3D "running"; - break; - case VIR_DOMAIN_BLOCKED: - string =3D "blocked"; - break; - case VIR_DOMAIN_PAUSED: - string =3D "paused"; - break; - case VIR_DOMAIN_SHUTDOWN: - string =3D "shutdown"; - break; - case VIR_DOMAIN_SHUTOFF: - string =3D "shutoff"; - break; - case VIR_DOMAIN_CRASHED: - string =3D "crashed"; - break; - case VIR_DOMAIN_PMSUSPENDED: - string =3D "pmsuspended"; - break; - } - - return sd_bus_message_append(reply, "s", string); -} - -static int -domain_get_autostart(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int autostart =3D 0; - - domain =3D domain_from_bus_path(manager->connection, path); - if (domain =3D=3D NULL) - return sd_bus_message_append(reply, "b", 0); - - virDomainGetAutostart(domain, &autostart); - - return sd_bus_message_append(reply, "b", autostart); -} - -static int -domain_get_xml_desc(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - _cleanup_(freep) char *description =3D NULL; - uint32_t flags; - int r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D sd_bus_message_read(message, "u", &flags); - if (r < 0) - return r; - - description =3D virDomainGetXMLDesc(domain, flags); - if (!description) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, "s", description); -} - -static void -virDomainStatsRecordListFreep(virDomainStatsRecordPtr **statsp) -{ - if (*statsp) - virDomainStatsRecordListFree(*statsp); -} - -static int -domain_get_stats(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - virDomainPtr domains[2]; - _cleanup_(virDomainStatsRecordListFreep) virDomainStatsRecordPtr *reco= rds =3D NULL; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; - uint32_t flags, stats; - int r; - - r =3D sd_bus_message_read(message, "uu", &stats, &flags); - if (r < 0) - return r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - domains[0] =3D domain; - domains[1] =3D NULL; - - if (virDomainListGetStats(domains, stats, &records, flags) !=3D 1) - return bus_error_set_last_virt_error(error); - - r =3D sd_bus_message_new_method_return(message, &reply); - if (r < 0) - return r; - - r =3D bus_message_append_typed_parameters(reply, records[0]->params, r= ecords[0]->nparams); - if (r < 0) - return r; - - return sd_bus_send(NULL, reply, NULL); -} - -static int -domain_shutdown(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D virDomainShutdown(domain); - if (r < 0) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, ""); -} - -static int -domain_destroy(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D virDomainDestroy(domain); - if (r < 0) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, ""); -} - -static int -domain_reboot(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - uint32_t flags; - int r; - - r =3D sd_bus_message_read(message, "u", &flags); - if (r < 0) - return r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D virDomainReboot(domain, flags); - if (r < 0) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, ""); -} - -static int -domain_reset(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - uint32_t flags; - int r; - - r =3D sd_bus_message_read(message, "u", &flags); - if (r < 0) - return r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D virDomainReset(domain, flags); - if (r < 0) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, ""); -} - -static int -domain_create(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D virDomainCreate(domain); - if (r < 0) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, ""); -} - -static int -domain_undefine(sd_bus_message *message, - void *userdata, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int r; - - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); - if (domain =3D=3D NULL) { - return sd_bus_reply_method_errorf(message, - SD_BUS_ERROR_UNKNOWN_OBJECT, - "Unknown object '%s'.", - sd_bus_message_get_path(message)= ); - } - - r =3D virDomainUndefine(domain); - if (r < 0) - return bus_error_set_last_virt_error(error); - - return sd_bus_reply_method_return(message, ""); -} - static int enumerate_domains(sd_bus *bus, const char *path, @@ -808,40 +332,6 @@ handle_domain_tray_change_event(virConnectPtr connecti= on, return sd_bus_send(manager->bus, message, NULL); } =20 -static int -lookup_domain(sd_bus *bus, - const char *path, - const char *interface, - void *userdata, - void **found, - sd_bus_error *error) -{ - VirtManager *manager =3D userdata; - _cleanup_(freep) char *name =3D NULL; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - int r; - - r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); - if (r < 0) - return r; - - if (*name =3D=3D '\0') - return 0; - - domain =3D virDomainLookupByUUIDString(manager->connection, name); - if (!domain) - return 0; - - /* - * There's no way to unref the pointer we're returning here. So, - * return the manager object and look up the domain again in the - * domain_* callbacks. - */ - *found =3D manager; - - return 1; -} - static void virt_manager_register_event(VirtManager *manager, int id, @@ -877,36 +367,6 @@ static const sd_bus_vtable virt_manager_vtable[] =3D { SD_BUS_VTABLE_END }; =20 -static const sd_bus_vtable virt_domain_vtable[] =3D { - SD_BUS_VTABLE_START(0), - - SD_BUS_PROPERTY("Name", "s", domain_get_name, 0, 0), - SD_BUS_PROPERTY("UUID", "s", domain_get_uuid, 0, 0), - SD_BUS_PROPERTY("Id", "u", domain_get_id, 0, 0), - SD_BUS_PROPERTY("Vcpus", "u", domain_get_vcpus, 0, 0), - SD_BUS_PROPERTY("OSType", "s", domain_get_os_type, 0, 0), - SD_BUS_PROPERTY("Active", "b", domain_get_active, 0, 0), - SD_BUS_PROPERTY("Persistent", "b", domain_get_persistent, 0, 0), - SD_BUS_PROPERTY("State", "s", domain_get_state, 0, 0), - SD_BUS_PROPERTY("Autostart", "b", domain_get_autostart, 0, 0), - - SD_BUS_METHOD("GetXMLDesc", "u", "s", domain_get_xml_desc, SD_BUS_VTAB= LE_UNPRIVILEGED), - SD_BUS_METHOD("GetStats", "uu", "a{sv}", domain_get_stats, SD_BUS_VTAB= LE_UNPRIVILEGED), - SD_BUS_METHOD("Shutdown", "", "", domain_shutdown, SD_BUS_VTABLE_UNPRI= VILEGED), - SD_BUS_METHOD("Destroy", "", "", domain_destroy, SD_BUS_VTABLE_UNPRIVI= LEGED), - SD_BUS_METHOD("Reboot", "u", "", domain_reboot, SD_BUS_VTABLE_UNPRIVIL= EGED), - SD_BUS_METHOD("Reset", "u", "", domain_reset, SD_BUS_VTABLE_UNPRIVILEG= ED), - SD_BUS_METHOD("Create", "", "", domain_create, SD_BUS_VTABLE_UNPRIVILE= GED), - SD_BUS_METHOD("Undefine", "", "", domain_undefine, SD_BUS_VTABLE_UNPRI= VILEGED), - - SD_BUS_SIGNAL("DeviceAdded", "s", 0), - SD_BUS_SIGNAL("DeviceRemoved", "s", 0), - SD_BUS_SIGNAL("DiskChange", "ssss", 0), - SD_BUS_SIGNAL("TrayChange", "ss", 0), - - SD_BUS_VTABLE_END -}; - int virt_manager_new(VirtManager **managerp, sd_bus *bus, @@ -958,14 +418,7 @@ virt_manager_new(VirtManager **managerp, if (r < 0) return r; =20 - r =3D sd_bus_add_fallback_vtable(bus, - NULL, - "/org/libvirt/domain", - "org.libvirt.Domain", - virt_domain_vtable, - lookup_domain, - manager); - if (r < 0) + if ((r =3D domain_register(manager, bus) < 0)) return r; =20 *managerp =3D manager; diff --git a/src/manager.h b/src/manager.h index 8f2aedb..06aaa04 100644 --- a/src/manager.h +++ b/src/manager.h @@ -5,6 +5,12 @@ #include #include =20 +struct VirtManager { + sd_bus *bus; + virConnectPtr connection; + + int callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; +}; typedef struct VirtManager VirtManager; =20 int virt_manager_new(VirtManager **managerp, --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903640006709.5872277028355; Mon, 24 Jul 2017 06:40:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0C688796E4; Mon, 24 Jul 2017 13:40:37 +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 B489D89F03; Mon, 24 Jul 2017 13:40:36 +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 6C72514B2D; Mon, 24 Jul 2017 13:40:36 +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 v6ODdBJZ001774 for ; Mon, 24 Jul 2017 09:39:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07BC667CF1; Mon, 24 Jul 2017 13:39:11 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8231117AF7 for ; Mon, 24 Jul 2017 13:39:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0C688796E4 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0C688796E4 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:38:57 +0200 Message-Id: <9761db768279df441a260675e7ec8259fb7420e8.1500647204.git.phrdina@redhat.com> 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 Subject: [libvirt] [dbus PATCH 4/9] events: split event code into separate file 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 24 Jul 2017 13:40:37 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Similarly to the previous patch, split the code into its separate file. Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/Makefile.am | 3 +- src/events.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ src/events.h | 9 ++ src/manager.c | 243 +---------------------------------------------------= -- 4 files changed, 265 insertions(+), 242 deletions(-) create mode 100644 src/events.c create mode 100644 src/events.h diff --git a/src/Makefile.am b/src/Makefile.am index f066ed3..30e7a35 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,8 @@ DAEMON_SOURCES =3D \ main.c \ manager.c manager.h \ util.c util.h \ - domain.c domain.h + domain.c domain.h \ + events.c events.h =20 EXTRA_DIST =3D \ $(DAEMON_SOURCES) diff --git a/src/events.c b/src/events.c new file mode 100644 index 0000000..4572e39 --- /dev/null +++ b/src/events.c @@ -0,0 +1,252 @@ +#include "domain.h" +#include "events.h" +#include "util.h" + +#include +#include + +static int +handle_domain_lifecycle_event(virConnectPtr connection, + virDomainPtr domain, + int event, + int detail, + void *opaque) +{ + VirtManager *manager =3D opaque; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; + const char *signal =3D NULL; + const char *name; + _cleanup_(freep) char *path =3D NULL; + int r; + + switch (event) { + case VIR_DOMAIN_EVENT_DEFINED: + signal =3D "DomainDefined"; + break; + case VIR_DOMAIN_EVENT_UNDEFINED: + signal =3D "DomainUndefined"; + break; + case VIR_DOMAIN_EVENT_STARTED: + signal =3D "DomainStarted"; + break; + case VIR_DOMAIN_EVENT_SUSPENDED: + signal =3D "DomainSuspended"; + break; + case VIR_DOMAIN_EVENT_RESUMED: + signal =3D "DomainResumed"; + break; + case VIR_DOMAIN_EVENT_STOPPED: + signal =3D "DomainStopped"; + break; + case VIR_DOMAIN_EVENT_SHUTDOWN: + signal =3D "DomainShutdown"; + break; + case VIR_DOMAIN_EVENT_PMSUSPENDED: + signal =3D "DomainPMSuspended"; + break; + case VIR_DOMAIN_EVENT_CRASHED: + signal =3D "DomainCrashed"; + break; + default: + return 0; + } + + r =3D sd_bus_message_new_signal(manager->bus, + &message, + "/org/libvirt/Manager", + "org.libvirt.Manager", + signal); + if (r < 0) + return r; + + name =3D virDomainGetName(domain); + path =3D bus_path_for_domain(domain); + + r =3D sd_bus_message_append(message, "so", name ? : "", path); + if (r < 0) + return r; + + return sd_bus_send(manager->bus, message, NULL); +} + +static int +handle_domain_device_added_event(virConnectPtr connection, + virDomainPtr domain, + const char *device, + void *opaque) +{ + VirtManager *manager =3D opaque; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; + _cleanup_(freep) char *path =3D NULL; + int r; + + path =3D bus_path_for_domain(domain); + + r =3D sd_bus_message_new_signal(manager->bus, + &message, + path, + "org.libvirt.Domain", + "DeviceAdded"); + if (r < 0) + return r; + + r =3D sd_bus_message_append(message, "s", device); + if (r < 0) + return r; + + return sd_bus_send(manager->bus, message, NULL); +} + +static int +handle_domain_device_removed_event(virConnectPtr connection, + virDomainPtr domain, + const char *device, + void *opaque) +{ + VirtManager *manager =3D opaque; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; + _cleanup_(freep) char *path =3D NULL; + int r; + + path =3D bus_path_for_domain(domain); + + r =3D sd_bus_message_new_signal(manager->bus, + &message, + path, + "org.libvirt.Domain", + "DeviceRemoved"); + if (r < 0) + return r; + + r =3D sd_bus_message_append(message, "s", device); + if (r < 0) + return r; + + return sd_bus_send(manager->bus, message, NULL); +} + +static int +handle_domain_disk_change_event(virConnectPtr connection, + virDomainPtr domain, + const char *device, + int reason, + void *opaque) +{ + VirtManager *manager =3D opaque; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; + _cleanup_(freep) char *path =3D NULL; + const char *reasonstr; + int r; + + path =3D bus_path_for_domain(domain); + + r =3D sd_bus_message_new_signal(manager->bus, + &message, + path, + "org.libvirt.Domain", + "TrayChange"); + if (r < 0) + return r; + + switch (reason) { + case VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN: + reasonstr =3D "open"; + break; + case VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE: + reasonstr =3D "close"; + break; + default: + reasonstr =3D ""; + break; + } + + r =3D sd_bus_message_append(message, "ssss", device, reasonstr); + if (r < 0) + return r; + + return sd_bus_send(manager->bus, message, NULL); +} + +static int +handle_domain_tray_change_event(virConnectPtr connection, + virDomainPtr domain, + const char *old_src_path, + const char *new_src_path, + const char *device, + int reason, + void *opaque) +{ + VirtManager *manager =3D opaque; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; + _cleanup_(freep) char *path =3D NULL; + const char *reasonstr; + int r; + + path =3D bus_path_for_domain(domain); + + r =3D sd_bus_message_new_signal(manager->bus, + &message, + path, + "org.libvirt.Domain", + "DiskChange"); + if (r < 0) + return r; + + switch (reason) { + case VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START: + reasonstr =3D "missing-on-start"; + break; + case VIR_DOMAIN_EVENT_DISK_DROP_MISSING_ON_START: + reasonstr =3D "missing-on-start"; + break; + default: + reasonstr =3D ""; + break; + } + + r =3D sd_bus_message_append(message, "ssss", old_src_path, new_src_pat= h, device, reasonstr); + if (r < 0) + return r; + + return sd_bus_send(manager->bus, message, NULL); +} + +static void +virt_manager_register_event(VirtManager *manager, + int id, + virConnectDomainEventGenericCallback callback) +{ + assert(manager->callback_ids[id] =3D=3D -1); + + manager->callback_ids[id] =3D virConnectDomainEventRegisterAny(manager= ->connection, + NULL, + id, + VIR_DOMAI= N_EVENT_CALLBACK(callback), + manager, + NULL); +} + +void +virt_manager_register_events(VirtManager *manager) +{ + virt_manager_register_event(manager, + VIR_DOMAIN_EVENT_ID_LIFECYCLE, + VIR_DOMAIN_EVENT_CALLBACK(handle_domain_li= fecycle_event)); + + virt_manager_register_event(manager, + VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, + VIR_DOMAIN_EVENT_CALLBACK(handle_domain_de= vice_added_event)); + + virt_manager_register_event(manager, + VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, + VIR_DOMAIN_EVENT_CALLBACK(handle_domain_de= vice_removed_event)); + + virt_manager_register_event(manager, + VIR_DOMAIN_EVENT_ID_DISK_CHANGE, + VIR_DOMAIN_EVENT_CALLBACK(handle_domain_tr= ay_change_event)); + + virt_manager_register_event(manager, + VIR_DOMAIN_EVENT_ID_TRAY_CHANGE, + VIR_DOMAIN_EVENT_CALLBACK(handle_domain_di= sk_change_event)); + +} diff --git a/src/events.h b/src/events.h new file mode 100644 index 0000000..7f1dfca --- /dev/null +++ b/src/events.h @@ -0,0 +1,9 @@ +#pragma once + +#include "manager.h" + +#include + + +void +virt_manager_register_events(VirtManager *manager); diff --git a/src/manager.c b/src/manager.c index a2709b4..32f38bb 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1,8 +1,8 @@ #include "domain.h" +#include "events.h" #include "manager.h" #include "util.h" =20 -#include #include #include =20 @@ -126,227 +126,6 @@ virt_manager_define_xml(sd_bus_message *message, return sd_bus_reply_method_return(message, "o", path); } =20 -static int -handle_domain_lifecycle_event(virConnectPtr connection, - virDomainPtr domain, - int event, - int detail, - void *opaque) -{ - VirtManager *manager =3D opaque; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - const char *signal =3D NULL; - const char *name; - _cleanup_(freep) char *path =3D NULL; - int r; - - switch (event) { - case VIR_DOMAIN_EVENT_DEFINED: - signal =3D "DomainDefined"; - break; - case VIR_DOMAIN_EVENT_UNDEFINED: - signal =3D "DomainUndefined"; - break; - case VIR_DOMAIN_EVENT_STARTED: - signal =3D "DomainStarted"; - break; - case VIR_DOMAIN_EVENT_SUSPENDED: - signal =3D "DomainSuspended"; - break; - case VIR_DOMAIN_EVENT_RESUMED: - signal =3D "DomainResumed"; - break; - case VIR_DOMAIN_EVENT_STOPPED: - signal =3D "DomainStopped"; - break; - case VIR_DOMAIN_EVENT_SHUTDOWN: - signal =3D "DomainShutdown"; - break; - case VIR_DOMAIN_EVENT_PMSUSPENDED: - signal =3D "DomainPMSuspended"; - break; - case VIR_DOMAIN_EVENT_CRASHED: - signal =3D "DomainCrashed"; - break; - default: - return 0; - } - - r =3D sd_bus_message_new_signal(manager->bus, - &message, - "/org/libvirt/Manager", - "org.libvirt.Manager", - signal); - if (r < 0) - return r; - - name =3D virDomainGetName(domain); - path =3D bus_path_for_domain(domain); - - r =3D sd_bus_message_append(message, "so", name ? : "", path); - if (r < 0) - return r; - - return sd_bus_send(manager->bus, message, NULL); -} - -static int -handle_domain_device_added_event(virConnectPtr connection, - virDomainPtr domain, - const char *device, - void *opaque) -{ - VirtManager *manager =3D opaque; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; - int r; - - path =3D bus_path_for_domain(domain); - - r =3D sd_bus_message_new_signal(manager->bus, - &message, - path, - "org.libvirt.Domain", - "DeviceAdded"); - if (r < 0) - return r; - - r =3D sd_bus_message_append(message, "s", device); - if (r < 0) - return r; - - return sd_bus_send(manager->bus, message, NULL); -} - -static int -handle_domain_device_removed_event(virConnectPtr connection, - virDomainPtr domain, - const char *device, - void *opaque) -{ - VirtManager *manager =3D opaque; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; - int r; - - path =3D bus_path_for_domain(domain); - - r =3D sd_bus_message_new_signal(manager->bus, - &message, - path, - "org.libvirt.Domain", - "DeviceRemoved"); - if (r < 0) - return r; - - r =3D sd_bus_message_append(message, "s", device); - if (r < 0) - return r; - - return sd_bus_send(manager->bus, message, NULL); -} - -static int -handle_domain_disk_change_event(virConnectPtr connection, - virDomainPtr domain, - const char *device, - int reason, - void *opaque) -{ - VirtManager *manager =3D opaque; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; - const char *reasonstr; - int r; - - path =3D bus_path_for_domain(domain); - - r =3D sd_bus_message_new_signal(manager->bus, - &message, - path, - "org.libvirt.Domain", - "TrayChange"); - if (r < 0) - return r; - - switch (reason) { - case VIR_DOMAIN_EVENT_TRAY_CHANGE_OPEN: - reasonstr =3D "open"; - break; - case VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE: - reasonstr =3D "close"; - break; - default: - reasonstr =3D ""; - break; - } - - r =3D sd_bus_message_append(message, "ssss", device, reasonstr); - if (r < 0) - return r; - - return sd_bus_send(manager->bus, message, NULL); -} - -static int -handle_domain_tray_change_event(virConnectPtr connection, - virDomainPtr domain, - const char *old_src_path, - const char *new_src_path, - const char *device, - int reason, - void *opaque) -{ - VirtManager *manager =3D opaque; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; - const char *reasonstr; - int r; - - path =3D bus_path_for_domain(domain); - - r =3D sd_bus_message_new_signal(manager->bus, - &message, - path, - "org.libvirt.Domain", - "DiskChange"); - if (r < 0) - return r; - - switch (reason) { - case VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START: - reasonstr =3D "missing-on-start"; - break; - case VIR_DOMAIN_EVENT_DISK_DROP_MISSING_ON_START: - reasonstr =3D "missing-on-start"; - break; - default: - reasonstr =3D ""; - break; - } - - r =3D sd_bus_message_append(message, "ssss", old_src_path, new_src_pat= h, device, reasonstr); - if (r < 0) - return r; - - return sd_bus_send(manager->bus, message, NULL); -} - -static void -virt_manager_register_event(VirtManager *manager, - int id, - virConnectDomainEventGenericCallback callback) -{ - assert(manager->callback_ids[id] =3D=3D -1); - - manager->callback_ids[id] =3D virConnectDomainEventRegisterAny(manager= ->connection, - NULL, - id, - VIR_DOMAI= N_EVENT_CALLBACK(callback), - manager, - NULL); -} - static const sd_bus_vtable virt_manager_vtable[] =3D { SD_BUS_VTABLE_START(0), =20 @@ -385,25 +164,7 @@ virt_manager_new(VirtManager **managerp, if (!manager->connection) return -EINVAL; =20 - virt_manager_register_event(manager, - VIR_DOMAIN_EVENT_ID_LIFECYCLE, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_li= fecycle_event)); - - virt_manager_register_event(manager, - VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_de= vice_added_event)); - - virt_manager_register_event(manager, - VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_de= vice_removed_event)); - - virt_manager_register_event(manager, - VIR_DOMAIN_EVENT_ID_DISK_CHANGE, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_tr= ay_change_event)); - - virt_manager_register_event(manager, - VIR_DOMAIN_EVENT_ID_TRAY_CHANGE, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_di= sk_change_event)); + virt_manager_register_events(manager); =20 r =3D sd_bus_add_object_vtable(manager->bus, NULL, --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903567239995.0244933760531; Mon, 24 Jul 2017 06:39:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 57879C04D292; Mon, 24 Jul 2017 13:39:22 +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 2A0A26DA80; Mon, 24 Jul 2017 13:39:22 +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 CABE714B27; Mon, 24 Jul 2017 13:39:21 +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 v6ODdBUh001779 for ; Mon, 24 Jul 2017 09:39:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id E904D67CF1; Mon, 24 Jul 2017 13:39:11 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E85769325 for ; Mon, 24 Jul 2017 13:39:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 57879C04D292 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 57879C04D292 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:38:58 +0200 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 Subject: [libvirt] [dbus PATCH 5/9] util: rename function to follow libvirt naming rules 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 24 Jul 2017 13:39:22 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" All libvirt-dbus function should use virtDBus preffix and use only one coding style, camelCase. Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/domain.c | 110 +++++++++++++++++++++++++++++-------------------------= ---- src/events.c | 20 +++++------ src/main.c | 2 +- src/manager.c | 32 ++++++++--------- src/util.c | 17 ++++----- src/util.h | 26 +++++++------- 6 files changed, 105 insertions(+), 102 deletions(-) diff --git a/src/domain.c b/src/domain.c index 1bda3b8..4bfb314 100644 --- a/src/domain.c +++ b/src/domain.c @@ -11,10 +11,10 @@ domain_get_name(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; const char *name =3D ""; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -35,10 +35,10 @@ domain_get_uuid(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -57,9 +57,9 @@ domain_get_id(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -76,9 +76,9 @@ domain_get_vcpus(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -95,10 +95,10 @@ domain_get_os_type(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - _cleanup_(freep) char *os_type =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusFreep) char *os_type =3D NULL; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -119,10 +119,10 @@ domain_get_active(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int active; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -143,10 +143,10 @@ domain_get_persistent(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int persistent; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -167,11 +167,11 @@ domain_get_state(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int state =3D 0; const char *string; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -218,10 +218,10 @@ domain_get_autostart(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int autostart =3D 0; =20 - domain =3D domain_from_bus_path(manager->connection, path); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -236,13 +236,13 @@ domain_get_xml_desc(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - _cleanup_(freep) char *description =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusFreep) char *description =3D NULL; uint32_t flags; int r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -256,7 +256,7 @@ domain_get_xml_desc(sd_bus_message *message, =20 description =3D virDomainGetXMLDesc(domain, flags); if (!description) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, "s", description); } @@ -274,7 +274,7 @@ domain_get_stats(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; virDomainPtr domains[2]; _cleanup_(virDomainStatsRecordListFreep) virDomainStatsRecordPtr *reco= rds =3D NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; @@ -285,8 +285,8 @@ domain_get_stats(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -298,13 +298,13 @@ domain_get_stats(sd_bus_message *message, domains[1] =3D NULL; =20 if (virDomainListGetStats(domains, stats, &records, flags) !=3D 1) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 r =3D sd_bus_message_new_method_return(message, &reply); if (r < 0) return r; =20 - r =3D bus_message_append_typed_parameters(reply, records[0]->params, r= ecords[0]->nparams); + r =3D virtDBusMessageAppendTypedParameters(reply, records[0]->params, = records[0]->nparams); if (r < 0) return r; =20 @@ -317,11 +317,11 @@ domain_shutdown(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -331,7 +331,7 @@ domain_shutdown(sd_bus_message *message, =20 r =3D virDomainShutdown(domain); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, ""); } @@ -342,11 +342,11 @@ domain_destroy(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -356,7 +356,7 @@ domain_destroy(sd_bus_message *message, =20 r =3D virDomainDestroy(domain); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, ""); } @@ -367,7 +367,7 @@ domain_reboot(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; uint32_t flags; int r; =20 @@ -375,8 +375,8 @@ domain_reboot(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -386,7 +386,7 @@ domain_reboot(sd_bus_message *message, =20 r =3D virDomainReboot(domain, flags); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, ""); } @@ -397,7 +397,7 @@ domain_reset(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; uint32_t flags; int r; =20 @@ -405,8 +405,8 @@ domain_reset(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -416,7 +416,7 @@ domain_reset(sd_bus_message *message, =20 r =3D virDomainReset(domain, flags); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, ""); } @@ -427,11 +427,11 @@ domain_create(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -441,7 +441,7 @@ domain_create(sd_bus_message *message, =20 r =3D virDomainCreate(domain); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, ""); } @@ -452,11 +452,11 @@ domain_undefine(sd_bus_message *message, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D domain_from_bus_path(manager->connection, - sd_bus_message_get_path(message)); + domain =3D virtDBusVirDomainFromBusPath(manager->connection, + sd_bus_message_get_path(message)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_UNKNOWN_OBJECT, @@ -466,7 +466,7 @@ domain_undefine(sd_bus_message *message, =20 r =3D virDomainUndefine(domain); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 return sd_bus_reply_method_return(message, ""); } @@ -510,8 +510,8 @@ lookup_domain(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(freep) char *name =3D NULL; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusFreep) char *name =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); diff --git a/src/events.c b/src/events.c index 4572e39..74f3d6f 100644 --- a/src/events.c +++ b/src/events.c @@ -16,7 +16,7 @@ handle_domain_lifecycle_event(virConnectPtr connection, _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; const char *signal =3D NULL; const char *name; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; int r; =20 switch (event) { @@ -60,7 +60,7 @@ handle_domain_lifecycle_event(virConnectPtr connection, return r; =20 name =3D virDomainGetName(domain); - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 r =3D sd_bus_message_append(message, "so", name ? : "", path); if (r < 0) @@ -77,10 +77,10 @@ handle_domain_device_added_event(virConnectPtr connecti= on, { VirtManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; int r; =20 - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 r =3D sd_bus_message_new_signal(manager->bus, &message, @@ -105,10 +105,10 @@ handle_domain_device_removed_event(virConnectPtr conn= ection, { VirtManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; int r; =20 - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 r =3D sd_bus_message_new_signal(manager->bus, &message, @@ -134,11 +134,11 @@ handle_domain_disk_change_event(virConnectPtr connect= ion, { VirtManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; const char *reasonstr; int r; =20 - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 r =3D sd_bus_message_new_signal(manager->bus, &message, @@ -178,11 +178,11 @@ handle_domain_tray_change_event(virConnectPtr connect= ion, { VirtManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; const char *reasonstr; int r; =20 - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 r =3D sd_bus_message_new_signal(manager->bus, &message, diff --git a/src/main.c b/src/main.c index a0cff38..a1d9cd1 100644 --- a/src/main.c +++ b/src/main.c @@ -100,7 +100,7 @@ main(int argc, char *argv[]) =20 _cleanup_(virt_manager_freep) VirtManager *manager =3D NULL; _cleanup_(sd_bus_unrefp) sd_bus *bus =3D NULL; - _cleanup_(closep) int signal_fd =3D -1; + _cleanup_(virtDBusClosep) int signal_fd =3D -1; _cleanup_(virEventRemoveHandlep) int bus_watch =3D -1; _cleanup_(virEventRemoveHandlep) int signal_watch =3D -1; sigset_t mask; diff --git a/src/manager.c b/src/manager.c index 32f38bb..8b25354 100644 --- a/src/manager.c +++ b/src/manager.c @@ -14,18 +14,18 @@ enumerate_domains(sd_bus *bus, sd_bus_error *error) { VirtManager *manager =3D userdata; - _cleanup_(virDomainListFreep) virDomainPtr *domains =3D NULL; - _cleanup_(strv_freep) char **paths =3D NULL; + _cleanup_(virtDBusVirDomainListFreep) virDomainPtr *domains =3D NULL; + _cleanup_(virtDBusStrvFreep) char **paths =3D NULL; int n_domains; =20 n_domains =3D virConnectListAllDomains(manager->connection, &domains, = 0); if (n_domains < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 paths =3D calloc(n_domains + 1, sizeof(char *)); =20 for (int i =3D 0; i < n_domains; i +=3D 1) - paths[i] =3D bus_path_for_domain(domains[i]); + paths[i] =3D virtDBusBusPathForVirDomain(domains[i]); =20 *nodes =3D paths; paths =3D NULL; @@ -40,7 +40,7 @@ virt_manager_list_domains(sd_bus_message *message, { VirtManager *manager =3D userdata; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; - _cleanup_(virDomainListFreep) virDomainPtr *domains =3D NULL; + _cleanup_(virtDBusVirDomainListFreep) virDomainPtr *domains =3D NULL; uint32_t flags; int r; =20 @@ -50,7 +50,7 @@ virt_manager_list_domains(sd_bus_message *message, =20 r =3D virConnectListAllDomains(manager->connection, &domains, flags); if (r < 0) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 r =3D sd_bus_message_new_method_return(message, &reply); if (r < 0) @@ -61,9 +61,9 @@ virt_manager_list_domains(sd_bus_message *message, return r; =20 for (int i =3D 0; domains[i] !=3D NULL; i +=3D 1) { - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; =20 - path =3D bus_path_for_domain(domains[i]); + path =3D virtDBusBusPathForVirDomain(domains[i]); =20 r =3D sd_bus_message_append(reply, "o", path); if (r < 0) @@ -85,8 +85,8 @@ virt_manager_create_xml(sd_bus_message *message, VirtManager *manager =3D userdata; const char *xml; uint32_t flags; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; int r; =20 r =3D sd_bus_message_read(message, "su", &xml, &flags); @@ -95,9 +95,9 @@ virt_manager_create_xml(sd_bus_message *message, =20 domain =3D virDomainCreateXML(manager->connection, xml, flags); if (!domain) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 return sd_bus_reply_method_return(message, "o", path); } @@ -109,8 +109,8 @@ virt_manager_define_xml(sd_bus_message *message, { VirtManager *manager =3D userdata; const char *xml; - _cleanup_(virDomainFreep) virDomainPtr domain =3D NULL; - _cleanup_(freep) char *path =3D NULL; + _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; + _cleanup_(virtDBusFreep) char *path =3D NULL; int r; =20 r =3D sd_bus_message_read(message, "s", &xml); @@ -119,9 +119,9 @@ virt_manager_define_xml(sd_bus_message *message, =20 domain =3D virDomainDefineXML(manager->connection, xml); if (!domain) - return bus_error_set_last_virt_error(error); + return virtDBusSetLastVirtError(error); =20 - path =3D bus_path_for_domain(domain); + path =3D virtDBusBusPathForVirDomain(domain); =20 return sd_bus_reply_method_return(message, "o", path); } diff --git a/src/util.c b/src/util.c index 99cd6b5..21a9453 100644 --- a/src/util.c +++ b/src/util.c @@ -3,9 +3,9 @@ #include =20 int -bus_message_append_typed_parameters(sd_bus_message *message, - virTypedParameterPtr parameters, - int n_parameters) +virtDBusMessageAppendTypedParameters(sd_bus_message *message, + virTypedParameterPtr parameters, + int n_parameters) { int r; =20 @@ -57,7 +57,8 @@ bus_message_append_typed_parameters(sd_bus_message *messa= ge, return sd_bus_message_close_container(message); } =20 -int bus_error_set_last_virt_error(sd_bus_error *error) +int +virtDBusSetLastVirtError(sd_bus_error *error) { virErrorPtr vir_error; =20 @@ -69,7 +70,7 @@ int bus_error_set_last_virt_error(sd_bus_error *error) } =20 char * -bus_path_for_domain(virDomainPtr domain) +virtDBusBusPathForVirDomain(virDomainPtr domain) { char *path =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; @@ -81,10 +82,10 @@ bus_path_for_domain(virDomainPtr domain) } =20 virDomainPtr -domain_from_bus_path(virConnectPtr connection, - const char *path) +virtDBusVirDomainFromBusPath(virConnectPtr connection, + const char *path) { - _cleanup_(freep) char *name =3D NULL; + _cleanup_(virtDBusFreep) char *name =3D NULL; int r; =20 r =3D sd_bus_path_decode(path, "/org/libvirt/domain", &name); diff --git a/src/util.h b/src/util.h index bc39f44..9ac7932 100644 --- a/src/util.h +++ b/src/util.h @@ -7,34 +7,36 @@ =20 #define _cleanup_(_x) __attribute__((__cleanup__(_x))) =20 -int bus_message_append_typed_parameters(sd_bus_message *message, - virTypedParameterPtr parameters, - int n_parameters); +int +virtDBusMessageAppendTypedParameters(sd_bus_message *message, + virTypedParameterPtr parameters, + int n_parameters); =20 -int bus_error_set_last_virt_error(sd_bus_error *error); +int +virtDBusSetLastVirtError(sd_bus_error *error); =20 char * -bus_path_for_domain(virDomainPtr domain); +virtDBusBusPathForVirDomain(virDomainPtr domain); =20 virDomainPtr -domain_from_bus_path(virConnectPtr connection, - const char *path); +virtDBusVirDomainFromBusPath(virConnectPtr connection, + const char *path); =20 static inline void -freep(void *p) +virtDBusFreep(void *p) { free(*(void **)p); } =20 static inline void -closep(int *fdp) +virtDBusClosep(int *fdp) { if (*fdp >=3D 0) close(*fdp); } =20 static inline void -strv_freep(void *p) +virtDBusStrvFreep(void *p) { char **strv =3D *(char ***)p; =20 @@ -48,14 +50,14 @@ strv_freep(void *p) } =20 static inline void -virDomainFreep(virDomainPtr *domainp) +virtDBusVirDomainFreep(virDomainPtr *domainp) { if (*domainp) virDomainFree(*domainp); } =20 static inline void -virDomainListFreep(virDomainPtr **domainsp) +virtDBusVirDomainListFreep(virDomainPtr **domainsp) { virDomainPtr *domains =3D *domainsp; =20 --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903590141741.8486607589157; Mon, 24 Jul 2017 06:39:50 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B43AA0B81; Mon, 24 Jul 2017 13:39:45 +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 5E1C9871ED; Mon, 24 Jul 2017 13:39:45 +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 071AD14B25; Mon, 24 Jul 2017 13:39:45 +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 v6ODdCQB001789 for ; Mon, 24 Jul 2017 09:39:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id C124D6931F; Mon, 24 Jul 2017 13:39:12 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4143669329 for ; Mon, 24 Jul 2017 13:39:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8B43AA0B81 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8B43AA0B81 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:38:59 +0200 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 Subject: [libvirt] [dbus PATCH 6/9] main: rename functions to follow libvirt naming rules 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 24 Jul 2017 13:39:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/main.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main.c b/src/main.c index a1d9cd1..493edcb 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ static int loop_status; =20 static int -bus_get_libvirt_events(sd_bus *bus) +virtDBusGetLibvirtEvents(sd_bus *bus) { int events; int virt_events =3D 0; @@ -31,7 +31,7 @@ bus_get_libvirt_events(sd_bus *bus) } =20 static int -bus_process_events(sd_bus *bus) +virtDBusProcessEvents(sd_bus *bus) { for (;;) { int r; @@ -48,35 +48,35 @@ bus_process_events(sd_bus *bus) } =20 static void -virEventRemoveHandlep(int *watchp) +virtDBusVirEventRemoveHandlep(int *watchp) { if (*watchp >=3D 0) virEventRemoveHandle(*watchp); } =20 static void -handle_signal(int watch, - int fd, - int events, - void *opaque) +virtDBusHandleSignal(int watch, + int fd, + int events, + void *opaque) { loop_status =3D -ECANCELED; } =20 static void -handle_bus_event(int watch, - int fd, - int events, - void *opaque) +virtDBusHandleBusEvent(int watch, + int fd, + int events, + void *opaque) { sd_bus *bus =3D opaque; =20 - loop_status =3D bus_process_events(bus); + loop_status =3D virtDBusProcessEvents(bus); =20 if (loop_status < 0) return; =20 - virEventUpdateHandle(watch, bus_get_libvirt_events(bus)); + virEventUpdateHandle(watch, virtDBusGetLibvirtEvents(bus)); } =20 int @@ -101,8 +101,8 @@ main(int argc, char *argv[]) _cleanup_(virt_manager_freep) VirtManager *manager =3D NULL; _cleanup_(sd_bus_unrefp) sd_bus *bus =3D NULL; _cleanup_(virtDBusClosep) int signal_fd =3D -1; - _cleanup_(virEventRemoveHandlep) int bus_watch =3D -1; - _cleanup_(virEventRemoveHandlep) int signal_watch =3D -1; + _cleanup_(virtDBusVirEventRemoveHandlep) int bus_watch =3D -1; + _cleanup_(virtDBusVirEventRemoveHandlep) int signal_watch =3D -1; sigset_t mask; int c; int r; @@ -168,20 +168,20 @@ main(int argc, char *argv[]) return EXIT_FAILURE; } =20 - r =3D bus_process_events(bus); + r =3D virtDBusProcessEvents(bus); if (r < 0) return EXIT_FAILURE; =20 bus_watch =3D virEventAddHandle(sd_bus_get_fd(bus), - bus_get_libvirt_events(bus), - handle_bus_event, + virtDBusGetLibvirtEvents(bus), + virtDBusHandleBusEvent, bus, NULL); =20 signal_fd =3D signalfd(-1, &mask, SFD_NONBLOCK | SFD_CLOEXEC); signal_watch =3D virEventAddHandle(signal_fd, VIR_EVENT_HANDLE_READABLE, - handle_signal, + virtDBusHandleSignal, NULL, NULL); =20 --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903592208981.2403504408687; Mon, 24 Jul 2017 06:39:52 -0700 (PDT) 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 656D6356E6; Mon, 24 Jul 2017 13:39:49 +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 25DFC70BC7; Mon, 24 Jul 2017 13:39:49 +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 C7AEB14B29; Mon, 24 Jul 2017 13:39:48 +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 v6ODdDev001802 for ; Mon, 24 Jul 2017 09:39:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 91BAC17AF7; Mon, 24 Jul 2017 13:39:13 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id 174D667CF1 for ; Mon, 24 Jul 2017 13:39:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 656D6356E6 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 656D6356E6 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:39:00 +0200 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 Subject: [libvirt] [dbus PATCH 7/9] manager: rename functions and structures to follow libvirt naming rules 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.30]); Mon, 24 Jul 2017 13:39:50 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/domain.c | 38 ++++++++++++++++++------------------ src/domain.h | 2 +- src/events.c | 14 +++++++------- src/events.h | 2 +- src/main.c | 4 ++-- src/manager.c | 62 +++++++++++++++++++++++++++++--------------------------= ---- src/manager.h | 14 +++++++------- 7 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/domain.c b/src/domain.c index 4bfb314..ab56ab1 100644 --- a/src/domain.c +++ b/src/domain.c @@ -10,7 +10,7 @@ domain_get_name(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; const char *name =3D ""; =20 @@ -34,7 +34,7 @@ domain_get_uuid(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 @@ -56,7 +56,7 @@ domain_get_id(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; =20 domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); @@ -75,7 +75,7 @@ domain_get_vcpus(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; =20 domain =3D virtDBusVirDomainFromBusPath(manager->connection, path); @@ -94,7 +94,7 @@ domain_get_os_type(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusFreep) char *os_type =3D NULL; =20 @@ -118,7 +118,7 @@ domain_get_active(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int active; =20 @@ -142,7 +142,7 @@ domain_get_persistent(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int persistent; =20 @@ -166,7 +166,7 @@ domain_get_state(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int state =3D 0; const char *string; @@ -217,7 +217,7 @@ domain_get_autostart(sd_bus *bus, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int autostart =3D 0; =20 @@ -235,7 +235,7 @@ domain_get_xml_desc(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusFreep) char *description =3D NULL; uint32_t flags; @@ -273,7 +273,7 @@ domain_get_stats(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; virDomainPtr domains[2]; _cleanup_(virDomainStatsRecordListFreep) virDomainStatsRecordPtr *reco= rds =3D NULL; @@ -316,7 +316,7 @@ domain_shutdown(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 @@ -341,7 +341,7 @@ domain_destroy(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 @@ -366,7 +366,7 @@ domain_reboot(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; uint32_t flags; int r; @@ -396,7 +396,7 @@ domain_reset(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; uint32_t flags; int r; @@ -426,7 +426,7 @@ domain_create(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 @@ -451,7 +451,7 @@ domain_undefine(sd_bus_message *message, void *userdata, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 @@ -509,7 +509,7 @@ lookup_domain(sd_bus *bus, void **found, sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusFreep) char *name =3D NULL; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; int r; @@ -536,7 +536,7 @@ lookup_domain(sd_bus *bus, } =20 int -domain_register(VirtManager *manager, +domain_register(virtDBusManager *manager, sd_bus *bus) { return sd_bus_add_fallback_vtable(bus, diff --git a/src/domain.h b/src/domain.h index 3f347e8..9007165 100644 --- a/src/domain.h +++ b/src/domain.h @@ -5,5 +5,5 @@ #include #include =20 -int domain_register(VirtManager *manager, +int domain_register(virtDBusManager *manager, sd_bus *bus); diff --git a/src/events.c b/src/events.c index 74f3d6f..c94cfd7 100644 --- a/src/events.c +++ b/src/events.c @@ -12,7 +12,7 @@ handle_domain_lifecycle_event(virConnectPtr connection, int detail, void *opaque) { - VirtManager *manager =3D opaque; + virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; const char *signal =3D NULL; const char *name; @@ -75,7 +75,7 @@ handle_domain_device_added_event(virConnectPtr connection, const char *device, void *opaque) { - VirtManager *manager =3D opaque; + virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusFreep) char *path =3D NULL; int r; @@ -103,7 +103,7 @@ handle_domain_device_removed_event(virConnectPtr connec= tion, const char *device, void *opaque) { - VirtManager *manager =3D opaque; + virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusFreep) char *path =3D NULL; int r; @@ -132,7 +132,7 @@ handle_domain_disk_change_event(virConnectPtr connectio= n, int reason, void *opaque) { - VirtManager *manager =3D opaque; + virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusFreep) char *path =3D NULL; const char *reasonstr; @@ -176,7 +176,7 @@ handle_domain_tray_change_event(virConnectPtr connectio= n, int reason, void *opaque) { - VirtManager *manager =3D opaque; + virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusFreep) char *path =3D NULL; const char *reasonstr; @@ -212,7 +212,7 @@ handle_domain_tray_change_event(virConnectPtr connectio= n, } =20 static void -virt_manager_register_event(VirtManager *manager, +virt_manager_register_event(virtDBusManager *manager, int id, virConnectDomainEventGenericCallback callback) { @@ -227,7 +227,7 @@ virt_manager_register_event(VirtManager *manager, } =20 void -virt_manager_register_events(VirtManager *manager) +virt_manager_register_events(virtDBusManager *manager) { virt_manager_register_event(manager, VIR_DOMAIN_EVENT_ID_LIFECYCLE, diff --git a/src/events.h b/src/events.h index 7f1dfca..b5cadcb 100644 --- a/src/events.h +++ b/src/events.h @@ -6,4 +6,4 @@ =20 =20 void -virt_manager_register_events(VirtManager *manager); +virt_manager_register_events(virtDBusManager *manager); diff --git a/src/main.c b/src/main.c index 493edcb..30b96fd 100644 --- a/src/main.c +++ b/src/main.c @@ -98,7 +98,7 @@ main(int argc, char *argv[]) bool system_bus; const char *uri =3D NULL; =20 - _cleanup_(virt_manager_freep) VirtManager *manager =3D NULL; + _cleanup_(virtDBusManagerFreep) virtDBusManager *manager =3D NULL; _cleanup_(sd_bus_unrefp) sd_bus *bus =3D NULL; _cleanup_(virtDBusClosep) int signal_fd =3D -1; _cleanup_(virtDBusVirEventRemoveHandlep) int bus_watch =3D -1; @@ -162,7 +162,7 @@ main(int argc, char *argv[]) return EXIT_FAILURE; } =20 - r =3D virt_manager_new(&manager, bus, uri); + r =3D virtDBusManagerNew(&manager, bus, uri); if (r < 0) { fprintf(stderr, "Failed to connect to libvirt"); return EXIT_FAILURE; diff --git a/src/manager.c b/src/manager.c index 8b25354..7a6e7b5 100644 --- a/src/manager.c +++ b/src/manager.c @@ -7,13 +7,13 @@ #include =20 static int -enumerate_domains(sd_bus *bus, - const char *path, - void *userdata, - char ***nodes, - sd_bus_error *error) +virtDBusManagerEnumarateDomains(sd_bus *bus, + const char *path, + void *userdata, + char ***nodes, + sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainListFreep) virDomainPtr *domains =3D NULL; _cleanup_(virtDBusStrvFreep) char **paths =3D NULL; int n_domains; @@ -34,11 +34,11 @@ enumerate_domains(sd_bus *bus, } =20 static int -virt_manager_list_domains(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusManagerListDomains(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; _cleanup_(virtDBusVirDomainListFreep) virDomainPtr *domains =3D NULL; uint32_t flags; @@ -78,11 +78,11 @@ virt_manager_list_domains(sd_bus_message *message, } =20 static int -virt_manager_create_xml(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusManagerCreateXML(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; const char *xml; uint32_t flags; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -103,11 +103,11 @@ virt_manager_create_xml(sd_bus_message *message, } =20 static int -virt_manager_define_xml(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusManagerDefineXML(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { - VirtManager *manager =3D userdata; + virtDBusManager *manager =3D userdata; const char *xml; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusFreep) char *path =3D NULL; @@ -129,9 +129,9 @@ virt_manager_define_xml(sd_bus_message *message, static const sd_bus_vtable virt_manager_vtable[] =3D { SD_BUS_VTABLE_START(0), =20 - SD_BUS_METHOD("ListDomains", "u", "ao", virt_manager_list_domains, SD_= BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("CreateXML", "su", "o", virt_manager_create_xml, SD_BUS_= VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("DefineXML", "s", "o", virt_manager_define_xml, SD_BUS_V= TABLE_UNPRIVILEGED), + SD_BUS_METHOD("ListDomains", "u", "ao", virtDBusManagerListDomains, SD= _BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("CreateXML", "su", "o", virtDBusManagerCreateXML, SD_BUS= _VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("DefineXML", "s", "o", virtDBusManagerDefineXML, SD_BUS_= VTABLE_UNPRIVILEGED), =20 SD_BUS_SIGNAL("DomainDefined", "so", 0), SD_BUS_SIGNAL("DomainUndefined", "so", 0), @@ -147,14 +147,14 @@ static const sd_bus_vtable virt_manager_vtable[] =3D { }; =20 int -virt_manager_new(VirtManager **managerp, - sd_bus *bus, - const char *uri) +virtDBusManagerNew(virtDBusManager **managerp, + sd_bus *bus, + const char *uri) { - _cleanup_(virt_manager_freep) VirtManager *manager =3D NULL; + _cleanup_(virtDBusManagerFreep) virtDBusManager *manager =3D NULL; int r; =20 - manager =3D calloc(1, sizeof(VirtManager)); + manager =3D calloc(1, sizeof(virtDBusManager)); for (int i =3D 0; i < VIR_DOMAIN_EVENT_ID_LAST; i +=3D 1) manager->callback_ids[i] =3D -1; =20 @@ -175,7 +175,7 @@ virt_manager_new(VirtManager **managerp, if (r < 0) return r; =20 - r =3D sd_bus_add_node_enumerator(bus, NULL, "/org/libvirt/domain", enu= merate_domains, manager); + r =3D sd_bus_add_node_enumerator(bus, NULL, "/org/libvirt/domain", vir= tDBusManagerEnumarateDomains, manager); if (r < 0) return r; =20 @@ -188,8 +188,8 @@ virt_manager_new(VirtManager **managerp, return 0; } =20 -VirtManager * -virt_manager_free(VirtManager *manager) +virtDBusManager * +virtDBusManagerFree(virtDBusManager *manager) { if (manager->bus) sd_bus_unref(manager->bus); @@ -209,8 +209,8 @@ virt_manager_free(VirtManager *manager) } =20 void -virt_manager_freep(VirtManager **managerp) +virtDBusManagerFreep(virtDBusManager **managerp) { if (*managerp) - virt_manager_free(*managerp); + virtDBusManagerFree(*managerp); } diff --git a/src/manager.h b/src/manager.h index 06aaa04..a1fefa6 100644 --- a/src/manager.h +++ b/src/manager.h @@ -5,16 +5,16 @@ #include #include =20 -struct VirtManager { +struct virtDBusManager { sd_bus *bus; virConnectPtr connection; =20 int callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; }; -typedef struct VirtManager VirtManager; +typedef struct virtDBusManager virtDBusManager; =20 -int virt_manager_new(VirtManager **managerp, - sd_bus *bus, - const char *uri); -VirtManager *virt_manager_free(VirtManager *manager); -void virt_manager_freep(VirtManager **managerp); +int virtDBusManagerNew(virtDBusManager **managerp, + sd_bus *bus, + const char *uri); +virtDBusManager *virtDBusManagerFree(virtDBusManager *manager); +void virtDBusManagerFreep(virtDBusManager **managerp); --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903597200301.4246483528075; Mon, 24 Jul 2017 06:39:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E4BAC025015; Mon, 24 Jul 2017 13:39:53 +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 E7B8B89A98; Mon, 24 Jul 2017 13:39: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 9A47F180597B; Mon, 24 Jul 2017 13:39:52 +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 v6ODdE88001817 for ; Mon, 24 Jul 2017 09:39:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 63E9F4DA74; Mon, 24 Jul 2017 13:39:14 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE7C617AF7 for ; Mon, 24 Jul 2017 13:39:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1E4BAC025015 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 1E4BAC025015 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:39:01 +0200 Message-Id: <8102eeaa61d1d9e57d70e3ad70ac53a6b23ea3e1.1500647204.git.phrdina@redhat.com> 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 Subject: [libvirt] [dbus PATCH 8/9] domain: rename functions to follow libvirt naming rules 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 24 Jul 2017 13:39:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/domain.c | 230 +++++++++++++++++++++++++++++-------------------------= ---- src/domain.h | 5 +- src/manager.c | 2 +- 3 files changed, 119 insertions(+), 118 deletions(-) diff --git a/src/domain.c b/src/domain.c index ab56ab1..1ff75e1 100644 --- a/src/domain.c +++ b/src/domain.c @@ -2,13 +2,13 @@ #include "util.h" =20 static int -domain_get_name(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetName(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -26,13 +26,13 @@ domain_get_name(sd_bus *bus, } =20 static int -domain_get_uuid(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetUUID(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -48,13 +48,13 @@ domain_get_uuid(sd_bus *bus, } =20 static int -domain_get_id(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetId(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -67,13 +67,13 @@ domain_get_id(sd_bus *bus, } =20 static int -domain_get_vcpus(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetVcpus(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -86,13 +86,13 @@ domain_get_vcpus(sd_bus *bus, } =20 static int -domain_get_os_type(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetOsType(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -110,13 +110,13 @@ domain_get_os_type(sd_bus *bus, } =20 static int -domain_get_active(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetActive(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -134,13 +134,13 @@ domain_get_active(sd_bus *bus, } =20 static int -domain_get_persistent(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetPersistent(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -158,13 +158,13 @@ domain_get_persistent(sd_bus *bus, } =20 static int -domain_get_state(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetState(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -209,13 +209,13 @@ domain_get_state(sd_bus *bus, } =20 static int -domain_get_autostart(sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetAutostart(sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -231,9 +231,9 @@ domain_get_autostart(sd_bus *bus, } =20 static int -domain_get_xml_desc(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetXMLDesc(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -262,21 +262,21 @@ domain_get_xml_desc(sd_bus_message *message, } =20 static void -virDomainStatsRecordListFreep(virDomainStatsRecordPtr **statsp) +virtDBusDomainStatsRecordListFreep(virDomainStatsRecordPtr **statsp) { if (*statsp) virDomainStatsRecordListFree(*statsp); } =20 static int -domain_get_stats(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainGetStats(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; virDomainPtr domains[2]; - _cleanup_(virDomainStatsRecordListFreep) virDomainStatsRecordPtr *reco= rds =3D NULL; + _cleanup_(virtDBusDomainStatsRecordListFreep) virDomainStatsRecordPtr = *records =3D NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; uint32_t flags, stats; int r; @@ -312,9 +312,9 @@ domain_get_stats(sd_bus_message *message, } =20 static int -domain_shutdown(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainShutdown(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -337,9 +337,9 @@ domain_shutdown(sd_bus_message *message, } =20 static int -domain_destroy(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainDestroy(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -362,9 +362,9 @@ domain_destroy(sd_bus_message *message, } =20 static int -domain_reboot(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainReboot(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -392,9 +392,9 @@ domain_reboot(sd_bus_message *message, } =20 static int -domain_reset(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainReset(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -422,9 +422,9 @@ domain_reset(sd_bus_message *message, } =20 static int -domain_create(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainCreate(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -447,9 +447,9 @@ domain_create(sd_bus_message *message, } =20 static int -domain_undefine(sd_bus_message *message, - void *userdata, - sd_bus_error *error) +virtDBusDomainUndefine(sd_bus_message *message, + void *userdata, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusVirDomainFreep) virDomainPtr domain =3D NULL; @@ -474,24 +474,24 @@ domain_undefine(sd_bus_message *message, static const sd_bus_vtable virt_domain_vtable[] =3D { SD_BUS_VTABLE_START(0), =20 - SD_BUS_PROPERTY("Name", "s", domain_get_name, 0, 0), - SD_BUS_PROPERTY("UUID", "s", domain_get_uuid, 0, 0), - SD_BUS_PROPERTY("Id", "u", domain_get_id, 0, 0), - SD_BUS_PROPERTY("Vcpus", "u", domain_get_vcpus, 0, 0), - SD_BUS_PROPERTY("OSType", "s", domain_get_os_type, 0, 0), - SD_BUS_PROPERTY("Active", "b", domain_get_active, 0, 0), - SD_BUS_PROPERTY("Persistent", "b", domain_get_persistent, 0, 0), - SD_BUS_PROPERTY("State", "s", domain_get_state, 0, 0), - SD_BUS_PROPERTY("Autostart", "b", domain_get_autostart, 0, 0), + SD_BUS_PROPERTY("Name", "s", virtDBusDomainGetName, 0, 0), + SD_BUS_PROPERTY("UUID", "s", virtDBusDomainGetUUID, 0, 0), + SD_BUS_PROPERTY("Id", "u", virtDBusDomainGetId, 0, 0), + SD_BUS_PROPERTY("Vcpus", "u", virtDBusDomainGetVcpus, 0, 0), + SD_BUS_PROPERTY("OSType", "s", virtDBusDomainGetOsType, 0, 0), + SD_BUS_PROPERTY("Active", "b", virtDBusDomainGetActive, 0, 0), + SD_BUS_PROPERTY("Persistent", "b", virtDBusDomainGetPersistent, 0, 0), + SD_BUS_PROPERTY("State", "s", virtDBusDomainGetState, 0, 0), + SD_BUS_PROPERTY("Autostart", "b", virtDBusDomainGetAutostart, 0, 0), =20 - SD_BUS_METHOD("GetXMLDesc", "u", "s", domain_get_xml_desc, SD_BUS_VTAB= LE_UNPRIVILEGED), - SD_BUS_METHOD("GetStats", "uu", "a{sv}", domain_get_stats, SD_BUS_VTAB= LE_UNPRIVILEGED), - SD_BUS_METHOD("Shutdown", "", "", domain_shutdown, SD_BUS_VTABLE_UNPRI= VILEGED), - SD_BUS_METHOD("Destroy", "", "", domain_destroy, SD_BUS_VTABLE_UNPRIVI= LEGED), - SD_BUS_METHOD("Reboot", "u", "", domain_reboot, SD_BUS_VTABLE_UNPRIVIL= EGED), - SD_BUS_METHOD("Reset", "u", "", domain_reset, SD_BUS_VTABLE_UNPRIVILEG= ED), - SD_BUS_METHOD("Create", "", "", domain_create, SD_BUS_VTABLE_UNPRIVILE= GED), - SD_BUS_METHOD("Undefine", "", "", domain_undefine, SD_BUS_VTABLE_UNPRI= VILEGED), + SD_BUS_METHOD("GetXMLDesc", "u", "s", virtDBusDomainGetXMLDesc, SD_BUS= _VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("GetStats", "uu", "a{sv}", virtDBusDomainGetStats, SD_BU= S_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("Shutdown", "", "", virtDBusDomainShutdown, SD_BUS_VTABL= E_UNPRIVILEGED), + SD_BUS_METHOD("Destroy", "", "", virtDBusDomainDestroy, SD_BUS_VTABLE_= UNPRIVILEGED), + SD_BUS_METHOD("Reboot", "u", "", virtDBusDomainReboot, SD_BUS_VTABLE_U= NPRIVILEGED), + SD_BUS_METHOD("Reset", "u", "", virtDBusDomainReset, SD_BUS_VTABLE_UNP= RIVILEGED), + SD_BUS_METHOD("Create", "", "", virtDBusDomainCreate, SD_BUS_VTABLE_UN= PRIVILEGED), + SD_BUS_METHOD("Undefine", "", "", virtDBusDomainUndefine, SD_BUS_VTABL= E_UNPRIVILEGED), =20 SD_BUS_SIGNAL("DeviceAdded", "s", 0), SD_BUS_SIGNAL("DeviceRemoved", "s", 0), @@ -502,12 +502,12 @@ static const sd_bus_vtable virt_domain_vtable[] =3D { }; =20 static int -lookup_domain(sd_bus *bus, - const char *path, - const char *interface, - void *userdata, - void **found, - sd_bus_error *error) +virtDBusDomainLookup(sd_bus *bus, + const char *path, + const char *interface, + void *userdata, + void **found, + sd_bus_error *error) { virtDBusManager *manager =3D userdata; _cleanup_(virtDBusFreep) char *name =3D NULL; @@ -536,14 +536,14 @@ lookup_domain(sd_bus *bus, } =20 int -domain_register(virtDBusManager *manager, - sd_bus *bus) +virtDBusDomainRegister(virtDBusManager *manager, + sd_bus *bus) { return sd_bus_add_fallback_vtable(bus, NULL, "/org/libvirt/domain", "org.libvirt.Domain", virt_domain_vtable, - lookup_domain, + virtDBusDomainLookup, manager); } diff --git a/src/domain.h b/src/domain.h index 9007165..165e452 100644 --- a/src/domain.h +++ b/src/domain.h @@ -5,5 +5,6 @@ #include #include =20 -int domain_register(virtDBusManager *manager, - sd_bus *bus); +int +virtDBusDomainRegister(virtDBusManager *manager, + sd_bus *bus); diff --git a/src/manager.c b/src/manager.c index 7a6e7b5..e4ce0ec 100644 --- a/src/manager.c +++ b/src/manager.c @@ -179,7 +179,7 @@ virtDBusManagerNew(virtDBusManager **managerp, if (r < 0) return r; =20 - if ((r =3D domain_register(manager, bus) < 0)) + if ((r =3D virtDBusDomainRegister(manager, bus) < 0)) return r; =20 *managerp =3D manager; --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 12:34:36 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1500903642224404.144215507377; Mon, 24 Jul 2017 06:40:42 -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 560A47F3E3; Mon, 24 Jul 2017 13:40:40 +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 268B060614; Mon, 24 Jul 2017 13:40: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 C67991805982; Mon, 24 Jul 2017 13:40: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 v6ODdFRn001825 for ; Mon, 24 Jul 2017 09:39:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 364814DA74; Mon, 24 Jul 2017 13:39:15 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1ACC17AF7 for ; Mon, 24 Jul 2017 13:39:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 560A47F3E3 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 560A47F3E3 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 24 Jul 2017 15:39:02 +0200 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 Subject: [libvirt] [dbus PATCH 9/9] events: rename functions to follow libvirt naming rules 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.25]); Mon, 24 Jul 2017 13:40:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina Reviewed-by: John Ferlan (series) --- src/events.c | 66 +++++++++++++++++++++++++++++--------------------------= ---- src/events.h | 2 +- src/manager.c | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/events.c b/src/events.c index c94cfd7..c9a1306 100644 --- a/src/events.c +++ b/src/events.c @@ -6,7 +6,7 @@ #include =20 static int -handle_domain_lifecycle_event(virConnectPtr connection, +virtDBusEventsDomainLifecycle(virConnectPtr connection, virDomainPtr domain, int event, int detail, @@ -70,10 +70,10 @@ handle_domain_lifecycle_event(virConnectPtr connection, } =20 static int -handle_domain_device_added_event(virConnectPtr connection, - virDomainPtr domain, - const char *device, - void *opaque) +virtDBusEventsDomainDeviceAdded(virConnectPtr connection, + virDomainPtr domain, + const char *device, + void *opaque) { virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; @@ -98,10 +98,10 @@ handle_domain_device_added_event(virConnectPtr connecti= on, } =20 static int -handle_domain_device_removed_event(virConnectPtr connection, - virDomainPtr domain, - const char *device, - void *opaque) +virtDBusEventsDomainDeviceRemoved(virConnectPtr connection, + virDomainPtr domain, + const char *device, + void *opaque) { virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; @@ -126,11 +126,11 @@ handle_domain_device_removed_event(virConnectPtr conn= ection, } =20 static int -handle_domain_disk_change_event(virConnectPtr connection, - virDomainPtr domain, - const char *device, - int reason, - void *opaque) +virtDBusEventsDomainDiskChange(virConnectPtr connection, + virDomainPtr domain, + const char *device, + int reason, + void *opaque) { virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; @@ -168,13 +168,13 @@ handle_domain_disk_change_event(virConnectPtr connect= ion, } =20 static int -handle_domain_tray_change_event(virConnectPtr connection, - virDomainPtr domain, - const char *old_src_path, - const char *new_src_path, - const char *device, - int reason, - void *opaque) +virtDBusEventsDomainTrayChange(virConnectPtr connection, + virDomainPtr domain, + const char *old_src_path, + const char *new_src_path, + const char *device, + int reason, + void *opaque) { virtDBusManager *manager =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; @@ -212,7 +212,7 @@ handle_domain_tray_change_event(virConnectPtr connectio= n, } =20 static void -virt_manager_register_event(virtDBusManager *manager, +virtDBusEventsRegisterEvent(virtDBusManager *manager, int id, virConnectDomainEventGenericCallback callback) { @@ -227,26 +227,26 @@ virt_manager_register_event(virtDBusManager *manager, } =20 void -virt_manager_register_events(virtDBusManager *manager) +virtDBusEventsRegister(virtDBusManager *manager) { - virt_manager_register_event(manager, + virtDBusEventsRegisterEvent(manager, VIR_DOMAIN_EVENT_ID_LIFECYCLE, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_li= fecycle_event)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainLifecycle)); =20 - virt_manager_register_event(manager, + virtDBusEventsRegisterEvent(manager, VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_de= vice_added_event)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainDeviceAdded)); =20 - virt_manager_register_event(manager, + virtDBusEventsRegisterEvent(manager, VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_de= vice_removed_event)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainDeviceRemoved)); =20 - virt_manager_register_event(manager, + virtDBusEventsRegisterEvent(manager, VIR_DOMAIN_EVENT_ID_DISK_CHANGE, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_tr= ay_change_event)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainTrayChange)); =20 - virt_manager_register_event(manager, + virtDBusEventsRegisterEvent(manager, VIR_DOMAIN_EVENT_ID_TRAY_CHANGE, - VIR_DOMAIN_EVENT_CALLBACK(handle_domain_di= sk_change_event)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainDiskChange)); =20 } diff --git a/src/events.h b/src/events.h index b5cadcb..d64bd94 100644 --- a/src/events.h +++ b/src/events.h @@ -6,4 +6,4 @@ =20 =20 void -virt_manager_register_events(virtDBusManager *manager); +virtDBusEventsRegister(virtDBusManager *manager); diff --git a/src/manager.c b/src/manager.c index e4ce0ec..010dc94 100644 --- a/src/manager.c +++ b/src/manager.c @@ -164,7 +164,7 @@ virtDBusManagerNew(virtDBusManager **managerp, if (!manager->connection) return -EINVAL; =20 - virt_manager_register_events(manager); + virtDBusEventsRegister(manager); =20 r =3D sd_bus_add_object_vtable(manager->bus, NULL, --=20 2.13.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list