From nobody Fri Dec 19 16:05:35 2025 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=1679064999; cv=none; d=zohomail.com; s=zohoarc; b=If6M/5R4Ni8gLu0TxBOs77LTH+r3xLhGsVB2c+Zwm/Jt09wobTl5nT99IomJ0bMYxZlTI39xRImeTlpPSQ3Ks+z1duqkA95K8cKisH34VvLOZbvmzJWkzPNAEEBlWP1gFAPW4fcHdYmArmrkke40TKbJcj6eONHXsjHkYlTfWTw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679064999; 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=nGn114dj2J4bta51FZ5CjBxeFznugAqh6pjVwcWhKXQ=; b=OFyj44/FvtoNjY8nFXxTKb54/vzCP3owCef22Q1G/IE4d7RitvxqWLnYBhpPKzZUbo+hAG60TmzPjnaiVwC/3s+n4CdZNScV2RTTlodEO4O5Opeh0UoO+unZp5TKU/chFvjsCTohOlwc39ZI9g3JSDgiRPG9VQWYlvXvfy9HMU4= 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 1679064999931300.2119939246875; Fri, 17 Mar 2023 07:56:39 -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-101--lqvGT3GOeWnbHuusjH9Ag-1; Fri, 17 Mar 2023 10:56:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A8E4E1C189A4; Fri, 17 Mar 2023 14:56:31 +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 93A8B40C6E67; Fri, 17 Mar 2023 14:56:31 +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 506781946597; 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 5C9301946587 for ; Thu, 16 Mar 2023 16:12:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4DA332166B29; Thu, 16 Mar 2023 16:12:11 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 400B22166B26 for ; Thu, 16 Mar 2023 16:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679064998; 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=nGn114dj2J4bta51FZ5CjBxeFznugAqh6pjVwcWhKXQ=; b=byYcdiibrPIBPUSoVFd9lagxAqxVsjta7qoCeYKKyGQg75ugsWzL47m1TgbuPFndyKu6fD iCQkFnwh/cRVScRbemjuN+jFAof07QZ3mSfoCYRPuD/rnARQYla4pZinEq2wAOgkFnEuCE Xhri3TU4dRNI52o8MpMwpZRKiFmSCCY= X-MC-Unique: -lqvGT3GOeWnbHuusjH9Ag-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/24] qemucapabilitiesdata: Separate version from architecture with a '_' Date: Thu, 16 Mar 2023 17:11:34 +0100 Message-Id: <2a4aaae80eb5b008875a56752efd28f1510b41a2.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.2 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: 1679065000221100001 Content-Type: text/plain; charset="utf-8" Parsing a version where components are separated by dots, while other components are also separated by dots is a bit insane. Separate the version by an underscore. To achieve this we rename all the caps files and adjust the appropriate places formatting the path. Signed-off-by: Peter Krempa --- tests/domaincapstest.c | 2 +- ....2.0.aarch64.replies =3D> caps_4.2.0_aarch64.replies} | 0 .../{caps_4.2.0.aarch64.xml =3D> caps_4.2.0_aarch64.xml} | 0 ...ps_4.2.0.ppc64.replies =3D> caps_4.2.0_ppc64.replies} | 0 .../{caps_4.2.0.ppc64.xml =3D> caps_4.2.0_ppc64.xml} | 0 ...ps_4.2.0.s390x.replies =3D> caps_4.2.0_s390x.replies} | 0 .../{caps_4.2.0.s390x.xml =3D> caps_4.2.0_s390x.xml} | 0 ..._4.2.0.x86_64.replies =3D> caps_4.2.0_x86_64.replies} | 0 .../{caps_4.2.0.x86_64.xml =3D> caps_4.2.0_x86_64.xml} | 0 ....0.0.aarch64.replies =3D> caps_5.0.0_aarch64.replies} | 0 .../{caps_5.0.0.aarch64.xml =3D> caps_5.0.0_aarch64.xml} | 0 ...ps_5.0.0.ppc64.replies =3D> caps_5.0.0_ppc64.replies} | 0 .../{caps_5.0.0.ppc64.xml =3D> caps_5.0.0_ppc64.xml} | 0 ....0.0.riscv64.replies =3D> caps_5.0.0_riscv64.replies} | 0 .../{caps_5.0.0.riscv64.xml =3D> caps_5.0.0_riscv64.xml} | 0 ..._5.0.0.x86_64.replies =3D> caps_5.0.0_x86_64.replies} | 0 .../{caps_5.0.0.x86_64.xml =3D> caps_5.0.0_x86_64.xml} | 0 ...ps_5.1.0.sparc.replies =3D> caps_5.1.0_sparc.replies} | 0 .../{caps_5.1.0.sparc.xml =3D> caps_5.1.0_sparc.xml} | 0 ..._5.1.0.x86_64.replies =3D> caps_5.1.0_x86_64.replies} | 0 .../{caps_5.1.0.x86_64.xml =3D> caps_5.1.0_x86_64.xml} | 0 ....2.0.aarch64.replies =3D> caps_5.2.0_aarch64.replies} | 0 .../{caps_5.2.0.aarch64.xml =3D> caps_5.2.0_aarch64.xml} | 0 ...ps_5.2.0.ppc64.replies =3D> caps_5.2.0_ppc64.replies} | 0 .../{caps_5.2.0.ppc64.xml =3D> caps_5.2.0_ppc64.xml} | 0 ....2.0.riscv64.replies =3D> caps_5.2.0_riscv64.replies} | 0 .../{caps_5.2.0.riscv64.xml =3D> caps_5.2.0_riscv64.xml} | 0 ...ps_5.2.0.s390x.replies =3D> caps_5.2.0_s390x.replies} | 0 .../{caps_5.2.0.s390x.xml =3D> caps_5.2.0_s390x.xml} | 0 ..._5.2.0.x86_64.replies =3D> caps_5.2.0_x86_64.replies} | 0 .../{caps_5.2.0.x86_64.xml =3D> caps_5.2.0_x86_64.xml} | 0 ....0.0.aarch64.replies =3D> caps_6.0.0_aarch64.replies} | 0 .../{caps_6.0.0.aarch64.xml =3D> caps_6.0.0_aarch64.xml} | 0 ...ps_6.0.0.s390x.replies =3D> caps_6.0.0_s390x.replies} | 0 .../{caps_6.0.0.s390x.xml =3D> caps_6.0.0_s390x.xml} | 0 ..._6.0.0.x86_64.replies =3D> caps_6.0.0_x86_64.replies} | 0 .../{caps_6.0.0.x86_64.xml =3D> caps_6.0.0_x86_64.xml} | 0 ..._6.1.0.x86_64.replies =3D> caps_6.1.0_x86_64.replies} | 0 .../{caps_6.1.0.x86_64.xml =3D> caps_6.1.0_x86_64.xml} | 0 ....2.0.aarch64.replies =3D> caps_6.2.0_aarch64.replies} | 0 .../{caps_6.2.0.aarch64.xml =3D> caps_6.2.0_aarch64.xml} | 0 ...ps_6.2.0.ppc64.replies =3D> caps_6.2.0_ppc64.replies} | 0 .../{caps_6.2.0.ppc64.xml =3D> caps_6.2.0_ppc64.xml} | 0 ..._6.2.0.x86_64.replies =3D> caps_6.2.0_x86_64.replies} | 0 .../{caps_6.2.0.x86_64.xml =3D> caps_6.2.0_x86_64.xml} | 0 ....0.0.aarch64.replies =3D> caps_7.0.0_aarch64.replies} | 0 .../{caps_7.0.0.aarch64.xml =3D> caps_7.0.0_aarch64.xml} | 0 ...ps_7.0.0.ppc64.replies =3D> caps_7.0.0_ppc64.replies} | 0 .../{caps_7.0.0.ppc64.xml =3D> caps_7.0.0_ppc64.xml} | 0 ..._7.0.0.x86_64.replies =3D> caps_7.0.0_x86_64.replies} | 0 .../{caps_7.0.0.x86_64.xml =3D> caps_7.0.0_x86_64.xml} | 0 ...ps_7.1.0.ppc64.replies =3D> caps_7.1.0_ppc64.replies} | 0 .../{caps_7.1.0.ppc64.xml =3D> caps_7.1.0_ppc64.xml} | 0 ..._7.1.0.x86_64.replies =3D> caps_7.1.0_x86_64.replies} | 0 .../{caps_7.1.0.x86_64.xml =3D> caps_7.1.0_x86_64.xml} | 0 .../{caps_7.2.0.ppc.replies =3D> caps_7.2.0_ppc.replies} | 0 .../{caps_7.2.0.ppc.xml =3D> caps_7.2.0_ppc.xml} | 0 ..._7.2.0.x86_64.replies =3D> caps_7.2.0_x86_64.replies} | 0 .../{caps_7.2.0.x86_64.xml =3D> caps_7.2.0_x86_64.xml} | 0 ....0.0.riscv64.replies =3D> caps_8.0.0_riscv64.replies} | 0 .../{caps_8.0.0.riscv64.xml =3D> caps_8.0.0_riscv64.xml} | 0 ..._8.0.0.x86_64.replies =3D> caps_8.0.0_x86_64.replies} | 0 .../{caps_8.0.0.x86_64.xml =3D> caps_8.0.0_x86_64.xml} | 0 tests/qemucapabilitiesnumbering.c | 2 +- tests/qemucapabilitiestest.c | 6 +++--- tests/qemucaps2xmltest.c | 2 +- tests/testutilsqemu.c | 10 +++++----- 67 files changed, 11 insertions(+), 11 deletions(-) rename tests/qemucapabilitiesdata/{caps_4.2.0.aarch64.replies =3D> caps_4.= 2.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.aarch64.xml =3D> caps_4.2.0_= aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.ppc64.replies =3D> caps_4.2.= 0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.ppc64.xml =3D> caps_4.2.0_pp= c64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.s390x.replies =3D> caps_4.2.= 0_s390x.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.s390x.xml =3D> caps_4.2.0_s3= 90x.xml} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.x86_64.replies =3D> caps_4.2= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_4.2.0.x86_64.xml =3D> caps_4.2.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.replies =3D> caps_5.= 0.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.aarch64.xml =3D> caps_5.0.0_= aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.ppc64.replies =3D> caps_5.0.= 0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.ppc64.xml =3D> caps_5.0.0_pp= c64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.riscv64.replies =3D> caps_5.= 0.0_riscv64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.riscv64.xml =3D> caps_5.0.0_= riscv64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.x86_64.replies =3D> caps_5.0= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.0.0.x86_64.xml =3D> caps_5.0.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.sparc.replies =3D> caps_5.1.= 0_sparc.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.sparc.xml =3D> caps_5.1.0_sp= arc.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.x86_64.replies =3D> caps_5.1= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.1.0.x86_64.xml =3D> caps_5.1.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.aarch64.replies =3D> caps_5.= 2.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.aarch64.xml =3D> caps_5.2.0_= aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.ppc64.replies =3D> caps_5.2.= 0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.ppc64.xml =3D> caps_5.2.0_pp= c64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.riscv64.replies =3D> caps_5.= 2.0_riscv64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.riscv64.xml =3D> caps_5.2.0_= riscv64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.s390x.replies =3D> caps_5.2.= 0_s390x.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.s390x.xml =3D> caps_5.2.0_s3= 90x.xml} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.x86_64.replies =3D> caps_5.2= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_5.2.0.x86_64.xml =3D> caps_5.2.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.replies =3D> caps_6.= 0.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.aarch64.xml =3D> caps_6.0.0_= aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.s390x.replies =3D> caps_6.0.= 0_s390x.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.s390x.xml =3D> caps_6.0.0_s3= 90x.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.x86_64.replies =3D> caps_6.0= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.0.0.x86_64.xml =3D> caps_6.0.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.replies =3D> caps_6.1= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.1.0.x86_64.xml =3D> caps_6.1.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.replies =3D> caps_6.= 2.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.aarch64.xml =3D> caps_6.2.0_= aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.ppc64.replies =3D> caps_6.2.= 0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.ppc64.xml =3D> caps_6.2.0_pp= c64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.x86_64.replies =3D> caps_6.2= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_6.2.0.x86_64.xml =3D> caps_6.2.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.aarch64.replies =3D> caps_7.= 0.0_aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.aarch64.xml =3D> caps_7.0.0_= aarch64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.replies =3D> caps_7.0.= 0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.ppc64.xml =3D> caps_7.0.0_pp= c64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.x86_64.replies =3D> caps_7.0= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.0.0.x86_64.xml =3D> caps_7.0.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.ppc64.replies =3D> caps_7.1.= 0_ppc64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.ppc64.xml =3D> caps_7.1.0_pp= c64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.x86_64.replies =3D> caps_7.1= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.1.0.x86_64.xml =3D> caps_7.1.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.ppc.replies =3D> caps_7.2.0_= ppc.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.ppc.xml =3D> caps_7.2.0_ppc.= xml} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.x86_64.replies =3D> caps_7.2= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_7.2.0.x86_64.xml =3D> caps_7.2.0_x= 86_64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.riscv64.replies =3D> caps_8.= 0.0_riscv64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.riscv64.xml =3D> caps_8.0.0_= riscv64.xml} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.x86_64.replies =3D> caps_8.0= .0_x86_64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_8.0.0.x86_64.xml =3D> caps_8.0.0_x= 86_64.xml} (100%) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 90693aac68..fbbed40c96 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -81,7 +81,7 @@ fillQemuCaps(virDomainCaps *domCaps, if (fakeHostCPU(domCaps->arch) < 0) return -1; - path =3D g_strdup_printf("%s/%s.%s.xml", TEST_QEMU_CAPS_PATH, name, ar= ch); + path =3D g_strdup_printf("%s/%s_%s.xml", TEST_QEMU_CAPS_PATH, name, ar= ch); if (!(qemuCaps =3D qemuTestParseCapabilitiesArch(domCaps->arch, path))) return -1; diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_4.2.0_aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies rename to tests/qemucapabilitiesdata/caps_4.2.0_aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0_aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml rename to tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_4.2.0_ppc64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies rename to tests/qemucapabilitiesdata/caps_4.2.0_ppc64.replies diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_ppc64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml rename to tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_4.2.0_s390x.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies rename to tests/qemucapabilitiesdata/caps_4.2.0_s390x.replies diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0_s390x.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml rename to tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_4.2.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_4.2.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_5.0.0_aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies rename to tests/qemucapabilitiesdata/caps_5.0.0_aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml rename to tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_5.0.0_ppc64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies rename to tests/qemucapabilitiesdata/caps_5.0.0_ppc64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0_ppc64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml rename to tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies b/tests/= qemucapabilitiesdata/caps_5.0.0_riscv64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies rename to tests/qemucapabilitiesdata/caps_5.0.0_riscv64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0_riscv64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml rename to tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_5.0.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_5.0.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies b/tests/qe= mucapabilitiesdata/caps_5.1.0_sparc.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.1.0.sparc.replies rename to tests/qemucapabilitiesdata/caps_5.1.0_sparc.replies diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0_sparc.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml rename to tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_5.1.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_5.1.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_5.2.0_aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies rename to tests/qemucapabilitiesdata/caps_5.2.0_aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml rename to tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_5.2.0_ppc64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies rename to tests/qemucapabilitiesdata/caps_5.2.0_ppc64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_ppc64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml rename to tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies b/tests/= qemucapabilitiesdata/caps_5.2.0_riscv64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies rename to tests/qemucapabilitiesdata/caps_5.2.0_riscv64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_riscv64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml rename to tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_5.2.0_s390x.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies rename to tests/qemucapabilitiesdata/caps_5.2.0_s390x.replies diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0_s390x.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml rename to tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_5.2.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_5.2.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_6.0.0_aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.0.0.aarch64.replies rename to tests/qemucapabilitiesdata/caps_6.0.0_aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0_aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml rename to tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_6.0.0_s390x.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies rename to tests/qemucapabilitiesdata/caps_6.0.0_s390x.replies diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0_s390x.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml rename to tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.0.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_6.0.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.1.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.1.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_6.1.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_6.2.0_aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.2.0.aarch64.replies rename to tests/qemucapabilitiesdata/caps_6.2.0_aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0_aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml rename to tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_6.2.0_ppc64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.2.0.ppc64.replies rename to tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml rename to tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.2.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_7.0.0_aarch64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.0.0.aarch64.replies rename to tests/qemucapabilitiesdata/caps_7.0.0_aarch64.replies diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0_aarch64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml rename to tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_7.0.0_ppc64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies rename to tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml rename to tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.0.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_7.1.0_ppc64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.1.0.ppc64.replies rename to tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml rename to tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.1.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.ppc.replies b/tests/qemu= capabilitiesdata/caps_7.2.0_ppc.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.2.0.ppc.replies rename to tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.2.0.ppc.xml rename to tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.2.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.riscv64.replies b/tests/= qemucapabilitiesdata/caps_8.0.0_riscv64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_8.0.0.riscv64.replies rename to tests/qemucapabilitiesdata/caps_8.0.0_riscv64.replies diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_8.0.0_riscv64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_8.0.0.riscv64.xml rename to tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.0.0_x86_64.replies similarity index 100% rename from tests/qemucapabilitiesdata/caps_8.0.0.x86_64.replies rename to tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies diff --git a/tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml similarity index 100% rename from tests/qemucapabilitiesdata/caps_8.0.0.x86_64.xml rename to tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml diff --git a/tests/qemucapabilitiesnumbering.c b/tests/qemucapabilitiesnumb= ering.c index aae21893c2..6814011351 100644 --- a/tests/qemucapabilitiesnumbering.c +++ b/tests/qemucapabilitiesnumbering.c @@ -224,7 +224,7 @@ iterateCapsFile(const char *inputDir, const char *suffix, void *opaque G_GNUC_UNUSED) { - g_autofree char *repliesFile =3D g_strdup_printf("%s/%s_%s.%s.%s", inp= utDir, prefix, version, archName, suffix); + g_autofree char *repliesFile =3D g_strdup_printf("%s/%s_%s_%s.%s", inp= utDir, prefix, version, archName, suffix); return virTestRun(repliesFile, testCapsFile, repliesFile); } diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 5be37a8380..8c86095e1c 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -78,10 +78,10 @@ testQemuCaps(const void *opaque) unsigned int fakeMicrocodeVersion =3D 0; const char *p; - repliesFile =3D g_strdup_printf("%s/%s_%s.%s.%s", + repliesFile =3D g_strdup_printf("%s/%s_%s_%s.%s", data->inputDir, data->prefix, data->vers= ion, data->archName, data->suffix); - capsFile =3D g_strdup_printf("%s/%s_%s.%s.xml", + capsFile =3D g_strdup_printf("%s/%s_%s_%s.xml", data->outputDir, data->prefix, data->versio= n, data->archName); @@ -142,7 +142,7 @@ testQemuCapsCopy(const void *opaque) g_autoptr(virQEMUCaps) copy =3D NULL; g_autofree char *actual =3D NULL; - capsFile =3D g_strdup_printf("%s/%s_%s.%s.xml", + capsFile =3D g_strdup_printf("%s/%s_%s_%s.xml", data->outputDir, data->prefix, data->versio= n, data->archName); diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index badbce986e..2c40dcb114 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -124,7 +124,7 @@ testQemuCapsXML(const void *opaque) xmlFile =3D g_strdup_printf("%s/caps.%s.xml", data->outputDir, data->a= rchName); - capsFile =3D g_strdup_printf("%s/%s_%s.%s.%s", + capsFile =3D g_strdup_printf("%s/%s_%s_%s.%s", data->inputDir, data->prefix, data->version, data->archName, data->suffix); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 41727cfd1a..8c2cb6aa45 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -832,15 +832,15 @@ testQemuCapsIterate(const char *suffix, return -1; } - /* Find the last dot */ - if (!(archName =3D strrchr(tmp, '.'))) { + /* Find the underscore separating version from arch */ + if (!(archName =3D strchr(version, '_'))) { VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name); return -1; } /* The version number and the architecture name are separated by - * a dot: overwriting that dot with \0 results in both being usable - * as independent, null-terminated strings */ + * a underscore: overwriting that underscore with \0 results in bo= th + * being usable as independent, null-terminated strings */ archName[0] =3D '\0'; archName++; @@ -1011,7 +1011,7 @@ testQemuInfoInitArgs(struct testQemuInfo *info) stripmachinealiases =3D true; } else { - capsfile =3D g_strdup_printf("%s/caps_%s.%s.xml", + capsfile =3D g_strdup_printf("%s/caps_%s_%s.xml", TEST_QEMU_CAPS_PATH, info->args.capsver, info->args.capsarch); --=20 2.39.2