From nobody Sun Apr 28 20:46:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1639476328; cv=none; d=zohomail.com; s=zohoarc; b=S8YrzegAW9b0G3HhdA7c5eTV4+RmLuwrUusVvaUkK7Ndnl9XWCD2Bj6ClVPM+2xwp6rPS/wpdFIfBEwzJW8eV7eKElvBX6Ei9GeaP6EGUHvXM60hKEhXsQ58VcYKQfirrFdeBpXLrwPvxmmCntoUAbb7gI/ivHcxC4z5Phw5ih4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639476328; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=B697eOwlpmD915x2nyVsBSA4xgXOFEUpVg4t5PY0QNI=; b=HYrRkeM4/SRmr4cSTBWbba9rfOCsvZu2pbqVGtHNGhZCKcoc1EPqW3WMf03xqSjetckr+DT8RWUXw4aAIeH8gaSVjhkm0+4uq7Hu/BXE96XPWmYBFRXQ/vFdIxtYIwYaU38Gl5w1EK7cTMiANkW8CtuxLnUw4lxuZiuSYqzB5fs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 16394763279981.8352488279779209; Tue, 14 Dec 2021 02:05:27 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-349-5SRtJ_wUM3CkpG4fso1T3w-1; Tue, 14 Dec 2021 05:05:23 -0500 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 411741006AA1; Tue, 14 Dec 2021 10:05:17 +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 A2D1413AB3; Tue, 14 Dec 2021 10:05:15 +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 3A1C01809CB8; Tue, 14 Dec 2021 10:05:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BEA5CZB016684 for ; Tue, 14 Dec 2021 05:05:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2F18B369A; Tue, 14 Dec 2021 10:05:12 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA7A9610DF for ; Tue, 14 Dec 2021 10:04:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639476327; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=B697eOwlpmD915x2nyVsBSA4xgXOFEUpVg4t5PY0QNI=; b=fo5mr2SOUDhEflcgr0nfSapSqnDKlJCaA6PGwt9BoAMvxZw10A3Mx/+eYT5qUNdVGkJCp7 tIXbjy8s6tteP7CyUlieQBeqqaTAbmie3oL5xfC6t+nl4BXClVOjX9mSDinZGpRpBur/4O yRR+sFlYFr+LjatsmHC3JOBHyH985ko= X-MC-Unique: 5SRtJ_wUM3CkpG4fso1T3w-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] conf: Turn virDomainDef.kvm_features into a struct Date: Tue, 14 Dec 2021 11:04:57 +0100 Message-Id: <7a00a2f199dc85b4baa0ec9fbdbea5dd222e2f6e.1639476297.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com 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 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: 1639476328550100001 Content-Type: text/plain; charset="utf-8" In future commits we will need to store not just an array of VIR_TRISTATE_SWITCH_* but also an additional integer. Follow the example of TCG and introduce a structure where both the array an integer can live. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 20 +++++++++++++------- src/conf/domain_conf.h | 7 ++++++- src/qemu/qemu_command.c | 8 ++++---- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b6249aa76f..07cbfa24bc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3713,6 +3713,7 @@ void virDomainDefFree(virDomainDef *def) g_free(def->emulator); g_free(def->description); g_free(def->title); + g_free(def->kvm_features); g_free(def->hyperv_vendor_id); g_free(def->tcg_features); =20 @@ -17532,7 +17533,9 @@ static int virDomainFeaturesKVMDefParse(virDomainDef *def, xmlNodePtr node) { - def->features[VIR_DOMAIN_FEATURE_KVM] =3D VIR_TRISTATE_SWITCH_ON; + g_autofree virDomainFeatureKVM *kvm =3D NULL; + + kvm =3D g_new0(virDomainFeatureKVM, 1); =20 node =3D xmlFirstElementChild(node); while (node) { @@ -17551,11 +17554,14 @@ virDomainFeaturesKVMDefParse(virDomainDef *def, &value) < 0) return -1; =20 - def->kvm_features[feature] =3D value; + kvm->features[feature] =3D value; =20 node =3D xmlNextElementSibling(node); } =20 + def->features[VIR_DOMAIN_FEATURE_KVM] =3D VIR_TRISTATE_SWITCH_ON; + def->kvm_features =3D g_steal_pointer(&kvm); + return 0; } =20 @@ -21803,13 +21809,13 @@ virDomainDefFeaturesCheckABIStability(virDomainDe= f *src, case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: case VIR_DOMAIN_KVM_PVIPI: - if (src->kvm_features[i] !=3D dst->kvm_features[i]) { + if (src->kvm_features->features[i] !=3D dst->kvm_features-= >features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of KVM feature '%s' differs: " "source: '%s', destination: '%s'"), virDomainKVMTypeToString(i), - virTristateSwitchTypeToString(src->kvm_= features[i]), - virTristateSwitchTypeToString(dst->kvm_= features[i])); + virTristateSwitchTypeToString(src->kvm_= features->features[i]), + virTristateSwitchTypeToString(dst->kvm_= features->features[i])); return false; } =20 @@ -27873,11 +27879,11 @@ virDomainDefFormatFeatures(virBuffer *buf, case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: case VIR_DOMAIN_KVM_PVIPI: - if (def->kvm_features[j]) + if (def->kvm_features->features[j]) virBufferAsprintf(&childBuf, "<%s state=3D'%s'/>\n= ", virDomainKVMTypeToString(j), virTristateSwitchTypeToString( - def->kvm_features[j])); + def->kvm_features->features[= j])); break; =20 case VIR_DOMAIN_KVM_LAST: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b410922f68..5613d621bb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2263,6 +2263,11 @@ typedef enum { =20 VIR_ENUM_DECL(virDomainIBS); =20 +typedef struct _virDomainFeatureKVM virDomainFeatureKVM; +struct _virDomainFeatureKVM { + int features[VIR_DOMAIN_KVM_LAST]; +}; + typedef struct _virDomainFeatureTCG virDomainFeatureTCG; struct _virDomainFeatureTCG { unsigned long long tb_cache; /* Stored in KiB */ @@ -2819,7 +2824,7 @@ struct _virDomainDef { int features[VIR_DOMAIN_FEATURE_LAST]; int caps_features[VIR_DOMAIN_PROCES_CAPS_FEATURE_LAST]; int hyperv_features[VIR_DOMAIN_HYPERV_LAST]; - int kvm_features[VIR_DOMAIN_KVM_LAST]; + virDomainFeatureKVM *kvm_features; int msrs_features[VIR_DOMAIN_MSRS_LAST]; int xen_features[VIR_DOMAIN_XEN_LAST]; virDomainXenPassthroughMode xen_passthrough_mode; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ce22372749..7cdec9f910 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6765,22 +6765,22 @@ qemuBuildCpuCommandLine(virCommand *cmd, for (i =3D 0; i < VIR_DOMAIN_KVM_LAST; i++) { switch ((virDomainKVM) i) { case VIR_DOMAIN_KVM_HIDDEN: - if (def->kvm_features[i] =3D=3D VIR_TRISTATE_SWITCH_ON) + if (def->kvm_features->features[i] =3D=3D VIR_TRISTATE_SWI= TCH_ON) virBufferAddLit(&buf, ",kvm=3Doff"); break; =20 case VIR_DOMAIN_KVM_DEDICATED: - if (def->kvm_features[i] =3D=3D VIR_TRISTATE_SWITCH_ON) + if (def->kvm_features->features[i] =3D=3D VIR_TRISTATE_SWI= TCH_ON) virBufferAddLit(&buf, ",kvm-hint-dedicated=3Don"); break; =20 case VIR_DOMAIN_KVM_POLLCONTROL: - if (def->kvm_features[i] =3D=3D VIR_TRISTATE_SWITCH_ON) + if (def->kvm_features->features[i] =3D=3D VIR_TRISTATE_SWI= TCH_ON) virBufferAddLit(&buf, ",kvm-poll-control=3Don"); break; =20 case VIR_DOMAIN_KVM_PVIPI: - if (def->kvm_features[i] =3D=3D VIR_TRISTATE_SWITCH_OFF) + if (def->kvm_features->features[i] =3D=3D VIR_TRISTATE_SWI= TCH_OFF) virBufferAddLit(&buf, ",kvm-pv-ipi=3Doff"); break; =20 --=20 2.32.0