From nobody Sat May 4 21:16:29 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=1626430678; cv=none; d=zohomail.com; s=zohoarc; b=gtCYageHA+oKmJYsvD1ggShuBQhe3ZtRNjumKWXL6oUa5Shnx2vRTa05Sdh/XAeiibfQJwWrudwEJqmhdPbT3zxUTL9NntoBwjyUtgffFvAU1Pka1mFum2ax4GFwdcyYHZZEuK/GXwNdyoPnPNOkXP1Tfr5AaOR43TpmjWewGGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626430678; 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=WDrLyYSvSzXm7LLw490Ei78SFXPWq2BoY1ema19psp0=; b=naMrQ4p6+QLWcPSHmNqofQJJ+GCWA8Oy8/DDqgl65BjD4OjWJPciIq9JW90s7uAdAmRqPD+j3NPFIoPFjiDhamACGHz3R1ivaTzFe4SY8+OBp2pq0XZlVPg3s6PzL2LSgIdK1uK8xIx5TmoLtZNxh8EWGWQ6D0wcYLYZz9Fh+IE= 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 162643067805693.41607787603846; Fri, 16 Jul 2021 03:17:58 -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-62-wm2Y75pwM72aYRPP-duesA-1; Fri, 16 Jul 2021 06:17:55 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9426E18414A1; Fri, 16 Jul 2021 10:17:50 +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 6C4CD5D703; Fri, 16 Jul 2021 10:17:50 +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 2BEB44EA2A; Fri, 16 Jul 2021 10:17:50 +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 16GAG68L006663 for ; Fri, 16 Jul 2021 06:16:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id C72F0100EB3E; Fri, 16 Jul 2021 10:16:06 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.195.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id D979010074FD for ; Fri, 16 Jul 2021 10:16:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626430677; 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=WDrLyYSvSzXm7LLw490Ei78SFXPWq2BoY1ema19psp0=; b=VLLdds9cbEWp5YKMG68JkVF17/8VzS4sF3zySnhOEwsvKRP/A4M2zbE0Mx1U6vuNO5W4KQ 31WGpiw5j9c75maVr8iAEqMvJD/AGk3E+fV4aFZwu9sDBZdC+ZBNQwxZ8WrNTcKIzkqECs zkTqEP8ujW4jGWoJw6E/W+A2xow/F/4= X-MC-Unique: wm2Y75pwM72aYRPP-duesA-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 1/2] docs: Allow 'id' attribute for 'cachetune' element Date: Fri, 16 Jul 2021 12:15:52 +0200 Message-Id: <1a1ffd2cf9e95b2fe55422e34de29a511748f22c.1626429550.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.15 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: 1626430679816100001 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 --- docs/formatdomain.rst | 2 +- docs/schemas/domaincommon.rng | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 25e6bf73ba..d3c91c2a6d 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -850,7 +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. - Supported subelements are: + The optional attribute ``id`` is output only. Supported subelements are: =20 ``cache`` This optional element controls the allocation of CPU cache and has t= he 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 Sat May 4 21:16:29 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=1626430580; cv=none; d=zohomail.com; s=zohoarc; b=Mch9p7OpaijMW0SbSK9CL4xVM4hDkdGWUiLMf9e9STjQze7LJWGlKDAJUydBbtQN8igKRh28GzK4B7ycybe+6N5rwxNU6KKNngzdHJqyu/So6SA06AAc360+j/4DD+3YNxocrxmp2TV34JDwogzMrQKn1WsYnonciN5t3tlxQ4M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626430580; 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=8i7bjraZYtY3g+4nsl2G+Ow+SVMpBjmISPodyQkLTG0=; b=OhSozocSX7KuTSnQD834OB/5JkbRI+lgw2EKJ5m5HT0vSgAAJd/f+U7539qa5rHWby3uD1qK/x8y7tX2EOOODEW+4ZnL97978JRaXHi4PQv5zGKwwxThVxVro0QwrZPCXO385QCAzrQoS4S4vVqEuZl5gv01WU6Burwop5X0Tzo= 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 1626430580277798.7752577208983; Fri, 16 Jul 2021 03:16:20 -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-344-Fxlsq-mSPq6vLyfFN90ktg-1; Fri, 16 Jul 2021 06:16:17 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB9581084F53; Fri, 16 Jul 2021 10:16:11 +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 EF656604CD; Fri, 16 Jul 2021 10:16:10 +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 CB3FB4EA2F; Fri, 16 Jul 2021 10:16:09 +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 16GAG8at006670 for ; Fri, 16 Jul 2021 06:16:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CB0D1036D20; Fri, 16 Jul 2021 10:16:08 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.195.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69BB510074FD for ; Fri, 16 Jul 2021 10:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626430579; 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=8i7bjraZYtY3g+4nsl2G+Ow+SVMpBjmISPodyQkLTG0=; b=iwZo33uCqowYxfPrWppYmGkHmjHJrp+Dd15BbNGbHIVJSnqaoQBCYd3Zqu6ZtLzZcFiHBE aijuoXHgjD4bYFQuXAjLo0zqTP99H5ucr/zSyFUsI/7yzlyjoOzV76h1jFK44ATOaaZCMf 2jtsdW4S7Zrc3OX95s9PVxdLtnPj0xA= X-MC-Unique: Fxlsq-mSPq6vLyfFN90ktg-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 2/2] tests: Modify to test output value of 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.11 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: 1626430581404100001 Content-Type: text/plain; charset="utf-8" We can also delete out xml thanks to the change in the call of the test to DO_TEST instead of DO_TEST_DIFFERENT. Signed-off-by: Kristina Hanicova --- 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