From nobody Mon Feb 9 08:28:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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.81 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=1589371148; cv=none; d=zohomail.com; s=zohoarc; b=dp1B/kv3u3BqNDaoyTaK9AkhZ0jBSCtajctZkuTQw2q/blUa50Mcb4+C1TfAuts97Qo/YPkBcRVxjsB7Pxl7NXG8paAMFG3rX2s2bglL/klj9p5b6fz1Hps/PstgCZt7cVH+1EgU/wU/4TwkljonR15R/rO/lEE/KA17VZBiqbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371148; 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=w25FY6p8afMA6RlrRWcn0bksRATy2Wx3ol/k2l6Mqoo=; b=CXpluw8wKHTeLNuMTOUAl4Q6DjSHOq2YbvBCi2fSXdAn58z2o/MNKO+BEJnpKYY822TefXm6bDs1/O7vkUOZ5yKiWMVK+8+/OEdopPHFej49Y4wId6Gb7x7Mm5Ibz7Ppp5Q/Nsw5LEYRyfkGvqd4UAuIX4aVgtWmyzj1Vu/fftU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1589371148982732.5346154342272; Wed, 13 May 2020 04:59:08 -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-21-1mH_q_BpPB6f6po8IPs35A-1; Wed, 13 May 2020 07:59:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D41213F8; Wed, 13 May 2020 11:58:59 +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 0EE625C1D3; Wed, 13 May 2020 11:58:59 +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 CFAC8180530B; Wed, 13 May 2020 11:58:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04DBwrVG016300 for ; Wed, 13 May 2020 07:58:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id CBDA72156A2D; Wed, 13 May 2020 11:58:53 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6B522166B27 for ; Wed, 13 May 2020 11:58:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 A431180028C for ; Wed, 13 May 2020 11:58:53 +0000 (UTC) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-rMWl-d21OK-5wdH8DYlAuw-1; Wed, 13 May 2020 07:58:51 -0400 Received: by mail-wr1-f48.google.com with SMTP id h17so11644805wrc.8 for ; Wed, 13 May 2020 04:58:51 -0700 (PDT) Received: from localhost.localdomain (public-gprs367127.centertel.pl. [37.47.65.88]) by smtp.gmail.com with ESMTPSA id l1sm27838422wrc.24.2020.05.13.04.58.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371147; 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=w25FY6p8afMA6RlrRWcn0bksRATy2Wx3ol/k2l6Mqoo=; b=T5d0/G33RSrW01vsZnk4jDPx9dsoi4W36acRD8tbYA6J1eheMoEPZALmhWJ45BP9IUbBcq i4FTyefi3lkVcZ2/vmJRQlKToSD8Fh8f4tvJSFrGLVpOrzRUK6IbnxRYhJQgFbUQr0a4pz FiruTHdqLib8Vl/z9ahw6lfFBfewoHo= X-MC-Unique: 1mH_q_BpPB6f6po8IPs35A-1 X-MC-Unique: rMWl-d21OK-5wdH8DYlAuw-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=w25FY6p8afMA6RlrRWcn0bksRATy2Wx3ol/k2l6Mqoo=; b=BojyjwIxDsuPp0W4JHifdcTOkS9XBK0QOJrASQSUvYoopWyyJMK8jXBVstpETMpmE2 KecFgtcZhG5Z/+sjlFPOc9vS77KKqzgm9BoebJdZ2/BRAIoeCVQh9b6oQ/MG19QkUYDK 38b3E1AGgNXC3MA2RDEz6A9ZZyxZI9tG6J6ToiMKosThqZItwDpbv2gYtvD7Rz/X1QO6 jZWvbSkEaCgKXRZK+wdAMY2Wq/7u+zVBA8O8NrLphunXLHmkJCah648trVSRI0gsSoM1 lRZpCRgAILe+xN1FHHis8y04eg4PwWTQxEaw8YhldQ7DAcmqz6/hDQALYX+7X3LuDb4v Sezg== X-Gm-Message-State: AGi0PubIEVpBUygqBQWPGYwrIOXe+6Be+WzLSphckObjs2ofVygP/ZpQ 6L4s+os4+t9wcWWALjzWP5FIjuXn X-Google-Smtp-Source: APiQypJgFB8ptLSeNLt2v1Ps78fk6qhiv9IB1OqXJSy8mo3FA1cJDBdJdE8v6zHkkMQbZ527QJ1ebQ== X-Received: by 2002:adf:9d91:: with SMTP id p17mr23656321wre.119.1589371129831; Wed, 13 May 2020 04:58:49 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 31/40] conf: convert virNetworkXMLOption to GObject Date: Wed, 13 May 2020 13:57:15 +0200 Message-Id: <20200513115724.157687-32-r4f4rfs@gmail.com> In-Reply-To: <20200513115724.157687-1-r4f4rfs@gmail.com> References: <20200513115724.157687-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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.16 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 dc64ce6959..e8491d0724 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -77,35 +77,23 @@ VIR_ENUM_IMPL(virNetworkDHCPLeaseTimeUnit, "hours", ); =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 f2dc388ef0..e32339e777 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 3c110a53fc..98f9b6c604 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -891,7 +891,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 700744785a..dc691330e6 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.26.2