From nobody Fri May 16 00:42:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 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 --- 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