From nobody Fri Dec 19 21:49:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1587477066; cv=none; d=zohomail.com; s=zohoarc; b=Vllr6oXQI8W3Z+V2kcwUYvSj4rb7fHcHl1q+84Iia+xl+Qjg5K4W1Z36VGr5YsFDiO9zgAPB5gkxqFD58zoCzN0Wjo1PTcmunrHx3Jsw0kSzE5mfHFdRCfcN8TJS50OOj10oRp4RYzeBxPjVLBLK7JcYBdTR9G0wgXqqN2IZbTU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477066; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LXDKlbY8HZOqrZdGyrUyVgA/swKs9a6Rg0x5PGpSKms=; b=UqT/Lwow9sgZxzknjXpB4Usk0k108+bDJOZ0XxQpa7tnWtD0pjr02zGs43K7DKyHKzRaX6vdJi369t0ZYqmcDCTbb0wNB8rDAAirBxHgta7aAiq1iGsoCOs1Sd4olQsHjI0PAa6JTQhvxVk/PNwITadF/3NSR4169hDQocg5gjw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1587477066419551.8405059534733; Tue, 21 Apr 2020 06:51:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-FBrioXFfP-uyCYlX-QjiWQ-1; Tue, 21 Apr 2020 09:51:01 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FD9E1085935; Tue, 21 Apr 2020 13:50:52 +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 1FCFDA18B1; Tue, 21 Apr 2020 13:50:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C04F3941C8; Tue, 21 Apr 2020 13:50:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03LDomYD003552 for ; Tue, 21 Apr 2020 09:50:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id B8DB81C0EF2; Tue, 21 Apr 2020 13:50:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B51C51C0EF5 for ; Tue, 21 Apr 2020 13:50:48 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C2DF185A78E for ; Tue, 21 Apr 2020 13:50:48 +0000 (UTC) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-242-UAF4h03XN6yRf3WEMtppNw-1; Tue, 21 Apr 2020 09:50:46 -0400 Received: by mail-wm1-f43.google.com with SMTP id y24so3758128wma.4 for ; Tue, 21 Apr 2020 06:50:46 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id q10sm3981826wrv.95.2020.04.21.06.50.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477065; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LXDKlbY8HZOqrZdGyrUyVgA/swKs9a6Rg0x5PGpSKms=; b=FHL6kD2dnYlR4WbmOsPOOBXklD3pe5pJv6GK8ESm4D90xrwu5TT9Y4bsfvD1uY7KD0SQRH maQ7TSVfkPzPad0kvtBUbZJvYz3H0QedaFn3e2j2/6UiOyV9NKOb1IQMSZfS0QV0oJPA3X 0FROVaD4iCJ/aVEO+ZeOskKL1gsfDAk= X-MC-Unique: FBrioXFfP-uyCYlX-QjiWQ-1 X-MC-Unique: UAF4h03XN6yRf3WEMtppNw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3Jbkr19Oj3IJS1kxDUvF3EPXPyvZgwaVCMgcFtdrRdc=; b=NgY3mqeNtc30CzPiHGrPQuPqRpDLVtUwXTSlPj8tk2a7pgGh0F/Kd77ql5OA1iAqsM nwdF1jys1/gfWlmdMQv/xwV3uUneW/yJJdU8hF1kaspsszjPYLxL0FcJUimRbvVgrzRO krhxUtQ/owBVOltiLDMk74wuBXm/nxgYIeDEVnwaTh2dlPWEPVi3u6wSBljRt9Uu6KXp RGeFKkyAJ8gldZ1GZQsAOrXnDLy/CugvuCsLn4TtD5ydiwjLFT45OvLUsl6keZ11UDEU nFU15/xodFTFXkdREsRCdfWZltsRDFQm1P8g4mKQyvJv2mXvh799dRVnbt6puAmcXpoz eV6Q== X-Gm-Message-State: AGi0PuZwcOZ7KxuQpJiax0Z+R1odTikAt6YrUFfj7Ck26XPppmiaX0ob aIwfhxf/tfJclhpY/0eyBkECrzsf2ss= X-Google-Smtp-Source: APiQypJy3KqVHzjsuDX2013LElYEzKwRpTHWey3vAYJux8n2WxKrU4+5ELg9poAnHvdhLTdCSIh8dg== X-Received: by 2002:a1c:40c4:: with SMTP id n187mr4864191wma.28.1587477044859; Tue, 21 Apr 2020 06:50:44 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 31/40] conf: convert virNetworkXMLOption to GObject Date: Tue, 21 Apr 2020 15:49:12 +0200 Message-Id: <20200421134921.3717019-32-r4f4rfs@gmail.com> In-Reply-To: <20200421134921.3717019-1-r4f4rfs@gmail.com> References: <20200421134921.3717019-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDomYD003552 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca 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: , 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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/conf/network_conf.c | 24 ++++++------------------ src/conf/network_conf.h | 12 +++++++++--- src/network/bridge_driver.c | 2 +- tests/networkxml2xmltest.c | 3 +-- 4 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 819b645df7..39330124a3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -70,35 +70,23 @@ VIR_ENUM_IMPL(virNetworkTaint, "hook-script", ); =20 -static virClassPtr virNetworkXMLOptionClass; +G_DEFINE_TYPE(virNetworkXMLOption, vir_network_xml_option, G_TYPE_OBJECT); =20 static void -virNetworkXMLOptionDispose(void *obj G_GNUC_UNUSED) +vir_network_xml_option_init(virNetworkXMLOption *xmlopt G_GNUC_UNUSED) { - return; } =20 -static int -virNetworkXMLOnceInit(void) +static void +vir_network_xml_option_class_init(virNetworkXMLOptionClass *klass G_GNUC_U= NUSED) { - if (!VIR_CLASS_NEW(virNetworkXMLOption, virClassForObject())) - return -1; - - return 0; } =20 -VIR_ONCE_GLOBAL_INIT(virNetworkXML); - virNetworkXMLOptionPtr virNetworkXMLOptionNew(virXMLNamespacePtr xmlns) { - virNetworkXMLOptionPtr xmlopt; - - if (virNetworkXMLInitialize() < 0) - return NULL; - - if (!(xmlopt =3D virObjectNew(virNetworkXMLOptionClass))) - return NULL; + virNetworkXMLOptionPtr xmlopt =3D + VIR_NETWORK_XML_OPTION(g_object_new(VIR_TYPE_NETWORK_XML_OPTION, N= ULL)); =20 if (xmlns) xmlopt->ns =3D *xmlns; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index db7243eef5..e492ca9c6f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -33,17 +33,23 @@ #include "device_conf.h" #include "virbitmap.h" #include "networkcommon_conf.h" -#include "virobject.h" #include "virmacmap.h" #include "virenum.h" #include "virxml.h" +#include =20 struct _virNetworkXMLOption { - virObject parent; + GObject parent; =20 virXMLNamespace ns; }; -typedef struct _virNetworkXMLOption virNetworkXMLOption; + +#define VIR_TYPE_NETWORK_XML_OPTION vir_network_xml_option_get_type() +G_DECLARE_FINAL_TYPE(virNetworkXMLOption, + vir_network_xml_option, + VIR, + NETWORK_XML_OPTION, + GObject); typedef virNetworkXMLOption *virNetworkXMLOptionPtr; =20 =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 728d432c4c..646d567974 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -889,7 +889,7 @@ networkStateCleanup(void) return -1; =20 virObjectUnref(network_driver->networkEventState); - virObjectUnref(network_driver->xmlopt); + g_clear_object(&network_driver->xmlopt); =20 /* free inactive networks */ virObjectUnref(network_driver->networks); diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index ec679e72ee..b881e03c3b 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -30,7 +30,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml, int ret; testCompareNetXML2XMLResult result =3D TEST_COMPARE_NET_XML2XML_RESULT= _SUCCESS; virNetworkDefPtr dev =3D NULL; - virNetworkXMLOptionPtr xmlopt =3D NULL; + g_autoptr(virNetworkXMLOption) xmlopt =3D NULL; =20 if (!(xmlopt =3D networkDnsmasqCreateXMLConf())) goto cleanup; @@ -72,7 +72,6 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml, =20 VIR_FREE(actual); virNetworkDefFree(dev); - virObjectUnref(xmlopt); return ret; } =20 --=20 2.25.3