From nobody Mon Feb 9 09:08:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; 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=1680183590; cv=none; d=zohomail.com; s=zohoarc; b=hcYiMgciFtsagQ1J9Df68upH47tbTMicomFLqAv7UmmYGTqVRCk4fq6zSXiNSk+ahIJf4ve+a8P04+E3xNGnxQNshvvn2QImDRN0x1sGuPDGIhhGrkzgTFA2bIHv05XQBTPuIrvtnPFmff0AZ2tPsw2mc3HXsVj3XzVUZMk59SQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1680183590; 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=n0lPAp5xfC6s890DQdxc1TfjdorINhujACcjWDJpSU8=; b=DZEafxKYK2v12lxKobX0PKU+AZTp9jgMyGiOLiNEREpMiMLe7KWYcOJOH1AuV/lVf2pUrZnipLi+T/ylndhk5sM8EQjaSUUDSd3ZBzzr0Ly4ICiuDYk0CBAa8hCEsr5L4lr7qgM6hB9IdxqImbnrZCu5A7RedYNhd0wD8s5NbsI= 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 1680183590970627.4200916104189; Thu, 30 Mar 2023 06:39:50 -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-416-pDn1bAAHNPeQCvu3OZD1fA-1; Thu, 30 Mar 2023 09:39:47 -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 6D1D6100F907; Thu, 30 Mar 2023 13:39:44 +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 567E418EC7; Thu, 30 Mar 2023 13:39:44 +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 5775219472DF; Thu, 30 Mar 2023 13:38:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 284491946A4C for ; Thu, 30 Mar 2023 13:38:36 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 245862166B35; Thu, 30 Mar 2023 13:38:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9359B2166B34 for ; Thu, 30 Mar 2023 13:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680183589; 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=n0lPAp5xfC6s890DQdxc1TfjdorINhujACcjWDJpSU8=; b=R+tojxIQJD6oHy7DGGoTsCNodifazeYlRiheJc6Sxj/8pKEtNGzVUl6D2COcYFUvy5CeWP yvCeVXC+X11poy8+YV6xIixmoO1NMrKcB5ycMfSc6ZfyVn2vZBbwXEYKHOeYAG6fBZGzw6 S1ULvBbbGt9yRlGIVMGsVlNWAskC+S8= X-MC-Unique: pDn1bAAHNPeQCvu3OZD1fA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/31] vircapstest: Remove 'qemu' testing Date: Thu, 30 Mar 2023 15:38:03 +0200 Message-Id: <3c5eb6c7365d92bc707b58e48a44407b168e52d4.1680182808.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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: 1680183592290100001 Content-Type: text/plain; charset="utf-8" We have testing based on real capabilities in 'qemucaps2xmltest' for qemu guest related data and 'vircaps2xmltest' tests the host data gathering. The testing done here makes no sense. Signed-off-by: Peter Krempa --- tests/vircapstest.c | 74 --------------------------------------------- 1 file changed, 74 deletions(-) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index be93325307..30e56ccc20 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -21,7 +21,6 @@ #include "testutils.h" #include "testutilslxc.h" -#include "testutilsqemu.h" #include "capabilities.h" #include "virbitmap.h" @@ -51,25 +50,6 @@ test_virCapabilitiesGetCpusForNodemask(const void *data = G_GNUC_UNUSED) } -static bool G_GNUC_UNUSED -doCapsExpectFailure(virCaps *caps, - int ostype, - virArch arch, - int domaintype, - const char *emulator, - const char *machinetype) -{ - virCapsDomainData *data =3D virCapabilitiesDomainDataLookup(caps, osty= pe, - arch, domaintype, emulator, machinetype); - - if (data) { - VIR_FREE(data); - return false; - } - - return true; -} - static bool G_GNUC_UNUSED doCapsCompare(virCaps *caps, int ostype, @@ -135,55 +115,6 @@ doCapsCompare(virCaps *caps, if (!doCapsCompare(caps, o, a, d, e, m, fo, fa, fd, fe, fm)) \ ret =3D -1; -#define CAPS_EXPECT_ERR(o, a, d, e, m) \ - if (!doCapsExpectFailure(caps, o, a, d, e, m)) \ - ret =3D -1; - -#ifdef WITH_QEMU -static int -test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED) -{ - int ret =3D 0; - g_autoptr(virCaps) caps =3D NULL; - - if (!(caps =3D testQemuCapsInit())) - return -1; - - /* Checking each parameter individually */ - CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc"); - CAPSCOMP(VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, N= ULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-x86_64", "pc"); - CAPSCOMP(-1, VIR_ARCH_AARCH64, VIR_DOMAIN_VIRT_NONE, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_AARCH64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-aarch64", "virt"); - CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_KVM, NULL, NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64, - VIR_DOMAIN_VIRT_KVM, "/usr/bin/qemu-system-x86_64", "pc"); - CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, "/usr/bin/qemu-syste= m-ppc64", NULL, - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries"); - - CAPSCOMP(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries", - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries"); - CAPSCOMP(-1, VIR_ARCH_PPC64LE, VIR_DOMAIN_VIRT_NONE, NULL, "pseries", - VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_PPC64LE, - VIR_DOMAIN_VIRT_QEMU, "/usr/bin/qemu-system-ppc64", "pseries"); - - CAPS_EXPECT_ERR(VIR_DOMAIN_OSTYPE_LINUX, VIR_ARCH_NONE, VIR_DOMAIN_VIR= T_NONE, NULL, NULL); - CAPS_EXPECT_ERR(-1, VIR_ARCH_PPC64LE, VIR_DOMAIN_VIRT_NONE, NULL, "pc"= ); - CAPS_EXPECT_ERR(-1, VIR_ARCH_MIPS, VIR_DOMAIN_VIRT_NONE, NULL, NULL); - CAPS_EXPECT_ERR(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_NONE, - "/usr/bin/qemu-system-aarch64", "pc"); - CAPS_EXPECT_ERR(-1, VIR_ARCH_NONE, VIR_DOMAIN_VIRT_VMWARE, NULL, "pc"); - - return ret; -} -#endif /* WITH_QEMU */ - #ifdef WITH_LXC static int test_virCapsDomainDataLookupLXC(const void *data G_GNUC_UNUSED) @@ -213,11 +144,6 @@ mymain(void) if (virTestRun("virCapabilitiesGetCpusForNodemask", test_virCapabilitiesGetCpusForNodemask, NULL) < 0) ret =3D -1; -#ifdef WITH_QEMU - if (virTestRun("virCapsDomainDataLookupQEMU", - test_virCapsDomainDataLookupQEMU, NULL) < 0) - ret =3D -1; -#endif #ifdef WITH_LXC if (virTestRun("virCapsDomainDataLookupLXC", test_virCapsDomainDataLookupLXC, NULL) < 0) --=20 2.39.2