From nobody Sun Feb 8 16:04:59 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; 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=none dis=none) header.from=gmail.com 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 1642686832947556.967712513187; Thu, 20 Jan 2022 05:53:52 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-Y-TkD6sAPrmJcVDZsurFYA-1; Thu, 20 Jan 2022 08:53:48 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C69F1B18BD0; Thu, 20 Jan 2022 13:53:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 639D27B6DF; Thu, 20 Jan 2022 13:53:42 +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 2EAA918218AF; Thu, 20 Jan 2022 13:53:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 20KDrbLP009591 for ; Thu, 20 Jan 2022 08:53:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 476FA40F9D74; Thu, 20 Jan 2022 13:53:37 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast10.extmail.prod.ext.rdu2.redhat.com [10.11.55.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4347540F9D73 for ; Thu, 20 Jan 2022 13:53:37 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 2D48F1C00F74 for ; Thu, 20 Jan 2022 13:53:37 +0000 (UTC) Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-596-6QLnhqW9PEqhqoLlecpT0g-1; Thu, 20 Jan 2022 08:53:35 -0500 Received: by mail-ot1-f43.google.com with SMTP id a12-20020a0568301dcc00b005919e149b4cso7620609otj.8 for ; Thu, 20 Jan 2022 05:53:35 -0800 (PST) Received: from rekt.COMFAST ([191.8.61.226]) by smtp.gmail.com with ESMTPSA id a26sm1574102oiy.26.2022.01.20.05.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 05:53:34 -0800 (PST) X-MC-Unique: Y-TkD6sAPrmJcVDZsurFYA-1 X-MC-Unique: 6QLnhqW9PEqhqoLlecpT0g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4RJV08/mIFr7+rbVpEr2I0FRkWKp8AikRHfPz2dC444=; b=Ekw02tOzUqu7f3RMDbhSSlvMt8GNooWSdxbqADWdd6wI2rS8s9teMlckb1G0GftLNe oHL0YROI8jiS23rafzsaAdgHWGxwPBW8gXkwnyDh5NulJIG6OVOAuT37JX9mfWkv8Yz7 PZxZ1HpdHUZ6XHfTab2KIDP5SFfpHLyxyfvV02xXaQP2PW+X7WHOou2PWt5aJvxRKi2Z zpIYGY1XNSshX4AULgEhU8mBPyH3RpuDrbVTVtbzjt/5gcv61wYec7FCedNqdA9l5S5b y7xv9gm9jVrs0ve+So9KM0DKo7oPjXLQgcrOzb4NHNwDokmvs+gxNzSJ+wui/089J0Jv tMaQ== X-Gm-Message-State: AOAM532ZfSngZ0CNe0Vf0gpMl+lqG6GO4Wefex85KlqAtoRYN5k0FP4j FjLILKj/jdZuDxD+2C021qoECVkLg28= X-Google-Smtp-Source: ABdhPJxvgwbA9R6Tf8KDsCzr+05mf/6u8JR09XwRbyIyUZz+2z5i6kJAdmki9QPvXUhiCCDdWinS7A== X-Received: by 2002:a9d:a0a:: with SMTP id 10mr27009701otg.37.1642686814644; Thu, 20 Jan 2022 05:53:34 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 26/33] domain_conf.c: reject duplicated pnv-phb3 devices Date: Thu, 20 Jan 2022 10:52:29 -0300 Message-Id: <20220120135236.719924-27-danielhb413@gmail.com> In-Reply-To: <20220120135236.719924-1-danielhb413@gmail.com> References: <20220120135236.719924-1-danielhb413@gmail.com> MIME-Version: 1.0 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 2.84 on 10.11.54.1 X-loop: libvir-list@redhat.com Cc: fbarrat@linux.ibm.com, danielhb413@gmail.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1642686834784100005 Content-Type: text/plain; charset="utf-8" These devices must have unique targetIndex/chip-id pairs. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_conf.c | 35 +++++++++++++++++++++ tests/qemuxml2argvdata/powernv8-dupPHBs.err | 1 + tests/qemuxml2argvdata/powernv8-dupPHBs.xml | 27 ++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 66 insertions(+) create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.err create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8e44e4b53c..442b3812b7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2481,6 +2481,33 @@ virDomainControllerIsPowerNVRootPort(const virDomain= ControllerDef *cont) } =20 =20 +/* Caller must ensure that 'cont' is a PowerNV PHB device */ +static bool +virDomainControllerDuplicatedPHB(virDomainDef *def, + virDomainControllerDef *cont) +{ + int chipId =3D cont->opts.pciopts.chipId; + int targetIndex =3D cont->opts.pciopts.targetIndex; + size_t i; + + for (i =3D 0; i < def->ncontrollers; i++) { + virDomainControllerDef *cont2 =3D def->controllers[i]; + + if (!virDomainControllerIsPowerNVPHB(cont2)) + continue; + + if (cont2 =3D=3D cont) + continue; + + if (cont2->opts.pciopts.chipId =3D=3D chipId && + cont2->opts.pciopts.targetIndex =3D=3D targetIndex) + return true; + } + + return false; +} + + virDomainFSDef * virDomainFSDefNew(virDomainXMLOption *xmlopt) { @@ -4737,6 +4764,14 @@ virDomainDefRejectDuplicateControllers(virDomainDef = *def) cont->idx); goto cleanup; } + + if (virDomainControllerIsPowerNVPHB(cont) && + virDomainControllerDuplicatedPHB(def, cont)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Multiple pnv-phb controllers with same chip-= id and index")); + goto cleanup; + } + ignore_value(virBitmapSetBit(bitmaps[cont->type], cont->idx)); } =20 diff --git a/tests/qemuxml2argvdata/powernv8-dupPHBs.err b/tests/qemuxml2ar= gvdata/powernv8-dupPHBs.err new file mode 100644 index 0000000000..bc5879640d --- /dev/null +++ b/tests/qemuxml2argvdata/powernv8-dupPHBs.err @@ -0,0 +1 @@ +XML error: Multiple pnv-phb controllers with same chip-id and index diff --git a/tests/qemuxml2argvdata/powernv8-dupPHBs.xml b/tests/qemuxml2ar= gvdata/powernv8-dupPHBs.xml new file mode 100644 index 0000000000..43ee3051eb --- /dev/null +++ b/tests/qemuxml2argvdata/powernv8-dupPHBs.xml @@ -0,0 +1,27 @@ + + QEMUGuest1 + b20fcfe3-4a0a-4039-8735-9e024256e0f7 + 2097152 + 1 + + hvm + + + /usr/bin/qemu-system-ppc64 + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a0bc5ed169..ff8698927e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2224,6 +2224,9 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_DEVICE_PNV_PHB3, QEMU_CAPS_DEVICE_PNV_PHB3_ROOT_PORT); + DO_TEST_PARSE_ERROR("powernv8-dupPHBs", + QEMU_CAPS_DEVICE_ISA_SERIAL, + QEMU_CAPS_DEVICE_PNV_PHB3); =20 DO_TEST("pseries-basic", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, --=20 2.34.1