From nobody Fri Oct 18 06:26:40 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=1678135629; cv=none; d=zohomail.com; s=zohoarc; b=DctBvKPP5z0TSBIOFDJ5o3Ie6It3i/WYwF9ivzouATaDZqtxMoBOYVZP/v/JJl0aB4nlnLpo28+nwAAY0mlZ2KRT39Tj9WuEAWY7ovUMrF53k+AJXPRiTMy8HhbzrPhby44ivb2DRqgIrwAVyvoTncFfXqMpOCrnfMMEu4XcbP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678135629; 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=w2Yu7njv0sbLQvyCp3cqOiVh0aEGrxaep93QynnRMZY=; b=W4Rx0KD98aXb0ew2C3MAaKQpngzQRMpep2xK+CF6KxiVRTMaN63ZqO8uXACYsMlfo1Dtk+uiJ8pmOaRWgQwogV3B6C/xwa/Z9i9jhH63bJlpBcXrponoeTx3B60PRIw+u376jnHH9T4i9k63KSm6YCzSRTkmtTqc65/DP57yvJw= 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 1678135629180986.7171761690341; Mon, 6 Mar 2023 12:47:09 -0800 (PST) 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-543-qHOwZtpVPxu5mMrxHGyO9A-1; Mon, 06 Mar 2023 15:47:01 -0500 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 E08AD101A521; Mon, 6 Mar 2023 20:46:55 +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 CD7BD492C3E; Mon, 6 Mar 2023 20:46:55 +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 BCF19194658D; Mon, 6 Mar 2023 20:46:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E7BE41946589 for ; Mon, 6 Mar 2023 20:46:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DB5C651FF; Mon, 6 Mar 2023 20:46:54 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A80C440E1 for ; Mon, 6 Mar 2023 20:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678135628; 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=w2Yu7njv0sbLQvyCp3cqOiVh0aEGrxaep93QynnRMZY=; b=Nq4LwCrBMo/egjRtKmEXhT9MLNQ7a1RjHPmhn6i6l6EH+CXVQwxiC7IFO8idR84Q1UE+Y4 IPiFibpiUthDILYwdh4eW9bGQdRtQURxXD9AD6qVAFLKezA4h0hOhEi0M4I4uxfjnzyyvs RtwrzTckVUdHpdAX1UndySu5jiU+w4w= X-MC-Unique: qHOwZtpVPxu5mMrxHGyO9A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/15] qemuxml2argvtest: Don't set QEMU_CAPS_MACH_VIRT_GIC_VERSION Date: Mon, 6 Mar 2023 21:46:35 +0100 Message-Id: <608e1db3a5fbe43651832b32f75c02b0bffe87c5.1678135546.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1678135631063100001 Content-Type: text/plain; charset="utf-8" testUpdateQEMUCaps calls virQEMUCapsInitQMPBasicArch which already sets it. Purge the capability from the testing code. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 72 ++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 48 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c0afb8cf27..757d3ee957 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2458,76 +2458,52 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-none", GIC_NONE, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-none-v2", GIC_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-none-v3", GIC_V3, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_GIC("aarch64-gic-none-tcg", GIC_BOTH, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); + DO_TEST_FULL("aarch64-gic-none-tcg", "", ARG_GIC, GIC_BOTH, ARG_END); DO_TEST_GIC("aarch64-gic-default", GIC_NONE, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v2", GIC_NONE, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v2", GIC_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v2", GIC_V3, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v2", GIC_BOTH, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v3", GIC_NONE, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v3", GIC_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v3", GIC_V3, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-v3", GIC_BOTH, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-host", GIC_NONE, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-host", GIC_V2, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-host", GIC_V3, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_GIC("aarch64-gic-host", GIC_BOTH, - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("aarch64-gic-invalid", - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("aarch64-gic-not-virt", - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("aarch64-gic-not-arm", - QEMU_CAPS_KVM, - QEMU_CAPS_MACH_VIRT_GIC_VERSION); + QEMU_CAPS_KVM); DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64"); DO_TEST("aarch64-pci-serial", QEMU_CAPS_DEVICE_PCI_SERIAL, --=20 2.39.2