From nobody Wed May 14 23:45:21 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 1516641394415788.8096061114268; Mon, 22 Jan 2018 09:16:34 -0800 (PST) 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 32AB178235; Mon, 22 Jan 2018 17:16:33 +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 002665F704; Mon, 22 Jan 2018 17:16:32 +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 B7F6C3FAED; Mon, 22 Jan 2018 17:16: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 w0MHGJxE028473 for ; Mon, 22 Jan 2018 12:16:19 -0500 Received: by smtp.corp.redhat.com (Postfix) id 99C795F704; Mon, 22 Jan 2018 17:16:19 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BF515C3F7; Mon, 22 Jan 2018 17:16:18 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 22 Jan 2018 18:16:01 +0100 Message-Id: <0c500969738a1ecc696177aba4addb9179e867ab.1516640486.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 Cc: lars@karlitski.net Subject: [libvirt] [dbus RFC 03/11] src: rename manager to connect 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.28]); Mon, 22 Jan 2018 17:16:33 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Manager was a good name for the original design. However, the design will be changed that for now libvirt-dbus will be using only local connection and will support multiple drivers. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrange --- src/Makefile.am | 2 +- src/{manager.c =3D> connect.c} | 93 ++++++++++++++++---------= ------ src/{manager.h =3D> connect.h} | 10 ++-- src/domain.c | 80 +++++++++++++------------- src/domain.h | 4 +- src/events.c | 54 +++++++++--------- src/events.h | 4 +- src/main.c | 8 +-- test/Makefile.am | 2 +- test/libvirttest.py | 4 +- test/{test_manager.py =3D> test_connect.py} | 12 ++-- test/test_domain.py | 6 +- 12 files changed, 140 insertions(+), 139 deletions(-) rename src/{manager.c =3D> connect.c} (64%) rename src/{manager.h =3D> connect.h} (53%) rename test/{test_manager.py =3D> test_connect.py} (79%) diff --git a/src/Makefile.am b/src/Makefile.am index 5d4cb04..1a5b50b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS =3D \ =20 DAEMON_SOURCES =3D \ main.c \ - manager.c manager.h \ + connect.c connect.h \ util.c util.h \ domain.c domain.h \ events.c events.h diff --git a/src/manager.c b/src/connect.c similarity index 64% rename from src/manager.c rename to src/connect.c index f289a7a..cb19c39 100644 --- a/src/manager.c +++ b/src/connect.c @@ -1,24 +1,24 @@ #include "domain.h" #include "events.h" -#include "manager.h" +#include "connect.h" #include "util.h" =20 #include #include =20 static int -virtDBusManagerEnumarateDomains(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusConnectEnumarateDomains(sd_bus *bus VIR_ATTR_UNUSED, const char *path VIR_ATTR_UNUSED, void *userdata, char ***nodes, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainListFreep) virDomainPtr *domains =3D NU= LL; _cleanup_(virtDBusUtilStrvFreep) char **paths =3D NULL; int n_domains; =20 - n_domains =3D virConnectListAllDomains(manager->connection, &domains, = 0); + n_domains =3D virConnectListAllDomains(connect->connection, &domains, = 0); if (n_domains < 0) return virtDBusUtilSetLastVirtError(error); =20 @@ -34,11 +34,11 @@ virtDBusManagerEnumarateDomains(sd_bus *bus VIR_ATTR_UN= USED, } =20 static int -virtDBusManagerListDomains(sd_bus_message *message, +virtDBusConnectListDomains(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply =3D NULL; _cleanup_(virtDBusUtilVirDomainListFreep) virDomainPtr *domains =3D NU= LL; uint32_t flags; @@ -48,7 +48,7 @@ virtDBusManagerListDomains(sd_bus_message *message, if (r < 0) return r; =20 - r =3D virConnectListAllDomains(manager->connection, &domains, flags); + r =3D virConnectListAllDomains(connect->connection, &domains, flags); if (r < 0) return virtDBusUtilSetLastVirtError(error); =20 @@ -78,11 +78,11 @@ virtDBusManagerListDomains(sd_bus_message *message, } =20 static int -virtDBusManagerCreateXML(sd_bus_message *message, +virtDBusConnectCreateXML(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; const char *xml; uint32_t flags; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -93,7 +93,7 @@ virtDBusManagerCreateXML(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D virDomainCreateXML(manager->connection, xml, flags); + domain =3D virDomainCreateXML(connect->connection, xml, flags); if (!domain) return virtDBusUtilSetLastVirtError(error); =20 @@ -103,11 +103,11 @@ virtDBusManagerCreateXML(sd_bus_message *message, } =20 static int -virtDBusManagerDefineXML(sd_bus_message *message, +virtDBusConnectDefineXML(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; const char *xml; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusUtilFreep) char *path =3D NULL; @@ -117,7 +117,7 @@ virtDBusManagerDefineXML(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D virDomainDefineXML(manager->connection, xml); + domain =3D virDomainDefineXML(connect->connection, xml); if (!domain) return virtDBusUtilSetLastVirtError(error); =20 @@ -126,12 +126,12 @@ virtDBusManagerDefineXML(sd_bus_message *message, return sd_bus_reply_method_return(message, "o", path); } =20 -static const sd_bus_vtable virt_manager_vtable[] =3D { +static const sd_bus_vtable virt_connect_vtable[] =3D { SD_BUS_VTABLE_START(0), =20 - 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), + SD_BUS_METHOD("ListDomains", "u", "ao", virtDBusConnectListDomains, SD= _BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("CreateXML", "su", "o", virtDBusConnectCreateXML, SD_BUS= _VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("DefineXML", "s", "o", virtDBusConnectDefineXML, SD_BUS_= VTABLE_UNPRIVILEGED), =20 SD_BUS_SIGNAL("DomainDefined", "so", 0), SD_BUS_SIGNAL("DomainUndefined", "so", 0), @@ -147,70 +147,71 @@ static const sd_bus_vtable virt_manager_vtable[] =3D { }; =20 int -virtDBusManagerNew(virtDBusManager **managerp, +virtDBusConnectNew(virtDBusConnect **connectp, sd_bus *bus, const char *uri) { - _cleanup_(virtDBusManagerFreep) virtDBusManager *manager =3D NULL; + _cleanup_(virtDBusConnectFreep) virtDBusConnect *connect =3D NULL; int r; =20 - manager =3D calloc(1, sizeof(virtDBusManager)); + connect =3D calloc(1, sizeof(virtDBusConnect)); for (int i =3D 0; i < VIR_DOMAIN_EVENT_ID_LAST; i +=3D 1) - manager->callback_ids[i] =3D -1; + connect->callback_ids[i] =3D -1; =20 - manager->bus =3D sd_bus_ref(bus); + connect->bus =3D sd_bus_ref(bus); =20 - manager->connection =3D virConnectOpenAuth(uri, virConnectAuthPtrDefau= lt, 0); - if (!manager->connection) + connect->connection =3D virConnectOpenAuth(uri, virConnectAuthPtrDefau= lt, 0); + if (!connect->connection) return -EINVAL; =20 - virtDBusEventsRegister(manager); + virtDBusEventsRegister(connect); =20 - r =3D sd_bus_add_object_vtable(manager->bus, + r =3D sd_bus_add_object_vtable(connect->bus, NULL, - "/org/libvirt/Manager", - "org.libvirt.Manager", - virt_manager_vtable, - manager); + "/org/libvirt/Connect", + "org.libvirt.Connect", + virt_connect_vtable, + connect); if (r < 0) return r; =20 - r =3D sd_bus_add_node_enumerator(bus, NULL, "/org/libvirt/domain", vir= tDBusManagerEnumarateDomains, manager); + r =3D sd_bus_add_node_enumerator(bus, NULL, "/org/libvirt/domain", + virtDBusConnectEnumarateDomains, connec= t); if (r < 0) return r; =20 - if ((r =3D virtDBusDomainRegister(manager, bus) < 0)) + if ((r =3D virtDBusDomainRegister(connect, bus) < 0)) return r; =20 - *managerp =3D manager; - manager =3D NULL; + *connectp =3D connect; + connect =3D NULL; =20 return 0; } =20 -virtDBusManager * -virtDBusManagerFree(virtDBusManager *manager) +virtDBusConnect * +virtDBusConnectFree(virtDBusConnect *connect) { - if (manager->bus) - sd_bus_unref(manager->bus); + if (connect->bus) + sd_bus_unref(connect->bus); =20 - if (manager->connection) { + if (connect->connection) { for (int i =3D 0; i < VIR_DOMAIN_EVENT_ID_LAST; i +=3D 1) { - if (manager->callback_ids[i] >=3D 0) - virConnectDomainEventDeregisterAny(manager->connection, ma= nager->callback_ids[i]); + if (connect->callback_ids[i] >=3D 0) + virConnectDomainEventDeregisterAny(connect->connection, co= nnect->callback_ids[i]); } =20 - virConnectClose(manager->connection); + virConnectClose(connect->connection); } =20 - free(manager); + free(connect); =20 return NULL; } =20 void -virtDBusManagerFreep(virtDBusManager **managerp) +virtDBusConnectFreep(virtDBusConnect **connectp) { - if (*managerp) - virtDBusManagerFree(*managerp); + if (*connectp) + virtDBusConnectFree(*connectp); } diff --git a/src/manager.h b/src/connect.h similarity index 53% rename from src/manager.h rename to src/connect.h index a1fefa6..5d64a10 100644 --- a/src/manager.h +++ b/src/connect.h @@ -5,16 +5,16 @@ #include #include =20 -struct virtDBusManager { +struct virtDBusConnect { sd_bus *bus; virConnectPtr connection; =20 int callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; }; -typedef struct virtDBusManager virtDBusManager; +typedef struct virtDBusConnect virtDBusConnect; =20 -int virtDBusManagerNew(virtDBusManager **managerp, +int virtDBusConnectNew(virtDBusConnect **connectp, sd_bus *bus, const char *uri); -virtDBusManager *virtDBusManagerFree(virtDBusManager *manager); -void virtDBusManagerFreep(virtDBusManager **managerp); +virtDBusConnect *virtDBusConnectFree(virtDBusConnect *connect); +void virtDBusConnectFreep(virtDBusConnect **connectp); diff --git a/src/domain.c b/src/domain.c index 5527778..a3e1d0b 100644 --- a/src/domain.c +++ b/src/domain.c @@ -10,11 +10,11 @@ virtDBusDomainGetName(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; const char *name =3D ""; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -34,11 +34,11 @@ virtDBusDomainGetUUID(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; char uuid[VIR_UUID_STRING_BUFLEN] =3D ""; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -56,10 +56,10 @@ virtDBusDomainGetId(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -75,10 +75,10 @@ virtDBusDomainGetVcpus(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "u", 0); =20 @@ -94,11 +94,11 @@ virtDBusDomainGetOsType(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusUtilFreep) char *os_type =3D NULL; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -118,11 +118,11 @@ virtDBusDomainGetActive(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int active; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -142,11 +142,11 @@ virtDBusDomainGetPersistent(sd_bus *bus VIR_ATTR_UNUS= ED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int persistent; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -166,12 +166,12 @@ virtDBusDomainGetState(sd_bus *bus VIR_ATTR_UNUSED, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int state =3D 0; const char *string; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "s", ""); =20 @@ -217,11 +217,11 @@ virtDBusDomainGetAutostart(sd_bus *bus VIR_ATTR_UNUSE= D, void *userdata, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int autostart =3D 0; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, path); + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, path); if (domain =3D=3D NULL) return sd_bus_message_append(reply, "b", 0); =20 @@ -235,13 +235,13 @@ virtDBusDomainGetXMLDesc(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; _cleanup_(virtDBusUtilFreep) char *description =3D NULL; uint32_t flags; int r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -273,7 +273,7 @@ virtDBusDomainGetStats(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; virDomainPtr domains[2]; _cleanup_(virtDBusDomainStatsRecordListFreep) virDomainStatsRecordPtr = *records =3D NULL; @@ -285,7 +285,7 @@ virtDBusDomainGetStats(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -316,11 +316,11 @@ virtDBusDomainShutdown(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -341,11 +341,11 @@ virtDBusDomainDestroy(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -366,7 +366,7 @@ virtDBusDomainReboot(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; uint32_t flags; int r; @@ -375,7 +375,7 @@ virtDBusDomainReboot(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -396,7 +396,7 @@ virtDBusDomainReset(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; uint32_t flags; int r; @@ -405,7 +405,7 @@ virtDBusDomainReset(sd_bus_message *message, if (r < 0) return r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -426,11 +426,11 @@ virtDBusDomainCreate(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -451,11 +451,11 @@ virtDBusDomainUndefine(sd_bus_message *message, void *userdata, sd_bus_error *error) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; =20 - domain =3D virtDBusUtilVirDomainFromBusPath(manager->connection, + domain =3D virtDBusUtilVirDomainFromBusPath(connect->connection, sd_bus_message_get_path(mess= age)); if (domain =3D=3D NULL) { return sd_bus_reply_method_errorf(message, @@ -509,7 +509,7 @@ virtDBusDomainLookup(sd_bus *bus VIR_ATTR_UNUSED, void **found, sd_bus_error *error VIR_ATTR_UNUSED) { - virtDBusManager *manager =3D userdata; + virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilFreep) char *name =3D NULL; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; int r; @@ -521,22 +521,22 @@ virtDBusDomainLookup(sd_bus *bus VIR_ATTR_UNUSED, if (*name =3D=3D '\0') return 0; =20 - domain =3D virDomainLookupByUUIDString(manager->connection, name); + domain =3D virDomainLookupByUUIDString(connect->connection, name); if (!domain) return 0; =20 /* * 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 + * return the connect object and look up the domain again in the * domain_* callbacks. */ - *found =3D manager; + *found =3D connect; =20 return 1; } =20 int -virtDBusDomainRegister(virtDBusManager *manager, +virtDBusDomainRegister(virtDBusConnect *connect, sd_bus *bus) { return sd_bus_add_fallback_vtable(bus, @@ -545,5 +545,5 @@ virtDBusDomainRegister(virtDBusManager *manager, "org.libvirt.Domain", virt_domain_vtable, virtDBusDomainLookup, - manager); + connect); } diff --git a/src/domain.h b/src/domain.h index 165e452..adadc6a 100644 --- a/src/domain.h +++ b/src/domain.h @@ -1,10 +1,10 @@ #pragma once =20 -#include "manager.h" +#include "connect.h" =20 #include #include =20 int -virtDBusDomainRegister(virtDBusManager *manager, +virtDBusDomainRegister(virtDBusConnect *connect, sd_bus *bus); diff --git a/src/events.c b/src/events.c index 731ef02..92f280d 100644 --- a/src/events.c +++ b/src/events.c @@ -12,7 +12,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection VI= R_ATTR_UNUSED, int detail VIR_ATTR_UNUSED, void *opaque) { - virtDBusManager *manager =3D opaque; + virtDBusConnect *connect =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; const char *signal =3D NULL; const char *name; @@ -51,10 +51,10 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection = VIR_ATTR_UNUSED, return 0; } =20 - r =3D sd_bus_message_new_signal(manager->bus, + r =3D sd_bus_message_new_signal(connect->bus, &message, - "/org/libvirt/Manager", - "org.libvirt.Manager", + "/org/libvirt/Connect", + "org.libvirt.connect", signal); if (r < 0) return r; @@ -66,7 +66,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection VI= R_ATTR_UNUSED, if (r < 0) return r; =20 - return sd_bus_send(manager->bus, message, NULL); + return sd_bus_send(connect->bus, message, NULL); } =20 static int @@ -75,14 +75,14 @@ virtDBusEventsDomainDeviceAdded(virConnectPtr connectio= n VIR_ATTR_UNUSED, const char *device, void *opaque) { - virtDBusManager *manager =3D opaque; + virtDBusConnect *connect =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusUtilFreep) char *path =3D NULL; int r; =20 path =3D virtDBusUtilBusPathForVirDomain(domain); =20 - r =3D sd_bus_message_new_signal(manager->bus, + r =3D sd_bus_message_new_signal(connect->bus, &message, path, "org.libvirt.Domain", @@ -94,7 +94,7 @@ virtDBusEventsDomainDeviceAdded(virConnectPtr connection = VIR_ATTR_UNUSED, if (r < 0) return r; =20 - return sd_bus_send(manager->bus, message, NULL); + return sd_bus_send(connect->bus, message, NULL); } =20 static int @@ -103,14 +103,14 @@ virtDBusEventsDomainDeviceRemoved(virConnectPtr conne= ction VIR_ATTR_UNUSED, const char *device, void *opaque) { - virtDBusManager *manager =3D opaque; + virtDBusConnect *connect =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusUtilFreep) char *path =3D NULL; int r; =20 path =3D virtDBusUtilBusPathForVirDomain(domain); =20 - r =3D sd_bus_message_new_signal(manager->bus, + r =3D sd_bus_message_new_signal(connect->bus, &message, path, "org.libvirt.Domain", @@ -122,7 +122,7 @@ virtDBusEventsDomainDeviceRemoved(virConnectPtr connect= ion VIR_ATTR_UNUSED, if (r < 0) return r; =20 - return sd_bus_send(manager->bus, message, NULL); + return sd_bus_send(connect->bus, message, NULL); } =20 static int @@ -132,7 +132,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection= VIR_ATTR_UNUSED, int reason, void *opaque) { - virtDBusManager *manager =3D opaque; + virtDBusConnect *connect =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusUtilFreep) char *path =3D NULL; const char *reasonstr; @@ -140,7 +140,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection= VIR_ATTR_UNUSED, =20 path =3D virtDBusUtilBusPathForVirDomain(domain); =20 - r =3D sd_bus_message_new_signal(manager->bus, + r =3D sd_bus_message_new_signal(connect->bus, &message, path, "org.libvirt.Domain", @@ -164,7 +164,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection= VIR_ATTR_UNUSED, if (r < 0) return r; =20 - return sd_bus_send(manager->bus, message, NULL); + return sd_bus_send(connect->bus, message, NULL); } =20 static int @@ -176,7 +176,7 @@ virtDBusEventsDomainTrayChange(virConnectPtr connection= VIR_ATTR_UNUSED, int reason, void *opaque) { - virtDBusManager *manager =3D opaque; + virtDBusConnect *connect =3D opaque; _cleanup_(sd_bus_message_unrefp) sd_bus_message *message =3D NULL; _cleanup_(virtDBusUtilFreep) char *path =3D NULL; const char *reasonstr; @@ -184,7 +184,7 @@ virtDBusEventsDomainTrayChange(virConnectPtr connection= VIR_ATTR_UNUSED, =20 path =3D virtDBusUtilBusPathForVirDomain(domain); =20 - r =3D sd_bus_message_new_signal(manager->bus, + r =3D sd_bus_message_new_signal(connect->bus, &message, path, "org.libvirt.Domain", @@ -208,44 +208,44 @@ virtDBusEventsDomainTrayChange(virConnectPtr connecti= on VIR_ATTR_UNUSED, if (r < 0) return r; =20 - return sd_bus_send(manager->bus, message, NULL); + return sd_bus_send(connect->bus, message, NULL); } =20 static void -virtDBusEventsRegisterEvent(virtDBusManager *manager, +virtDBusEventsRegisterEvent(virtDBusConnect *connect, int id, virConnectDomainEventGenericCallback callback) { - assert(manager->callback_ids[id] =3D=3D -1); + assert(connect->callback_ids[id] =3D=3D -1); =20 - manager->callback_ids[id] =3D virConnectDomainEventRegisterAny(manager= ->connection, + connect->callback_ids[id] =3D virConnectDomainEventRegisterAny(connect= ->connection, NULL, id, VIR_DOMAI= N_EVENT_CALLBACK(callback), - manager, + connect, NULL); } =20 void -virtDBusEventsRegister(virtDBusManager *manager) +virtDBusEventsRegister(virtDBusConnect *connect) { - virtDBusEventsRegisterEvent(manager, + virtDBusEventsRegisterEvent(connect, VIR_DOMAIN_EVENT_ID_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainLifecycle)); =20 - virtDBusEventsRegisterEvent(manager, + virtDBusEventsRegisterEvent(connect, VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainDeviceAdded)); =20 - virtDBusEventsRegisterEvent(manager, + virtDBusEventsRegisterEvent(connect, VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainDeviceRemoved)); =20 - virtDBusEventsRegisterEvent(manager, + virtDBusEventsRegisterEvent(connect, VIR_DOMAIN_EVENT_ID_DISK_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainTrayChange)); =20 - virtDBusEventsRegisterEvent(manager, + virtDBusEventsRegisterEvent(connect, VIR_DOMAIN_EVENT_ID_TRAY_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDo= mainDiskChange)); =20 diff --git a/src/events.h b/src/events.h index d64bd94..f588c85 100644 --- a/src/events.h +++ b/src/events.h @@ -1,9 +1,9 @@ #pragma once =20 -#include "manager.h" +#include "connect.h" =20 #include =20 =20 void -virtDBusEventsRegister(virtDBusManager *manager); +virtDBusEventsRegister(virtDBusConnect *connect); diff --git a/src/main.c b/src/main.c index 225fb46..95522f5 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ #include "config.h" =20 -#include "manager.h" +#include "connect.h" #include "util.h" =20 #include @@ -98,7 +98,7 @@ main(int argc, char *argv[]) bool system_bus; const char *uri =3D NULL; =20 - _cleanup_(virtDBusManagerFreep) virtDBusManager *manager =3D NULL; + _cleanup_(virtDBusConnectFreep) virtDBusConnect *connect =3D NULL; _cleanup_(sd_bus_unrefp) sd_bus *bus =3D NULL; _cleanup_(virtDBusUtilClosep) int signal_fd =3D -1; _cleanup_(virtDBusVirEventRemoveHandlep) int bus_watch =3D -1; @@ -170,9 +170,9 @@ main(int argc, char *argv[]) return EXIT_FAILURE; } =20 - r =3D virtDBusManagerNew(&manager, bus, uri); + r =3D virtDBusConnectNew(&connect, bus, uri); if (r < 0) { - fprintf(stderr, "Failed to connect to libvirt"); + fprintf(stderr, "Failed to connect to libvirt."); return EXIT_FAILURE; } =20 diff --git a/test/Makefile.am b/test/Makefile.am index a7f22d0..4651d08 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,7 +2,7 @@ test_helpers =3D \ libvirttest.py =20 test_programs =3D \ - test_manager.py \ + test_connect.py \ test_domain.py =20 TESTS =3D $(test_programs) diff --git a/test/libvirttest.py b/test/libvirttest.py index f5c2020..2c735e9 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -38,8 +38,8 @@ class TestCase(unittest.TestCase): else: raise TimeoutError('error starting libvirt-dbus') =20 - obj =3D self.bus.get_object('org.libvirt', '/org/libvirt/Manager') - self.manager =3D dbus.Interface(obj, 'org.libvirt.Manager') + obj =3D self.bus.get_object('org.libvirt', '/org/libvirt/Connect') + self.connect =3D dbus.Interface(obj, 'org.libvirt.Connect') =20 def tearDown(self): self.daemon.terminate() diff --git a/test/test_manager.py b/test/test_connect.py similarity index 79% rename from test/test_manager.py rename to test/test_connect.py index 1f58b9d..4ec3fe0 100755 --- a/test/test_manager.py +++ b/test/test_connect.py @@ -14,9 +14,9 @@ minimal_xml =3D ''' ''' =20 -class TestManager(libvirttest.TestCase): +class TestConnect(libvirttest.TestCase): def test_list_domains(self): - domains =3D self.manager.ListDomains(0) + domains =3D self.connect.ListDomains(0) self.assertEqual(type(domains), dbus.Array) self.assertEqual(len(domains), 1) =20 @@ -33,9 +33,9 @@ class TestManager(libvirttest.TestCase): self.assertEqual(type(path), dbus.ObjectPath) self.loop.quit() =20 - self.manager.connect_to_signal('DomainStarted', domain_started) + self.connect.connect_to_signal('DomainStarted', domain_started) =20 - path =3D self.manager.CreateXML(minimal_xml, 0) + path =3D self.connect.CreateXML(minimal_xml, 0) self.assertEqual(type(path), dbus.ObjectPath) =20 self.main_loop() @@ -46,9 +46,9 @@ class TestManager(libvirttest.TestCase): self.assertEqual(type(path), dbus.ObjectPath) self.loop.quit() =20 - self.manager.connect_to_signal('DomainDefined', domain_defined) + self.connect.connect_to_signal('DomainDefined', domain_defined) =20 - path =3D self.manager.DefineXML(minimal_xml) + path =3D self.connect.DefineXML(minimal_xml) self.assertEqual(type(path), dbus.ObjectPath) =20 self.main_loop() diff --git a/test/test_domain.py b/test/test_domain.py index 2b15285..b1ab7a5 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -6,7 +6,7 @@ import unittest =20 class TestDomain(libvirttest.TestCase): def domain(self): - path =3D self.manager.ListDomains(0)[0] + path =3D self.connect.ListDomains(0)[0] obj =3D self.bus.get_object('org.libvirt', path) return obj, dbus.Interface(obj, 'org.libvirt.Domain') =20 @@ -42,7 +42,7 @@ class TestDomain(libvirttest.TestCase): self.assertEqual(type(path), dbus.ObjectPath) self.loop.quit() =20 - self.manager.connect_to_signal('DomainStopped', domain_stopped) + self.connect.connect_to_signal('DomainStopped', domain_stopped) =20 obj, domain =3D self.domain() domain.Shutdown() @@ -58,7 +58,7 @@ class TestDomain(libvirttest.TestCase): self.assertEqual(type(path), dbus.ObjectPath) self.loop.quit() =20 - self.manager.connect_to_signal('DomainUndefined', domain_undefined) + self.connect.connect_to_signal('DomainUndefined', domain_undefined) =20 _, domain =3D self.domain() domain.Shutdown() --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list