From nobody Mon Sep 16 19:43:39 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=1693923915; cv=none; d=zohomail.com; s=zohoarc; b=GPgqC4ToSJjq7MX7UZsSjjWJMyT2ZbVIDzgWLLO10bZknRrDFi/C0FOt/nP78GBDUjJESSbvaQBCVXqGheALREg2eSMKu6po0qC3VCx8+GBIQeSnXhYJMpKYcf4YXPUI6sqJ6ldS0qgFQ3V1TekH4NilZPrvluBuaBSptO3bUxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923915; 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=8k6Cn3rD2LY8B10s1aZ/z7ZSBYmSdsu0k/r9ad/Btl4=; b=fR6uMW3s2gokXGvNOgLYQNGVMKvOKDPfp9MOumy9KUv/5YcLGQyrOK61PUOQBO6OeIV8y/LXchVm9AAuJBH/6zFqJMY84jnHU0X4gMCXTU315YLkGIYWAnOMHjkwx1I3UWCoD1bNNn7rzt+wSF6m7puLz30Z3y6dSk34tUk/FGQ= 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 1693923915903510.6725997414168; Tue, 5 Sep 2023 07:25:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.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-647-ylzSQfHBOrCYA88xRuCjqg-1; Tue, 05 Sep 2023 10:24:55 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ADAC23C1938E; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 923F21460FE5; Tue, 5 Sep 2023 14:24: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 77BA51946597; Tue, 5 Sep 2023 14:24:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 796AD19465B3 for ; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5CF591121319; Tue, 5 Sep 2023 14:24:28 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 697031121314 for ; Tue, 5 Sep 2023 14:24:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923914; 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=8k6Cn3rD2LY8B10s1aZ/z7ZSBYmSdsu0k/r9ad/Btl4=; b=BC1ILns6wBx0VjCKdks8j2wPHmhbEe+GNLiIiV7NFP2YHeXmwy5F1/8H58Zspv905xU4al eBZ7b2NvMH9FRdXgMY46ukeDb2bFtCPSata0A3GKRP7SI1/Cgt8+mkBrr1SLcVxglgszl9 yvzhdRHU2TxM+PnP1Ml+BgBnGULyGck= X-MC-Unique: ylzSQfHBOrCYA88xRuCjqg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 05/51] qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models Date: Tue, 5 Sep 2023 16:23:32 +0200 Message-ID: <186ed1e4bf963c1c5107fa7c5d1397dc3b0c3fd3.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.7 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: 1693923917840100001 Content-Type: text/plain; charset="utf-8" At this point only x86_64 is using fake machines, and for real machines we don't populate the fake cpu models. Thus we can remove everything non-x86_64. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 32affb16c0..3c2156118a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -270,15 +270,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) "486", "coreduo", "kvm32", "qemu32", "kvm64", "core2duo", "phenom", "qemu64", }; - const char *armModels[] =3D { - "cortex-a9", "cortex-a8", "cortex-a57", "cortex-a53", - }; - const char *ppc64Models[] =3D { - "POWER8", "POWER7", - }; - const char *s390xModels[] =3D { - "z990", "zEC12", "z13", - }; if (ARCH_IS_X86(arch)) { if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, x86Mod= els, @@ -300,27 +291,6 @@ testAddCPUModels(virQEMUCaps *caps, bool skipLegacy) VIR_DOMCAPS_CPU_USABLE_UNKNOW= N) < 0) return -1; } - } else if (ARCH_IS_ARM(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, armMod= els, - G_N_ELEMENTS(armModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, armMo= dels, - G_N_ELEMENTS(armModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) - return -1; - } else if (ARCH_IS_PPC64(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, ppc64M= odels, - G_N_ELEMENTS(ppc64Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0 || - virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_QEMU, ppc64= Models, - G_N_ELEMENTS(ppc64Models), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) - return -1; - } else if (ARCH_IS_S390(arch)) { - if (virQEMUCapsAddCPUDefinitions(caps, VIR_DOMAIN_VIRT_KVM, s390xM= odels, - G_N_ELEMENTS(s390xModels), - VIR_DOMCAPS_CPU_USABLE_UNKNOWN) <= 0) - return -1; } return 0; --=20 2.41.0