From nobody Fri May 3 08:29:58 2024 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626785923; cv=none; d=zohomail.com; s=zohoarc; b=SOXzXVg21v5Tfs3nIyfDQyxXdyNCOf68FVvvz7/6E0jakpEOtH731IgHtoUJ2zn6quOQo0UzgGAi9oUJ4aRovxzD5aNLGntIYHWgxx8CGlCRI57UZv2LWHlRVBQwCi+NniUM9H5+sg5lYm0GJi9MCT55+Bv1KTiVXF+MQxKVw04= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626785923; h=Content-Type:Content-Transfer-Encoding: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=KrpWqhbY6P6xjDj2NQ2dnib/G4qqANMchvEcEiNp+Ys=; b=BxM4TXc5ZNFbKPUpeinexeS8UfSGuyvkjfd0vxLi5R4iL7U0bLJ23gHIyodX8lUrH2fBe0Mzf5ywUNYy2Iuh0vBxPnZT2urLtrutrEqVcDHYtiEwBiJEVM+IofYY7VRNa7EMDCjYjp5j/h3AVhwXkCoCxY8VpbJ8yLKn4QGZgsI= 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=pass header.from= (p=none dis=none) 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 1626785923942778.344477035744; Tue, 20 Jul 2021 05:58:43 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-416-hJ_r5QHIO9C2DVbVXzJwPg-1; Tue, 20 Jul 2021 08:58:40 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D4E89F93F; Tue, 20 Jul 2021 12:58:34 +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 A826E5D9DC; Tue, 20 Jul 2021 12:58:33 +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 43E7D4EA37; Tue, 20 Jul 2021 12:58:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16KCwIu1030152 for ; Tue, 20 Jul 2021 08:58:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id E4C8E10016F8; Tue, 20 Jul 2021 12:58:18 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70E0F1001281 for ; Tue, 20 Jul 2021 12:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626785922; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=KrpWqhbY6P6xjDj2NQ2dnib/G4qqANMchvEcEiNp+Ys=; b=DCUrQ61Q2o0+/vqfMjLWlBFpe61iHglTCqiAZ2FCxQsNTF5vZ+rPJ4zsSzqtDq2Wd9iMMr dNX75ExvVgyrOzW/J9ZDzisxsqJZIKw0c2ew2m32kvfjSoqEoZoPER2gsQLFdRmcHiSYWS liY2caxqMrwvFp3/lRIRl8iaaxjoHOU= X-MC-Unique: hJ_r5QHIO9C2DVbVXzJwPg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 1/2] docs: Allow 'id' attribute for 'cachetune' element Date: Tue, 20 Jul 2021 14:58:08 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.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.14 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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626785925577100001 Content-Type: text/plain; charset="utf-8" Even though 'id' attribute is output-only, we should accept xml files containing it. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1941594 Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- docs/formatdomain.rst | 1 + docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 25e6bf73ba..b14fba2cd1 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -850,6 +850,7 @@ CPU Tuning to which vCPUs this allocation applies. A vCPU can only be member of one ``cachetune`` element allocation. The vCPUs specified by cachetune can = be identical with those in memorytune, however they are not allowed to ove= rlap. + The optional, output only ``id`` attribute identifies cache uniquely. Supported subelements are: =20 ``cache`` diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 5ea14b6dbf..c6643bbc7f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1006,6 +1006,11 @@ + + + + + --=20 2.31.1 From nobody Fri May 3 08:29:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1626785926; cv=none; d=zohomail.com; s=zohoarc; b=OAgu/5Dl0g5efve5fx73SvUVDT3raQnlY4vtX/etjh04M3g44hNqbDGnviATAtDrXMYMlsVUvLEAzPnv1yoZDV30QdXLfYUSHD4yLnN8a5j4yMdndUxpR+AykK1+OAF2ZMYkqoUfsIMGZZ+Scqaa3skauYsQXl9Eq5rc7p11H3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626785926; h=Content-Type:Content-Transfer-Encoding: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=BjE1CtYZsn44lNV5/RHwJqwJ9A6GWuXqJUDLdsu1BeA=; b=CaHKUfKwdBcv+2hmGTTBeNv32Oi3UT7rhKBPyCeoQ4yUVeVPxuTkFkN/2anMsk8iyMtU251QdYa/nUTohhlGVbMe2qrAsrO2w427/0FL8tAk5USoNm9s7SUqCVY1SO9Q1Xo2LvcrU+ILD7aDOtjQkWQZa5T+amh/72cvXWPEgS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1626785926813423.08471366016613; Tue, 20 Jul 2021 05:58:46 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-xM-emDitNlaouZwaii3zRQ-1; Tue, 20 Jul 2021 08:58:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 690B61084F60; Tue, 20 Jul 2021 12:58:37 +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 4668F60CA1; Tue, 20 Jul 2021 12:58:37 +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 0B77D1809C99; Tue, 20 Jul 2021 12:58:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16KCwJwH030158 for ; Tue, 20 Jul 2021 08:58:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id B129110016F8; Tue, 20 Jul 2021 12:58:19 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.43.2.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D5671001281 for ; Tue, 20 Jul 2021 12:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626785925; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=BjE1CtYZsn44lNV5/RHwJqwJ9A6GWuXqJUDLdsu1BeA=; b=eEjopP5GR4A4xeRFWWHpKoml5O4lJenS2UKRiiC94ECSdMwZW/oYuNhs6F8RUQ7J9fWfR5 VP5l3XGIDeIkKmd3zf0ZxBhglXEXOc9i0eEuKbhomOfEOC6GU65XL1ydqoGpnDz5LhT7uJ uRXfVIVOpzyxMIzBI3W24817LIKCHQ8= X-MC-Unique: xM-emDitNlaouZwaii3zRQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 2/2] genericxml2xmltest: Modify cachetune test to include id Date: Tue, 20 Jul 2021 14:58:09 +0200 Message-Id: <50788b49a4c9612ddf9777e08a25e0324ecc1c48.1626785302.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.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.12 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-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626785927371100003 Content-Type: text/plain; charset="utf-8" I changed DO_TEST_DIFFERENT to DO_TEST, which allows us to remove the duplicate out file. I also added id attribute for domain element in order to parse it as a live XML ('cachetune id' is in the output of only live XMLs). Lastly I added id of cachetune to test its output value. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- tests/genericxml2xmlindata/cachetune.xml | 8 +++--- tests/genericxml2xmloutdata/cachetune.xml | 34 ----------------------- tests/genericxml2xmltest.c | 2 +- 3 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 tests/genericxml2xmloutdata/cachetune.xml diff --git a/tests/genericxml2xmlindata/cachetune.xml b/tests/genericxml2xm= lindata/cachetune.xml index 40259cf2ee..07e81999a5 100644 --- a/tests/genericxml2xmlindata/cachetune.xml +++ b/tests/genericxml2xmlindata/cachetune.xml @@ -1,16 +1,16 @@ - + QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 219136 219136 4 - - + + - + diff --git a/tests/genericxml2xmloutdata/cachetune.xml b/tests/genericxml2x= mloutdata/cachetune.xml deleted file mode 100644 index f05cab70ff..0000000000 --- a/tests/genericxml2xmloutdata/cachetune.xml +++ /dev/null @@ -1,34 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 4 - - - - - - - - - - - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i386 - - - - - - - - diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index ac89422a32..17448a3465 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -214,7 +214,7 @@ mymain(void) =20 DO_TEST("cachetune-small"); DO_TEST("cachetune-cdp"); - DO_TEST_DIFFERENT("cachetune"); + DO_TEST("cachetune"); DO_TEST_DIFFERENT("cachetune-extra-tunes"); DO_TEST_FULL("cachetune-colliding-allocs", false, true, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); --=20 2.31.1