From nobody Fri Dec 12 15:17:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1761724746; cv=none; d=zohomail.com; s=zohoarc; b=cuj8ju5DYTDCqUFkfTdLL+3NPhDNDm28oKI+1MXMqYUfep3Zoz9vm939mFU7aSnUFlC9JNNSsSNdTAFPKbL3El3/UBUwr8+RFYNllv72m8beOYGLojkMf5yru5OQtSjQuhjcWmdFabr/tpkgmxbKI1pcUYavv430AetIAR2mmkc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761724746; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=f1Mrh1j7eZQXRpBk37hb7ijtJyLwx0vnoeCr5ccwrB4=; b=cjAA0g9pFsyQSGRNOCCLAKlCHR48SlCzYrLqqypK5Pu+wkLpgl8MxF9DXFRkBy9hL6EWhs2c7qvbgvoRF3ESMyR6TZ0xkhWyJtLEFpBh4ybm3bcHh6avCnKoh8ffOMXznQ3l44FDWgCadb7Ipu34OzUQUcyLyCHrrp1f+cqRpA4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1761724746388965.3820505378084; Wed, 29 Oct 2025 00:59:06 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id BDF1641958; Wed, 29 Oct 2025 03:59:05 -0400 (EDT) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 55ADF41A11; Wed, 29 Oct 2025 03:56:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id F190B41850; Wed, 29 Oct 2025 03:53:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 213044184F for ; Wed, 29 Oct 2025 03:53:24 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-e-UcxCjKO7e9_0_GUAszxA-1; Wed, 29 Oct 2025 03:53:22 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B752B19560A0 for ; Wed, 29 Oct 2025 07:53:21 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0DE721800452 for ; Wed, 29 Oct 2025 07:53:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1761724403; h=from:from: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; bh=f1Mrh1j7eZQXRpBk37hb7ijtJyLwx0vnoeCr5ccwrB4=; b=Nr89ACfIHZTAiZrDW6s8Rr+kbqnrF8xpJInTG9W5oEFXedo6kBv6EWZULI93UCGFslWAhO zFXGE9qRlshLAVZcR+O9jehsL2DnKTnyHl2vuEqbdIz4YmeOH4MIiOykoQqxQAiJGOtR68 Nj2xR4ddGqzbpxYyDyegdmf43AeBktE= X-MC-Unique: e-UcxCjKO7e9_0_GUAszxA-1 X-Mimecast-MFC-AGG-ID: e-UcxCjKO7e9_0_GUAszxA_1761724401 To: devel@lists.libvirt.org Subject: [PATCH 4/7] qemu: Use virDomainMemoryIsVirtioModel() Date: Wed, 29 Oct 2025 08:53:04 +0100 Message-ID: <3c75dbe94d5c35b6d202c3427adc948a525fa9c3.1761724370.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Dc0EPJNgjecnFq2Dsi_Ba5KoBw-vN54HQXBd8ydmV0o_1761724401 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZFGEVLISQFWMTPEMBQHB75U74FB4RES4 X-Message-ID-Hash: ZFGEVLISQFWMTPEMBQHB75U74FB4RES4 X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1761724751390154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Instead of having these big switch()-es that enumerate all memory models (but act only on virtio models), let's use virDomainMemoryIsVirtioModel() helper instead. Signed-off-by: Michal Privoznik Reviewed-by: Jiri Denemark --- src/qemu/qemu_domain_address.c | 44 +++++++--------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 774541ca06..6d5c4785e8 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -293,18 +293,9 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def, } =20 for (i =3D 0; i < def->nmems; i++) { - switch (def->mems[i]->model) { - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - if (def->mems[i]->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_T= YPE_NONE) - def->mems[i]->info.type =3D type; - break; - case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: - case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: - case VIR_DOMAIN_MEMORY_MODEL_LAST: - break; + if (virDomainMemoryIsVirtioModel(def->mems[i]) && + def->mems[i]->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_= NONE) { + def->mems[i]->info.type =3D type; } } =20 @@ -1024,18 +1015,10 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainD= eviceDef *dev, break; =20 case VIR_DOMAIN_DEVICE_MEMORY: - switch (dev->data.memory->model) { - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: + if (virDomainMemoryIsVirtioModel(dev->data.memory)) return virtioFlags; =20 - case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: - case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: - case VIR_DOMAIN_MEMORY_MODEL_LAST: - return 0; - } + return 0; break; =20 case VIR_DOMAIN_DEVICE_CRYPTO: @@ -2444,19 +2427,10 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def, for (i =3D 0; i < def->nmems; i++) { virDomainMemoryDef *mem =3D def->mems[i]; =20 - switch (mem->model) { - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM: - case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM: - if (virDeviceInfoPCIAddressIsWanted(&mem->info) && - qemuDomainPCIAddressReserveNextAddr(addrs, &mem->info) < 0) - return -1; - break; - case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: - case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC: - case VIR_DOMAIN_MEMORY_MODEL_LAST: - break; + if (virDomainMemoryIsVirtioModel(mem) && + virDeviceInfoPCIAddressIsWanted(&mem->info) && + qemuDomainPCIAddressReserveNextAddr(addrs, &mem->info) < 0) { + return -1; } } =20 --=20 2.51.0