From nobody Fri May 3 01:01:35 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 1534752940394410.3822272971074; Mon, 20 Aug 2018 01:15:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 42C013082129; Mon, 20 Aug 2018 08:15:38 +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 06D29308BDA0; Mon, 20 Aug 2018 08:15: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 7D06718005CF; Mon, 20 Aug 2018 08:15:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7K8FRUa027715 for ; Mon, 20 Aug 2018 04:15:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id A400410B7CB5; Mon, 20 Aug 2018 08:15:27 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-209.brq.redhat.com [10.40.204.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07D6210AF9D7 for ; Mon, 20 Aug 2018 08:15:26 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 20 Aug 2018 10:15:05 +0200 Message-Id: <20180820081506.9400-2-abologna@redhat.com> In-Reply-To: <20180820081506.9400-1-abologna@redhat.com> References: <20180820081506.9400-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [sandbox PATCH 1/2] configure: Use a single required version for GLib 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 20 Aug 2018 08:15:38 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Both GObject and GIO are part of GLib, so there's no point in requiring different versions of the two. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- configure.ac | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f32c735..d2e2636 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,7 @@ AC_CANONICAL_HOST =20 AM_SILENT_RULES([yes]) =20 -GIO_UNIX_REQUIRED=3D2.28.0 -GOBJECT_REQUIRED=3D2.32.0 +GLIB_REQUIRED=3D2.32.0 LIBVIRT_REQUIRED=3D1.0.2 LIBVIRT_GCONFIG_REQUIRED=3D0.2.1 LIBVIRT_GLIB_REQUIRED=3D0.2.2 @@ -74,8 +73,8 @@ AC_CONFIG_LIBOBJ_DIR([libvirt-sandbox]) =20 LIBVIRT_SANDBOX_COMPILE_WARNINGS =20 -PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >=3D $GIO_UNIX_REQUIRED) -PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >=3D $GOBJECT_REQUIRED) +PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >=3D $GLIB_REQUIRED) +PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >=3D $GLIB_REQUIRED) PKG_CHECK_MODULES(LIBVIRT, libvirt >=3D $LIBVIRT_REQUIRED) PKG_CHECK_MODULES(LIBVIRT_GLIB, libvirt-glib-1.0 >=3D $LIBVIRT_GOBJECT_REQ= UIRED) PKG_CHECK_MODULES(LIBVIRT_GOBJECT, libvirt-gobject-1.0 >=3D $LIBVIRT_GOBJE= CT_REQUIRED) --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 01:01:35 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 1534752946864847.1753463141354; Mon, 20 Aug 2018 01:15:46 -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 9117AC0467C5; Mon, 20 Aug 2018 08:15:44 +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 4697760C11; Mon, 20 Aug 2018 08:15:44 +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 E10A8181A12F; Mon, 20 Aug 2018 08:15:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7K8FTI5027729 for ; Mon, 20 Aug 2018 04:15:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 20DE910AF9D7; Mon, 20 Aug 2018 08:15:29 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-209.brq.redhat.com [10.40.204.209]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 12BD010B7CB5 for ; Mon, 20 Aug 2018 08:15:27 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 20 Aug 2018 10:15:06 +0200 Message-Id: <20180820081506.9400-3-abologna@redhat.com> In-Reply-To: <20180820081506.9400-1-abologna@redhat.com> References: <20180820081506.9400-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [sandbox PATCH 2/2] Remove all uses of g_type_class_add_private() 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.31]); Mon, 20 Aug 2018 08:15:45 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The API has been deprecated, which causes build failures on Fedora Rawhide; use the G_DEFINE_TYPE_WITH_PRIVATE() macro instead. This requires bumping the minimum GLib version to 2.38. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- configure.ac | 2 +- libvirt-sandbox/libvirt-sandbox-builder-container.c | 4 +--- libvirt-sandbox/libvirt-sandbox-builder-initrd.c | 4 +--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 4 +--- libvirt-sandbox/libvirt-sandbox-builder.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-disk.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-initrd.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-interactive.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount-file.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c | 5 ++--- libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c | 5 ++--- libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount-ram.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-mount.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network-address.c | 4 +--- .../libvirt-sandbox-config-network-filterref-parameter.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network-filterref.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network-route.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-network.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-service-generic.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-service-systemd.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config-service.c | 4 +--- libvirt-sandbox/libvirt-sandbox-config.c | 4 +--- libvirt-sandbox/libvirt-sandbox-console-raw.c | 4 +--- libvirt-sandbox/libvirt-sandbox-console-rpc.c | 4 +--- libvirt-sandbox/libvirt-sandbox-console.c | 4 +--- libvirt-sandbox/libvirt-sandbox-context-interactive.c | 4 +--- libvirt-sandbox/libvirt-sandbox-context-service.c | 4 +--- libvirt-sandbox/libvirt-sandbox-context.c | 4 +--- 29 files changed, 31 insertions(+), 85 deletions(-) diff --git a/configure.ac b/configure.ac index d2e2636..42b6538 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_CANONICAL_HOST =20 AM_SILENT_RULES([yes]) =20 -GLIB_REQUIRED=3D2.32.0 +GLIB_REQUIRED=3D2.38.0 LIBVIRT_REQUIRED=3D1.0.2 LIBVIRT_GCONFIG_REQUIRED=3D0.2.1 LIBVIRT_GLIB_REQUIRED=3D0.2.2 diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c b/libvirt-= sandbox/libvirt-sandbox-builder-container.c index 66e1fc6..a4b00e3 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-container.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c @@ -48,7 +48,7 @@ struct _GVirSandboxBuilderContainerPrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxBuilderContainer, gvir_sandbox_builder_container,= GVIR_SANDBOX_TYPE_BUILDER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxBuilderContainer, gvir_sandbox_build= er_container, GVIR_SANDBOX_TYPE_BUILDER); =20 =20 enum { @@ -473,8 +473,6 @@ static void gvir_sandbox_builder_container_class_init(G= VirSandboxBuilderContaine builder_class->construct_devices =3D gvir_sandbox_builder_container_co= nstruct_devices; builder_class->get_disk_prefix =3D gvir_sandbox_builder_container_get_= disk_prefix; builder_class->get_files_to_copy =3D gvir_sandbox_builder_container_ge= t_files_to_copy; - - g_type_class_add_private(klass, sizeof(GVirSandboxBuilderContainerPriv= ate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-builder-initrd.c b/libvirt-san= dbox/libvirt-sandbox-builder-initrd.c index 59a03e6..a550d4c 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-initrd.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-initrd.c @@ -51,7 +51,7 @@ struct _GVirSandboxBuilderInitrdPrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxBuilderInitrd, gvir_sandbox_builder_initrd, G_TYP= E_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxBuilderInitrd, gvir_sandbox_builder_= initrd, G_TYPE_OBJECT); =20 =20 enum { @@ -127,8 +127,6 @@ static void gvir_sandbox_builder_initrd_class_init(GVir= SandboxBuilderInitrdClass object_class->finalize =3D gvir_sandbox_builder_initrd_finalize; object_class->get_property =3D gvir_sandbox_builder_initrd_get_propert= y; object_class->set_property =3D gvir_sandbox_builder_initrd_set_propert= y; - - g_type_class_add_private(klass, sizeof(GVirSandboxBuilderInitrdPrivate= )); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sa= ndbox/libvirt-sandbox-builder-machine.c index b6f2218..a4a5dcd 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -50,7 +50,7 @@ struct _GVirSandboxBuilderMachinePrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxBuilderMachine, gvir_sandbox_builder_machine, GVI= R_SANDBOX_TYPE_BUILDER); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxBuilderMachine, gvir_sandbox_builder= _machine, GVIR_SANDBOX_TYPE_BUILDER); =20 =20 enum { @@ -792,8 +792,6 @@ static void gvir_sandbox_builder_machine_class_init(GVi= rSandboxBuilderMachineCla builder_class->clean_post_start =3D gvir_sandbox_builder_machine_clean= _post_start; builder_class->clean_post_stop =3D gvir_sandbox_builder_machine_clean_= post_stop; builder_class->get_disk_prefix =3D gvir_sandbox_builder_machine_get_di= sk_prefix; - - g_type_class_add_private(klass, sizeof(GVirSandboxBuilderMachinePrivat= e)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/li= bvirt-sandbox-builder.c index 0c43b62..8cfc2f4 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -47,7 +47,7 @@ struct _GVirSandboxBuilderPrivate GVirConnection *connection; }; =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxBuilder, gvir_sandbox_builder, G_TYPE_OB= JECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxBuilder, gvir_sandbox_build= er, G_TYPE_OBJECT); =20 =20 enum { @@ -193,8 +193,6 @@ static void gvir_sandbox_builder_class_init(GVirSandbox= BuilderClass *klass) G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxBuilderPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-disk.c b/libvirt-sandbo= x/libvirt-sandbox-config-disk.c index 9837735..3584b62 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-disk.c +++ b/libvirt-sandbox/libvirt-sandbox-config-disk.c @@ -47,7 +47,7 @@ struct _GVirSandboxConfigDiskPrivate GVirConfigDomainDiskFormat format; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigDisk, gvir_sandbox_config_disk, G_TYPE_OBJE= CT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigDisk, gvir_sandbox_config_disk= , G_TYPE_OBJECT); =20 =20 enum { @@ -194,8 +194,6 @@ static void gvir_sandbox_config_disk_class_init(GVirSan= dboxConfigDiskClass *klas G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB= )); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigDiskPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-initrd.c b/libvirt-sand= box/libvirt-sandbox-config-initrd.c index ed35c36..dcdc3de 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-initrd.c +++ b/libvirt-sandbox/libvirt-sandbox-config-initrd.c @@ -48,7 +48,7 @@ struct _GVirSandboxConfigInitrdPrivate GList *modules; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigInitrd, gvir_sandbox_config_initrd, G_TYPE_= OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigInitrd, gvir_sandbox_config_in= itrd, G_TYPE_OBJECT); =20 =20 enum { @@ -174,8 +174,6 @@ static void gvir_sandbox_config_initrd_class_init(GVirS= andboxConfigInitrdClass * G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigInitrdPrivate)= ); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-interactive.c b/libvirt= -sandbox/libvirt-sandbox-config-interactive.c index 88bc015..6d35c3a 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-interactive.c +++ b/libvirt-sandbox/libvirt-sandbox-config-interactive.c @@ -47,7 +47,7 @@ struct _GVirSandboxConfigInteractivePrivate gchar **command; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigInteractive, gvir_sandbox_config_interactiv= e, GVIR_SANDBOX_TYPE_CONFIG); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigInteractive, gvir_sandbox_conf= ig_interactive, GVIR_SANDBOX_TYPE_CONFIG); =20 static gchar **gvir_sandbox_config_interactive_get_command(GVirSandboxConf= ig *config); =20 @@ -210,8 +210,6 @@ static void gvir_sandbox_config_interactive_class_init(= GVirSandboxConfigInteract G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigInteractivePri= vate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-file.c b/libvirt-= sandbox/libvirt-sandbox-config-mount-file.c index e53929f..9d15954 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-file.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-file.c @@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountFilePrivate gchar *source; }; =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfigMountFile, gvir_sandbox_config_mou= nt_file, GVIR_SANDBOX_TYPE_CONFIG_MOUNT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfigMountFile, gvir_sandb= ox_config_mount_file, GVIR_SANDBOX_TYPE_CONFIG_MOUNT); =20 enum { PROP_0, @@ -131,8 +131,6 @@ static void gvir_sandbox_config_mount_file_class_init(G= VirSandboxConfigMountFile G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountFilePriva= te)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c b/li= bvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c index 061f625..1510458 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.c @@ -48,12 +48,11 @@ struct _GVirSandboxConfigMountGuestBindPrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigMountGuestBind, gvir_sandbox_config_mount_g= uest_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountGuestBind, gvir_sandbox_c= onfig_mount_guest_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); =20 =20 -static void gvir_sandbox_config_mount_guest_bind_class_init(GVirSandboxCon= figMountGuestBindClass *klass) +static void gvir_sandbox_config_mount_guest_bind_class_init(GVirSandboxCon= figMountGuestBindClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountGuestBind= Private)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c b/lib= virt-sandbox/libvirt-sandbox-config-mount-host-bind.c index c0c911b..cc27449 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-host-bind.c @@ -48,12 +48,11 @@ struct _GVirSandboxConfigMountHostBindPrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigMountHostBind, gvir_sandbox_config_mount_ho= st_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountHostBind, gvir_sandbox_co= nfig_mount_host_bind, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); =20 =20 -static void gvir_sandbox_config_mount_host_bind_class_init(GVirSandboxConf= igMountHostBindClass *klass) +static void gvir_sandbox_config_mount_host_bind_class_init(GVirSandboxConf= igMountHostBindClass *klass G_GNUC_UNUSED) { - g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountHostBindP= rivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c b/li= bvirt-sandbox/libvirt-sandbox-config-mount-host-image.c index cf7ce49..2c82fab 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-host-image.c @@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountHostImagePrivate GVirConfigDomainDiskFormat format; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigMountHostImage, gvir_sandbox_config_mount_h= ost_image, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountHostImage, gvir_sandbox_c= onfig_mount_host_image, GVIR_SANDBOX_TYPE_CONFIG_MOUNT_FILE); =20 enum { PROP_0, @@ -118,8 +118,6 @@ static void gvir_sandbox_config_mount_host_image_class_= init(GVirSandboxConfigMou G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB= )); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountHostImage= Private)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c b/libvirt-s= andbox/libvirt-sandbox-config-mount-ram.c index 1e0c352..82eef8b 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount-ram.c @@ -48,7 +48,7 @@ struct _GVirSandboxConfigMountRamPrivate guint64 usage; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigMountRam, gvir_sandbox_config_mount_ram, GV= IR_SANDBOX_TYPE_CONFIG_MOUNT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigMountRam, gvir_sandbox_config_= mount_ram, GVIR_SANDBOX_TYPE_CONFIG_MOUNT); =20 enum { PROP_0, @@ -121,8 +121,6 @@ static void gvir_sandbox_config_mount_ram_class_init(GV= irSandboxConfigMountRamCl G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountRamPrivat= e)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-mount.c b/libvirt-sandb= ox/libvirt-sandbox-config-mount.c index 21a8684..bb26cd6 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-mount.c +++ b/libvirt-sandbox/libvirt-sandbox-config-mount.c @@ -49,7 +49,7 @@ struct _GVirSandboxConfigMountPrivate GHashTable *includes; }; =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfigMount, gvir_sandbox_config_mount, = G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfigMount, gvir_sandbox_c= onfig_mount, G_TYPE_OBJECT); =20 =20 enum { @@ -134,8 +134,6 @@ static void gvir_sandbox_config_mount_class_init(GVirSa= ndboxConfigMountClass *kl G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigMountPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-address.c b/lib= virt-sandbox/libvirt-sandbox-config-network-address.c index 68b0268..e885fa2 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-address.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-address.c @@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkAddressPrivate guint prefix; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigNetworkAddress, gvir_sandbox_config_network= _address, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkAddress, gvir_sandbox_c= onfig_network_address, G_TYPE_OBJECT); =20 =20 enum { @@ -180,8 +180,6 @@ static void gvir_sandbox_config_network_address_class_i= nit(GVirSandboxConfigNetw G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB= )); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkAddress= Private)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-param= eter.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter= .c index 2807b4f..063efac 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c @@ -45,7 +45,7 @@ struct _GVirSandboxConfigNetworkFilterrefParameterPrivate gchar *value; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterrefParameter, gvir_sandbox_con= fig_network_filterref_parameter, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkFilterrefParameter, gvi= r_sandbox_config_network_filterref_parameter, G_TYPE_OBJECT); =20 =20 enum { @@ -143,8 +143,6 @@ static void gvir_sandbox_config_network_filterref_param= eter_class_init(GVirSandb NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STR= INGS)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterr= efParameterPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c b/l= ibvirt-sandbox/libvirt-sandbox-config-network-filterref.c index 1770c0b..755aec6 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c @@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkFilterrefPrivate GList *parameters; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterref, gvir_sandbox_config_netwo= rk_filterref, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkFilterref, gvir_sandbox= _config_network_filterref, G_TYPE_OBJECT); =20 =20 enum { @@ -128,8 +128,6 @@ static void gvir_sandbox_config_network_filterref_class= _init(GVirSandboxConfigNe NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STR= INGS)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterr= efPrivate)); } =20 /** diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-route.c b/libvi= rt-sandbox/libvirt-sandbox-config-network-route.c index c6bf6f3..621a767 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network-route.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network-route.c @@ -47,7 +47,7 @@ struct _GVirSandboxConfigNetworkRoutePrivate GInetAddress *target; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigNetworkRoute, gvir_sandbox_config_network_r= oute, G_TYPE_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetworkRoute, gvir_sandbox_con= fig_network_route, G_TYPE_OBJECT); =20 =20 enum { @@ -180,8 +180,6 @@ static void gvir_sandbox_config_network_route_class_ini= t(GVirSandboxConfigNetwor G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkRoutePr= ivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-san= dbox/libvirt-sandbox-config-network.c index df21700..9e2bbdf 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -50,7 +50,7 @@ struct _GVirSandboxConfigNetworkPrivate GVirSandboxConfigNetworkFilterref *filterref; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigNetwork, gvir_sandbox_config_network, G_TYP= E_OBJECT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigNetwork, gvir_sandbox_config_n= etwork, G_TYPE_OBJECT); =20 =20 enum { @@ -183,8 +183,6 @@ static void gvir_sandbox_config_network_class_init(GVir= SandboxConfigNetworkClass G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkPrivate= )); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-service-generic.c b/lib= virt-sandbox/libvirt-sandbox-config-service-generic.c index d1118c2..6d15fb8 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service-generic.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service-generic.c @@ -45,7 +45,7 @@ struct _GVirSandboxConfigServiceGenericPrivate gchar **command; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigServiceGeneric, gvir_sandbox_config_service= _generic, GVIR_SANDBOX_TYPE_CONFIG_SERVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigServiceGeneric, gvir_sandbox_c= onfig_service_generic, GVIR_SANDBOX_TYPE_CONFIG_SERVICE); =20 static gchar **gvir_sandbox_config_service_generic_get_command(GVirSandbox= Config *config); =20 @@ -154,8 +154,6 @@ static void gvir_sandbox_config_service_generic_class_i= nit(GVirSandboxConfigServ config_class->load_config =3D gvir_sandbox_config_service_generic_load= _config; config_class->save_config =3D gvir_sandbox_config_service_generic_save= _config; config_class->get_command =3D gvir_sandbox_config_service_generic_get_= command; - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigServiceGeneric= Private)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c b/lib= virt-sandbox/libvirt-sandbox-config-service-systemd.c index dc2e4a5..7f7ea7e 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service-systemd.c @@ -45,7 +45,7 @@ struct _GVirSandboxConfigServiceSystemdPrivate gchar *bootTarget; }; =20 -G_DEFINE_TYPE(GVirSandboxConfigServiceSystemd, gvir_sandbox_config_service= _systemd, GVIR_SANDBOX_TYPE_CONFIG_SERVICE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConfigServiceSystemd, gvir_sandbox_c= onfig_service_systemd, GVIR_SANDBOX_TYPE_CONFIG_SERVICE); =20 static gchar **gvir_sandbox_config_service_systemd_get_command(GVirSandbox= Config *config); =20 @@ -165,8 +165,6 @@ static void gvir_sandbox_config_service_systemd_class_i= nit(GVirSandboxConfigServ config_class->load_config =3D gvir_sandbox_config_service_systemd_load= _config; config_class->save_config =3D gvir_sandbox_config_service_systemd_save= _config; config_class->get_command =3D gvir_sandbox_config_service_systemd_get_= command; - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigServiceSystemd= Private)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config-service.c b/libvirt-san= dbox/libvirt-sandbox-config-service.c index 388ec63..668db4a 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-service.c +++ b/libvirt-sandbox/libvirt-sandbox-config-service.c @@ -45,7 +45,7 @@ struct _GVirSandboxConfigServicePrivate gboolean unused; }; =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfigService, gvir_sandbox_config_servi= ce, GVIR_SANDBOX_TYPE_CONFIG); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfigService, gvir_sandbox= _config_service, GVIR_SANDBOX_TYPE_CONFIG); =20 =20 enum { @@ -77,8 +77,6 @@ static void gvir_sandbox_config_service_class_init(GVirSa= ndboxConfigServiceClass GObjectClass *object_class =3D G_OBJECT_CLASS(klass); =20 object_class->finalize =3D gvir_sandbox_config_service_finalize; - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigServicePrivate= )); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/lib= virt-sandbox-config.c index 73a0fa4..ded1093 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -73,7 +73,7 @@ struct _GVirSandboxConfigPrivate gboolean verbose; }; =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxConfig, gvir_sandbox_config, G_TYPE_OBJE= CT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConfig, gvir_sandbox_config= , G_TYPE_OBJECT); =20 =20 enum { @@ -470,8 +470,6 @@ static void gvir_sandbox_config_class_init(GVirSandboxC= onfigClass *klass) G_PARAM_STATIC_NA= ME | G_PARAM_STATIC_NI= CK | G_PARAM_STATIC_BL= URB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxConfigPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-console-raw.c b/libvirt-sandbo= x/libvirt-sandbox-console-raw.c index a10d8f7..7ed61cb 100644 --- a/libvirt-sandbox/libvirt-sandbox-console-raw.c +++ b/libvirt-sandbox/libvirt-sandbox-console-raw.c @@ -94,7 +94,7 @@ struct _GVirSandboxConsoleRawPrivate GSource *consoleOutputSource; }; =20 -G_DEFINE_TYPE(GVirSandboxConsoleRaw, gvir_sandbox_console_raw, GVIR_SANDBO= X_TYPE_CONSOLE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConsoleRaw, gvir_sandbox_console_raw= , GVIR_SANDBOX_TYPE_CONSOLE); =20 enum { LAST_SIGNAL @@ -133,8 +133,6 @@ static void gvir_sandbox_console_raw_class_init(GVirSan= dboxConsoleRawClass *klas object_class->finalize =3D gvir_sandbox_console_raw_finalize; console_class->attach =3D gvir_sandbox_console_raw_attach; console_class->detach =3D gvir_sandbox_console_raw_detach; - - g_type_class_add_private(klass, sizeof(GVirSandboxConsoleRawPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-console-rpc.c b/libvirt-sandbo= x/libvirt-sandbox-console-rpc.c index be35bb5..abc9390 100644 --- a/libvirt-sandbox/libvirt-sandbox-console-rpc.c +++ b/libvirt-sandbox/libvirt-sandbox-console-rpc.c @@ -153,7 +153,7 @@ struct _GVirSandboxConsoleRpcPrivate gsize serial; }; =20 -G_DEFINE_TYPE(GVirSandboxConsoleRpc, gvir_sandbox_console_rpc, GVIR_SANDBO= X_TYPE_CONSOLE); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxConsoleRpc, gvir_sandbox_console_rpc= , GVIR_SANDBOX_TYPE_CONSOLE); =20 =20 enum { @@ -291,8 +291,6 @@ static void gvir_sandbox_console_rpc_class_init(GVirSan= dboxConsoleRpcClass *klas G_TYPE_NONE, 1, G_TYPE_INT); - - g_type_class_add_private(klass, sizeof(GVirSandboxConsoleRpcPrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-console.c b/libvirt-sandbox/li= bvirt-sandbox-console.c index 9fcfcdd..881285c 100644 --- a/libvirt-sandbox/libvirt-sandbox-console.c +++ b/libvirt-sandbox/libvirt-sandbox-console.c @@ -54,7 +54,7 @@ struct _GVirSandboxConsolePrivate }; =20 =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxConsole, gvir_sandbox_console, G_TYPE_OB= JECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxConsole, gvir_sandbox_conso= le, G_TYPE_OBJECT); =20 enum { PROP_0, @@ -251,8 +251,6 @@ static void gvir_sandbox_console_class_init(GVirSandbox= ConsoleClass *klass) G_TYPE_NONE, 1, G_TYPE_BOOLEAN); - - g_type_class_add_private(klass, sizeof(GVirSandboxConsolePrivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-context-interactive.c b/libvir= t-sandbox/libvirt-sandbox-context-interactive.c index 5ecaf09..d988323 100644 --- a/libvirt-sandbox/libvirt-sandbox-context-interactive.c +++ b/libvirt-sandbox/libvirt-sandbox-context-interactive.c @@ -49,7 +49,7 @@ struct _GVirSandboxContextInteractivePrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxContextInteractive, gvir_sandbox_context_interact= ive, GVIR_SANDBOX_TYPE_CONTEXT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxContextInteractive, gvir_sandbox_con= text_interactive, GVIR_SANDBOX_TYPE_CONTEXT); =20 =20 enum { @@ -346,8 +346,6 @@ static void gvir_sandbox_context_interactive_class_init= (GVirSandboxContextIntera =20 context_class->start =3D gvir_sandbox_context_interactive_start; context_class->stop =3D gvir_sandbox_context_interactive_stop; - - g_type_class_add_private(klass, sizeof(GVirSandboxContextInteractivePr= ivate)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-context-service.c b/libvirt-sa= ndbox/libvirt-sandbox-context-service.c index 538a740..6b4622e 100644 --- a/libvirt-sandbox/libvirt-sandbox-context-service.c +++ b/libvirt-sandbox/libvirt-sandbox-context-service.c @@ -47,7 +47,7 @@ struct _GVirSandboxContextServicePrivate gboolean unused; }; =20 -G_DEFINE_TYPE(GVirSandboxContextService, gvir_sandbox_context_service, GVI= R_SANDBOX_TYPE_CONTEXT); +G_DEFINE_TYPE_WITH_PRIVATE(GVirSandboxContextService, gvir_sandbox_context= _service, GVIR_SANDBOX_TYPE_CONTEXT); =20 =20 enum { @@ -356,8 +356,6 @@ static void gvir_sandbox_context_service_class_init(GVi= rSandboxContextServiceCla =20 klass->define =3D gvir_sandbox_context_service_define_default; klass->undefine =3D gvir_sandbox_context_service_undefine_default; - - g_type_class_add_private(klass, sizeof(GVirSandboxContextServicePrivat= e)); } =20 =20 diff --git a/libvirt-sandbox/libvirt-sandbox-context.c b/libvirt-sandbox/li= bvirt-sandbox-context.c index 28a70b5..e271f6b 100644 --- a/libvirt-sandbox/libvirt-sandbox-context.c +++ b/libvirt-sandbox/libvirt-sandbox-context.c @@ -52,7 +52,7 @@ struct _GVirSandboxContextPrivate GVirSandboxConfig *config; }; =20 -G_DEFINE_ABSTRACT_TYPE(GVirSandboxContext, gvir_sandbox_context, G_TYPE_OB= JECT); +G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE(GVirSandboxContext, gvir_sandbox_conte= xt, G_TYPE_OBJECT); =20 =20 enum { @@ -208,8 +208,6 @@ static void gvir_sandbox_context_class_init(GVirSandbox= ContextClass *klass) G_PARAM_STATIC_NAM= E | G_PARAM_STATIC_NIC= K | G_PARAM_STATIC_BLU= RB)); - - g_type_class_add_private(klass, sizeof(GVirSandboxContextPrivate)); } =20 =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list