From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523630845785356.56896022681315; Fri, 13 Apr 2018 07:47:25 -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 7944585543; Fri, 13 Apr 2018 14:47:23 +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 D8FD88A9FB; Fri, 13 Apr 2018 14:47: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 6DFD9B3487; Fri, 13 Apr 2018 14:47:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElJij012290 for ; Fri, 13 Apr 2018 10:47:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id C330A2026E0E; Fri, 13 Apr 2018 14:47:19 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 699A02026DFD for ; Fri, 13 Apr 2018 14:47:19 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:08 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/9] domain_event: s/MetadataCange/MetadataChange/g 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.28]); Fri, 13 Apr 2018 14:47:24 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There's a typo in struct name. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/domain_event.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 7baccd5b57..fdb48a1eaa 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -270,13 +270,13 @@ struct _virDomainEventDeviceRemovalFailed { typedef struct _virDomainEventDeviceRemovalFailed virDomainEventDeviceRemo= valFailed; typedef virDomainEventDeviceRemovalFailed *virDomainEventDeviceRemovalFail= edPtr; =20 -struct _virDomainEventMetadataCange { +struct _virDomainEventMetadataChange { virDomainEvent parent; =20 int type; char *nsuri; }; -typedef struct _virDomainEventMetadataCange virDomainEventMetadataChange; +typedef struct _virDomainEventMetadataChange virDomainEventMetadataChange; typedef virDomainEventMetadataChange *virDomainEventMetadataChangePtr; =20 struct _virDomainEventBlockThreshold { --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523630853065422.8900074503101; Fri, 13 Apr 2018 07:47:33 -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 76C063130D7E; Fri, 13 Apr 2018 14:47:31 +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 3BA928A9F2; Fri, 13 Apr 2018 14:47:31 +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 ED145B3491; Fri, 13 Apr 2018 14:47:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElKAT012303 for ; Fri, 13 Apr 2018 10:47:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 615602026E0E; Fri, 13 Apr 2018 14:47:20 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08A672026DFD for ; Fri, 13 Apr 2018 14:47:19 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:09 +0200 Message-Id: <3b9a1c503392175dbbbdffabe54b3753770ccab6.1523630758.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/9] util: Make structs follow our naming convention 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.43]); Fri, 13 Apr 2018 14:47:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" There are two structs virMacMap and virFDStreamData that don't have the underscore prefix. Put it there so that they follow the rest of the code. Signed-off-by: Michal Privoznik --- src/util/virfdstream.c | 4 ++-- src/util/virmacmap.c | 2 +- src/util/virmacmap.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index be40379a92..e2d3f365cd 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -75,9 +75,9 @@ struct _virFDStreamMsg { =20 =20 /* Tunnelled migration stream support */ -typedef struct virFDStreamData virFDStreamData; +typedef struct _virFDStreamData virFDStreamData; typedef virFDStreamData *virFDStreamDataPtr; -struct virFDStreamData { +struct _virFDStreamData { virObjectLockable parent; =20 int fd; diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 42890ba2ff..d3be3066cc 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -43,7 +43,7 @@ VIR_LOG_INIT("util.virmacmap"); */ #define VIR_MAC_MAP_FILE_SIZE_MAX (32 * 1024 * 1024) =20 -struct virMacMap { +struct _virMacMap { virObjectLockable parent; =20 virHashTablePtr macs; diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h index e6f754e247..93295c9107 100644 --- a/src/util/virmacmap.h +++ b/src/util/virmacmap.h @@ -24,7 +24,7 @@ #ifndef __VIR_MACMAP_H__ # define __VIR_MACMAP_H__ =20 -typedef struct virMacMap virMacMap; +typedef struct _virMacMap virMacMap; typedef virMacMap *virMacMapPtr; =20 char * --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523630852935203.64617224735173; Fri, 13 Apr 2018 07:47:32 -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 675AE2F30D8; Fri, 13 Apr 2018 14:47:31 +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 3BCA75F7C4; Fri, 13 Apr 2018 14:47:31 +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 EC1FAB3490; Fri, 13 Apr 2018 14:47:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElLlg012309 for ; Fri, 13 Apr 2018 10:47:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id F32082026E0E; Fri, 13 Apr 2018 14:47:20 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9ADA22026DFD for ; Fri, 13 Apr 2018 14:47:20 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:10 +0200 Message-Id: <1a7dbe2d8d296e365536a6e642d246b7f6bb00e1.1523630758.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/9] datatypes: Rename @parent to @parentName in virNodeDevice 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.29]); Fri, 13 Apr 2018 14:47:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In next patches this name will be needed for a different memeber. Also, it makes sense to rename the variable because it does not contain reference to parent device, just its name. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/virnodedeviceobj.c | 2 +- src/datatypes.c | 2 +- src/datatypes.h | 2 +- src/libvirt-nodedev.c | 6 +++--- src/node_device/node_device_driver.c | 4 ++-- src/test/test_driver.c | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index ad0f27ee47..9d2996046f 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -870,7 +870,7 @@ virNodeDeviceObjListExportCallback(void *payload, virNodeDeviceMatch(obj, data->flags)) { if (data->devices) { if (!(device =3D virGetNodeDevice(data->conn, def->name)) || - VIR_STRDUP(device->parent, def->parent) < 0) { + VIR_STRDUP(device->parentName, def->parent) < 0) { virObjectUnref(device); data->error =3D true; goto cleanup; diff --git a/src/datatypes.c b/src/datatypes.c index f7eef24ba8..0c3c66a9ce 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -653,7 +653,7 @@ virNodeDeviceDispose(void *obj) VIR_DEBUG("release dev %p %s", dev, dev->name); =20 VIR_FREE(dev->name); - VIR_FREE(dev->parent); + VIR_FREE(dev->parentName); =20 virObjectUnref(dev->conn); } diff --git a/src/datatypes.h b/src/datatypes.h index 1a8ea01ba3..66733b075c 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -618,7 +618,7 @@ struct _virNodeDevice { virObject object; virConnectPtr conn; /* pointer back to the connection = */ char *name; /* device name (unique on node) */ - char *parent; /* parent device name */ + char *parentName; /* parent device name */ }; =20 /** diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 563ce889b9..8ced3cea0e 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -346,16 +346,16 @@ virNodeDeviceGetParent(virNodeDevicePtr dev) =20 virCheckNodeDeviceReturn(dev, NULL); =20 - if (!dev->parent) { + if (!dev->parentName) { if (dev->conn->nodeDeviceDriver && dev->conn->nodeDeviceDriver->no= deDeviceGetParent) { - dev->parent =3D dev->conn->nodeDeviceDriver->nodeDeviceGetPare= nt(dev); + dev->parentName =3D dev->conn->nodeDeviceDriver->nodeDeviceGet= Parent(dev); } else { virReportUnsupportedError(); virDispatchError(dev->conn); return NULL; } } - return dev->parent; + return dev->parentName; } =20 =20 diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 61afa1f8eb..d04a31747a 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -256,7 +256,7 @@ nodeDeviceLookupByName(virConnectPtr conn, goto cleanup; =20 if ((device =3D virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(device->parent, def->parent) < 0) { + if (VIR_STRDUP(device->parentName, def->parent) < 0) { virObjectUnref(device); device =3D NULL; } @@ -290,7 +290,7 @@ nodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, goto cleanup; =20 if ((device =3D virGetNodeDevice(conn, def->name))) { - if (VIR_STRDUP(device->parent, def->parent) < 0) { + if (VIR_STRDUP(device->parentName, def->parent) < 0) { virObjectUnref(device); device =3D NULL; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index eec7a82924..f5b5e3ee8d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5416,7 +5416,7 @@ testNodeDeviceLookupByName(virConnectPtr conn, const = char *name) def =3D virNodeDeviceObjGetDef(obj); =20 if ((ret =3D virGetNodeDevice(conn, name))) { - if (VIR_STRDUP(ret->parent, def->parent) < 0) { + if (VIR_STRDUP(ret->parentName, def->parent) < 0) { virObjectUnref(ret); ret =3D NULL; } @@ -5641,8 +5641,8 @@ testNodeDeviceCreateXML(virConnectPtr conn, if (!(dev =3D virGetNodeDevice(conn, objdef->name))) goto cleanup; =20 - VIR_FREE(dev->parent); - if (VIR_STRDUP(dev->parent, def->parent) < 0) + VIR_FREE(dev->parentName); + if (VIR_STRDUP(dev->parentName, def->parent) < 0) goto cleanup; =20 ret =3D dev; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523782356358450.085883166572; Sun, 15 Apr 2018 01:52:36 -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 E5C4E80467; Sun, 15 Apr 2018 08:52:34 +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 B7B4417CDC; Sun, 15 Apr 2018 08:52:34 +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 75D24180BAF1; Sun, 15 Apr 2018 08:52:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElL9m012332 for ; Fri, 13 Apr 2018 10:47:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 912972026E0E; Fri, 13 Apr 2018 14:47:21 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38D0C2026DFD for ; Fri, 13 Apr 2018 14:47:21 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:11 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/9] src: Unify virObject member name 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.28]); Sun, 15 Apr 2018 08:52:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Whenever we declare a new object the first member of the struct has to be virObject (or any other member of that family). Now, up until now we did not care about the name of the struct member. But lets unify it so that we can do some checks at compile time later. The unified name is 'parent'. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/datatypes.h | 28 ++++++++++++++-------------- src/libvirt-admin.c | 2 +- src/libvirt-domain-snapshot.c | 2 +- src/libvirt-domain.c | 2 +- src/libvirt-host.c | 2 +- src/libvirt-interface.c | 2 +- src/libvirt-network.c | 2 +- src/libvirt-nodedev.c | 2 +- src/libvirt-nwfilter.c | 2 +- src/libvirt-secret.c | 2 +- src/libvirt-storage.c | 4 ++-- src/libvirt-stream.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virfilecache.c | 2 +- tests/virfilecachetest.c | 2 +- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index 66733b075c..192c86be80 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -453,7 +453,7 @@ struct _virAdmConnectCloseCallbackData { * Internal structure associated to a connection */ struct _virConnect { - virObjectLockable object; + virObjectLockable parent; =20 /* All the variables from here, until declared otherwise in one of * the following comments, are setup at time of connection open @@ -496,7 +496,7 @@ struct _virConnect { * Internal structure associated to an admin connection */ struct _virAdmConnect { - virObjectLockable object; + virObjectLockable parent; virURIPtr uri; =20 void *privateData; @@ -512,7 +512,7 @@ struct _virAdmConnect { * Internal structure associated to a daemon server */ struct _virAdmServer { - virObject object; + virObject parent; virAdmConnectPtr conn; /* pointer back to the admin connectio= n */ char *name; /* the server external name */ }; @@ -523,7 +523,7 @@ struct _virAdmServer { * Internal structure associated to a client connected to daemon */ struct _virAdmClient { - virObject object; + virObject parent; virAdmServerPtr srv; /* pointer to the server client is * connected to, which also holds a * reference back to the admin connect= ion @@ -539,7 +539,7 @@ struct _virAdmClient { * Internal structure associated to a domain */ struct _virDomain { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the domain external name */ int id; /* the domain ID */ @@ -552,7 +552,7 @@ struct _virDomain { * Internal structure associated to a domain */ struct _virNetwork { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the network external name */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the network unique identifier = */ @@ -564,7 +564,7 @@ struct _virNetwork { * Internal structure associated to a physical host interface */ struct _virInterface { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the network external name */ char *mac; /* the interface MAC address */ @@ -576,7 +576,7 @@ struct _virInterface { * Internal structure associated to a storage pool */ struct _virStoragePool { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the storage pool external name= */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the storage pool unique identi= fier */ @@ -595,7 +595,7 @@ struct _virStoragePool { * Internal structure associated to a storage volume */ struct _virStorageVol { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *pool; /* Pool name of owner */ char *name; /* the storage vol external name = */ @@ -615,7 +615,7 @@ struct _virStorageVol { * Internal structure associated with a node device */ struct _virNodeDevice { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection = */ char *name; /* device name (unique on node) */ char *parentName; /* parent device name */ @@ -627,7 +627,7 @@ struct _virNodeDevice { * Internal structure associated with a secret */ struct _virSecret { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the secret unique identifier */ int usageType; /* the type of usage */ @@ -644,7 +644,7 @@ typedef int (*virStreamFinishFunc)(virStreamPtr, void *= opaque); * Internal structure associated with an input stream */ struct _virStream { - virObject object; + virObject parent; virConnectPtr conn; unsigned int flags; =20 @@ -658,7 +658,7 @@ struct _virStream { * Internal structure associated with a domain snapshot */ struct _virDomainSnapshot { - virObject object; + virObject parent; char *name; virDomainPtr domain; }; @@ -669,7 +669,7 @@ struct _virDomainSnapshot { * Internal structure associated to a network filter */ struct _virNWFilter { - virObject object; + virObject parent; virConnectPtr conn; /* pointer back to the connection= */ char *name; /* the network filter external na= me */ unsigned char uuid[VIR_UUID_BUFLEN]; /* the network filter unique iden= tifier */ diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index de595a9f7f..7f695311b4 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -340,7 +340,7 @@ int virAdmConnectRef(virAdmConnectPtr conn) { VIR_DEBUG("conn=3D%p refs=3D%d", conn, - conn ? conn->object.parent.u.s.refs : 0); + conn ? conn->parent.parent.u.s.refs : 0); =20 virResetLastError(); virCheckAdmConnectReturn(conn, -1); diff --git a/src/libvirt-domain-snapshot.c b/src/libvirt-domain-snapshot.c index e44a1d1f38..100326a5e7 100644 --- a/src/libvirt-domain-snapshot.c +++ b/src/libvirt-domain-snapshot.c @@ -1159,7 +1159,7 @@ int virDomainSnapshotRef(virDomainSnapshotPtr snapshot) { VIR_DEBUG("snapshot=3D%p, refs=3D%d", snapshot, - snapshot ? snapshot->object.u.s.refs : 0); + snapshot ? snapshot->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 63d2ae23d7..2d86e48979 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -589,7 +589,7 @@ virDomainFree(virDomainPtr domain) int virDomainRef(virDomainPtr domain) { - VIR_DOMAIN_DEBUG(domain, "refs=3D%d", domain ? domain->object.u.s.refs= : 0); + VIR_DOMAIN_DEBUG(domain, "refs=3D%d", domain ? domain->parent.u.s.refs= : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 7ff7407a08..76087badd8 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -51,7 +51,7 @@ VIR_LOG_INIT("libvirt.host"); int virConnectRef(virConnectPtr conn) { - VIR_DEBUG("conn=3D%p refs=3D%d", conn, conn ? conn->object.parent.u.s.= refs : 0); + VIR_DEBUG("conn=3D%p refs=3D%d", conn, conn ? conn->parent.parent.u.s.= refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index bb79101abe..69415293ed 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -642,7 +642,7 @@ virInterfaceDestroy(virInterfacePtr iface, unsigned int= flags) int virInterfaceRef(virInterfacePtr iface) { - VIR_DEBUG("iface=3D%p refs=3D%d", iface, iface ? iface->object.u.s.ref= s : 0); + VIR_DEBUG("iface=3D%p refs=3D%d", iface, iface ? iface->parent.u.s.ref= s : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-network.c b/src/libvirt-network.c index da33543001..9f9e0ddaf8 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -679,7 +679,7 @@ int virNetworkRef(virNetworkPtr network) { VIR_DEBUG("network=3D%p refs=3D%d", network, - network ? network->object.u.s.refs : 0); + network ? network->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 8ced3cea0e..10050b193b 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -477,7 +477,7 @@ virNodeDeviceFree(virNodeDevicePtr dev) int virNodeDeviceRef(virNodeDevicePtr dev) { - VIR_DEBUG("dev=3D%p refs=3D%d", dev, dev ? dev->object.u.s.refs : 0); + VIR_DEBUG("dev=3D%p refs=3D%d", dev, dev ? dev->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index 43e2b164e8..948c30deef 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -504,7 +504,7 @@ int virNWFilterRef(virNWFilterPtr nwfilter) { VIR_DEBUG("nwfilter=3D%p refs=3D%d", nwfilter, - nwfilter ? nwfilter->object.u.s.refs : 0); + nwfilter ? nwfilter->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 1e1cd4e65b..711c4fc580 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -659,7 +659,7 @@ int virSecretRef(virSecretPtr secret) { VIR_DEBUG("secret=3D%p refs=3D%d", secret, - secret ? secret->object.u.s.refs : 0); + secret ? secret->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 3845a5d55e..1879c6bd60 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -868,7 +868,7 @@ virStoragePoolFree(virStoragePoolPtr pool) int virStoragePoolRef(virStoragePoolPtr pool) { - VIR_DEBUG("pool=3D%p refs=3D%d", pool, pool ? pool->object.u.s.refs : = 0); + VIR_DEBUG("pool=3D%p refs=3D%d", pool, pool ? pool->parent.u.s.refs : = 0); =20 virResetLastError(); =20 @@ -1904,7 +1904,7 @@ virStorageVolFree(virStorageVolPtr vol) int virStorageVolRef(virStorageVolPtr vol) { - VIR_DEBUG("vol=3D%p refs=3D%d", vol, vol ? vol->object.u.s.refs : 0); + VIR_DEBUG("vol=3D%p refs=3D%d", vol, vol ? vol->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index 3204b7b177..ef83696bcd 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -86,7 +86,7 @@ int virStreamRef(virStreamPtr stream) { VIR_DEBUG("stream=3D%p refs=3D%d", stream, - stream ? stream->object.u.s.refs : 0); + stream ? stream->parent.u.s.refs : 0); =20 virResetLastError(); =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c8488f875d..b5347b6cad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -506,7 +506,7 @@ struct _virQEMUCapsHostCPUData { * And don't forget to update virQEMUCapsNewCopy. */ struct _virQEMUCaps { - virObject object; + virObject parent; =20 bool usedQMP; =20 diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 505b40fc4b..d1e54a0892 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -40,7 +40,7 @@ VIR_LOG_INIT("rpc.netclientprogram"); =20 struct _virNetClientProgram { - virObject object; + virObject parent; =20 unsigned program; unsigned version; diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 75b0052cdb..f28274fc22 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -37,7 +37,7 @@ VIR_LOG_INIT("rpc.netserverprogram"); =20 struct _virNetServerProgram { - virObject object; + virObject parent; =20 unsigned program; unsigned version; diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 4e5426ffea..d2350b2b91 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -34,7 +34,7 @@ #define VIR_FROM_THIS VIR_FROM_RPC =20 struct _virNetServerService { - virObject object; + virObject parent; =20 size_t nsocks; virNetSocketPtr *socks; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 1b78c1fadc..db5c51b6a2 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -620,7 +620,7 @@ dnsmasqReload(pid_t pid ATTRIBUTE_UNUSED) * */ struct _dnsmasqCaps { - virObject object; + virObject parent; char *binaryPath; bool noRefresh; time_t mtime; diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index 2577d711bc..e24eb5a68c 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -45,7 +45,7 @@ VIR_LOG_INIT("util.filecache") =20 =20 struct _virFileCache { - virObjectLockable object; + virObjectLockable parent; =20 virHashTablePtr table; =20 diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index ae7d08d257..d4a9d598ef 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -28,7 +28,7 @@ =20 =20 struct _testFileCacheObj { - virObject object; + virObject parent; char *data; }; typedef struct _testFileCacheObj testFileCacheObj; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523782359936572.1836947821861; Sun, 15 Apr 2018 01:52:39 -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 82ACA821C7; Sun, 15 Apr 2018 08:52:38 +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 5347C649AC; Sun, 15 Apr 2018 08:52:38 +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 12034B34B3; Sun, 15 Apr 2018 08:52:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElMCd012343 for ; Fri, 13 Apr 2018 10:47:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E8CF2026E0E; Fri, 13 Apr 2018 14:47:22 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA6A42026DFD for ; Fri, 13 Apr 2018 14:47:21 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:12 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/9] src: Unify dispose function names 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.28]); Sun, 15 Apr 2018 08:52:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" If a function is disposing virSomething it should be called virSomethingDispose(). There are two offenders: virCapabilitiesDispose(virCapsPtr) and virDomainXMLOptionClassDispose(virDomainXMLOptionPtr). Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/capabilities.c | 6 +++--- src/conf/domain_conf.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index edf9f54f77..33b9194041 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -58,14 +58,14 @@ VIR_ENUM_IMPL(virCapsHostPMTarget, VIR_NODE_SUSPEND_TAR= GET_LAST, "suspend_mem", "suspend_disk", "suspend_hybrid"); =20 static virClassPtr virCapsClass; -static void virCapabilitiesDispose(void *obj); +static void virCapsDispose(void *obj); =20 static int virCapabilitiesOnceInit(void) { if (!(virCapsClass =3D virClassNew(virClassForObject(), "virCaps", sizeof(virCaps), - virCapabilitiesDispose))) + virCapsDispose))) return -1; =20 return 0; @@ -215,7 +215,7 @@ virCapabilitiesClearSecModel(virCapsHostSecModelPtr sec= model) } =20 static void -virCapabilitiesDispose(void *object) +virCapsDispose(void *object) { virCapsPtr caps =3D object; size_t i; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d23182f18a..4dad8e3b20 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -934,7 +934,7 @@ VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MOD= EL_LAST, static virClassPtr virDomainObjClass; static virClassPtr virDomainXMLOptionClass; static void virDomainObjDispose(void *obj); -static void virDomainXMLOptionClassDispose(void *obj); +static void virDomainXMLOptionDispose(void *obj); =20 static int virDomainObjOnceInit(void) { @@ -947,7 +947,7 @@ static int virDomainObjOnceInit(void) if (!(virDomainXMLOptionClass =3D virClassNew(virClassForObject(), "virDomainXMLOption", sizeof(virDomainXMLOption), - virDomainXMLOptionClassDis= pose))) + virDomainXMLOptionDispose)= )) return -1; =20 return 0; @@ -957,7 +957,7 @@ VIR_ONCE_GLOBAL_INIT(virDomainObj) =20 =20 static void -virDomainXMLOptionClassDispose(void *obj) +virDomainXMLOptionDispose(void *obj) { virDomainXMLOptionPtr xmlopt =3D obj; =20 --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523630856257858.626121890696; Fri, 13 Apr 2018 07:47:36 -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 936DC804E5; Fri, 13 Apr 2018 14:47:34 +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 628945F7DF; Fri, 13 Apr 2018 14:47:34 +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 2609D180BAD3; Fri, 13 Apr 2018 14:47:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElMZv012352 for ; Fri, 13 Apr 2018 10:47:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id C237E2026E0E; Fri, 13 Apr 2018 14:47:22 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 685262026DFD for ; Fri, 13 Apr 2018 14:47:22 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:13 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/9] Introduce virNetSASLContextDispose 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.27]); Fri, 13 Apr 2018 14:47:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Strictly speaking this is not needed right now. However, next commits will require dispose function to exist. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/rpc/virnetsaslcontext.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index a7b891feb6..f1f8bdc855 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -52,6 +52,7 @@ struct _virNetSASLSession { =20 static virClassPtr virNetSASLContextClass; static virClassPtr virNetSASLSessionClass; +static void virNetSASLContextDispose(void *obj); static void virNetSASLSessionDispose(void *obj); =20 static int virNetSASLContextOnceInit(void) @@ -59,7 +60,7 @@ static int virNetSASLContextOnceInit(void) if (!(virNetSASLContextClass =3D virClassNew(virClassForObjectLockable= (), "virNetSASLContext", sizeof(virNetSASLContext), - NULL))) + virNetSASLContextDispose))) return -1; =20 if (!(virNetSASLSessionClass =3D virClassNew(virClassForObjectLockable= (), @@ -686,6 +687,11 @@ ssize_t virNetSASLSessionDecode(virNetSASLSessionPtr s= asl, return ret; } =20 +void virNetSASLContextDispose(void *obj ATTRIBUTE_UNUSED) +{ + /* nada */ +} + void virNetSASLSessionDispose(void *obj) { virNetSASLSessionPtr sasl =3D obj; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152363085926067.6231654847553; Fri, 13 Apr 2018 07:47:39 -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 B477D81F01; Fri, 13 Apr 2018 14:47: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 831DE8874A; Fri, 13 Apr 2018 14:47:37 +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 4792FB3492; Fri, 13 Apr 2018 14:47:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElNYZ012358 for ; Fri, 13 Apr 2018 10:47:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9A3A72026E0E; Fri, 13 Apr 2018 14:47:23 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07BD12026DFD for ; Fri, 13 Apr 2018 14:47:22 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:14 +0200 Message-Id: <8884a38d64f12a957dd0832ee7f90555e53644a3.1523630758.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 7/9] virobject: Introduce VIR_CLASS_NEW() macro 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.27]); Fri, 13 Apr 2018 14:47:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" So far we are repeating the following lines over and over: virClassNew(virClassForObject(), "virSomeObject", sizeof(virSomeObject), virSomeObjectDispose); While this works, it is impossible to do some checking. Firstly, the class name (the 2nd argument) doesn't match the name in the code in all cases (the 3rd argument). Secondly, the current style is needlessly verbose. This commit turns example into following: VIR_CLASS_NEW(virClassForObject(), virSomeObject); Signed-off-by: Michal Privoznik --- src/access/viraccessmanager.c | 6 +- src/bhyve/bhyve_conf.c | 6 +- src/conf/capabilities.c | 6 +- src/conf/domain_capabilities.c | 12 +-- src/conf/domain_conf.c | 18 ++--- src/conf/domain_event.c | 126 +++++++++++-----------------= ---- src/conf/network_event.c | 12 +-- src/conf/node_device_event.c | 18 ++--- src/conf/object_event.c | 12 +-- src/conf/secret_event.c | 18 ++--- src/conf/storage_event.c | 18 ++--- src/conf/virdomainobjlist.c | 6 +- src/conf/virinterfaceobj.c | 12 +-- src/conf/virnetworkobj.c | 12 +-- src/conf/virnodedeviceobj.c | 12 +-- src/conf/virsecretobj.c | 12 +-- src/conf/virstorageobj.c | 24 ++---- src/datatypes.c | 6 +- src/interface/interface_backend_netcf.c | 6 +- src/libvirt-admin.c | 6 +- src/libxl/libxl_conf.c | 6 +- src/libxl/libxl_domain.c | 6 +- src/libxl/libxl_migration.c | 6 +- src/logging/log_handler.c | 6 +- src/lxc/lxc_conf.c | 6 +- src/lxc/lxc_monitor.c | 6 +- src/node_device/node_device_udev.c | 6 +- src/qemu/qemu_agent.c | 6 +- src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_conf.c | 6 +- src/qemu/qemu_domain.c | 36 +++------ src/qemu/qemu_monitor.c | 6 +- src/rpc/virkeepalive.c | 6 +- src/rpc/virnetclient.c | 6 +- src/rpc/virnetclientprogram.c | 6 +- src/rpc/virnetclientstream.c | 6 +- src/rpc/virnetdaemon.c | 6 +- src/rpc/virnetlibsshsession.c | 6 +- src/rpc/virnetsaslcontext.c | 12 +-- src/rpc/virnetserver.c | 6 +- src/rpc/virnetserverclient.c | 6 +- src/rpc/virnetserverprogram.c | 6 +- src/rpc/virnetserverservice.c | 6 +- src/rpc/virnetsocket.c | 6 +- src/rpc/virnetsshsession.c | 6 +- src/rpc/virnettlscontext.c | 12 +-- src/security/security_manager.c | 6 +- src/util/virclosecallbacks.c | 6 +- src/util/virdnsmasq.c | 7 +- src/util/virfdstream.c | 6 +- src/util/virfilecache.c | 6 +- src/util/virhash.c | 6 +- src/util/virhostdev.c | 6 +- src/util/viridentity.c | 6 +- src/util/virmacmap.c | 6 +- src/util/virmdev.c | 6 +- src/util/virobject.c | 12 +-- src/util/virobject.h | 4 + src/util/virpci.c | 6 +- src/util/virportallocator.c | 6 +- src/util/virresctrl.c | 12 +-- src/util/virscsi.c | 6 +- src/util/virscsivhost.c | 6 +- src/util/virusb.c | 6 +- src/vbox/vbox_common.c | 6 +- src/vz/vz_driver.c | 6 +- tests/virfilecachetest.c | 6 +- 67 files changed, 230 insertions(+), 453 deletions(-) diff --git a/src/access/viraccessmanager.c b/src/access/viraccessmanager.c index c268ec57f7..2940692598 100644 --- a/src/access/viraccessmanager.c +++ b/src/access/viraccessmanager.c @@ -54,10 +54,8 @@ static void virAccessManagerDispose(void *obj); =20 static int virAccessManagerOnceInit(void) { - if (!(virAccessManagerClass =3D virClassNew(virClassForObjectLockable(= ), - "virAccessManagerClass", - sizeof(virAccessManager), - virAccessManagerDispose))) + if (!(virAccessManagerClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virAccessManager))) return -1; =20 return 0; diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index b0b40c5754..027311ad37 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -36,10 +36,8 @@ static void virBhyveDriverConfigDispose(void *obj); =20 static int virBhyveConfigOnceInit(void) { - if (!(virBhyveDriverConfigClass =3D virClassNew(virClassForObject(), - "virBhyveDriverConfig", - sizeof(virBhyveDriverCo= nfig), - virBhyveDriverConfigDis= pose))) + if (!(virBhyveDriverConfigClass =3D VIR_CLASS_NEW(virClassForObject(), + virBhyveDriverConfig)= )) return -1; =20 return 0; diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 33b9194041..239d409388 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -62,10 +62,8 @@ static void virCapsDispose(void *obj); =20 static int virCapabilitiesOnceInit(void) { - if (!(virCapsClass =3D virClassNew(virClassForObject(), - "virCaps", - sizeof(virCaps), - virCapsDispose))) + if (!(virCapsClass =3D VIR_CLASS_NEW(virClassForObject(), + virCaps))) return -1; =20 return 0; diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index f7d9be50f8..aad93392ea 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -40,16 +40,12 @@ static void virDomainCapsCPUModelsDispose(void *obj); =20 static int virDomainCapsOnceInit(void) { - if (!(virDomainCapsClass =3D virClassNew(virClassForObjectLockable(), - "virDomainCapsClass", - sizeof(virDomainCaps), - virDomainCapsDispose))) + if (!(virDomainCapsClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virDomainCaps))) return -1; =20 - virDomainCapsCPUModelsClass =3D virClassNew(virClassForObject(), - "virDomainCapsCPUModelsClass= ", - sizeof(virDomainCapsCPUModel= s), - virDomainCapsCPUModelsDispos= e); + virDomainCapsCPUModelsClass =3D VIR_CLASS_NEW(virClassForObject(), + virDomainCapsCPUModels); if (!virDomainCapsCPUModelsClass) return -1; =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4dad8e3b20..364f41f384 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -938,16 +938,12 @@ static void virDomainXMLOptionDispose(void *obj); =20 static int virDomainObjOnceInit(void) { - if (!(virDomainObjClass =3D virClassNew(virClassForObjectLockable(), - "virDomainObj", - sizeof(virDomainObj), - virDomainObjDispose))) + if (!(virDomainObjClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virDomainObj))) return -1; =20 - if (!(virDomainXMLOptionClass =3D virClassNew(virClassForObject(), - "virDomainXMLOption", - sizeof(virDomainXMLOption), - virDomainXMLOptionDispose)= )) + if (!(virDomainXMLOptionClass =3D VIR_CLASS_NEW(virClassForObject(), + virDomainXMLOption))) return -1; =20 return 0; @@ -12223,10 +12219,8 @@ static virClassPtr virDomainChrSourceDefClass; static int virDomainChrSourceDefOnceInit(void) { - virDomainChrSourceDefClass =3D virClassNew(virClassForObject(), - "virDomainChrSourceDef", - sizeof(virDomainChrSourceDef), - virDomainChrSourceDefDispose); + virDomainChrSourceDefClass =3D VIR_CLASS_NEW(virClassForObject(), + virDomainChrSourceDef); if (!virDomainChrSourceDefClass) return -1; else diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index fdb48a1eaa..2272844085 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -296,130 +296,88 @@ static int virDomainEventsOnceInit(void) { if (!(virDomainEventClass =3D - virClassNew(virClassForObjectEvent(), - "virDomainEvent", - sizeof(virDomainEvent), - virDomainEventDispose))) + VIR_CLASS_NEW(virClassForObjectEvent(), + virDomainEvent))) return -1; if (!(virDomainEventLifecycleClass =3D - virClassNew(virDomainEventClass, - "virDomainEventLifecycle", - sizeof(virDomainEventLifecycle), - virDomainEventLifecycleDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventLifecycle))) return -1; if (!(virDomainEventRTCChangeClass =3D - virClassNew(virDomainEventClass, - "virDomainEventRTCChange", - sizeof(virDomainEventRTCChange), - virDomainEventRTCChangeDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventRTCChange))) return -1; if (!(virDomainEventWatchdogClass =3D - virClassNew(virDomainEventClass, - "virDomainEventWatchdog", - sizeof(virDomainEventWatchdog), - virDomainEventWatchdogDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventWatchdog))) return -1; if (!(virDomainEventIOErrorClass =3D - virClassNew(virDomainEventClass, - "virDomainEventIOError", - sizeof(virDomainEventIOError), - virDomainEventIOErrorDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventIOError))) return -1; if (!(virDomainEventGraphicsClass =3D - virClassNew(virDomainEventClass, - "virDomainEventGraphics", - sizeof(virDomainEventGraphics), - virDomainEventGraphicsDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventGraphics))) return -1; if (!(virDomainEventBlockJobClass =3D - virClassNew(virDomainEventClass, - "virDomainEventBlockJob", - sizeof(virDomainEventBlockJob), - virDomainEventBlockJobDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventBlockJob))) return -1; if (!(virDomainEventDiskChangeClass =3D - virClassNew(virDomainEventClass, - "virDomainEventDiskChange", - sizeof(virDomainEventDiskChange), - virDomainEventDiskChangeDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventDiskChange))) return -1; if (!(virDomainEventTrayChangeClass =3D - virClassNew(virDomainEventClass, - "virDomainEventTrayChange", - sizeof(virDomainEventTrayChange), - virDomainEventTrayChangeDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventTrayChange))) return -1; if (!(virDomainEventBalloonChangeClass =3D - virClassNew(virDomainEventClass, - "virDomainEventBalloonChange", - sizeof(virDomainEventBalloonChange), - virDomainEventBalloonChangeDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventBalloonChange))) return -1; if (!(virDomainEventDeviceRemovedClass =3D - virClassNew(virDomainEventClass, - "virDomainEventDeviceRemoved", - sizeof(virDomainEventDeviceRemoved), - virDomainEventDeviceRemovedDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventDeviceRemoved))) return -1; if (!(virDomainEventDeviceAddedClass =3D - virClassNew(virDomainEventClass, - "virDomainEventDeviceAdded", - sizeof(virDomainEventDeviceAdded), - virDomainEventDeviceAddedDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventDeviceAdded))) return -1; if (!(virDomainEventPMClass =3D - virClassNew(virDomainEventClass, - "virDomainEventPM", - sizeof(virDomainEventPM), - virDomainEventPMDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventPM))) return -1; if (!(virDomainQemuMonitorEventClass =3D - virClassNew(virClassForObjectEvent(), - "virDomainQemuMonitorEvent", - sizeof(virDomainQemuMonitorEvent), - virDomainQemuMonitorEventDispose))) + VIR_CLASS_NEW(virClassForObjectEvent(), + virDomainQemuMonitorEvent))) return -1; if (!(virDomainEventTunableClass =3D - virClassNew(virDomainEventClass, - "virDomainEventTunable", - sizeof(virDomainEventTunable), - virDomainEventTunableDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventTunable))) return -1; if (!(virDomainEventAgentLifecycleClass =3D - virClassNew(virDomainEventClass, - "virDomainEventAgentLifecycle", - sizeof(virDomainEventAgentLifecycle), - virDomainEventAgentLifecycleDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventAgentLifecycle))) return -1; if (!(virDomainEventMigrationIterationClass =3D - virClassNew(virDomainEventClass, - "virDomainEventMigrationIteration", - sizeof(virDomainEventMigrationIteration), - virDomainEventMigrationIterationDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventMigrationIteration))) return -1; if (!(virDomainEventJobCompletedClass =3D - virClassNew(virDomainEventClass, - "virDomainEventJobCompleted", - sizeof(virDomainEventJobCompleted), - virDomainEventJobCompletedDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventJobCompleted))) return -1; if (!(virDomainEventDeviceRemovalFailedClass =3D - virClassNew(virDomainEventClass, - "virDomainEventDeviceRemovalFailed", - sizeof(virDomainEventDeviceRemovalFailed), - virDomainEventDeviceRemovalFailedDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventDeviceRemovalFailed))) return -1; if (!(virDomainEventMetadataChangeClass =3D - virClassNew(virDomainEventClass, - "virDomainEventMetadataChange", - sizeof(virDomainEventMetadataChange), - virDomainEventMetadataChangeDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventMetadataChange))) return -1; if (!(virDomainEventBlockThresholdClass =3D - virClassNew(virDomainEventClass, - "virDomainEventBlockThreshold", - sizeof(virDomainEventBlockThreshold), - virDomainEventBlockThresholdDispose))) + VIR_CLASS_NEW(virDomainEventClass, + virDomainEventBlockThreshold))) return -1; return 0; } diff --git a/src/conf/network_event.c b/src/conf/network_event.c index e0d1a3d5ca..2a94aceb6e 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -58,16 +58,12 @@ static int virNetworkEventsOnceInit(void) { if (!(virNetworkEventClass =3D - virClassNew(virClassForObjectEvent(), - "virNetworkEvent", - sizeof(virNetworkEvent), - virNetworkEventDispose))) + VIR_CLASS_NEW(virClassForObjectEvent(), + virNetworkEvent))) return -1; if (!(virNetworkEventLifecycleClass =3D - virClassNew(virNetworkEventClass, - "virNetworkEventLifecycle", - sizeof(virNetworkEventLifecycle), - virNetworkEventLifecycleDispose))) + VIR_CLASS_NEW(virNetworkEventClass, + virNetworkEventLifecycle))) return -1; return 0; } diff --git a/src/conf/node_device_event.c b/src/conf/node_device_event.c index 312ef512d1..0fbb4da49d 100644 --- a/src/conf/node_device_event.c +++ b/src/conf/node_device_event.c @@ -67,22 +67,16 @@ static int virNodeDeviceEventsOnceInit(void) { if (!(virNodeDeviceEventClass =3D - virClassNew(virClassForObjectEvent(), - "virNodeDeviceEvent", - sizeof(virNodeDeviceEvent), - virNodeDeviceEventDispose))) + VIR_CLASS_NEW(virClassForObjectEvent(), + virNodeDeviceEvent))) return -1; if (!(virNodeDeviceEventLifecycleClass =3D - virClassNew(virNodeDeviceEventClass, - "virNodeDeviceEventLifecycle", - sizeof(virNodeDeviceEventLifecycle), - virNodeDeviceEventLifecycleDispose))) + VIR_CLASS_NEW(virNodeDeviceEventClass, + virNodeDeviceEventLifecycle))) return -1; if (!(virNodeDeviceEventUpdateClass =3D - virClassNew(virNodeDeviceEventClass, - "virNodeDeviceEventUpdate", - sizeof(virNodeDeviceEventUpdate), - virNodeDeviceEventUpdateDispose))) + VIR_CLASS_NEW(virNodeDeviceEventClass, + virNodeDeviceEventUpdate))) return -1; return 0; } diff --git a/src/conf/object_event.c b/src/conf/object_event.c index e8116b880c..5a3dccc70b 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -93,17 +93,13 @@ static int virObjectEventOnceInit(void) { if (!(virObjectEventStateClass =3D - virClassNew(virClassForObjectLockable(), - "virObjectEventState", - sizeof(virObjectEventState), - virObjectEventStateDispose))) + VIR_CLASS_NEW(virClassForObjectLockable(), + virObjectEventState))) return -1; =20 if (!(virObjectEventClass =3D - virClassNew(virClassForObject(), - "virObjectEvent", - sizeof(virObjectEvent), - virObjectEventDispose))) + VIR_CLASS_NEW(virClassForObject(), + virObjectEvent))) return -1; =20 return 0; diff --git a/src/conf/secret_event.c b/src/conf/secret_event.c index c130909282..4b9898a9d1 100644 --- a/src/conf/secret_event.c +++ b/src/conf/secret_event.c @@ -66,22 +66,16 @@ static int virSecretEventsOnceInit(void) { if (!(virSecretEventClass =3D - virClassNew(virClassForObjectEvent(), - "virSecretEvent", - sizeof(virSecretEvent), - virSecretEventDispose))) + VIR_CLASS_NEW(virClassForObjectEvent(), + virSecretEvent))) return -1; if (!(virSecretEventLifecycleClass =3D - virClassNew(virSecretEventClass, - "virSecretEventLifecycle", - sizeof(virSecretEventLifecycle), - virSecretEventLifecycleDispose))) + VIR_CLASS_NEW(virSecretEventClass, + virSecretEventLifecycle))) return -1; if (!(virSecretEventValueChangedClass =3D - virClassNew(virSecretEventClass, - "virSecretEventValueChanged", - sizeof(virSecretEventValueChanged), - virSecretEventValueChangedDispose))) + VIR_CLASS_NEW(virSecretEventClass, + virSecretEventValueChanged))) return -1; return 0; } diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c index f9b796878a..83aa165787 100644 --- a/src/conf/storage_event.c +++ b/src/conf/storage_event.c @@ -67,22 +67,16 @@ static int virStoragePoolEventsOnceInit(void) { if (!(virStoragePoolEventClass =3D - virClassNew(virClassForObjectEvent(), - "virStoragePoolEvent", - sizeof(virStoragePoolEvent), - virStoragePoolEventDispose))) + VIR_CLASS_NEW(virClassForObjectEvent(), + virStoragePoolEvent))) return -1; if (!(virStoragePoolEventLifecycleClass =3D - virClassNew(virStoragePoolEventClass, - "virStoragePoolEventLifecycle", - sizeof(virStoragePoolEventLifecycle), - virStoragePoolEventLifecycleDispose))) + VIR_CLASS_NEW(virStoragePoolEventClass, + virStoragePoolEventLifecycle))) return -1; if (!(virStoragePoolEventRefreshClass =3D - virClassNew(virStoragePoolEventClass, - "virStoragePoolEventRefresh", - sizeof(virStoragePoolEventRefresh), - virStoragePoolEventRefreshDispose))) + VIR_CLASS_NEW(virStoragePoolEventClass, + virStoragePoolEventRefresh))) return -1; return 0; } diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 7022abe094..5df4921187 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -56,10 +56,8 @@ struct _virDomainObjList { =20 static int virDomainObjListOnceInit(void) { - if (!(virDomainObjListClass =3D virClassNew(virClassForObjectRWLockabl= e(), - "virDomainObjList", - sizeof(virDomainObjList), - virDomainObjListDispose))) + if (!(virDomainObjListClass =3D VIR_CLASS_NEW(virClassForObjectRWLocka= ble(), + virDomainObjList))) return -1; =20 return 0; diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index f90c0bd9c4..8c572fbb23 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -58,16 +58,12 @@ static void virInterfaceObjListDispose(void *obj); static int virInterfaceObjOnceInit(void) { - if (!(virInterfaceObjClass =3D virClassNew(virClassForObjectLockable(), - "virInterfaceObj", - sizeof(virInterfaceObj), - virInterfaceObjDispose))) + if (!(virInterfaceObjClass =3D VIR_CLASS_NEW(virClassForObjectLockable= (), + virInterfaceObj))) return -1; =20 - if (!(virInterfaceObjListClass =3D virClassNew(virClassForObjectRWLock= able(), - "virInterfaceObjList", - sizeof(virInterfaceObjLis= t), - virInterfaceObjListDispos= e))) + if (!(virInterfaceObjListClass =3D VIR_CLASS_NEW(virClassForObjectRWLo= ckable(), + virInterfaceObjList))) return -1; =20 return 0; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 8cd1b62c1c..38522445e1 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -74,16 +74,12 @@ static void virNetworkObjListDispose(void *obj); static int virNetworkObjOnceInit(void) { - if (!(virNetworkObjClass =3D virClassNew(virClassForObjectLockable(), - "virNetworkObj", - sizeof(virNetworkObj), - virNetworkObjDispose))) + if (!(virNetworkObjClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virNetworkObj))) return -1; =20 - if (!(virNetworkObjListClass =3D virClassNew(virClassForObjectRWLockab= le(), - "virNetworkObjList", - sizeof(virNetworkObjList), - virNetworkObjListDispose))) + if (!(virNetworkObjListClass =3D VIR_CLASS_NEW(virClassForObjectRWLock= able(), + virNetworkObjList))) return -1; return 0; } diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 9d2996046f..09402d82f1 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -58,16 +58,12 @@ static bool virNodeDeviceObjHasCap(const virNodeDeviceO= bj *obj, int type); static int virNodeDeviceObjOnceInit(void) { - if (!(virNodeDeviceObjClass =3D virClassNew(virClassForObjectLockable(= ), - "virNodeDeviceObj", - sizeof(virNodeDeviceObj), - virNodeDeviceObjDispose))) + if (!(virNodeDeviceObjClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virNodeDeviceObj))) return -1; =20 - if (!(virNodeDeviceObjListClass =3D virClassNew(virClassForObjectRWLoc= kable(), - "virNodeDeviceObjList", - sizeof(virNodeDeviceObjL= ist), - virNodeDeviceObjListDisp= ose))) + if (!(virNodeDeviceObjListClass =3D VIR_CLASS_NEW(virClassForObjectRWL= ockable(), + virNodeDeviceObjList))) return -1; =20 return 0; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 47e0b28968..fee31ff366 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -68,16 +68,12 @@ struct virSecretSearchData { static int virSecretObjOnceInit(void) { - if (!(virSecretObjClass =3D virClassNew(virClassForObjectLockable(), - "virSecretObj", - sizeof(virSecretObj), - virSecretObjDispose))) + if (!(virSecretObjClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virSecretObj))) return -1; =20 - if (!(virSecretObjListClass =3D virClassNew(virClassForObjectRWLockabl= e(), - "virSecretObjList", - sizeof(virSecretObjList), - virSecretObjListDispose))) + if (!(virSecretObjListClass =3D VIR_CLASS_NEW(virClassForObjectRWLocka= ble(), + virSecretObjList))) return -1; =20 return 0; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 799b8c9fa3..7ed187e30f 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -110,16 +110,12 @@ struct _virStoragePoolObjList { static int virStorageVolObjOnceInit(void) { - if (!(virStorageVolObjClass =3D virClassNew(virClassForObjectLockable(= ), - "virStorageVolObj", - sizeof(virStorageVolObj), - virStorageVolObjDispose))) + if (!(virStorageVolObjClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virStorageVolObj))) return -1; =20 - if (!(virStorageVolObjListClass =3D virClassNew(virClassForObjectRWLoc= kable(), - "virStorageVolObjList", - sizeof(virStorageVolObjL= ist), - virStorageVolObjListDisp= ose))) + if (!(virStorageVolObjListClass =3D VIR_CLASS_NEW(virClassForObjectRWL= ockable(), + virStorageVolObjList))) return -1; =20 return 0; @@ -207,16 +203,12 @@ virStorageVolObjListDispose(void *opaque) static int virStoragePoolObjOnceInit(void) { - if (!(virStoragePoolObjClass =3D virClassNew(virClassForObjectLockable= (), - "virStoragePoolObj", - sizeof(virStoragePoolObj), - virStoragePoolObjDispose))) + if (!(virStoragePoolObjClass =3D VIR_CLASS_NEW(virClassForObjectLockab= le(), + virStoragePoolObj))) return -1; =20 - if (!(virStoragePoolObjListClass =3D virClassNew(virClassForObjectRWLo= ckable(), - "virStoragePoolObjList", - sizeof(virStoragePoolOb= jList), - virStoragePoolObjListDi= spose))) + if (!(virStoragePoolObjListClass =3D VIR_CLASS_NEW(virClassForObjectRW= Lockable(), + virStoragePoolObjList= ))) return -1; =20 return 0; diff --git a/src/datatypes.c b/src/datatypes.c index 0c3c66a9ce..3016e45076 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -74,10 +74,8 @@ static int virDataTypesOnceInit(void) { #define DECLARE_CLASS_COMMON(basename, parent) \ - if (!(basename ## Class =3D virClassNew(parent, \ - #basename, \ - sizeof(basename), \ - basename ## Dispose))) \ + if (!(basename ## Class =3D VIR_CLASS_NEW(parent, \ + basename))) \ return -1; #define DECLARE_CLASS(basename) \ DECLARE_CLASS_COMMON(basename, virClassForObject()) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index cc2402febb..8acccf8940 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -55,10 +55,8 @@ static void virNetcfDriverStateDispose(void *obj); static int virNetcfDriverStateOnceInit(void) { - if (!(virNetcfDriverStateClass =3D virClassNew(virClassForObjectLockab= le(), - "virNetcfDriverState", - sizeof(virNetcfDriverState), - virNetcfDriverStateDispose))) + if (!(virNetcfDriverStateClass =3D VIR_CLASS_NEW(virClassForObjectLock= able(), + virNetcfDriverStat))) return -1; return 0; } diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 7f695311b4..cb2ec9d633 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -67,10 +67,8 @@ virAdmGlobalInit(void) if (!bindtextdomain(PACKAGE, LOCALEDIR)) goto error; =20 - if (!(remoteAdminPrivClass =3D virClassNew(virClassForObjectLockable(), - "remoteAdminPriv", - sizeof(remoteAdminPriv), - remoteAdminPrivDispose))) + if (!(remoteAdminPrivClass =3D VIR_CLASS_NEW(virClassForObjectLockable= (), + remoteAdminPriv))) goto error; =20 return; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index df1cece82f..b398cbee67 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -62,10 +62,8 @@ static void libxlDriverConfigDispose(void *obj); =20 static int libxlConfigOnceInit(void) { - if (!(libxlDriverConfigClass =3D virClassNew(virClassForObject(), - "libxlDriverConfig", - sizeof(libxlDriverConfig), - libxlDriverConfigDispose))) + if (!(libxlDriverConfigClass =3D VIR_CLASS_NEW(virClassForObject(), + libxlDriverConfig))) return -1; =20 return 0; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index ef9a902671..0882a9fc98 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -58,10 +58,8 @@ libxlDomainObjPrivateDispose(void *obj); static int libxlDomainObjPrivateOnceInit(void) { - if (!(libxlDomainObjPrivateClass =3D virClassNew(virClassForObjectLock= able(), - "libxlDomainObjPrivate", - sizeof(libxlDomainObjPr= ivate), - libxlDomainObjPrivateDi= spose))) + if (!(libxlDomainObjPrivateClass =3D VIR_CLASS_NEW(virClassForObjectLo= ckable(), + libxlDomainObjPrivate= ))) return -1; =20 return 0; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 5c0fd4b052..93e72bf815 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -244,10 +244,8 @@ libxlMigrationDstArgsDispose(void *obj) static int libxlMigrationDstArgsOnceInit(void) { - if (!(libxlMigrationDstArgsClass =3D virClassNew(virClassForObject(), - "libxlMigrationDstArgs", - sizeof(libxlMigrationDs= tArgs), - libxlMigrationDstArgsDi= spose))) + if (!(libxlMigrationDstArgsClass =3D VIR_CLASS_NEW(virClassForObject(), + libxlMigrationDstArgs= ))) return -1; =20 return 0; diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index cd0ba6ec24..7d275d4a80 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -76,10 +76,8 @@ static void virLogHandlerDispose(void *obj); static int virLogHandlerOnceInit(void) { - if (!(virLogHandlerClass =3D virClassNew(virClassForObjectLockable(), - "virLogHandler", - sizeof(virLogHandler), - virLogHandlerDispose))) + if (!(virLogHandlerClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virLogHandler))) return -1; =20 return 0; diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 92a82a4768..f623685be8 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -48,10 +48,8 @@ static void virLXCDriverConfigDispose(void *obj); =20 static int virLXCConfigOnceInit(void) { - if (!(virLXCDriverConfigClass =3D virClassNew(virClassForObject(), - "virLXCDriverConfig", - sizeof(virLXCDriverConfig= ), - virLXCDriverConfigDispose= ))) + if (!(virLXCDriverConfigClass =3D VIR_CLASS_NEW(virClassForObject(), + virLXCDriverConfig))) return -1; =20 return 0; diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 9cab6c2035..0c6daf5882 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -51,10 +51,8 @@ static void virLXCMonitorDispose(void *obj); =20 static int virLXCMonitorOnceInit(void) { - if (!(virLXCMonitorClass =3D virClassNew(virClassForObjectLockable(), - "virLXCMonitor", - sizeof(virLXCMonitor), - virLXCMonitorDispose))) + if (!(virLXCMonitorClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virLXCMonitor))) return -1; =20 return 0; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index de01816402..e87b5886b8 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -93,10 +93,8 @@ udevEventDataDispose(void *obj) static int udevEventDataOnceInit(void) { - if (!(udevEventDataClass =3D virClassNew(virClassForObjectLockable(), - "udevEventData", - sizeof(udevEventData), - udevEventDataDispose))) + if (!(udevEventDataClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + udevEventData))) return -1; =20 return 0; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 85af53d194..3e03997f07 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -138,10 +138,8 @@ static void qemuAgentDispose(void *obj); =20 static int qemuAgentOnceInit(void) { - if (!(qemuAgentClass =3D virClassNew(virClassForObjectLockable(), - "qemuAgent", - sizeof(qemuAgent), - qemuAgentDispose))) + if (!(qemuAgentClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + qemuAgent))) return -1; =20 return 0; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b5347b6cad..656dac18bf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -548,10 +548,8 @@ static void virQEMUCapsDispose(void *obj); =20 static int virQEMUCapsOnceInit(void) { - if (!(virQEMUCapsClass =3D virClassNew(virClassForObject(), - "virQEMUCaps", - sizeof(virQEMUCaps), - virQEMUCapsDispose))) + if (!(virQEMUCapsClass =3D VIR_CLASS_NEW(virClassForObject(), + virQEMUCaps))) return -1; =20 return 0; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36cf3a281c..5e05fedb9e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -80,10 +80,8 @@ static void virQEMUDriverConfigDispose(void *obj); =20 static int virQEMUConfigOnceInit(void) { - virQEMUDriverConfigClass =3D virClassNew(virClassForObject(), - "virQEMUDriverConfig", - sizeof(virQEMUDriverConfig), - virQEMUDriverConfigDispose); + virQEMUDriverConfigClass =3D VIR_CLASS_NEW(virClassForObject(), + virQEMUDriverConfig); =20 if (!virQEMUDriverConfigClass) return -1; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7000de6a91..133506dd18 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -130,16 +130,12 @@ static void qemuDomainSaveCookieDispose(void *obj); static int qemuDomainOnceInit(void) { - if (!(qemuDomainLogContextClass =3D virClassNew(virClassForObject(), - "qemuDomainLogContext", - sizeof(qemuDomainLogConte= xt), - qemuDomainLogContextDispo= se))) + if (!(qemuDomainLogContextClass =3D VIR_CLASS_NEW(virClassForObject(), + qemuDomainLogContext))) return -1; =20 - if (!(qemuDomainSaveCookieClass =3D virClassNew(virClassForObject(), - "qemuDomainSaveCookie", - sizeof(qemuDomainSaveCoo= kie), - qemuDomainSaveCookieDisp= ose))) + if (!(qemuDomainSaveCookieClass =3D VIR_CLASS_NEW(virClassForObject(), + qemuDomainSaveCookie))) return -1; =20 return 0; @@ -988,10 +984,8 @@ static void qemuDomainDiskPrivateDispose(void *obj); static int qemuDomainDiskPrivateOnceInit(void) { - qemuDomainDiskPrivateClass =3D virClassNew(virClassForObject(), - "qemuDomainDiskPrivate", - sizeof(qemuDomainDiskPrivate), - qemuDomainDiskPrivateDispose); + qemuDomainDiskPrivateClass =3D VIR_CLASS_NEW(virClassForObject(), + qemuDomainDiskPrivate); if (!qemuDomainDiskPrivateClass) return -1; else @@ -1028,10 +1022,8 @@ static void qemuDomainStorageSourcePrivateDispose(vo= id *obj); static int qemuDomainStorageSourcePrivateOnceInit(void) { - qemuDomainStorageSourcePrivateClass =3D virClassNew(virClassForObject(= ), - "qemuDomainStorageSo= urcePrivate", - sizeof(qemuDomainSto= rageSourcePrivate), - qemuDomainStorageSou= rcePrivateDispose); + qemuDomainStorageSourcePrivateClass =3D VIR_CLASS_NEW(virClassForObjec= t(), + qemuDomainStorageS= ourcePrivate); if (!qemuDomainStorageSourcePrivateClass) return -1; else @@ -1071,10 +1063,8 @@ static void qemuDomainVcpuPrivateDispose(void *obj); static int qemuDomainVcpuPrivateOnceInit(void) { - qemuDomainVcpuPrivateClass =3D virClassNew(virClassForObject(), - "qemuDomainVcpuPrivate", - sizeof(qemuDomainVcpuPrivate), - qemuDomainVcpuPrivateDispose); + qemuDomainVcpuPrivateClass =3D VIR_CLASS_NEW(virClassForObject(), + qemuDomainVcpuPrivate); if (!qemuDomainVcpuPrivateClass) return -1; else @@ -1116,10 +1106,8 @@ static int qemuDomainChrSourcePrivateOnceInit(void) { qemuDomainChrSourcePrivateClass =3D - virClassNew(virClassForObject(), - "qemuDomainChrSourcePrivate", - sizeof(qemuDomainChrSourcePrivate), - qemuDomainChrSourcePrivateDispose); + VIR_CLASS_NEW(virClassForObject(), + qemuDomainChrSourcePrivate); if (!qemuDomainChrSourcePrivateClass) return -1; else diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7b647525b3..a8b2ba91b5 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -165,10 +165,8 @@ static void qemuMonitorDispose(void *obj); =20 static int qemuMonitorOnceInit(void) { - if (!(qemuMonitorClass =3D virClassNew(virClassForObjectLockable(), - "qemuMonitor", - sizeof(qemuMonitor), - qemuMonitorDispose))) + if (!(qemuMonitorClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + qemuMonitor))) return -1; =20 return 0; diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 4f666fd09b..aa49e6c7f4 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -58,10 +58,8 @@ static void virKeepAliveDispose(void *obj); =20 static int virKeepAliveOnceInit(void) { - if (!(virKeepAliveClass =3D virClassNew(virClassForObjectLockable(), - "virKeepAlive", - sizeof(virKeepAlive), - virKeepAliveDispose))) + if (!(virKeepAliveClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virKeepAlive))) return -1; =20 return 0; diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 0c8d58c32c..5fa304b24f 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -120,10 +120,8 @@ static void virNetClientDispose(void *obj); =20 static int virNetClientOnceInit(void) { - if (!(virNetClientClass =3D virClassNew(virClassForObjectLockable(), - "virNetClient", - sizeof(virNetClient), - virNetClientDispose))) + if (!(virNetClientClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virNetClient))) return -1; =20 return 0; diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index d1e54a0892..04f5dea7ad 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -54,10 +54,8 @@ static void virNetClientProgramDispose(void *obj); =20 static int virNetClientProgramOnceInit(void) { - if (!(virNetClientProgramClass =3D virClassNew(virClassForObject(), - "virNetClientProgram", - sizeof(virNetClientProgra= m), - virNetClientProgramDispos= e))) + if (!(virNetClientProgramClass =3D VIR_CLASS_NEW(virClassForObject(), + virNetClientProgram))) return -1; =20 return 0; diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 2f037db0dc..963634b5af 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -71,10 +71,8 @@ static void virNetClientStreamDispose(void *obj); =20 static int virNetClientStreamOnceInit(void) { - if (!(virNetClientStreamClass =3D virClassNew(virClassForObjectLockabl= e(), - "virNetClientStream", - sizeof(virNetClientStream), - virNetClientStreamDispose)= )) + if (!(virNetClientStreamClass =3D VIR_CLASS_NEW(virClassForObjectLocka= ble(), + virNetClientStream))) return -1; =20 return 0; diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 6f00bfd9d1..8658878b0a 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -110,10 +110,8 @@ virNetDaemonDispose(void *obj) static int virNetDaemonOnceInit(void) { - if (!(virNetDaemonClass =3D virClassNew(virClassForObjectLockable(), - "virNetDaemon", - sizeof(virNetDaemon), - virNetDaemonDispose))) + if (!(virNetDaemonClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virNetDaemon))) return -1; =20 return 0; diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 25f93cec97..5875c258df 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -161,10 +161,8 @@ virNetLibsshSessionOnceInit(void) { const char *dbgLevelStr; =20 - if (!(virNetLibsshSessionClass =3D virClassNew(virClassForObjectLockab= le(), - "virNetLibsshSession", - sizeof(virNetLibsshSessio= n), - virNetLibsshSessionDispos= e))) + if (!(virNetLibsshSessionClass =3D VIR_CLASS_NEW(virClassForObjectLock= able(), + virNetLibsshSession))) return -1; =20 if (ssh_init() < 0) { diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index f1f8bdc855..56fa57ff7e 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -57,16 +57,12 @@ static void virNetSASLSessionDispose(void *obj); =20 static int virNetSASLContextOnceInit(void) { - if (!(virNetSASLContextClass =3D virClassNew(virClassForObjectLockable= (), - "virNetSASLContext", - sizeof(virNetSASLContext), - virNetSASLContextDispose))) + if (!(virNetSASLContextClass =3D VIR_CLASS_NEW(virClassForObjectLockab= le(), + virNetSASLContext))) return -1; =20 - if (!(virNetSASLSessionClass =3D virClassNew(virClassForObjectLockable= (), - "virNetSASLSession", - sizeof(virNetSASLSession), - virNetSASLSessionDispose))) + if (!(virNetSASLSessionClass =3D VIR_CLASS_NEW(virClassForObjectLockab= le(), + virNetSASLSession))) return -1; =20 return 0; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 3ce21a8f53..de0692f3cf 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -93,10 +93,8 @@ static inline size_t virNetServerTrackCompletedAuthLocke= d(virNetServerPtr srv); =20 static int virNetServerOnceInit(void) { - if (!(virNetServerClass =3D virClassNew(virClassForObjectLockable(), - "virNetServer", - sizeof(virNetServer), - virNetServerDispose))) + if (!(virNetServerClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virNetServer))) return -1; =20 return 0; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index d5f0cf448f..2ef590641c 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -129,10 +129,8 @@ static void virNetServerClientDispose(void *obj); =20 static int virNetServerClientOnceInit(void) { - if (!(virNetServerClientClass =3D virClassNew(virClassForObjectLockabl= e(), - "virNetServerClient", - sizeof(virNetServerClient), - virNetServerClientDispose)= )) + if (!(virNetServerClientClass =3D VIR_CLASS_NEW(virClassForObjectLocka= ble(), + virNetServerClient))) return -1; =20 return 0; diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index f28274fc22..75cd01b299 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -51,10 +51,8 @@ static void virNetServerProgramDispose(void *obj); =20 static int virNetServerProgramOnceInit(void) { - if (!(virNetServerProgramClass =3D virClassNew(virClassForObject(), - "virNetServerProgram", - sizeof(virNetServerProgra= m), - virNetServerProgramDispos= e))) + if (!(virNetServerProgramClass =3D VIR_CLASS_NEW(virClassForObject(), + virNetServerProgram))) return -1; =20 return 0; diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index d2350b2b91..11a1d164fd 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -57,10 +57,8 @@ static void virNetServerServiceDispose(void *obj); =20 static int virNetServerServiceOnceInit(void) { - if (!(virNetServerServiceClass =3D virClassNew(virClassForObject(), - "virNetServerService", - sizeof(virNetServerServic= e), - virNetServerServiceDispos= e))) + if (!(virNetServerServiceClass =3D VIR_CLASS_NEW(virClassForObject(), + virNetServerService))) return -1; =20 return 0; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index f362a09555..f605db3930 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -124,10 +124,8 @@ static void virNetSocketDispose(void *obj); =20 static int virNetSocketOnceInit(void) { - if (!(virNetSocketClass =3D virClassNew(virClassForObjectLockable(), - "virNetSocket", - sizeof(virNetSocket), - virNetSocketDispose))) + if (!(virNetSocketClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virNetSocket))) return -1; =20 return 0; diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index e742175654..a5f905b88d 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -167,10 +167,8 @@ static virClassPtr virNetSSHSessionClass; static int virNetSSHSessionOnceInit(void) { - if (!(virNetSSHSessionClass =3D virClassNew(virClassForObjectLockable(= ), - "virNetSSHSession", - sizeof(virNetSSHSession), - virNetSSHSessionDispose))) + if (!(virNetSSHSessionClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virNetSSHSession))) return -1; =20 return 0; diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 5699eb8f24..a419c5f831 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -90,16 +90,12 @@ static void virNetTLSSessionDispose(void *obj); =20 static int virNetTLSContextOnceInit(void) { - if (!(virNetTLSContextClass =3D virClassNew(virClassForObjectLockable(= ), - "virNetTLSContext", - sizeof(virNetTLSContext), - virNetTLSContextDispose))) + if (!(virNetTLSContextClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virNetTLSContext))) return -1; =20 - if (!(virNetTLSSessionClass =3D virClassNew(virClassForObjectLockable(= ), - "virNetTLSSession", - sizeof(virNetTLSSession), - virNetTLSSessionDispose))) + if (!(virNetTLSSessionClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virNetTLSSession))) return -1; =20 return 0; diff --git a/src/security/security_manager.c b/src/security/security_manage= r.c index fdeea4d533..422de15060 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -59,10 +59,8 @@ void virSecurityManagerDispose(void *obj) static int virSecurityManagerOnceInit(void) { - if (!(virSecurityManagerClass =3D virClassNew(virClassForObjectLockabl= e(), - "virSecurityManagerClass", - sizeof(virSecurityManager), - virSecurityManagerDispose)= )) + if (!(virSecurityManagerClass =3D VIR_CLASS_NEW(virClassForObjectLocka= ble(), + virSecurityManager))) return -1; =20 return 0; diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 49dac65892..11d8fd8cbd 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -53,10 +53,8 @@ static void virCloseCallbacksDispose(void *obj); =20 static int virCloseCallbacksOnceInit(void) { - virCloseCallbacksClass =3D virClassNew(virClassForObjectLockable(), - "virCloseCallbacks", - sizeof(virCloseCallbacks), - virCloseCallbacksDispose); + virCloseCallbacksClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virCloseCallbacks); =20 if (!virCloseCallbacksClass) return -1; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index db5c51b6a2..3af3785a23 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -641,12 +641,9 @@ dnsmasqCapsDispose(void *obj) =20 static int dnsmasqCapsOnceInit(void) { - if (!(dnsmasqCapsClass =3D virClassNew(virClassForObject(), - "dnsmasqCaps", - sizeof(dnsmasqCaps), - dnsmasqCapsDispose))) { + if (!(dnsmasqCapsClass =3D VIR_CLASS_NEW(virClassForObject(), + dnsmasqCaps))) return -1; - } =20 return 0; } diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index e2d3f365cd..e7d2e4a954 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -129,10 +129,8 @@ virFDStreamDataDispose(void *obj) =20 static int virFDStreamDataOnceInit(void) { - if (!(virFDStreamDataClass =3D virClassNew(virClassForObjectLockable(), - "virFDStreamData", - sizeof(virFDStreamData), - virFDStreamDataDispose))) + if (!(virFDStreamDataClass =3D VIR_CLASS_NEW(virClassForObjectLockable= (), + virFDStreamData))) return -1; =20 return 0; diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c index e24eb5a68c..a1ff518386 100644 --- a/src/util/virfilecache.c +++ b/src/util/virfilecache.c @@ -86,10 +86,8 @@ virFileCacheDispose(void *obj) static int virFileCacheOnceInit(void) { - if (!(virFileCacheClass =3D virClassNew(virClassForObjectLockable(), - "virFileCache", - sizeof(virFileCache), - virFileCacheDispose))) + if (!(virFileCacheClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virFileCache))) return -1; =20 return 0; diff --git a/src/util/virhash.c b/src/util/virhash.c index 475c2b0281..bd00b7f359 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -77,10 +77,8 @@ static void virHashAtomicDispose(void *obj); =20 static int virHashAtomicOnceInit(void) { - virHashAtomicClass =3D virClassNew(virClassForObjectLockable(), - "virHashAtomic", - sizeof(virHashAtomic), - virHashAtomicDispose); + virHashAtomicClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virHashAtomic); if (!virHashAtomicClass) return -1; else diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index a12224c58f..b8a5d4d5d3 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -120,10 +120,8 @@ static int virHostdevIsPCINodeDeviceUsed(virPCIDeviceA= ddressPtr devAddr, void *o =20 static int virHostdevManagerOnceInit(void) { - if (!(virHostdevManagerClass =3D virClassNew(virClassForObject(), - "virHostdevManager", - sizeof(virHostdevManager), - virHostdevManagerDispose))) + if (!(virHostdevManagerClass =3D VIR_CLASS_NEW(virClassForObject(), + virHostdevManager))) return -1; =20 if (!(manager =3D virHostdevManagerNew())) diff --git a/src/util/viridentity.c b/src/util/viridentity.c index 52a0a30a45..b9ffeecefa 100644 --- a/src/util/viridentity.c +++ b/src/util/viridentity.c @@ -54,10 +54,8 @@ static void virIdentityDispose(void *obj); =20 static int virIdentityOnceInit(void) { - if (!(virIdentityClass =3D virClassNew(virClassForObject(), - "virIdentity", - sizeof(virIdentity), - virIdentityDispose))) + if (!(virIdentityClass =3D VIR_CLASS_NEW(virClassForObject(), + virIdentity))) return -1; =20 if (virThreadLocalInit(&virIdentityCurrent, diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index d3be3066cc..3e376c0c73 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -74,10 +74,8 @@ virMacMapDispose(void *obj) =20 static int virMacMapOnceInit(void) { - if (!(virMacMapClass =3D virClassNew(virClassForObjectLockable(), - "virMacMapClass", - sizeof(virMacMap), - virMacMapDispose))) + if (!(virMacMapClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + virMacMap))) return -1; =20 return 0; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 27541cf34f..a74a7d5554 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -58,10 +58,8 @@ virMediatedDeviceListDispose(void *obj); static int virMediatedOnceInit(void) { - if (!(virMediatedDeviceListClass =3D virClassNew(virClassForObjectLock= able(), - "virMediatedDeviceList", - sizeof(virMediatedDevic= eList), - virMediatedDeviceListDi= spose))) + if (!(virMediatedDeviceListClass =3D VIR_CLASS_NEW(virClassForObjectLo= ckable(), + virMediatedDeviceList= ))) return -1; =20 return 0; diff --git a/src/util/virobject.c b/src/util/virobject.c index 1723df6b2f..c5a98d21cc 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -81,16 +81,12 @@ virObjectOnceInit(void) NULL))) return -1; =20 - if (!(virObjectLockableClass =3D virClassNew(virObjectClass, - "virObjectLockable", - sizeof(virObjectLockable), - virObjectLockableDispose))) + if (!(virObjectLockableClass =3D VIR_CLASS_NEW(virObjectClass, + virObjectLockable))) return -1; =20 - if (!(virObjectRWLockableClass =3D virClassNew(virObjectClass, - "virObjectRWLockable", - sizeof(virObjectRWLockabl= e), - virObjectRWLockableDispos= e))) + if (!(virObjectRWLockableClass =3D VIR_CLASS_NEW(virObjectClass, + virObjectRWLockable))) return -1; =20 return 0; diff --git a/src/util/virobject.h b/src/util/virobject.h index ac6cf22f9e..92dd512399 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -74,6 +74,10 @@ virClassPtr virClassForObjectRWLockable(void); # ifndef VIR_PARENT_REQUIRED # define VIR_PARENT_REQUIRED ATTRIBUTE_NONNULL(1) # endif + +# define VIR_CLASS_NEW(prnt, name) \ + virClassNew(prnt, #name, sizeof(name), name##Dispose) + virClassPtr virClassNew(virClassPtr parent, const char *name, diff --git a/src/util/virpci.c b/src/util/virpci.c index 55e4c3e492..ba8449116a 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -204,10 +204,8 @@ static void virPCIDeviceListDispose(void *obj); =20 static int virPCIOnceInit(void) { - if (!(virPCIDeviceListClass =3D virClassNew(virClassForObjectLockable(= ), - "virPCIDeviceList", - sizeof(virPCIDeviceList), - virPCIDeviceListDispose))) + if (!(virPCIDeviceListClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virPCIDeviceList))) return -1; =20 return 0; diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 25200fbbb2..63c0be0b6e 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -80,10 +80,8 @@ virPortAllocatorNew(void) static int virPortAllocatorOnceInit(void) { - if (!(virPortAllocatorClass =3D virClassNew(virClassForObjectLockable(= ), - "virPortAllocator", - sizeof(virPortAllocator), - virPortAllocatorDispose))) + if (!(virPortAllocatorClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virPortAllocator))) return -1; =20 if (!(virPortAllocatorInstance =3D virPortAllocatorNew())) diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 9639e00468..d78612f521 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -133,10 +133,8 @@ virResctrlInfoDispose(void *obj) static int virResctrlInfoOnceInit(void) { - if (!(virResctrlInfoClass =3D virClassNew(virClassForObject(), - "virResctrlInfo", - sizeof(virResctrlInfo), - virResctrlInfoDispose))) + if (!(virResctrlInfoClass =3D VIR_CLASS_NEW(virClassForObject(), + virResctrlInfo))) return -1; =20 return 0; @@ -271,10 +269,8 @@ virResctrlAllocDispose(void *obj) static int virResctrlAllocOnceInit(void) { - if (!(virResctrlAllocClass =3D virClassNew(virClassForObject(), - "virResctrlAlloc", - sizeof(virResctrlAlloc), - virResctrlAllocDispose))) + if (!(virResctrlAllocClass =3D VIR_CLASS_NEW(virClassForObject(), + virResctrlAlloc))) return -1; =20 return 0; diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 22f2677a3f..c1e2eb3790 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -85,10 +85,8 @@ static void virSCSIDeviceListDispose(void *obj); static int virSCSIOnceInit(void) { - if (!(virSCSIDeviceListClass =3D virClassNew(virClassForObjectLockable= (), - "virSCSIDeviceList", - sizeof(virSCSIDeviceList), - virSCSIDeviceListDispose))) + if (!(virSCSIDeviceListClass =3D VIR_CLASS_NEW(virClassForObjectLockab= le(), + virSCSIDeviceList))) return -1; =20 return 0; diff --git a/src/util/virscsivhost.c b/src/util/virscsivhost.c index 5f176e177f..c28403809d 100644 --- a/src/util/virscsivhost.c +++ b/src/util/virscsivhost.c @@ -70,10 +70,8 @@ virSCSIVHostDeviceListDispose(void *obj) static int virSCSIVHostOnceInit(void) { - if (!(virSCSIVHostDeviceListClass =3D virClassNew(virClassForObjectLoc= kable(), - "virSCSIVHostDeviceLis= t", - sizeof(virSCSIVHostDev= iceList), - virSCSIVHostDeviceList= Dispose))) + if (!(virSCSIVHostDeviceListClass =3D VIR_CLASS_NEW(virClassForObjectL= ockable(), + virSCSIVHostDeviceLi= st))) return -1; =20 return 0; diff --git a/src/util/virusb.c b/src/util/virusb.c index be7be5dc18..67a679afda 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -80,10 +80,8 @@ static void virUSBDeviceListDispose(void *obj); =20 static int virUSBOnceInit(void) { - if (!(virUSBDeviceListClass =3D virClassNew(virClassForObjectLockable(= ), - "virUSBDeviceList", - sizeof(virUSBDeviceList), - virUSBDeviceListDispose))) + if (!(virUSBDeviceListClass =3D VIR_CLASS_NEW(virClassForObjectLockabl= e(), + virUSBDeviceList))) return -1; =20 return 0; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 920af4c010..2adfe0660d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -118,10 +118,8 @@ vboxDriverDispose(void *obj) static int vboxDriverOnceInit(void) { - if (!(vboxDriverClass =3D virClassNew(virClassForObjectLockable(), - "vboxDriver", - sizeof(vboxDriver), - vboxDriverDispose))) + if (!(vboxDriverClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + vboxDriver))) return -1; =20 return 0; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index e51d968f28..11120e6ff9 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -161,10 +161,8 @@ static void vzDriverDispose(void * obj) =20 static int vzDriverOnceInit(void) { - if (!(vzDriverClass =3D virClassNew(virClassForObjectLockable(), - "vzDriver", - sizeof(vzDriver), - vzDriverDispose))) + if (!(vzDriverClass =3D VIR_CLASS_NEW(virClassForObjectLockable(), + vzDriver))) return -1; =20 return 0; diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index d4a9d598ef..13724011b7 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -49,10 +49,8 @@ testFileCacheObjDispose(void *opaque) static int testFileCacheObjOnceInit(void) { - if (!(testFileCacheObjClass =3D virClassNew(virClassForObject(), - "testFileCacheObj", - sizeof(testFileCacheObj), - testFileCacheObjDispose))) + if (!(testFileCacheObjClass =3D VIR_CLASS_NEW(virClassForObject(), + testFileCacheObj))) return -1; =20 return 0; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523630862399163.6632581830895; Fri, 13 Apr 2018 07:47:42 -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 197F93134C6C; Fri, 13 Apr 2018 14:47:41 +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 DF3AC90C3A; Fri, 13 Apr 2018 14:47: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 A6264B3498; Fri, 13 Apr 2018 14:47:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElO8h012366 for ; Fri, 13 Apr 2018 10:47:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 385522026E0E; Fri, 13 Apr 2018 14:47:24 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id D401F2026DFD for ; Fri, 13 Apr 2018 14:47:23 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:15 +0200 Message-Id: <0b16967cd2ba4a1d5a9f1e3d1076425ce5b5587e.1523630758.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 8/9] virobject: Check if @parent is the first member in class 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.44]); Fri, 13 Apr 2018 14:47:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Our virObject code relies heavily on the fact that the first member of the class struct is type of virObject (or some derivation of if). Let's check for that. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/util/virobject.c | 31 +++++++++++++++++++++---------- src/util/virobject.h | 5 ++++- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/util/virobject.c b/src/util/virobject.c index c5a98d21cc..e184f5349e 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -77,6 +77,7 @@ virObjectOnceInit(void) { if (!(virObjectClass =3D virClassNew(NULL, "virObject", + 0, sizeof(virObject), NULL))) return -1; @@ -159,21 +160,31 @@ virClassForObjectRWLockable(void) virClassPtr virClassNew(virClassPtr parent, const char *name, + size_t off, size_t objectSize, virObjectDisposeCallback dispose) { virClassPtr klass; =20 - if (parent =3D=3D NULL && - STRNEQ(name, "virObject")) { - virReportInvalidNonNullArg(parent); - return NULL; - } else if (parent && - objectSize <=3D parent->objectSize) { - virReportInvalidArg(objectSize, - _("object size %zu of %s is smaller than paren= t class %zu"), - objectSize, name, parent->objectSize); - return NULL; + if (parent =3D=3D NULL) { + if (STRNEQ(name, "virObject")) { + virReportInvalidNonNullArg(parent); + return NULL; + } + } else { + if (objectSize <=3D parent->objectSize) { + virReportInvalidArg(objectSize, + _("object size %zu of %s is smaller than p= arent class %zu"), + objectSize, name, parent->objectSize); + return NULL; + } + + if (off) { + virReportInvalidArg(off, + _("struct %s doesn't have 'parent' as its = first member"), + name); + return NULL; + } } =20 if (VIR_ALLOC(klass) < 0) diff --git a/src/util/virobject.h b/src/util/virobject.h index 92dd512399..25db3a0c22 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -76,11 +76,14 @@ virClassPtr virClassForObjectRWLockable(void); # endif =20 # define VIR_CLASS_NEW(prnt, name) \ - virClassNew(prnt, #name, sizeof(name), name##Dispose) + virClassNew(prnt, #name, \ + offsetof(name, parent), \ + sizeof(name), name##Dispose) =20 virClassPtr virClassNew(virClassPtr parent, const char *name, + size_t off, size_t objectSize, virObjectDisposeCallback dispose) VIR_PARENT_REQUIRED ATTRIBUTE_NONNULL(2); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 20 07:04:37 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523630856381992.2992601433643; Fri, 13 Apr 2018 07:47:36 -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 BA1543135539; Fri, 13 Apr 2018 14:47:34 +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 88DC088741; Fri, 13 Apr 2018 14:47:34 +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 4BAEA180BAD5; Fri, 13 Apr 2018 14:47:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3DElOKO012376 for ; Fri, 13 Apr 2018 10:47:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id CA21F2026E0E; Fri, 13 Apr 2018 14:47:24 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71EA82026DFD for ; Fri, 13 Apr 2018 14:47:24 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Fri, 13 Apr 2018 16:47:16 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 9/9] cfg.mk: Introduce syntax-check rule to prefer VIR_CLASS_NEW 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.44]); Fri, 13 Apr 2018 14:47:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that we have macro that does some checks lets forbid raw usage of virClassNew() in favor of VIR_CLASS_NEW(). Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- cfg.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cfg.mk b/cfg.mk index 4078bc2c63..5b7a9728d2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -321,6 +321,11 @@ sc_prohibit_internal_functions: halt=3D'use VIR_ macros instead of internal functions' \ $(_sc_search_regexp) =20 +sc_prohibit_raw_virclassnew: + @prohibit=3D'virClassNew *\(' \ + halt=3D'use VIR_CLASS_NEW macro instead of virClassNew' \ + $(_sc_search_regexp) + # Avoid raw malloc and free, except in documentation comments. sc_prohibit_raw_allocation: @prohibit=3D'^.[^*].*\<((m|c|re)alloc|free) *\([^)]' \ @@ -1188,6 +1193,9 @@ exclude_file_name_regexp--sc_prohibit_gethostname =3D= ^src/util/vir(util|log)\.c$$ exclude_file_name_regexp--sc_prohibit_internal_functions =3D \ ^src/(util/(viralloc|virutil|virfile)\.[hc]|esx/esx_vi\.c)$$ =20 +exclude_file_name_regexp--sc_prohibit_raw_virclassnew =3D \ + ^src/util/virobject\.[hc]$$ + exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic =3D \ ^src/rpc/gendispatch\.pl$$ =20 --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list