From nobody Fri Dec 19 21:57:55 2025 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=1679065001; cv=none; d=zohomail.com; s=zohoarc; b=J6IUxtyQDZoMsnr5+kxmAGdEGIbqCee93ET+OolXSXqxpGqL1ev+n+nnfSoRgo7MVkcv607rKxpjQZr3Mx68zoJbU9GKu6fF0bygBLiLAAXZKLVwGQ8SRpl8wLjTfNRxswVOsrQusR2p0/Zn2+vOMX096FGfwf/aOQllPUSf+8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679065001; 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=Q+lznSoWEq21k0U62hsnpxhmvyFLLWlh/gOVyrVwquE=; b=P/tUZoKmYqx8+2BUhCo9w1F+0UEOghRWa1gJ/6LAQcWjQg01aKaJtBu5M2haQTsqpyTPU3a6WJuarCTvLjguLoZt9Q7YNJkzO88oJoRINytx5mbwM+RM/RVRZwfff4CtWvyTISKr/tfY7IVTGmAtGWfS+v2gzmlmj/wAI40s3NQ= 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 1679065001643346.48501885279245; Fri, 17 Mar 2023 07:56:41 -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-80-NHaZCJffMHymfgDGkzZgiQ-1; Fri, 17 Mar 2023 10:56:35 -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 7EC7D8678BB; Fri, 17 Mar 2023 14:56:32 +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 6789D40282F; Fri, 17 Mar 2023 14:56:32 +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 A77A61946A40; Fri, 17 Mar 2023 14:56:31 +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 5B45A1946587 for ; Thu, 16 Mar 2023 16:13:20 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3C1832166B26; Thu, 16 Mar 2023 16:13:20 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80C182166B29 for ; Thu, 16 Mar 2023 16:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679065000; 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=Q+lznSoWEq21k0U62hsnpxhmvyFLLWlh/gOVyrVwquE=; b=iAkUdWHAlCy1eEddTbwrc52C/g/sHv5KDZs2Ct8d09HgmxIbgkEfka+IvKjmDyuH0/XihD +Fs2mvu9deQP0CtrkixmAZO6zwGqhFfDEJ2go18Tv7WnIkHLS4Q3kAF5KRwslkY3hI3slA Jq8gJ5JWkeAyNT00Er4SLOEkw1lXDr4= X-MC-Unique: NHaZCJffMHymfgDGkzZgiQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 19/24] testutilsqemu: Add support for specifying the variant for qemuxml2(argv|xml)test Date: Thu, 16 Mar 2023 17:11:48 +0100 Message-Id: <5ca2b5729aa9847536980aa6bce0c2446bf0ed32.1678982996.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.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: 1679065002241100004 Content-Type: text/plain; charset="utf-8" Add the possibility to control the variant of the test data for real caps testing in qemuxml2argvtest and qemuxml2xmltest. Signed-off-by: Peter Krempa --- tests/testutilsqemu.c | 15 ++++++++++++--- tests/testutilsqemu.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 7f2aca5221..e12eaf4dd8 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -943,6 +943,10 @@ testQemuInfoSetArgs(struct testQemuInfo *info, info->args.capsver =3D va_arg(argptr, char *); break; + case ARG_CAPS_VARIANT: + info->args.capsvariant =3D va_arg(argptr, char *); + break; + case ARG_CAPS_HOST_CPU_MODEL: info->args.capsHostCPUModel =3D va_arg(argptr, int); break; @@ -1008,6 +1012,9 @@ testQemuInfoInitArgs(struct testQemuInfo *info) info->args.newargs =3D false; + if (!info->args.capsvariant) + info->args.capsvariant =3D ""; + if (info->args.invalidarg) { fprintf(stderr, "Invalid argument encountered by 'testQemuInfoSetA= rgs'\n"); return -1; @@ -1025,7 +1032,8 @@ testQemuInfoInitArgs(struct testQemuInfo *info) info->arch =3D virArchFromString(info->args.capsarch); if (STREQ(info->args.capsver, "latest")) { - struct testQemuCapsFile *f =3D g_hash_table_lookup(info->conf-= >capslatest, info->args.capsarch); + g_autofree char *archvariant =3D g_strdup_printf("%s%s", info-= >args.capsarch, info->args.capsvariant); + struct testQemuCapsFile *f =3D g_hash_table_lookup(info->conf-= >capslatest, archvariant); if (!f) { fprintf(stderr, "'latest' caps for '%s' were not found\n",= info->args.capsarch); @@ -1035,10 +1043,11 @@ testQemuInfoInitArgs(struct testQemuInfo *info) capsfile =3D g_strdup(f->path); stripmachinealiases =3D true; } else { - capsfile =3D g_strdup_printf("%s/caps_%s_%s.xml", + capsfile =3D g_strdup_printf("%s/caps_%s_%s%s.xml", TEST_QEMU_CAPS_PATH, info->args.capsver, - info->args.capsarch); + info->args.capsarch, + info->args.capsvariant); } if (!g_hash_table_lookup_extended(info->conf->capscache, capsfile,= NULL, (void **) &cachedcaps)) { diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index d75dfee839..070bca6a53 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -51,6 +51,7 @@ typedef enum { ARG_PARSEFLAGS, ARG_CAPS_ARCH, ARG_CAPS_VER, + ARG_CAPS_VARIANT, ARG_CAPS_HOST_CPU_MODEL, ARG_HOST_OS, ARG_FD_GROUP, /* name, nfds, fd[0], ... fd[n-1] */ @@ -86,6 +87,7 @@ struct testQemuArgs { virBitmap *fakeCapsDel; char *capsver; char *capsarch; + const char *capsvariant; qemuTestCPUDef capsHostCPUModel; int gic; testQemuHostOS hostOS; --=20 2.39.2