From nobody Tue Feb 10 00:57:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=huawei.com ARC-Seal: i=1; a=rsa-sha256; t=1668651323; cv=none; d=zohomail.com; s=zohoarc; b=kEAq31IVpLB5kgVYvfm//xrx3pjGnXIO6ojAMFdrMsmLLW4NPDoWKFBj9pg4DXSkWo4CyJu9k2swsegRh8Nz0tWO2IzLsIidUQU7IhB9s0nWNybiZqZWf7fK2TeN/UNXLs+CAvyWmrCmm/sOgbsD0drC7ZxB7JmyGNXEbCSX/RQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668651323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XTzKpWPZC5y7Aj6so2KRuSNcdTeqjylB5jwrzA68Y/Y=; b=OaykorwbETzYTNO1J/ws4/jkUHX791wNc1lDonKvERYEEkFdNxUhUSiB/ttZGhzAsJiNG8rgrKl4KJneX4XYlGgyO4Mm8vYRgFh4/mgTeMlXklXMZnC6yx2Vt1glbjfXCHdOPCCczPftnxQUnWQWJg8k8JP+oretTledbJ6fkDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1668651323559574.018913675145; Wed, 16 Nov 2022 18:15:23 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-660-RV-9wHDNO4iLKY9L9EhDYQ-1; Wed, 16 Nov 2022 21:15:18 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39B481C05EBF; Thu, 17 Nov 2022 02:15:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 276D92023A16; Thu, 17 Nov 2022 02:15:15 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 1C4B019465A3; Thu, 17 Nov 2022 02:15:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5893E19465A2 for ; Thu, 17 Nov 2022 02:15:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3DB31111E3E4; Thu, 17 Nov 2022 02:15:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast08.extmail.prod.ext.rdu2.redhat.com [10.11.55.24]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 34EF2112132C for ; Thu, 17 Nov 2022 02:15:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 160EC38123BC for ; Thu, 17 Nov 2022 02:15:14 +0000 (UTC) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-286-ufW48ukcMziUGEk6VTkIKg-1; Wed, 16 Nov 2022 21:15:12 -0500 Received: from dggpeml500022.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NCNlr3JDtzRpNf for ; Thu, 17 Nov 2022 10:14:48 +0800 (CST) Received: from localhost.localdomain (10.175.124.27) by dggpeml500022.china.huawei.com (7.185.36.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 17 Nov 2022 10:15:04 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668651322; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XTzKpWPZC5y7Aj6so2KRuSNcdTeqjylB5jwrzA68Y/Y=; b=BUNTvbk3RbPF8BnqgciktW87mjhkqkEw9kxL1inQ7qHPNPTiNjucJqMkHlEK53wRrxobeB vw9dzctiDGYc8uTuUSIIyoYWJfhAwZ1wB7kj0czh8FzEXJUaV1da66n7hrUVNnpE/SWIea cpE9V+TgTA+LCxwvEmQB50UEcojrPqc= X-MC-Unique: RV-9wHDNO4iLKY9L9EhDYQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: ufW48ukcMziUGEk6VTkIKg-1 From: Jiang Jiacheng To: Subject: [PATCH 6/7] qemu: Support add bootindex = 0 to boothash when its bootIndexSpecified is true Date: Thu, 17 Nov 2022 10:05:32 +0800 Message-ID: <20221117020533.45412-7-jiangjiacheng@huawei.com> In-Reply-To: <20221117020533.45412-1-jiangjiacheng@huawei.com> References: <20221117020533.45412-1-jiangjiacheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpeml500022.china.huawei.com (7.185.36.66) X-CFilter-Loop: Reflected X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yubihong@huawei.com, zhengchuan@huawei.com, linyilu@huawei.com, jiangjiacheng@huawei.com, xiexiangyou@huawei.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1668651325383100006 Content-Type: text/plain; charset="utf-8" Support add bootindex =3D 0 to boothash and return 0 if duplicated bootinde= x =3D 0 is set. It is nessary to add bootindex =3D 0 into boothash, otherwise libvirt will = auto set boot dev, which will cause bootindex unchangable. Meanwhile, bootindex =3D 0 means di= sable bootindex, so it should be allowed to set duplicated bootindex =3D 0. Signed-off-by: Jiang Jiacheng --- src/conf/domain_postparse.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c index 9a3e8f494c..2ba3186561 100644 --- a/src/conf/domain_postparse.c +++ b/src/conf/domain_postparse.c @@ -1031,7 +1031,7 @@ virDomainDefCollectBootOrder(virDomainDef *def G_GNUC= _UNUSED, GHashTable *bootHash =3D data; g_autofree char *order =3D NULL; =20 - if (info->bootIndex =3D=3D 0) + if (info->bootIndex =3D=3D 0 && !info->bootIndexSpecified) return 0; =20 if (dev->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV && @@ -1045,6 +1045,12 @@ virDomainDefCollectBootOrder(virDomainDef *def G_GNU= C_UNUSED, order =3D g_strdup_printf("%u", info->bootIndex); =20 if (virHashLookup(bootHash, order)) { + /* 0 in the bootHash means cancel the bootIndex specified in + * XML, so it allowed to make more than one device use 0 with + * its bootIndexSpecified =3D true. + */ + if (info->bootIndex =3D=3D 0) + return 0; virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("boot order '%s' used for more than one device"), order); --=20 2.33.0