From nobody Tue Sep 9 03:19:40 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=1748860401; cv=none; d=zohomail.com; s=zohoarc; b=AJURUTRgdrTap/aY/++vjE4Hwaz+GEuT9Aw+Mo+obxm0Mo+buk0JQWD51TApzDoBpPWXBR/mmdkkKWyiSbGlz/bk4exUd+2VNkG/anQn5+uYBTb6DxMaF6oIJGqnD54cSubtQU3+KqKfkPvvYUnmdriYM0WUULjc0e167pOe0/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748860401; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=CF0kxAE908rKa17Q4A8mY0j8pKOHfw6IHJq0kNo/gI4=; b=ZtgxeTC+mXYAhDk7PesMe4wc6nfpN4UNvkR3wi2dJeorEJUd781gW1jZGKg64XiihU+PHGSGCRhzl1BeK+p8F0MKeO+DQfI4k1JNGHrZGMu7H8eQDV1rKntn1nSOMerIm2O7ufxFInSxa68cFNj9+x3LjkQiDwGSPVsK6q6Gk7U= 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 1748860401003387.9527324957645; Mon, 2 Jun 2025 03:33:21 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F1F2D14F3; Mon, 2 Jun 2025 06:33:19 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6CF611481; Mon, 2 Jun 2025 06:31:14 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 157DFE77; Mon, 2 Jun 2025 06:31:05 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 125C9E8C for ; Mon, 2 Jun 2025 06:31:03 -0400 (EDT) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-455-2JpA-Qm1OJeSZP_ErAxxYA-1; Mon, 02 Jun 2025 06:31:01 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-442f90418b0so22196485e9.2 for ; Mon, 02 Jun 2025 03:31:01 -0700 (PDT) Received: from wheatley.localdomain ([85.93.96.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-450d7f0803fsm85770355e9.1.2025.06.02.03.30.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 03:30:57 -0700 (PDT) Received: from wheatley.brq.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 63AB4B55DC75 for ; Mon, 02 Jun 2025 12:30:57 +0200 (CEST) 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=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748860262; 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=yMk9/AjSlzY1CejobW8L0mEyJGKyg7OFJBEkAEp4ooM=; b=GMF0/bA/ZzhZR5Vh5ENZcmhk2jZoyqSOCM0118Peqz3zZ7NwL/sC4Y2AL6ZOvzkMdJUpWf WbaMQHwIDmFxUJe7OKIK2zOoa/F0oo+NrItL7oRb93fmeu6yaX+sCtM2JFcdesZBzXx/zr 9yH8RN+IHGVDOnj4ZRA9hVsUJNeHLws= X-MC-Unique: 2JpA-Qm1OJeSZP_ErAxxYA-1 X-Mimecast-MFC-AGG-ID: 2JpA-Qm1OJeSZP_ErAxxYA_1748860260 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748860260; x=1749465060; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yMk9/AjSlzY1CejobW8L0mEyJGKyg7OFJBEkAEp4ooM=; b=INz6nozr3veR9lPOThABfzb2dPi7i1bXKgoeRpxwzwRTddEh7Fct60JlWo/pbX+szq thiPUzKjNEXwDxkRrl2i8Q1esgYTZsIv2Hm3aJ+C11GVbk5ruYGeCECAeORm5suJHMOx pyLa6dU9g4Lt6YHgCgFgi6B+WFjMsaMv3zJ7cK5QS4otb+DejDhywNAINGy0H9KVggM0 DVsWuWu3kP1d3zlAjOqy8Db1LJOc3lit4gJGrySdfEGwWvCgwdA/ohCteagHVg3PEtWT KqMKfJhfPzbQghIZo0vuPshsHElSg83bUEAzt2toxmH9BI2OP7RQdQBFjqVaH8Ijt2pt qKQQ== X-Gm-Message-State: AOJu0YxCmaH9EvbwGMMit0onfcLMoeJg+HRBrKof18Kyipf1TL5Vrwya If3wjhzA1sbQyDyvUJHYeZhcl/R5Vqwkg5bfyp+icC3Z9Yu9y9b8em65xa+Z8RqYOtelSokjjLk Yfe0QBv8vZzCTcD7IUTB1sbk7VR5ooLKDpYwJUlT4WhTyrqBbB/5ErvT+SzYkqqlQqmIQkxqehv RG+UONBhp9G0bvHePGSt1rM9AMnvsBZO7L1cgrXzsoJ7U= X-Gm-Gg: ASbGncsRLfpip/vN5sfnMmwmi6MFWaIhH/NwQoYgPa5YPuLqm5CC9qhVFv4ONigZnlt WEIcK8uIs0alUn6DjnkavWCpXIhGwF2s544IO3LzUNFIwcvnv1XCY1Ky4R8oz9O/wQOc989qeUq CRpocp6wKAL7/QfDjZ2Uh85w/hLq9V2HCV9gMLZy+/kx4X/I3Enl4VipO0MKFtVmLnYAuRgh9X8 JEDslImLjt3lHbhPVXS1ofraEbYzdK3HBRLB3xPXq0GjHFydAUa951GU0wQtxTgrppoAqZ6pXsL vvEA2jc1Af0X3E3k0sey X-Received: by 2002:a05:600c:1d81:b0:442:e03b:589d with SMTP id 5b1f17b1804b1-4511edf2931mr58483245e9.24.1748860260341; Mon, 02 Jun 2025 03:31:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEp6GRlCkapSf7kd60SK/Gqhl8QkPaomUHpO2EF4A+wU6y/qtyjtH3KzjtPIayJQzJJWWbbVQ== X-Received: by 2002:a05:600c:1d81:b0:442:e03b:589d with SMTP id 5b1f17b1804b1-4511edf2931mr58483015e9.24.1748860259963; Mon, 02 Jun 2025 03:30:59 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH 03/11] conf: Add virDomainDeviceFindNvmeController Date: Mon, 2 Jun 2025 12:30:46 +0200 Message-ID: <29473ce35c59bddbe7195be6822314d90fe4ddc8.1748860220.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CfnYQDcb-RaY_AUo9ZZx4sh8rQW57ea4PqPgakIbbFQ_1748860260 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QN2T2CT6GBUI7ZOTQVSUH2MJNS5CIJMA X-Message-ID-Hash: QN2T2CT6GBUI7ZOTQVSUH2MJNS5CIJMA X-MailFrom: mkletzan@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: From: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1748860402364116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander Same as for the SCSI controller, but this time for NVMe, will be used later to do some post parse modifications. Signed-off-by: Martin Kletzander --- src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1b09e25b53b6..c046f5e7cbe5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6791,6 +6791,23 @@ virDomainDeviceFindSCSIController(const virDomainDef= *def, return NULL; } =20 + +virDomainControllerDef * +virDomainDeviceFindNvmeController(const virDomainDef *def, + const virDomainDeviceDriveAddress *addr) +{ + size_t i; + + for (i =3D 0; i < def->ncontrollers; i++) { + if (def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_NV= ME && + def->controllers[i]->idx =3D=3D addr->controller) + return def->controllers[i]; + } + + return NULL; +} + + int virDomainDiskDefAssignAddress(virDomainXMLOption *xmlopt G_GNUC_UNUSED, virDomainDiskDef *def, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f184a4b9b774..c54e4759a783 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3700,6 +3700,9 @@ void virDomainDiskSetFormat(virDomainDiskDef *def, in= t format); virDomainControllerDef * virDomainDeviceFindSCSIController(const virDomainDef *def, const virDomainDeviceDriveAddress *addr); +virDomainControllerDef * +virDomainDeviceFindNvmeController(const virDomainDef *def, + const virDomainDeviceDriveAddress *addr); virDomainControllerDef *virDomainControllerDefNew(virDomainControllerType = type); void virDomainControllerDefFree(virDomainControllerDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainControllerDef, virDomainControllerD= efFree); --=20 2.49.0