From nobody Mon Feb 9 08:55:15 2026 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=1589371153; cv=none; d=zohomail.com; s=zohoarc; b=KQz64tLwgrnkSEmvHREkgPTLsFtwk4RRdhhW35ugW7ay1jk1FlB3ax/H/VPqEKHKILxv1CjpjbWkjBUXps2oELmCFK5F+TxbowCxc8bYuNAj7AIJYo0Rea2L7CZgqH4j8GAomE9a/Q26udvGf+9L0HqvvYM8s3ER1CoaHU9iEds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589371153; 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=AL3xXyxIk+01q0xTZrGcitJijKAgx6EkHqaMNMg0KoE=; b=ciVKRENhB2TJF6jhYDS2/f4jKttk74KYTLkogufCVjWrnh6NyTD8vVATXL8WrkIV0dgAhZH2A7co2rHIYl01YFccmjNo/H8jaf9eYCH9CLemp8B+5xC3/axBsbvM2phNg3KTkt8PkbagXpx9U98EMIgh17hW7wLJ912lsoHhy3I= 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 1589371153165999.4293859553685; Wed, 13 May 2020 04:59:13 -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-299-UhKYEMmKNqOeYw4Au3PCxA-1; Wed, 13 May 2020 07:59:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D2162E94; Wed, 13 May 2020 11:59:04 +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 17BDD5D9FC; Wed, 13 May 2020 11:59:04 +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 C65F24EA06; Wed, 13 May 2020 11:59:03 +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 04DBx1sc016388 for ; Wed, 13 May 2020 07:59:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8E932014DFA; Wed, 13 May 2020 11:59:01 +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 A416C202696C for ; Wed, 13 May 2020 11:59:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 E236D1859162 for ; Wed, 13 May 2020 11:58:59 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-461-JS17q5GaO2yvQ7ri6z3ZQQ-1; Wed, 13 May 2020 07:58:57 -0400 Received: by mail-wr1-f41.google.com with SMTP id s8so20551465wrt.9 for ; Wed, 13 May 2020 04:58:57 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 May 2020 04:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589371152; 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=AL3xXyxIk+01q0xTZrGcitJijKAgx6EkHqaMNMg0KoE=; b=G3m5tOpOqGEN8ful+ESdDf1IxQ8IK/NafWIGz5pGmNlFiyqIVq9D7D7b7+vXdZu8rAD8y/ I/b0FZiVIp5vJAm92RV/xyhmoraMmB8udS2wwXlEzn45XI+Ps6sqrE/mt5o0tOiUR4tFoF 7rl/Mlm6lRfeOE9lE5jK8RXCek15TU0= X-MC-Unique: UhKYEMmKNqOeYw4Au3PCxA-1 X-MC-Unique: JS17q5GaO2yvQ7ri6z3ZQQ-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=AL3xXyxIk+01q0xTZrGcitJijKAgx6EkHqaMNMg0KoE=; b=nBmMsFK64BAZHtO5Yr0zRsh2n/cnaJ2UMHBiuuoti23/4Attrp+IRODnoa3YUGQSo1 3MvwH5cKtx42dJtPDwtBQ3evFKeBem8RCr9sSPS33ZeEFlU0Lyrm70MOtgTachWxE3f1 /6O66u1iuM50zpx5e36Rzo0+w1saX7PGI6EqfuFUeocKi80brt+b4s55epP0UiQ0fO97 +SsqQzOXyDHVhBiN2a/6bXHiN+uV7buzmiXZMc/owat1B7XL16iCrr0BfECr/huqxw83 pLlL0+p929ZMQ8Uk7JcQQ/SWrhM17WC5VutH2+EO2WI4n/lVm73++XAl87ZxmXwWcUVm bBCQ== X-Gm-Message-State: AGi0PuY2uWXDyVfm8+H+qezpwPmeoODTDT1FV/DweCLQ7GQI5beHfV/C VSbgdP/0IZ81eZdjTdf+tRR6k+E+ X-Google-Smtp-Source: APiQypL8xBEpfQzp5SR4oMEv4AwRxa3hdnQULOgRUO7iA21XymCLmQGCl6HCme/MtCL7mDCWZ/qc4Q== X-Received: by 2002:a5d:6907:: with SMTP id t7mr27373335wru.321.1589371135651; Wed, 13 May 2020 04:58:55 -0700 (PDT) From: Rafael Fonseca To: libvirt-list@redhat.com Subject: [PATCH 35/40] libxl: convert libxlMigrationDstArgs to GObject Date: Wed, 13 May 2020 13:57:19 +0200 Message-Id: <20200513115724.157687-36-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.4 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.14 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/libxl/libxl_migration.c | 65 +++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 50225855ae..678d850cf6 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -60,7 +60,7 @@ struct _libxlMigrationCookie { }; =20 typedef struct _libxlMigrationDstArgs { - virObject parent; + GObject parent; =20 int recvfd; virConnectPtr conn; @@ -73,7 +73,28 @@ typedef struct _libxlMigrationDstArgs { size_t nsocks; } libxlMigrationDstArgs; =20 -static virClassPtr libxlMigrationDstArgsClass; +G_DEFINE_TYPE(libxlMigrationDstArgs, libxl_migration_dst_args, G_TYPE_OBJE= CT); +#define LIBXL_TYPE_MIGRATION_DST_ARGS libxl_migration_dst_args_get_type() +G_DECLARE_FINAL_TYPE(libxlMigrationDstArgs, + libxl_migration_dst_args, + LIBXL, + MIGRATION_DST_ARGS, + GObject); + +static void libxlMigrationDstArgsFinalize(GObject *obj); + +static void +libxl_migration_dst_args_init(lixlMigrationDstArgs *args G_GNUC_UNUSED) +{ +} + +static void +libxl_migration_dst_args_class_init(lixlMigrationDstArgsClass *klass) +{ + GObjectClass *obj =3D G_OBJECT_CLASS(klass); + + obj->finalize =3D libxlMigrationDstArgsFinalize; +} =20 =20 static void @@ -226,31 +247,23 @@ libxlMigrationEatCookie(const char *cookiein, } =20 static void -libxlMigrationDstArgsDispose(void *obj) +libxlMigrationDstArgsFinalize(GObject *obj) { - libxlMigrationDstArgs *args =3D obj; + libxlMigrationDstArgs *args =3D LIBXL_MIGRATION_DST_ARGS(obj); =20 libxlMigrationCookieFree(args->migcookie); VIR_FREE(args->socks); virObjectUnref(args->conn); virObjectUnref(args->vm); -} =20 -static int -libxlMigrationDstArgsOnceInit(void) -{ - if (!VIR_CLASS_NEW(libxlMigrationDstArgs, virClassForObject())) - return -1; - - return 0; + G_OBJECT_CLASS(libxl_migration_dst_args_parent_class)->finalize(obj); } =20 -VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs); =20 static void libxlDoMigrateDstReceive(void *opaque) { - libxlMigrationDstArgs *args =3D opaque; + g_autoptr(libxlMigrationDstArgs) args =3D LIBXL_MIGRATION_DST_ARGS(opa= que); virDomainObjPtr vm =3D args->vm; virNetSocketPtr *socks =3D args->socks; size_t nsocks =3D args->nsocks; @@ -277,7 +290,6 @@ libxlDoMigrateDstReceive(void *opaque) } args->nsocks =3D 0; VIR_FORCE_CLOSE(recvfd); - virObjectUnref(args); virDomainObjEndAPI(&vm); } =20 @@ -287,7 +299,7 @@ libxlMigrateDstReceive(virNetSocketPtr sock, int events G_GNUC_UNUSED, void *opaque) { - libxlMigrationDstArgs *args =3D opaque; + g_autoptr(libxlMigrationDstArgs) args =3D LIBXL_MIGRATION_DST_ARGS(opa= que); virNetSocketPtr *socks =3D args->socks; size_t nsocks =3D args->nsocks; libxlDomainObjPrivatePtr priv =3D args->vm->privateData; @@ -321,7 +333,7 @@ libxlMigrateDstReceive(virNetSocketPtr sock, libxlDoMigrateDstReceive, name, false, - args) < 0) { + g_object_ref(args)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration = data")); goto fail; @@ -339,7 +351,6 @@ libxlMigrateDstReceive(virNetSocketPtr sock, } args->nsocks =3D 0; VIR_FORCE_CLOSE(recvfd); - virObjectUnref(args); } =20 static int @@ -551,7 +562,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, libxlMigrationCookiePtr mig =3D NULL; libxlDriverPrivatePtr driver =3D dconn->privateData; virDomainObjPtr vm =3D NULL; - libxlMigrationDstArgs *args =3D NULL; + g_autoptr(libxlMigrationDstArgs) args =3D NULL; bool taint_hook =3D false; libxlDomainObjPrivatePtr priv =3D NULL; char *xmlout =3D NULL; @@ -600,8 +611,8 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, if (libxlMigrationDstArgsInitialize() < 0) goto endjob; =20 - if (!(args =3D virObjectNew(libxlMigrationDstArgsClass))) - goto endjob; + args =3D LIBXL_MIGRATION_DST_ARGS( + g_object_new(LIBXL_TYPE_MIGRATION_DST_ARGS, NULL)); =20 args->conn =3D virObjectRef(dconn); args->vm =3D virObjectRef(vm); @@ -618,7 +629,7 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, name =3D g_strdup_printf("mig-%s", args->vm->def->name); if (virThreadCreateFull(priv->migrationDstReceiveThr, true, libxlDoMigrateDstReceive, - name, false, args) < 0) { + name, false, g_object_ref(args)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration = data")); goto endjob; @@ -634,7 +645,6 @@ libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dco= nn, libxlMigrationCookieFree(mig); VIR_FORCE_CLOSE(dataFD[1]); VIR_FORCE_CLOSE(dataFD[0]); - virObjectUnref(args); /* Remove virDomainObj from domain list */ if (vm) virDomainObjListRemove(driver->domains, vm); @@ -665,7 +675,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, virNetSocketPtr *socks =3D NULL; size_t nsocks =3D 0; int nsocks_listen =3D 0; - libxlMigrationDstArgs *args =3D NULL; + g_autoptr(libxlMigrationDstArgs) args =3D NULL; bool taint_hook =3D false; libxlDomainObjPrivatePtr priv =3D NULL; size_t i; @@ -765,8 +775,8 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, if (libxlMigrationDstArgsInitialize() < 0) goto endjob; =20 - if (!(args =3D virObjectNew(libxlMigrationDstArgsClass))) - goto endjob; + args =3D LIBXL_MIGRATION_DST_ARGS( + g_object_new(LIBXL_TYPE_MIGRATION_DST_ARGS, NULL)); =20 args->conn =3D virObjectRef(dconn); args->vm =3D virObjectRef(vm); @@ -786,7 +796,7 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, if (virNetSocketAddIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE, libxlMigrateDstReceive, - virObjectRef(args), + g_object_ref(args), NULL) < 0) continue; =20 @@ -823,7 +833,6 @@ libxlDomainMigrationDstPrepare(virConnectPtr dconn, VIR_FREE(hostname); else virURIFree(uri); - virObjectUnref(args); virDomainObjEndAPI(&vm); return ret; } --=20 2.26.2