From nobody Sun Feb 8 19:43:14 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1699271209652427.46713317191245; Mon, 6 Nov 2023 03:46:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5B88918FA; Mon, 6 Nov 2023 06:46:48 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F419C1A3A; Mon, 6 Nov 2023 06:39:32 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 11B2A18DD; Mon, 6 Nov 2023 06:38:52 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id E8E2E197A for ; Mon, 6 Nov 2023 06:38:50 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-604-IxlQ98LEP2Wga13BtzVUfA-1; Mon, 06 Nov 2023 06:38:49 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id C60AA85A5B5 for ; Mon, 6 Nov 2023 11:38:48 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70A6F502B for ; Mon, 6 Nov 2023 11:38:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: IxlQ98LEP2Wga13BtzVUfA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 4/5] virDomainMemoryDefCheckConflict: Validate dimm slot too Date: Mon, 6 Nov 2023 12:38:27 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: PCAOBMZ4ETVDYJ6OVX4RUQ27LQHTRNAN X-Message-ID-Hash: PCAOBMZ4ETVDYJ6OVX4RUQ27LQHTRNAN X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1699271210665100001 Since we're iterating over def->mems array, might as well check for dimm slot duplicates. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/conf/domain_validate.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 5d9602666e..f45ee0a8a5 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2221,6 +2221,7 @@ static int virDomainMemoryDefCheckConflict(const virDomainMemoryDef *mem, const virDomainDef *def) { + const virDomainDeviceDimmAddress *thisAddr =3D NULL; unsigned long long thisStart =3D 0; unsigned long long thisEnd =3D 0; size_t i; @@ -2235,6 +2236,7 @@ virDomainMemoryDefCheckConflict(const virDomainMemory= Def *mem, case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_NVDIMM: if (mem->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) { + thisAddr =3D &mem->info.addr.dimm; thisStart =3D mem->info.addr.dimm.base; } break; @@ -2244,7 +2246,7 @@ virDomainMemoryDefCheckConflict(const virDomainMemory= Def *mem, break; } =20 - if (thisStart =3D=3D 0) { + if (thisStart =3D=3D 0 && !thisAddr) { return 0; } =20 @@ -2258,19 +2260,27 @@ virDomainMemoryDefCheckConflict(const virDomainMemo= ryDef *mem, if (other =3D=3D mem) continue; =20 - /* In case we're updating an existing memory device (e.g. virtio-m= em), - * then pointers will be different. But addresses and aliases are = the - * same. However, STREQ_NULLABLE() returns true if both strings are - * NULL which is not what we want. */ - if (virDomainDeviceInfoAddressIsEqual(&other->info, - &mem->info)) { - continue; - } + if (thisAddr && other->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_= TYPE_DIMM && + thisAddr->slot =3D=3D other->info.addr.dimm.slot) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory device slot '%1$u' is already being u= sed by another memory device"), + thisAddr->slot); + return -1; + } else if (!thisAddr) { + /* In case we're updating an existing memory device (e.g. + * virtio-mem), then pointers will be different. But addresses= and + * aliases are the same. However, STREQ_NULLABLE() returns tru= e if + * both strings are NULL which is not what we want. */ + if (virDomainDeviceInfoAddressIsEqual(&other->info, + &mem->info)) { + continue; + } =20 - if (mem->info.alias && - STREQ_NULLABLE(other->info.alias, - mem->info.alias)) { - continue; + if (mem->info.alias && + STREQ_NULLABLE(other->info.alias, + mem->info.alias)) { + continue; + } } =20 switch (other->model) { --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org