From nobody Fri Dec 19 20:15:34 2025 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-delivery-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=1587477049; cv=none; d=zohomail.com; s=zohoarc; b=JPXfDB5ylolwxHjvZXYvN9Iqc48Aks2gHPdGdcg0jMn4H1+H+dBleVoDyMciuUjjDi/XuMmUuMhjm5VMV5SGl/HNi055YMQWk3SS4R5gTImpsc3NqPY8aMGKwKDON/+/jfIo+smPhOkdrmDr43DFTmBITH9hCxLtr171KFzvDyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587477049; 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=YKE+nZqPBCiKwWD6XZ1nH1mKNMz6aT6AbL2QcOFT3dA=; b=hDBlewZdw8nWyCv/yetADXLo1mi7bK1yc8fmG20KPkHX84CD3nq5E7T+4GrB/Rp3Oc0r8RmMdgoR/ZdFHAYUiAj/Cr0MKG0yus6DXPnAdepU/49P0zliOzIHmu2qEgwRosLgonQSnKAIePDffxAP/o6QX6jRmLNgUObHEBur1xI= 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1587477049045933.7861667074682; Tue, 21 Apr 2020 06:50:49 -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-213-1A7SSmftP6urJcnVm6dTOg-1; Tue, 21 Apr 2020 09:50:45 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A17B01085927; Tue, 21 Apr 2020 13:50:39 +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 739041001B0B; Tue, 21 Apr 2020 13:50:39 +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 039291800B74; Tue, 21 Apr 2020 13:50:39 +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 03LDoDYm003291 for ; Tue, 21 Apr 2020 09:50:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85A4C11921A4; Tue, 21 Apr 2020 13:50:13 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81A9211921A2 for ; Tue, 21 Apr 2020 13:50:13 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 654CA1019E13 for ; Tue, 21 Apr 2020 13:50:13 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-413-42KOwee6OYOGGXKj5B_Kbw-1; Tue, 21 Apr 2020 09:50:10 -0400 Received: by mail-wr1-f67.google.com with SMTP id x18so16587454wrq.2 for ; Tue, 21 Apr 2020 06:50:10 -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.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2020 06:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587477047; 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=YKE+nZqPBCiKwWD6XZ1nH1mKNMz6aT6AbL2QcOFT3dA=; b=QCM13C5E+pTH/GQEHSQ/UccmSBHPelyNbLGE+QOYH27nch/LzHBhCeiOGGH2RzpJqrDbMA Jn2iAeGviwSoDLpX+EepnGX/zN/4jXqiFxQ4hQS1e3vmgevX0wrPAjGF72Ar7ic8T7GiyQ FGFWuX0nCXjpj/JZLLToiUWzIEl6JdY= X-MC-Unique: 1A7SSmftP6urJcnVm6dTOg-1 X-MC-Unique: 42KOwee6OYOGGXKj5B_Kbw-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=y8R0Wo8uybik1tOs5L/YwunBQHuz4AME+2l7uinqlRU=; b=ARy4DzSQGLrAcCeqOQT95UhWWcXQ9sD9rru58XG1KRrgwb1RbsiQEyLnGOAH6u6iJZ AFzfbtaEJvx7+M1t6oHxvnK2sj304LODz5sU1KgyYZZWLNfdewT08R2ormNiSmY4mttU eZdzlUCtuBwGsgxrq4jVBTTJ0Hyu1wVjc/8HgPw0HRUql9au2R1+Z/w148gn+VO2Lmz0 +5LdtYUaphV0+ZCH9YNGtE37ElJ2GhpgOKVAM9jZLLJAgp/VAC3IbA+ScuVTLsi0+3nl I/vvoSF5i4rDwpSNYmSlhLQkYjf0E2SSNix36wFB1gVXA1bx9hASoyhiMXxCXcQY1Itv s3/A== X-Gm-Message-State: AGi0Pub9TXLbBc0G96/xZ7OJD23LqWNMAEOM09vYUa7g3PBz/ZYqEoGm a1iuaXv3Iwgc+fWB2hZ+GdVNrlNRFVE= X-Google-Smtp-Source: APiQypKODKyYx3Xs61ibBOF9XTmg8moJOBNmSmiEJWstQXaei870qhjYSt+PbpK+kRO1aWDfwAO9YQ== X-Received: by 2002:adf:f98e:: with SMTP id f14mr23978553wrr.253.1587477009067; Tue, 21 Apr 2020 06:50:09 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH v2 09/40] bhyve: convert virBhyveDriverConfig to GObject Date: Tue, 21 Apr 2020 15:48:50 +0200 Message-Id: <20200421134921.3717019-10-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.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03LDoDYm003291 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.84 on 10.5.11.22 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/bhyve/bhyve_capabilities.c | 3 +-- src/bhyve/bhyve_conf.c | 36 +++++++++++++++++----------------- src/bhyve/bhyve_driver.c | 2 +- src/bhyve/bhyve_utils.h | 11 +++++++++-- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c index 66442e50ba..00f7613594 100644 --- a/src/bhyve/bhyve_capabilities.c +++ b/src/bhyve/bhyve_capabilities.c @@ -131,7 +131,7 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, DIR *dir; struct dirent *entry; size_t firmwares_alloc =3D 0; - virBhyveDriverConfigPtr cfg =3D virBhyveDriverGetConfig(conn); + g_autoptr(virBhyveDriverConfig) cfg =3D virBhyveDriverGetConfig(conn); const char *firmware_dir =3D cfg->firmwareDir; virDomainCapsStringValuesPtr firmwares =3D NULL; =20 @@ -167,7 +167,6 @@ virBhyveDomainCapsBuild(bhyveConnPtr conn, cleanup: VIR_FREE(firmwares); VIR_DIR_CLOSE(dir); - virObjectUnref(cfg); return caps; } =20 diff --git a/src/bhyve/bhyve_conf.c b/src/bhyve/bhyve_conf.c index f3e2ebf7c7..85f170b1a7 100644 --- a/src/bhyve/bhyve_conf.c +++ b/src/bhyve/bhyve_conf.c @@ -32,29 +32,27 @@ =20 VIR_LOG_INIT("bhyve.bhyve_conf"); =20 -static virClassPtr virBhyveDriverConfigClass; -static void virBhyveDriverConfigDispose(void *obj); +G_DEFINE_TYPE(virBhyveDriverConfig, vir_bhyve_driver_config, G_TYPE_OBJECT= ); +static void virBhyveDriverConfigFinalize(GObject *obj); =20 -static int virBhyveConfigOnceInit(void) +static void +vir_bhyve_driver_config_init(virBhyveDriverConfig *cfg G_GNUC_UNUSED) { - if (!VIR_CLASS_NEW(virBhyveDriverConfig, virClassForObject())) - return -1; - - return 0; } =20 -VIR_ONCE_GLOBAL_INIT(virBhyveConfig); +static void +vir_bhyve_driver_config_class_init(virBhyveDriverConfigClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D virBhyveDriverConfigFinalize; +} =20 virBhyveDriverConfigPtr virBhyveDriverConfigNew(void) { - virBhyveDriverConfigPtr cfg; - - if (virBhyveConfigInitialize() < 0) - return NULL; - - if (!(cfg =3D virObjectNew(virBhyveDriverConfigClass))) - return NULL; + virBhyveDriverConfigPtr cfg =3D + VIR_BHYVE_DRIVER_CONFIG(g_object_new(VIR_TYPE_BHYVE_DRIVER_CONFIG,= NULL)); =20 cfg->firmwareDir =3D g_strdup(DATADIR "/uefi-firmware"); =20 @@ -87,17 +85,19 @@ virBhyveDriverGetConfig(bhyveConnPtr driver) { virBhyveDriverConfigPtr cfg; bhyveDriverLock(driver); - cfg =3D virObjectRef(driver->config); + cfg =3D g_object_ref(driver->config); bhyveDriverUnlock(driver); return cfg; } =20 static void -virBhyveDriverConfigDispose(void *obj) +virBhyveDriverConfigFinalize(GObject *obj) { - virBhyveDriverConfigPtr cfg =3D obj; + virBhyveDriverConfigPtr cfg =3D VIR_BHYVE_DRIVER_CONFIG(obj); =20 VIR_FREE(cfg->firmwareDir); + + G_OBJECT_CLASS(vir_bhyve_driver_config_parent_class)->finalize(obj); } =20 void diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 6a37c7973b..2bdffe0b63 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1186,7 +1186,7 @@ bhyveStateCleanup(void) virSysinfoDefFree(bhyve_driver->hostsysinfo); virObjectUnref(bhyve_driver->closeCallbacks); virObjectUnref(bhyve_driver->domainEventState); - virObjectUnref(bhyve_driver->config); + g_clear_object(&bhyve_driver->config); virPortAllocatorRangeFree(bhyve_driver->remotePorts); =20 if (bhyve_driver->lockFD !=3D -1) diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index f3e80b6121..675b859098 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -29,16 +29,23 @@ #include "hypervisor/virclosecallbacks.h" #include "virportallocator.h" =20 +#include + #define BHYVE_AUTOSTART_DIR SYSCONFDIR "/libvirt/bhyve/autostart" #define BHYVE_CONFIG_DIR SYSCONFDIR "/libvirt/bhyve" #define BHYVE_STATE_DIR RUNSTATEDIR "/libvirt/bhyve" #define BHYVE_LOG_DIR LOCALSTATEDIR "/log/libvirt/bhyve" =20 -typedef struct _virBhyveDriverConfig virBhyveDriverConfig; +#define VIR_TYPE_BHYVE_DRIVER_CONFIG vir_bhyve_driver_config_get_type() +G_DECLARE_FINAL_TYPE(virBhyveDriverConfig, + vir_bhyve_driver_config, + VIR, + BHYVE_DRIVER_CONFIG, + GObject); typedef struct _virBhyveDriverConfig *virBhyveDriverConfigPtr; =20 struct _virBhyveDriverConfig { - virObject parent; + GObject parent; =20 char *firmwareDir; }; --=20 2.25.3