From nobody Sun Feb 8 05:30:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1656589555; cv=none; d=zohomail.com; s=zohoarc; b=NwNwVykvGxLnqmvegjvRQjRtvjkNBQ3QsYj8k7XQt5TZxrxLB37h7T9zKAJZGRsFFvoOj0Q9rvP0oF3MeJd8OaydqVA3skS04WsQr8tTEeh2ACvx89VWDY5geiP2nZS+ucaAHFEZuSKMi+T13JHt9dvcyGOjWt0Q4ikouYQD22I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1656589555; h=Content-Type:Content-Transfer-Encoding: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=9L2A2EjRN27ZhGJyPWK20N7nNksQNoerLC1TDQ7OQZM=; b=UPMDXlVSn7m31nQlysvsh84WMIejOOdooZZc1vpIJHEUu6y3S9LMLUxlM0EkUjBpRy8vtLjNhAxEpHmXcX/THf57/LSPEnwneArMuECMRQ/IBq4DXJrv7LqcZI/YKx67zUT/JlQN94iOIqLKEt2uV8wJFWhwXiLfoXnnE3Phk4U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1656589554785270.2168227739878; Thu, 30 Jun 2022 04:45:54 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-408-UAaOlwrvPyKj1WCRV8bKDQ-1; Thu, 30 Jun 2022 07:45:51 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23E7A380117C; Thu, 30 Jun 2022 11:45:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D044492CA4; Thu, 30 Jun 2022 11:45:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5D0CC1947BA3; Thu, 30 Jun 2022 11:45:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0310D1947061 for ; Thu, 30 Jun 2022 11:45:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E5C7C1121314; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A95C8112131B for ; Thu, 30 Jun 2022 11:45:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A2A4C240776; Thu, 30 Jun 2022 13:45:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656589553; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=9L2A2EjRN27ZhGJyPWK20N7nNksQNoerLC1TDQ7OQZM=; b=bYjiKb3eX3DBprvcB7OJBAwpRiYJdmmt7IPL/Xmi4VucwCcWl4Us03Xl2riz6+9G+qGGsP djGMxk+THhHS5VZxijUvrmQkwlbmokHq+isGtPhUg6bqY4pjwZ1T56+CCyAkbATptalAFL K0tgoZxrI5LBDR30FZVNqM9PJIXKzc4= X-MC-Unique: UAaOlwrvPyKj1WCRV8bKDQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] qemu_migration_params: Replace qemuMigrationParamTypes array Date: Thu, 30 Jun 2022 13:45:38 +0200 Message-Id: <262ccf62efea21fd6f63f25976e73a82fb226ebe.1656589462.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1656589556981100002 Content-Type: text/plain; charset="utf-8" We will need to annotate individual parameters a bit more than just noting their type. Let's introduce qemuMigrationParamInfo replacing simple qemuMigrationParamTypes with an array of structs. Signed-off-by: Jiri Denemark --- src/qemu/qemu_migration_params.c | 77 ++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index 398c07efd0..a68aed9aa4 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -138,6 +138,11 @@ struct _qemuMigrationParamsTPMapItem { int party; /* bit-wise OR of qemuMigrationParty */ }; =20 +typedef struct _qemuMigrationParamInfoItem qemuMigrationParamInfoItem; +struct _qemuMigrationParamInfoItem { + qemuMigrationParamType type; +}; + /* Migration capabilities which should always be enabled as long as they * are supported by QEMU. If the capability is supposed to be enabled on b= oth * sides of migration, it won't be enabled unless both sides support it. @@ -224,22 +229,48 @@ static const qemuMigrationParamsTPMapItem qemuMigrati= onParamsTPMap[] =3D { .party =3D QEMU_MIGRATION_SOURCE}, }; =20 -static const qemuMigrationParamType qemuMigrationParamTypes[] =3D { - [QEMU_MIGRATION_PARAM_COMPRESS_LEVEL] =3D QEMU_MIGRATION_PARAM_TYPE_IN= T, - [QEMU_MIGRATION_PARAM_COMPRESS_THREADS] =3D QEMU_MIGRATION_PARAM_TYPE_= INT, - [QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS] =3D QEMU_MIGRATION_PARAM_TYP= E_INT, - [QEMU_MIGRATION_PARAM_THROTTLE_INITIAL] =3D QEMU_MIGRATION_PARAM_TYPE_= INT, - [QEMU_MIGRATION_PARAM_THROTTLE_INCREMENT] =3D QEMU_MIGRATION_PARAM_TYP= E_INT, - [QEMU_MIGRATION_PARAM_TLS_CREDS] =3D QEMU_MIGRATION_PARAM_TYPE_STRING, - [QEMU_MIGRATION_PARAM_TLS_HOSTNAME] =3D QEMU_MIGRATION_PARAM_TYPE_STRI= NG, - [QEMU_MIGRATION_PARAM_MAX_BANDWIDTH] =3D QEMU_MIGRATION_PARAM_TYPE_ULL, - [QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT] =3D QEMU_MIGRATION_PARAM_TYPE_UL= L, - [QEMU_MIGRATION_PARAM_BLOCK_INCREMENTAL] =3D QEMU_MIGRATION_PARAM_TYPE= _BOOL, - [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] =3D QEMU_MIGRATION_PARAM_TYPE= _ULL, - [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] =3D QEMU_MIGRATION_PARAM= _TYPE_ULL, - [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D QEMU_MIGRATION_PARAM_TYPE_= INT, +static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] =3D { + [QEMU_MIGRATION_PARAM_COMPRESS_LEVEL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_COMPRESS_THREADS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_THROTTLE_INITIAL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_THROTTLE_INCREMENT] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, + [QEMU_MIGRATION_PARAM_TLS_CREDS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_STRING, + }, + [QEMU_MIGRATION_PARAM_TLS_HOSTNAME] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_STRING, + }, + [QEMU_MIGRATION_PARAM_MAX_BANDWIDTH] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_BLOCK_INCREMENTAL] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_BOOL, + }, + [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_ULL, + }, + [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] =3D { + .type =3D QEMU_MIGRATION_PARAM_TYPE_INT, + }, }; -G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamTypes) =3D=3D QEMU_MIGRATIO= N_PARAM_LAST); +G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamInfo) =3D=3D QEMU_MIGRATION= _PARAM_LAST); =20 =20 virBitmap * @@ -281,7 +312,7 @@ qemuMigrationParamsFree(qemuMigrationParams *migParams) return; =20 for (i =3D 0; i < QEMU_MIGRATION_PARAM_LAST; i++) { - if (qemuMigrationParamTypes[i] =3D=3D QEMU_MIGRATION_PARAM_TYPE_ST= RING) + if (qemuMigrationParamInfo[i].type =3D=3D QEMU_MIGRATION_PARAM_TYP= E_STRING) g_free(migParams->params[i].value.s); } =20 @@ -295,7 +326,7 @@ static int qemuMigrationParamsCheckType(qemuMigrationParam param, qemuMigrationParamType type) { - if (qemuMigrationParamTypes[param] !=3D type) { + if (qemuMigrationParamInfo[param].type !=3D type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Type mismatch for '%s' migration parameter"), qemuMigrationParamTypeToString(param)); @@ -595,7 +626,7 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr param= s, VIR_DEBUG("Setting migration parameter '%s' from '%s'", qemuMigrationParamTypeToString(item->param), item->typed= Param); =20 - switch (qemuMigrationParamTypes[item->param]) { + switch (qemuMigrationParamInfo[item->param].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: if (qemuMigrationParamsGetTPInt(migParams, item->param, params, nparams, item->typedParam, @@ -671,7 +702,7 @@ qemuMigrationParamsDump(qemuMigrationParams *migParams, if (!(item->party & QEMU_MIGRATION_DESTINATION)) continue; =20 - switch (qemuMigrationParamTypes[item->param]) { + switch (qemuMigrationParamInfo[item->param].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: if (qemuMigrationParamsSetTPInt(migParams, item->param, params, nparams, maxparams, @@ -721,7 +752,7 @@ qemuMigrationParamsFromJSON(virJSONValue *params) name =3D qemuMigrationParamTypeToString(i); pv =3D &migParams->params[i]; =20 - switch (qemuMigrationParamTypes[i]) { + switch (qemuMigrationParamInfo[i].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: if (virJSONValueObjectGetNumberInt(params, name, &pv->value.i)= =3D=3D 0) pv->set =3D true; @@ -764,7 +795,7 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParam= s) if (!pv->set) continue; =20 - switch (qemuMigrationParamTypes[i]) { + switch (qemuMigrationParamInfo[i].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: rc =3D virJSONValueObjectAppendNumberInt(params, name, pv->val= ue.i); break; @@ -1280,7 +1311,7 @@ qemuMigrationParamsFormat(virBuffer *buf, virBufferAsprintf(buf, "value.i); break; @@ -1357,7 +1388,7 @@ qemuMigrationParamsParse(xmlXPathContextPtr ctxt, } =20 rc =3D 0; - switch (qemuMigrationParamTypes[param]) { + switch (qemuMigrationParamInfo[param].type) { case QEMU_MIGRATION_PARAM_TYPE_INT: rc =3D virStrToLong_i(value, NULL, 10, &pv->value.i); break; --=20 2.35.1