From nobody Mon Feb 9 02:51:56 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 1699271304440876.4810997801696; Mon, 6 Nov 2023 03:48:24 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5336A1A02; Mon, 6 Nov 2023 06:48:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6386A197A; Mon, 6 Nov 2023 06:39:41 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 6CE2D1970; 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 24ED9197C for ; Mon, 6 Nov 2023 06:38:51 -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-160-T53riOKnNe-68BPwxUyEGA-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 5E5B58F9202 for ; Mon, 6 Nov 2023 11:38:49 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 062DC10E4E 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: T53riOKnNe-68BPwxUyEGA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 5/5] qemu_domain: Drop qemuCheckMemoryDimmConflict() Date: Mon, 6 Nov 2023 12:38:28 +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: 65MTQ7Q3QKVW4N44X54EEXS3PJ5R46GO X-Message-ID-Hash: 65MTQ7Q3QKVW4N44X54EEXS3PJ5R46GO 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: 1699271305322100001 The virDomainMemoryDefCheckConflict() already does the same set of checks. There's no need to duplicate them. Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- src/qemu/qemu_domain.c | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ae19ce884b..413f67577e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9082,39 +9082,6 @@ qemuDomainSupportsPCI(virDomainDef *def, } =20 =20 -static bool -qemuCheckMemoryDimmConflict(const virDomainDef *def, - const virDomainMemoryDef *mem) -{ - size_t i; - - for (i =3D 0; i < def->nmems; i++) { - virDomainMemoryDef *tmp =3D def->mems[i]; - - if (tmp =3D=3D mem || - tmp->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) - continue; - - if (mem->info.addr.dimm.slot =3D=3D tmp->info.addr.dimm.slot) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory device slot '%1$u' is already being = used by another memory device"), - mem->info.addr.dimm.slot); - return true; - } - - if (mem->info.addr.dimm.base !=3D 0 && - mem->info.addr.dimm.base =3D=3D tmp->info.addr.dimm.base) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory device base '0x%1$llx' is already be= ing used by another memory device"), - mem->info.addr.dimm.base); - return true; - } - } - - return false; -} - - static int qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, const virDomainDef *def) @@ -9138,10 +9105,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDo= mainMemoryDef *mem, mem->info.addr.dimm.slot, def->mem.memory_s= lots); return -1; } - - - if (qemuCheckMemoryDimmConflict(def, mem)) - return -1; } break; =20 --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org