From nobody Sat May 18 03:29:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1688478034; cv=none; d=zohomail.com; s=zohoarc; b=IO/hdGiWokK9Jf7pGw1P3EdQUx2/gPgjp9uwdGLeNpuDx4sXeA1OlWxgKHQtaYOEDIgyFgsCPWa91+XL1v0HCjV5d19MZt8BxtOq/BHC4/yFkFBzlNAS5BpAVQeyOym/0/zPufOXZFibdJ4dB3185DHxmauvRvMElfDQZCimZJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478034; 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=w9xoosEuQQlifGblwfffVUlPIuDN7vRa+2G+Ld0lNsE=; b=RHGkROLGZ8ZqNkPfY4ZDmIEmqptj36lM4F29qk0rIQO0UIafFF4wZ2Y/LAC4LD80WiG2KJhNtUlMCFFmPr2ddsMz+EgAcMhatMW4A62hmRFmj4K3gdy2b+B6K9ehOyyJmoBGHeHnzk5NqiCal3JCc9bia3g+00N70f5hYpkwigQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1688478034448801.0222997697201; Tue, 4 Jul 2023 06:40:34 -0700 (PDT) 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-97-WOLB6nxnNsK96f9iDeteqw-1; Tue, 04 Jul 2023 09:40:27 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E99583C0F679; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62648C00049; Tue, 4 Jul 2023 13:40:23 +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 1C238194658C; Tue, 4 Jul 2023 13:40:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A86C41946588 for ; Tue, 4 Jul 2023 13:40:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9AAF34021523; Tue, 4 Jul 2023 13:40:21 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 266564021522 for ; Tue, 4 Jul 2023 13:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478033; 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=w9xoosEuQQlifGblwfffVUlPIuDN7vRa+2G+Ld0lNsE=; b=GIfwdScaWYI7kyg/w9SICb53A23dGqwgbXY2YNbX7us/9SLNqls8SNmZx65fSow8cJ0JbM CYDXY/LcdP9o0ra8m3yVF9pfbP5a2L3xOkGVbDfVc/k4hEhxBqa2PQg/Rmur84DDu4aUsu 9sgnYPDRXygqjrO5ZKsEbA0a4AsJJf8= X-MC-Unique: WOLB6nxnNsK96f9iDeteqw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/10] testutils: Print number of failed tests Date: Tue, 4 Jul 2023 15:40:10 +0200 Message-ID: <531d8bc61c60acdc30c103430dd8f7651222c71f.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: 1688478036578100006 Content-Type: text/plain; charset="utf-8" We can easily report how many tests failed. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index d77b9e8db2..e546422941 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -922,7 +922,7 @@ int virTestMain(int argc, if (ret =3D=3D EXIT_FAILURE && !virBitmapIsAllClear(failedTests)) { g_autofree char *failed =3D virBitmapFormat(failedTests); - fprintf(stderr, "Some tests failed. Run them using:\n"); + fprintf(stderr, "%zu tests failed. Run them using:\n", virBitmapCo= untBits(failedTests)); fprintf(stderr, "VIR_TEST_DEBUG=3D1 VIR_TEST_RANGE=3D%s %s\n", fai= led, argv[0]); } --=20 2.41.0 From nobody Sat May 18 03:29:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1688478034; cv=none; d=zohomail.com; s=zohoarc; b=kOPOxRrjSksQsbFsduSusDQHmTGKo25velTmaHqsarBCaRDmaUaW5ADNwi8G89I9kjI2duFz81m0ITRfKPUa7NPCzvx2Mv/IFqjSqEPCqFPpsq1X1CZt2YJCw3C1fda2NibY1GV5wmDKkDZoc8DwlQ7+FGCXVq/my/qwTeuPXU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478034; 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=HiuZajU+iUXFDEx7AScn6ng/vPXqQPAljN8WG6IHqBQ=; b=lW1x+hvMQ14KwHF6OOR6B5XM0+/OQM1AMfMjjvRApZsKqcHGCS5oYvkS/ajpOeWNzDoDuWKeLYPFaeVvVs0JgBlPWVa/2paUNBPEMDMtGsVNbWDHg+vyQkJzLZKqovBjYhHlqXrz1isQYrPT89qzahWdG2igd6N4kSB6DN07BUk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1688478034043817.9497394825913; Tue, 4 Jul 2023 06:40:34 -0700 (PDT) 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-475-2_eqZk3_PHKvG8L8iK0jig-1; Tue, 04 Jul 2023 09:40:28 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EDCCA1C2BD6D; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0015540C2074; Tue, 4 Jul 2023 13:40:23 +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 532C21946A45; Tue, 4 Jul 2023 13:40:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C20E81946588 for ; Tue, 4 Jul 2023 13:40:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A5C634021522; Tue, 4 Jul 2023 13:40:22 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id F109A402152F for ; Tue, 4 Jul 2023 13:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478032; 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=HiuZajU+iUXFDEx7AScn6ng/vPXqQPAljN8WG6IHqBQ=; b=ZFpO8Pq8o6iqC2x2j/eykGGdA4kWXNM/kgu8JnBS+RMpIcW/rxo0Ej1YZKu0dQEa7kgRIL gTHsU5bBi7zCJwvhNHPFEy6q2lBp/k+PRQueCxkPrx0YulLr9LyKfAWhP6Cj3OCj1LA20Y O0PW7TGqM76kV5rqAPWxcBSSDtuCbEU= X-MC-Unique: 2_eqZk3_PHKvG8L8iK0jig-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/10] domaincapstest: Use obviously fake firmware name in capabilities Date: Tue, 4 Jul 2023 15:40:11 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1688478034558100003 Content-Type: text/plain; charset="utf-8" The domain capabilities data feature a firmware section which is filled by few entries. The entries used until now looked real and it was suspicious that a x86_64 host was listing aarch64 firmware images which should not happen. Fill it by an obviously fake path as it's not actually interpreted in a meaningful way. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0.sparc.xml | 5 ++--- tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 5 ++--- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 5 ++--- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0.ppc.xml | 5 ++--- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml | 5 ++--- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 5 ++--- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 5 ++--- tests/domaincapstest.c | 5 ++--- 69 files changed, 138 insertions(+), 207 deletions(-) diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-q35.x86_64.xml index f408c2a969..ffde9506ec 100644 --- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_4.2.0-tcg.x86_64.xml index 4427634d7c..0dad4fda05 100644 --- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_4.2.0-virt.aarch64.xml index 981a06856d..87a4921785 100644 --- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincaps= data/qemu_4.2.0.aarch64.xml index 981a06856d..87a4921785 100644 --- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_4.2.0.ppc64.xml index a3289573bd..a09e6e07c4 100644 --- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_4.2.0.s390x.xml index c35bed1326..ebef40479a 100644 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_4.2.0.x86_64.xml index cbe083f1f1..bfee062653 100644 --- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-q35.x86_64.xml index 6b68d4f2a5..4d6d0ae6d9 100644 --- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml b/tests/d= omaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml index 20a8c9a583..d87115eaa1 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg-virt.riscv64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.0.0-tcg.x86_64.xml index 39b1b4c1f2..53cc099b96 100644 --- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.0.0-virt.aarch64.xml index f84aec44c9..55de5582d3 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml b/tests/domai= ncapsdata/qemu_5.0.0-virt.riscv64.xml index 833cb4bb2e..6ed31714c2 100644 --- a/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.0.0-virt.riscv64.xml @@ -7,9 +7,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincaps= data/qemu_5.0.0.aarch64.xml index f84aec44c9..55de5582d3 100644 --- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.0.0.ppc64.xml index 4b3f490942..9ae36313f4 100644 --- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.0.0.x86_64.xml index 603d842dfe..e21a4fef57 100644 --- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-q35.x86_64.xml index cdbbe86ede..afc930ca97 100644 --- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.1.0-tcg.x86_64.xml index 8950900e72..52c4ab995c 100644 --- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsda= ta/qemu_5.1.0.sparc.xml index 6f92de2b6c..fc14338efc 100644 --- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml +++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml @@ -7,9 +7,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.1.0.x86_64.xml index 1ef28a71e4..4d0490ceb8 100644 --- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-q35.x86_64.xml index 46a3a44cdd..6d0da1dee1 100644 --- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml b/tests/d= omaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml index 20a8c9a583..d87115eaa1 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg-virt.riscv64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_5.2.0-tcg.x86_64.xml index edb622240e..678698b083 100644 --- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.aarch64.xml index af01bdfbe9..3f6cecbbab 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml b/tests/domai= ncapsdata/qemu_5.2.0-virt.riscv64.xml index 833cb4bb2e..6ed31714c2 100644 --- a/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_5.2.0-virt.riscv64.xml @@ -7,9 +7,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincaps= data/qemu_5.2.0.aarch64.xml index af01bdfbe9..3f6cecbbab 100644 --- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_5.2.0.ppc64.xml index b465ad1030..a92d0d3e43 100644 --- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsda= ta/qemu_5.2.0.s390x.xml index 9dbf118713..5348e0de4c 100644 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_5.2.0.x86_64.xml index 09db834535..b263d35c3b 100644 --- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-q35.x86_64.xml index b1a2be10e6..bb7b2198fa 100644 --- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.0.0-tcg.x86_64.xml index 29b95a836f..855b5b7a54 100644 --- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.0.0-virt.aarch64.xml index 67889c4572..15f729fe05 100644 --- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincaps= data/qemu_6.0.0.aarch64.xml index 67889c4572..15f729fe05 100644 --- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsda= ta/qemu_6.0.0.s390x.xml index f0a8b196f5..d06b862185 100644 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.0.0.x86_64.xml index 693ae0a7f1..6530989fb2 100644 --- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-q35.x86_64.xml index a161d6aa20..8a0bdd3b3b 100644 --- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.1.0-tcg.x86_64.xml index 7bfe6f802c..d12dfeeaac 100644 --- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.1.0.x86_64.xml index 8c4f8cc860..f55bd8df91 100644 --- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-q35.x86_64.xml index 0449f562df..9b9603a460 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-tcg.x86_64.xml index f15111c590..a657c54eff 100644 --- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_6.2.0-virt.aarch64.xml index 241e893df6..e1c4e378a8 100644 --- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincaps= data/qemu_6.2.0.aarch64.xml index 241e893df6..e1c4e378a8 100644 --- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsda= ta/qemu_6.2.0.ppc64.xml index a9f7aefbc9..9176718e03 100644 --- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_6.2.0.x86_64.xml index fa1f7a2316..ac00ad791e 100644 --- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml b/tests/do= maincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml index bcabf66d2a..9758bb10c1 100644 --- a/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.0.0-hvf.aarch64+hvf.xml @@ -9,9 +9,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-q35.x86_64.xml index e793278d41..8ae50e06c0 100644 --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.0.0-tcg.x86_64.xml index 6ff9df5766..41a8e8acaa 100644 --- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domai= ncapsdata/qemu_7.0.0-virt.aarch64.xml index 6aa5e78612..c7b636e5e9 100644 --- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincaps= data/qemu_7.0.0.aarch64.xml index 6aa5e78612..c7b636e5e9 100644 --- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.0.0.ppc64.xml index 78f8d3cac4..145af975bf 100644 --- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.0.0.x86_64.xml index 1d1505f757..9a2117d829 100644 --- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-q35.x86_64.xml index 047763bd43..e503607e7d 100644 --- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.1.0-tcg.x86_64.xml index b8621b5efd..0bc94b7913 100644 --- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml b/tests/domaincapsda= ta/qemu_7.1.0.ppc64.xml index f3a436d859..2d116deeb1 100644 --- a/tests/domaincapsdata/qemu_7.1.0.ppc64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.ppc64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.1.0.x86_64.xml index 95452bb0a4..67a767da38 100644 --- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml b/tests/dom= aincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml index d6dc93d957..bf7013c359 100644 --- a/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-hvf.x86_64+hvf.xml @@ -10,9 +10,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_7.2.0-q35.x86_64.xml index d0029c65da..75bfdfd1da 100644 --- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/dom= aincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml index a5744e41fa..a6c4e0694a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_7.2.0-tcg.x86_64.xml index a5744e41fa..a6c4e0694a 100644 --- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.2.0.ppc.xml b/tests/domaincapsdata= /qemu_7.2.0.ppc.xml index 59ace0a0b2..d9d8ef49eb 100644 --- a/tests/domaincapsdata/qemu_7.2.0.ppc.xml +++ b/tests/domaincapsdata/qemu_7.2.0.ppc.xml @@ -7,9 +7,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsd= ata/qemu_7.2.0.x86_64.xml index fecb7e4a0a..a8beb0654d 100644 --- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_8.0.0-q35.x86_64.xml index ef2637ab26..a117fb04d5 100644 --- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml b/tests/d= omaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml index 5254d8807a..6491a61dab 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg-virt.riscv64.xml @@ -8,9 +8,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_8.0.0-tcg.x86_64.xml index cde1d70f09..8397c1ccc0 100644 --- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml b/tests/domai= ncapsdata/qemu_8.0.0-virt.riscv64.xml index 68aa0d6189..ff2679c4c1 100644 --- a/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml +++ b/tests/domaincapsdata/qemu_8.0.0-virt.riscv64.xml @@ -7,9 +7,8 @@ - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsd= ata/qemu_8.0.0.x86_64.xml index ebae9e34d6..3d09f77385 100644 --- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_8.1.0-q35.x86_64.xml index effa6f6630..c8dc6c390a 100644 --- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domainc= apsdata/qemu_8.1.0-tcg.x86_64.xml index c36bac3fd2..0ff0f85e25 100644 --- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsd= ata/qemu_8.1.0.x86_64.xml index 48e9444deb..a2060d69d1 100644 --- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml +++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml @@ -11,9 +11,8 @@ efi - /usr/share/AAVMF/AAVMF_CODE.fd - /usr/share/AAVMF/AAVMF32_CODE.fd - /usr/share/OVMF/OVMF_CODE.fd + /obviously/fake/firmware1.fd + /obviously/fake/firmware2.fd rom pflash diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index ca4761aad0..c4a4508430 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -118,9 +118,8 @@ fillQemuCaps(virDomainCaps *domCaps, VIR_FREE(loader->values.values[--loader->values.nvalues]); if (fillStringValues(&loader->values, - "/usr/share/AAVMF/AAVMF_CODE.fd", - "/usr/share/AAVMF/AAVMF32_CODE.fd", - "/usr/share/OVMF/OVMF_CODE.fd", + "/obviously/fake/firmware1.fd", + "/obviously/fake/firmware2.fd", NULL) < 0) return -1; --=20 2.41.0 From nobody Sat May 18 03:29:47 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=1688478034; cv=none; d=zohomail.com; s=zohoarc; b=PuPsZlmo2GLbrq4eW1snrSrIUwYIoy3UdWYDES46YyISYSFYGuXDAhzPBZw7sZP48cqKdjcFHjuMOsJd/CF4YJDUl5IuF5yPvTcP3SD+kvJaVXIEiwqDrUk26wefoB+KgQsra+od5DMJL6uS/H52Uxj8sPy1nRNmq3CROpVKWyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478034; 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=2IaPg2kBhq0M6zAtRrkVmVREgdc6MiFt6ouVhRKe0m0=; b=aAMRBEIAiBeG1B2ndV26GfLjw+eQTxeMYAyhx+W3E5uKKjIi9bGolliFBV0QCmSgDpH3wolBjgA9tW5+hi0Oo1BNjI3QfyIhQFhHHHZXuikNn9KCu7vb9oJJZvvVHaFfAC+0uBC9AeWAhMy8yqMCdBOWxqqbYJ2w0dRSJjrdofI= 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 1688478034349211.04371992017366; Tue, 4 Jul 2023 06:40:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-368-DpGm7jgGNqy6KpUTOv-v3Q-1; Tue, 04 Jul 2023 09:40:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9A5488D0F7; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD5F61121314; Tue, 4 Jul 2023 13:40:24 +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 9A00319465B2; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B496219465B8 for ; Tue, 4 Jul 2023 13:40:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 984C94021522; Tue, 4 Jul 2023 13:40:23 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20AFD402152F for ; Tue, 4 Jul 2023 13:40:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478033; 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=2IaPg2kBhq0M6zAtRrkVmVREgdc6MiFt6ouVhRKe0m0=; b=MbYmH5bEWbCyjAeS5RrS+T59/PigOchCTNWO2VHZM/ulf/42J9etc1IkY/XDerpt4DZwK5 UB/oDOynFhyRJg0H5cEBaVyq3k26Oo46BOPMYBw+ApVyWirZ6rC/d88S+ZJqXtiBmOOPb8 NPkSNPvdFIQXF1ShSUeCKyxm+Q5YP2g= X-MC-Unique: DpGm7jgGNqy6KpUTOv-v3Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/10] testQemuGetRealCaps: Strip the default machine alias before insertion into cache Date: Tue, 4 Jul 2023 15:40:12 +0200 Message-ID: <82d33acfa047a20fb18950b3663ffce8c06fa858.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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: 1688478036536100005 Content-Type: text/plain; charset="utf-8" Expand the default machine type alias of the 'latest' capabilities for an architecture before caching it rather than after copying it, so that we don't duplicate the work all the time. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutilsqemu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index b75241d545..40c2cb8bba 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -931,14 +931,14 @@ testQemuGetRealCaps(const char *arch, return NULL; } + if (stripmachinealiases) + virQEMUCapsStripMachineAliases(cachedcaps); + g_hash_table_insert(capsCache, g_strdup(capsfile), cachedcaps); } ret =3D virQEMUCapsNewCopy(cachedcaps); - if (stripmachinealiases) - virQEMUCapsStripMachineAliases(ret); - /* strip 'xml' suffix so that we can format the file to '.replies' */ capsfile[strlen(capsfile) - 3] =3D '\0'; --=20 2.41.0 From nobody Sat May 18 03:29:47 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=1688478036; cv=none; d=zohomail.com; s=zohoarc; b=CTYY056TBxUZ3c+Qgyrv0PNeswdqvJGr6YGyywQVzxBw3Pp60E4GF3CqzHnzcM0bN8YJIBKoCdQ/TYwGnL2bUGyfIHUWU4gXLwdu9D0mNqYNL0slgRqkA//ow2+oj5uKv78LwU2Jzj6Yl92m+Q1o7EHDpArWC/bH0nYf+LyOD9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478036; 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=5EwdkHgjRckCs219IcLu0/ZCRGF659j3xjM7rAvO98M=; b=U8nK4ixRjsDa9PyNBy0bvCDe11G872a6uMsgKwFGKw9FIl2X9I1QEsjeUylFA2mQSUWCbG7bLvIXbHrTAbcWXKMF0z1+/JfO4CvHiTuGmoFZiZ8uxkASlAfNL/E434HrFAAINGMTW3MYJ2M2dlcwGSmtmYP27Hn/sbD5eXg8+PE= 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 1688478036127310.1815044172715; Tue, 4 Jul 2023 06:40:36 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-362-tRfaNkDXMae7Fc0gCaG0kw-1; Tue, 04 Jul 2023 09:40:29 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 14C1080123E; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDD16492B02; Tue, 4 Jul 2023 13:40:25 +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 CEA4B1946589; Tue, 4 Jul 2023 13:40:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8E784194658F for ; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 72DFE4021523; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id EBEC34021522 for ; Tue, 4 Jul 2023 13:40:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478035; 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=5EwdkHgjRckCs219IcLu0/ZCRGF659j3xjM7rAvO98M=; b=JnY6apaH6HMHt2fcmRTMC1Aa6QYDhFB2BFc1r9GejuXGfwGU34MuDuNL3/rG2PGfEnp1uH cPap+jMJPvE6z0OoBUpCFX0h57h6OA3wT5QToD2emVDyCiR6GRYkpU4F2XRWJNeadv6kap p4YB7zuEfw7mAbNfWHgI23Ez2JMX/lk= X-MC-Unique: tRfaNkDXMae7Fc0gCaG0kw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 04/10] testQemuGetRealCaps: Extract caching of the caps into a new helper Date: Tue, 4 Jul 2023 15:40:13 +0200 Message-ID: <0c7e1bb48437a1008b84a61f287c8e95e4ca9c92.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1688478037203100013 Content-Type: text/plain; charset="utf-8" Introduce testQemuGetRealCapsInternal that loads and caches the capabilities. testQemuGetRealCaps just copies the cache entry and returns it to the user. The new helper will be used in a helper that doesn't modify the capabilities and thus we don't need to copy it before use. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutilsqemu.c | 79 +++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 40c2cb8bba..0a42e59c59 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -876,37 +876,21 @@ testQemuInfoSetArgs(struct testQemuInfo *info, /** - * testQemuGetRealCaps: - * - * @arch: architecture to fetch caps for - * @version: qemu version to fetch caps for ("latest" for fetching the lat= est version from @capsLatestFiles) - * @variant: capabilities variant to fetch caps for - * @capsLatestFiles: hash table containing latest version of capabilities = for the @arch+@variant tuple - * @capsCache: hash table filled with the cache of capabilities - * @schemaCache: hash table for caching QMP schemas (may be NULL, see belo= w) - * @schema: Filled with the QMP schema (hash table) (may be NULL, see belo= w) - * - * Fetches and returns the appropriate virQEMUCaps for the @arch+@version+= @variant - * tuple. The returned pointer is a copy of the cached object and thus can - * be freely modified. Caller is responsible for freeing it. - * - * If @schemaCache and @schema are non-NULL, @schema is filled with with a - * pointer (borrowed from the cache) to the hash table representing the QE= MU QMP - * schema used for validation of the monitor traffic. + * See testQemuGetRealCaps, this helper returns the pointer to the virQEMU= Caps + * object as stored in the cache hash table. */ -virQEMUCaps * -testQemuGetRealCaps(const char *arch, - const char *version, - const char *variant, - GHashTable *capsLatestFiles, - GHashTable *capsCache, - GHashTable *schemaCache, - GHashTable **schema) +static virQEMUCaps * +testQemuGetRealCapsInternal(const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema) { g_autofree char *capsfile =3D NULL; bool stripmachinealiases =3D false; virQEMUCaps *cachedcaps =3D NULL; - virQEMUCaps *ret =3D NULL; if (STREQ(version, "latest")) { g_autofree char *archvariant =3D g_strdup_printf("%s%s", arch, var= iant); @@ -937,8 +921,6 @@ testQemuGetRealCaps(const char *arch, g_hash_table_insert(capsCache, g_strdup(capsfile), cachedcaps); } - ret =3D virQEMUCapsNewCopy(cachedcaps); - /* strip 'xml' suffix so that we can format the file to '.replies' */ capsfile[strlen(capsfile) - 3] =3D '\0'; @@ -951,7 +933,46 @@ testQemuGetRealCaps(const char *arch, } } - return ret; + return cachedcaps; +} + + +/** + * testQemuGetRealCaps: + * + * @arch: architecture to fetch caps for + * @version: qemu version to fetch caps for ("latest" for fetching the lat= est version from @capsLatestFiles) + * @variant: capabilities variant to fetch caps for + * @capsLatestFiles: hash table containing latest version of capabilities = for the @arch+@variant tuple + * @capsCache: hash table filled with the cache of capabilities + * @schemaCache: hash table for caching QMP schemas (may be NULL, see belo= w) + * @schema: Filled with the QMP schema (hash table) (may be NULL, see belo= w) + * + * Fetches and returns the appropriate virQEMUCaps for the @arch+@version+= @variant + * tuple. The returned pointer is a copy of the cached object and thus can + * be freely modified. Caller is responsible for freeing it. + * + * If @schemaCache and @schema are non-NULL, @schema is filled with with a + * pointer (borrowed from the cache) to the hash table representing the QE= MU QMP + * schema used for validation of the monitor traffic. + */ +virQEMUCaps * +testQemuGetRealCaps(const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema) +{ + virQEMUCaps *cachedcaps; + + if (!(cachedcaps =3D testQemuGetRealCapsInternal(arch, version, varian= t, + capsLatestFiles, capsCac= he, + schemaCache, schema))) + return NULL; + + return virQEMUCapsNewCopy(cachedcaps); } --=20 2.41.0 From nobody Sat May 18 03:29:47 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=1688478034; cv=none; d=zohomail.com; s=zohoarc; b=HO5QiF43ZZ6mPul8DSCvNGtj/1gDdn9N0RpNBWMuWVMEQoNx0hOrPXOTdVOZU5+3sjv7oHJvs+g66Pq/4kZDW3kAUY77LXP6WcPrYidr9DmewyV2aVW9lTkXkpx6PDLVe9TzVkQyI/Hv70tAfgJCdFGuy8hrXic2ICXWKBSgSDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478034; 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=KD8HYdZICXIiwFC5nNeri0INJQI+6r+KaftclFFCUoM=; b=Rul9T+wR4RbcUGKD9vpPpDnN/UDXo8YJ/9zQK+xw9Z2pUHo0yR2GXuWVxr93Q7xMWEpJdIxqXiKD0L5p6gHmxV+ljp3HywKFQFJkVYuOO0qCzMk8g7zYCh8IOD9YOR/Cw9o3v1I3xFxW58QwVDvc2ha+tevNCa2vQbkKMjVrt6I= 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 1688478034447414.45954128234825; Tue, 4 Jul 2023 06:40:34 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-_7jHaPs4OFmgoRBdjyeqPg-1; Tue, 04 Jul 2023 09:40:30 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E811C10504BE; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D68EB40C2073; Tue, 4 Jul 2023 13:40:26 +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 C9CBE19465A0; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 64AE61946588 for ; Tue, 4 Jul 2023 13:40:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4578F4021526; Tue, 4 Jul 2023 13:40:25 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF0794021523 for ; Tue, 4 Jul 2023 13:40:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478033; 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=KD8HYdZICXIiwFC5nNeri0INJQI+6r+KaftclFFCUoM=; b=IFfMxUIKB3J6g0xYezxoAHVjUnvPchj61sZl+KVWFJfdyIg99/sIIFLDeHdy9dUfj45Gkr c/wcHUFKKK/D86gC0Uph1Glf3g8l04O4uo0lDFa/KfnbflFs3iHE8DdVLCDaZ1KSaCanTY +XuUfHutNel1V2NMpqKPJRyIJaF7X3c= X-MC-Unique: _7jHaPs4OFmgoRBdjyeqPg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/10] testutilsqemu: Introduce 'testQemuInsertRealCaps' helper Date: Tue, 4 Jul 2023 15:40:14 +0200 Message-ID: <1eb1dea962ecd4d4ec2a00e689015356f33b1edf.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1688478036598100008 Content-Type: text/plain; charset="utf-8" 'testQemuInsertRealCaps' looks up and inserts real capabilities into the capability 'file cache' for testing purposes. Effectively this helper replaces following steps: 1) testQemuGetRealCaps 2) virFileCacheClear 3) qemuTestCapsCacheInsert This helper doesn't copy the capabilities that are borrowed from it's internal cache thus they must not be modified afterwards in contrast to the above steps. The use of this helper is in simple tests which require some form of capabilities to parse a definition but don't care about doctoring them in any way. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutilsqemu.c | 45 +++++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 10 ++++++++++ 2 files changed, 55 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 0a42e59c59..e0b58b1d5d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -976,6 +976,51 @@ testQemuGetRealCaps(const char *arch, } +/** + * testQemuInsertRealCaps: + * + * @arch: architecture to fetch caps for + * @version: qemu version to fetch caps for ("latest" for fetching the lat= est version from @capsLatestFiles) + * @variant: capabilities variant to fetch caps for + * @capsLatestFiles: hash table containing latest version of capabilities = for the @arch+@variant tuple + * @capsCache: hash table filled with the cache of capabilities + * @schemaCache: hash table for caching QMP schemas (may be NULL, see belo= w) + * @schema: Filled with the QMP schema (hash table) (may be NULL, see belo= w) + * + * Fetches and inserts into the test capability cache the appropriate virQ= EMUCaps + * for the @arch+@version+@variant tuple. Note that the data inserted into + * the cache is borrowed from the cache thus must not be further modified. + * + * If @schemaCache and @schema are non-NULL, @schema is filled with with a + * pointer (borrowed from the cache) to the hash table representing the QE= MU QMP + * schema used for validation of the monitor traffic. + */ +int +testQemuInsertRealCaps(virFileCache *cache, + const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema) +{ + virQEMUCaps *cachedcaps; + + virFileCacheClear(cache); + + if (!(cachedcaps =3D testQemuGetRealCapsInternal(arch, version, varian= t, + capsLatestFiles, capsCac= he, + schemaCache, schema))) + return -1; + + if (qemuTestCapsCacheInsertData(cache, virQEMUCapsGetBinary(cachedcaps= ), cachedcaps) < 0) + return -1; + + return 0; +} + + int testQemuInfoInitArgs(struct testQemuInfo *info) { diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 1e6611daa3..e0d116336e 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -160,4 +160,14 @@ testQemuGetRealCaps(const char *arch, GHashTable *capsCache, GHashTable *schemaCache, GHashTable **schema); + +int +testQemuInsertRealCaps(virFileCache *cache, + const char *arch, + const char *version, + const char *variant, + GHashTable *capsLatestFiles, + GHashTable *capsCache, + GHashTable *schemaCache, + GHashTable **schema); #endif --=20 2.41.0 From nobody Sat May 18 03:29:47 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=1688478037; cv=none; d=zohomail.com; s=zohoarc; b=JHyUkCoszy+zd/g+RHPmEYuJBseIHadtaFhG1347AWCxuFBbuiGJoOOLQqCSCB/eotNblvsytxHYxkXHQs6lAvjzKTRcfdcTX72Q5AYxMRjBn2kosImOYjE9YQT70Nv4utWXMZ+NmO2Di7QKJ+TWt/qbhqkv5A36Okr1iO8hMh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478037; 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=RDb+ukje1aYpJbQgnoz++s3Gxgd5Sp+PXva351lLXdg=; b=kRxa1+BsZvXbW7CzYsK7MYMjucHzNqfREf+SEwxntEhtdTjACKNWjc4C3Ga60mvfO2p6nEKMFqeqaC5PH+AHxqIw1kzVbmrDbyNWm8IlYu9WYwR/wx9HgD/4CnJt+I/3uHQ34qexgUGbPa/Z90Ah2La09rwwfg/nQ8J9zjcS4BM= 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 1688478037687612.1474741158295; Tue, 4 Jul 2023 06:40:37 -0700 (PDT) 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-52-FfRAaooGMFq3_-c823B7Eg-1; Tue, 04 Jul 2023 09:40:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 644EC3810D43; Tue, 4 Jul 2023 13:40:27 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4EFCB40C2077; Tue, 4 Jul 2023 13:40:27 +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 10E3E194658C; Tue, 4 Jul 2023 13:40:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2BB921946589 for ; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0F3344021522; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F59E4021526 for ; Tue, 4 Jul 2023 13:40:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478036; 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=RDb+ukje1aYpJbQgnoz++s3Gxgd5Sp+PXva351lLXdg=; b=MKN58/KqdYufS/ldp6dat4OJFuux6B86q+jR7dJti9B8WmlAkop0Dt3gsG/o/WAlg1nzIo 6hkYaK+WoXJIfmkSgMx4LrPaZsPqiWppfFGpSHRb775IXvsH4cdfDnlvAm7ymS/9M7Bc4+ +pCqczyWJJoy5pqJ2pThc1xpenfH8bg= X-MC-Unique: FfRAaooGMFq3_-c823B7Eg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/10] qemumemlocktest: Use 'testQemuInsertRealCaps' Date: Tue, 4 Jul 2023 15:40:15 +0200 Message-ID: <654d33a27163a631450cff9d75c98f4b97ee8ec0.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 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: 1688478038194100015 Content-Type: text/plain; charset="utf-8" Rewrite the capability fetching to use the new helper, thus simplifying the code. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemumemlocktest.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 7d219fcc40..a2888732f7 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -47,14 +47,8 @@ mymain(void) { g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); - g_autoptr(virQEMUCaps) qemuCaps_x86_64 =3D NULL; - g_autoptr(virQEMUCaps) qemuCaps_ppc64 =3D NULL; int ret =3D 0; - if (!(qemuCaps_x86_64 =3D testQemuGetRealCaps("x86_64", "latest", "", = capslatest, capscache, NULL, NULL)) || - !(qemuCaps_ppc64 =3D testQemuGetRealCaps("ppc64", "latest", "", c= apslatest, capscache, NULL, NULL))) - return EXIT_FAILURE; - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; @@ -85,11 +79,11 @@ mymain(void) qemuTestSetHostArch(&driver, VIR_ARCH_X86_64); - virFileCacheClear(driver.qemuCapsCache); - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps_x86_64) < 0= ) { + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "= ", + capslatest, capscache, NULL, NULL) < 0) { ret =3D -1; goto cleanup; - }; + } DO_TEST("pc-kvm", 0); DO_TEST("pc-tcg", 0); @@ -105,11 +99,12 @@ mymain(void) DO_TEST("pc-locked+hostdev", VIR_DOMAIN_MEMORY_PARAM_UNLIMITED); qemuTestSetHostArch(&driver, VIR_ARCH_PPC64); - virFileCacheClear(driver.qemuCapsCache); - if (qemuTestCapsCacheInsert(driver.qemuCapsCache, qemuCaps_ppc64) < 0)= { + + if (testQemuInsertRealCaps(driver.qemuCapsCache, "ppc64", "latest", "", + capslatest, capscache, NULL, NULL) < 0) { ret =3D -1; goto cleanup; - }; + } DO_TEST("pseries-kvm", 20971520); DO_TEST("pseries-tcg", 0); --=20 2.41.0 From nobody Sat May 18 03:29:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1688478066; cv=none; d=zohomail.com; s=zohoarc; b=brWRRkItl9pOI8tm6reBa6IlCysMfjPJxAHejHydBZTylYEK4yC9nOk3s4vgXnOB0HUPsSjYuTNbBGVdMdfw+X/YzgGcm6WahMMo2mM/MXhKPlAFXzCy6xlMJuRnhyE4cFpbwirCyuuTS1IrtKcKazRl8F4OlI1ni4J402qcDD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478066; 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=isnSdXclRHfdJJGSQwQKQU0nkY20fz5nPOoJejcs6n0=; b=QxATTsNPZIybP2wm/MCqrmAaL+101HjRdW2/LH583ObvaPXBk6IRiNf7xFC4wnGb6rH1R4Te/G5YNAjHAOfjT8tPXA+KENtL1g+VgryeA7IAHPD5tHbP2bnSx0rrJQpwJArd/w1CW/GMFR5orDacmZca5lGZdjtlGcv+qB/okp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1688478066165327.1176645764575; Tue, 4 Jul 2023 06:41:06 -0700 (PDT) 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-64-II711abbNW24IDjeEYesVA-1; Tue, 04 Jul 2023 09:40:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5478B280BC52; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B385F641E; Tue, 4 Jul 2023 13:40:28 +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 0EB2F1946589; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EE4C8194658C for ; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CFBB94021523; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58EF74021522 for ; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478065; 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=isnSdXclRHfdJJGSQwQKQU0nkY20fz5nPOoJejcs6n0=; b=L/lrxWlWXoyUkxfqsc36R6Gxi5q7FuidsjGjjIjlNFVHsBvFS0ty5ZyxwwI56wUlHEqIT1 aqrnXtjWX751o0VJ5UbzovdLE7H8X3VT04FYcxYydOQ+jgeqDCszG1u7nyWuXfhgYjENEl eSYhgSli8uuixZacnHj6hg5NiT+gQLk= X-MC-Unique: II711abbNW24IDjeEYesVA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/10] tests: qemudomainsnapshotxml2xmlout: Use real 'x86_64' capabilities in all test data Date: Tue, 4 Jul 2023 15:40:16 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1688478066570100003 Content-Type: text/plain; charset="utf-8" Use the platform which is getting most development for the snapshot XML examples so that it's tested against latest capabilities. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../disk_snapshot_redefine.xml | 9 ++++++--- .../external_vm_redefine.xml | 9 ++++++--- tests/qemudomainsnapshotxml2xmlout/full_domain.xml | 9 ++++++--- tests/qemudomainsnapshotxml2xmlout/metadata.xml | 9 ++++++--- tests/qemudomainsnapshotxml2xmltest.c | 6 ++++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml = b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml index 24b41ba7c5..736a260eab 100644 --- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml @@ -31,15 +31,18 @@ 219100 1 - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 @@ -76,7 +79,7 @@
- +
diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/= tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml index eae4691c1c..da717cb236 100644 --- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml +++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml @@ -21,22 +21,25 @@ 219100 1 - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
- +
diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qem= udomainsnapshotxml2xmlout/full_domain.xml index 1ddaa2a9aa..643f20269b 100644 --- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml +++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml @@ -14,22 +14,25 @@ 219100 1 - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
- +
diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudo= mainsnapshotxml2xmlout/metadata.xml index 4b14c9efde..3fae6aa9e4 100644 --- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml +++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml @@ -18,22 +18,25 @@ 219100 1 - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64
- +
diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index a09404a9d5..035c275b14 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -109,11 +109,17 @@ testCompareXMLToXMLHelper(const void *data) static int mymain(void) { + g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); int ret =3D 0; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "= ", + capslatest, capscache, NULL, NULL) < 0) + return EXIT_FAILURE; + virDomainXMLOptionSetMomentPostParse(driver.xmlopt, testSnapshotPostParse); --=20 2.41.0 From nobody Sat May 18 03:29:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1688478064; cv=none; d=zohomail.com; s=zohoarc; b=OMmCZoPw7PKxBz+lmM/Lwox2iDPDDKMD+JUNp2UN/48g/e6701KJr12bD1ix7sIRHIkDL1jJZJngYw7ZNbA7rO1qzdMHC9UnbIOarhKVqPWYt2rQkxQsYPDlIPW+pQW9nPv5RmlZh/QxKAp43VzMICJlpOCIQ15l2IDVFd5G4I0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478064; 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=e2tPae0m6hS3bAMt2tYK2ipDybBL8ycnDBdDgPOCg3c=; b=RhVw/Uzer80F8b/DZElgG7wzVQrzt3Q1gPEwcsQtNMg4g+MfA1fIMdubl7drNxFgCsXyWXrqCySIYYO7Mun5kHoC4LbpfwIgOlA1gW9DPcb2zPrJPY3H+Y3mao4v0efhFtt9QDjTl0peA9kV4qgFsO4PiZO9gUZv56+4Ip3QL3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1688478064299985.8865929323713; Tue, 4 Jul 2023 06:41:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-CWSm_ba7NeiWcL5slBWcDg-1; Tue, 04 Jul 2023 09:40:32 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8847788D4E7; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DB31492CAC; Tue, 4 Jul 2023 13:40:28 +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 4679419465BB; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AD8121946588 for ; Tue, 4 Jul 2023 13:40:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9CBF64021522; Tue, 4 Jul 2023 13:40:27 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 272D64021523 for ; Tue, 4 Jul 2023 13:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478063; 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=e2tPae0m6hS3bAMt2tYK2ipDybBL8ycnDBdDgPOCg3c=; b=CGnQOKcjMJlRleLXzQli9HUnFwZgAdjr8Qj7HQi5XFt30rjO2WabG5xWy1/DSEciALxEmg Wp2iCKbGoJvZUrT24Wmx0pvcebwILnhiUeyALzoZpZ0DgtXgpT9Gin8Gp3pkNPQBCjKcXk XcqihyaINc01tRFE++60ZA+uQOExO9o= X-MC-Unique: CWSm_ba7NeiWcL5slBWcDg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/10] qemuagenttest: Use real x86_64 capabilities for parsing domain definitions Date: Tue, 4 Jul 2023 15:40:17 +0200 Message-ID: <33b78bfbcc37e8696aec4aad3f9ae98b24bf4957.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1688478064679100001 Content-Type: text/plain; charset="utf-8" Some test cases require a real definition and thus parse a XML with the definition to obtain it. Convert the code to use real capabilities and switch to x86_64. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/qemuagentdata/fsinfo.xml | 4 ++-- tests/qemuagenttest.c | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/qemuagentdata/fsinfo.xml b/tests/qemuagentdata/fsinfo.xml index 233968fc29..914c2828c6 100644 --- a/tests/qemuagentdata/fsinfo.xml +++ b/tests/qemuagentdata/fsinfo.xml @@ -5,7 +5,7 @@ 219136 1 - hvm + hvm @@ -13,7 +13,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 3c24a3139f..3287880241 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1359,11 +1359,19 @@ testQemuAgentTimezone(const void *data) static int mymain(void) { + g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); int ret =3D 0; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; + /* Some test cases need a real definition thus parse a XML. We need + * qemu capabilities for that. */ + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "= ", + capslatest, capscache, NULL, NULL) < 0) + return EXIT_FAILURE; + virEventRegisterDefaultImpl(); #define DO_TEST(name) \ --=20 2.41.0 From nobody Sat May 18 03:29:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1688478035; cv=none; d=zohomail.com; s=zohoarc; b=lbwO3GjKC7yfGgK9BPXRDnrJIGV7MAPSW76wz5I1OYfq8+LhCmgV8sE9QK3HlOElbPYptaJB4JJeWPtfvXP45ggm8pjlte9pK6J1OYKcz4n4r7TWlCJBneMtg4Ut8gZkrHHsjVBzZhV5Q0tZXKUiU7Xyuj3+0XY6ma1g2AY9BdU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478035; 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=s/iv/7mMn0It0l/egFVfOscVoIQb4XraajfgsQCe3/8=; b=fo7tIUardhSX9G8ck4+pavdRo4fMScQSwcUQx/dQWBZ4pcGQdBOu9HvujDFfITem6cDnuPQZxdBKtBYuGVW+K2Zrew5w74ISeUyO74VyhwpuTU+Y32vUX88ad0oA23wkmRy7+SNSJdL7EJsAFwx4wTqOSoN5HMD/m+dAAshsxjM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1688478035660895.095826164103; Tue, 4 Jul 2023 06:40:35 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-_V4sUrbwMEq4Z6EnUasnhw-1; Tue, 04 Jul 2023 09:40:33 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78FC31064AF7; Tue, 4 Jul 2023 13:40:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 65E2B492C13; Tue, 4 Jul 2023 13:40:29 +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 553A519465B2; Tue, 4 Jul 2023 13:40:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 7358C19465A2 for ; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 64602402152F; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4ED74021522 for ; Tue, 4 Jul 2023 13:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478034; 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=s/iv/7mMn0It0l/egFVfOscVoIQb4XraajfgsQCe3/8=; b=AwEQXAn07A/kbgmLs0rIMI3WPY8CA5CTkW+cXN08spKAdbzlByb2unW4mF7/Qs7rLorGCW Qr6ua+uCwc/F0ItHr+XcRgnayFJy4zKTa+Jh6c2+txa3Ym7OcbG3CAVJ5X5aLeGnQ0ckcA nhFrXjV4ZH28QqLqtgEpB7PRNMGmN7A= X-MC-Unique: _V4sUrbwMEq4Z6EnUasnhw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/10] qemudomaincheckpointxml2xmltest: Use real 'x86_64' capabilities in all test data Date: Tue, 4 Jul 2023 15:40:18 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1688478036592100007 Content-Type: text/plain; charset="utf-8" Use the platform which is getting most development for the checkpoint XML examples so that it's tested against latest capabilities. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- .../internal-active-invalid.xml | 4 ++-- .../internal-inactive-invalid.xml | 4 ++-- tests/qemudomaincheckpointxml2xmlout/redefine.xml | 9 ++++++--- tests/qemudomaincheckpointxml2xmltest.c | 6 ++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.x= ml b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml index 2b6d8298c2..a31bf14500 100644 --- a/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml +++ b/tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml @@ -16,7 +16,7 @@ 219136 1 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid= .xml b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml index 427df0b4cf..ec51bc02ce 100644 --- a/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml +++ b/tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml @@ -16,7 +16,7 @@ 219136 1 - hvm + hvm @@ -24,7 +24,7 @@ restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemu= domaincheckpointxml2xmlout/redefine.xml index b7c9d9dc6c..6b60b267fc 100644 --- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml +++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml @@ -14,15 +14,18 @@ 219136 1 - hvm + hvm + + qemu64 + destroy restart destroy - /usr/bin/qemu-system-i386 + /usr/bin/qemu-system-x86_64 @@ -48,7 +51,7 @@
- +
diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomainchec= kpointxml2xmltest.c index d49dcd9143..0e195dae8d 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -131,11 +131,17 @@ testCompareXMLToXMLHelper(const void *data) static int mymain(void) { + g_autoptr(GHashTable) capslatest =3D testQemuGetLatestCaps(); + g_autoptr(GHashTable) capscache =3D virHashNew(virObjectUnref); int ret =3D 0; if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; + if (testQemuInsertRealCaps(driver.qemuCapsCache, "x86_64", "latest", "= ", + capslatest, capscache, NULL, NULL) < 0) + return EXIT_FAILURE; + virDomainXMLOptionSetMomentPostParse(driver.xmlopt, testCheckpointPostParse); --=20 2.41.0 From nobody Sat May 18 03:29:47 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=1688478039; cv=none; d=zohomail.com; s=zohoarc; b=UyGpzXwLEJUCz2xvsMzLZd+P52x8VcePT/SjjpumRfVZw9RIgzHz3jqK+LFenU5TtjWmeZEQD6ZYIlEXkh1aim8CypU+x7rF7fuAWuuV6TK22PUsQR7y4fbcaXTW5vxLoFQVXo4dsGWIGI+9VdAK0YHulwwBoK1JiZJhmPbDZ1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1688478039; 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=J4J6QpURZzjlhEvgI10mjndWWXv+dekkZ3VYod3knF0=; b=iLJUBb0cwzPIOUjRqARPmbKM9TxCDVtY/ihFraz3QL9vAUmGVQx1yCcCNAfEDsFkiQarx4ydCzg/9K+smlxjCLIlqkFvgMLFf1KEW1msUIR8PQ1D4aS5SGaTJU7IgCjOFP7RzNJLSY/Rf/NLHSTm5bmPhatv0okED8cI3Mqq8g4= 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 1688478039589737.1769436590997; Tue, 4 Jul 2023 06:40:39 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-DWJfiSXuMUqISxtDBAYS-w-1; Tue, 04 Jul 2023 09:40:34 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB6DD830DB5; Tue, 4 Jul 2023 13:40:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A6685C1ED98; Tue, 4 Jul 2023 13:40:30 +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 880291946589; Tue, 4 Jul 2023 13:40:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4D2D61946588 for ; Tue, 4 Jul 2023 13:40:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 2E73C4021522; Tue, 4 Jul 2023 13:40:29 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADBA54021530 for ; Tue, 4 Jul 2023 13:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1688478038; 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=J4J6QpURZzjlhEvgI10mjndWWXv+dekkZ3VYod3knF0=; b=T/Dk/BXs3A61RvFGgX+R9Pq43vYw3ta7jwEnXnHd+xDJtiqMwOTWIY/wh1HP1Z132STdS3 WG+Rvo2linsjEX0T0S034p0no5Hb71ynYbA2ln1tIuPra79usgwfJEfujvwhTxwFBVVbH4 b7zkRszPVTfN/ACaUv+1slXIcX0yJ/4= X-MC-Unique: DWJfiSXuMUqISxtDBAYS-w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/10] qemuTestDriverInit: Don't autopopulate qemu capabilities when initializing driver Date: Tue, 4 Jul 2023 15:40:19 +0200 Message-ID: <84860771b43b10127d3b9eaab76fb3f8ca2e1908.1688477951.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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: 1688478040553100001 Content-Type: text/plain; charset="utf-8" In an effort to use strictly real capability testing all tests were converted to do insertion of their own capabilities when required, thus we don't need to popluate the capabilities. This will also promote using proper capabilities based on what the test is trying to achieve. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- tests/testutilsqemu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index e0b58b1d5d..16b773a768 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -428,7 +428,6 @@ int qemuTestDriverInit(virQEMUDriver *driver) virSecurityManager *mgr =3D NULL; char statedir[] =3D STATEDIRTEMPLATE; char configdir[] =3D CONFIGDIRTEMPLATE; - g_autoptr(virQEMUCaps) emptyCaps =3D NULL; memset(driver, 0, sizeof(*driver)); @@ -499,11 +498,6 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (!driver->xmlopt) goto error; - /* Populate the capabilities cache with fake empty caps */ - emptyCaps =3D virQEMUCapsNew(); - if (qemuTestCapsCacheInsert(driver->qemuCapsCache, emptyCaps) < 0) - goto error; - if (!(mgr =3D virSecurityManagerNew("none", "qemu", VIR_SECURITY_MANAGER_PRIVILEGED))) goto error; --=20 2.41.0