From nobody Sat Feb 7 07:10:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1502984681756176.40789600388382; Thu, 17 Aug 2017 08:44:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C42D155DF; Thu, 17 Aug 2017 15:44:39 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6AAFF5C472; Thu, 17 Aug 2017 15:44:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A021F3FAD0; Thu, 17 Aug 2017 15:44:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v7HFibIK023376 for ; Thu, 17 Aug 2017 11:44:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4A965EDE2; Thu, 17 Aug 2017 15:44:37 +0000 (UTC) Received: from inaba.usersys.redhat.com (ovpn-204-132.brq.redhat.com [10.40.204.132]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B59A25EDEB for ; Thu, 17 Aug 2017 15:44:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8C42D155DF Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 17 Aug 2017 17:44:23 +0200 Message-Id: <20170817154423.5825-4-abologna@redhat.com> In-Reply-To: <20170817154423.5825-1-abologna@redhat.com> References: <20170817154423.5825-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/3] conf: Use the correct limit for the number of PHBs X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 17 Aug 2017 15:44:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" I mistakenly thought pSeries guests supported 32 PHBs, but it turns out they only support 31. Validate the target index accordingly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1479647 Signed-off-by: Andrea Bolognani --- src/conf/domain_conf.c | 4 ++= -- .../qemuxml2argv-pseries-phb-invalid-target-index-3.xml | 6 ++= +--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 86afeaa3f..41a2a7bc8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5007,10 +5007,10 @@ virDomainControllerDefValidate(const virDomainContr= ollerDef *controller) /* Only validate the target index if it's been set */ if (opts->targetIndex !=3D -1) { =20 - if (opts->targetIndex < 0 || opts->targetIndex > 31) { + if (opts->targetIndex < 0 || opts->targetIndex > 30) { virReportError(VIR_ERR_XML_ERROR, _("PCI controller target index '%d' out of " - "range - must be 0-31"), + "range - must be 0-30"), opts->targetIndex); return -1; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target= -index-3.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-targ= et-index-3.xml index 864c5d875..3d99da499 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-= 3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-invalid-target-index-= 3.xml @@ -8,10 +8,10 @@ /usr/bin/qemu-system-ppc64 - + - + --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list