From nobody Mon May 13 19:00:57 2024 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=fail(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1694697392; cv=none; d=zohomail.com; s=zohoarc; b=DlLcWTXEjYmO1+e8irh6HNNcT0/p8rHb2Oop8ubNUO4K9A5Svs2WhNHfsSB5zM49tpEI6FKKQLa9CkLQx6XLVz3lx0MhNFmXK3TiYBL3EVeSfDnEl72HAjEh1XEi74ZjaZkUE2Ml7oNlnITAdSBXOmhhUCpsuQcZO8c8gQqVWZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694697392; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=yP7Q7+gB8zsFU/oL34JZZgH4io1OjF1zkv3OHYeOal8=; b=UwIzyYBE6ZZ+3YEUdQ8xAXD4fVboZYm9V7ouEBd70FgG9WkA53qQz4xWW6n/KA7NTUJkIHcdq8qHbG/e+rTvd90szaN0JGSeVYt+B6mYUKlALBlKgOgLnwMzhabVN+fSKg9sf+0BT6lMgu8jrAxSME/wcjCiPJqZE3mj1Yt6igE= 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=fail header.from= (p=reject 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 1694697392725372.44013878153726; Thu, 14 Sep 2023 06:16:32 -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-176-uHs437-tM_KQ1_CpnAxb7Q-1; Thu, 14 Sep 2023 09:16:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3BF6D81D88A; Thu, 14 Sep 2023 13:16:22 +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 8365140C2070; Thu, 14 Sep 2023 13:16:19 +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 1010419465B8; Thu, 14 Sep 2023 13:16:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3B38319465B7 for ; Thu, 14 Sep 2023 13:16:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1A98F40C6ECA; Thu, 14 Sep 2023 13:16:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1215B40C6EC0 for ; Thu, 14 Sep 2023 13:16:12 +0000 (UTC) Received: from us-smtp-inbound-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E57C3185A79B for ; Thu, 14 Sep 2023 13:16:11 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-362-9tNXIkpkN6aL6eMev6Ey4A-1; Thu, 14 Sep 2023 09:16:07 -0400 Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 38ED8alJ010853; Thu, 14 Sep 2023 13:16:00 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3t41atb3mt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Sep 2023 13:15:59 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 38ECbFr0012069; Thu, 14 Sep 2023 13:15:58 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3t13e03ae9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Sep 2023 13:15:57 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 38EDFtmZ19333724 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Sep 2023 13:15:56 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DFD6820043; Thu, 14 Sep 2023 13:15:55 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C93C320040; Thu, 14 Sep 2023 13:15:55 +0000 (GMT) Received: from fiuczyvm.. (unknown [9.152.222.239]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 14 Sep 2023 13:15:55 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694697391; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=yP7Q7+gB8zsFU/oL34JZZgH4io1OjF1zkv3OHYeOal8=; b=VoTSLUany4N8XIZ8gXfpoUBXtysp3e9zXpMZ7TtOpdwm9eVp6v/cgAAnH6KzY284Frf8bZ sm5WgkZNUvOQcrjgO9lLAsqdFExcN4Ymj30tE+DJOxzEeYc/FGzjmzlPZf9B0+otjY6KUQ 0i76Zd0fWrOi0hTH+iBH2/E5d293q50= X-MC-Unique: uHs437-tM_KQ1_CpnAxb7Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 9tNXIkpkN6aL6eMev6Ey4A-1 From: Boris Fiuczynski To: libvir-list@redhat.com Subject: [PATCH] qemuxml2argvtest: Fix tests failing on none x86 host CPUs Date: Thu, 14 Sep 2023 15:15:55 +0200 Message-ID: <20230914131555.14927-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: b38vBI8wZFFXwQw02FFIWtY9S7JKqQLz X-Proofpoint-GUID: b38vBI8wZFFXwQw02FFIWtY9S7JKqQLz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-09-14_09,2023-09-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 adultscore=0 spamscore=0 impostorscore=0 phishscore=0 mlxlogscore=407 mlxscore=0 clxscore=1011 bulkscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000 definitions=main-2309140111 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Cc: pkrempa@redhat.com, jtomko@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: linux.ibm.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694697393183100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Since commit 54257ed51b51 on S390x qemuxml2argvtest fails with the followin= g errors: 144) QEMU XML-2-ARGV cpu-kvmclock.x86_64-latest ... = libvirt: CPU Driver error : the CPU is incompatible with host CPU: Host CPU= does not provide required features: monitor FAILED 2023-09-14 13:01:23.883+0000: 4113077: info : libvirt version: 9.8.0 2023-09-14 13:01:23.883+0000: 4113077: info : hostname: a46lp61.lnxne.boe 2023-09-14 13:01:23.883+0000: 4113077: error : virCPUx86Compare:1954 : the = CPU is incompatible with host CPU: Host CPU does not provide required featu= res: monitor 1059) QEMU XML-2-ARGV cpu-check-partial.x86_64-latest ...= libvirt: CPU Driver error : the CPU is incompatible with host CPU: Host CP= U does not provide required features: monitor FAILED 2023-09-14 13:01:23.885+0000: 4113077: error : virCPUx86Compare:1954 : the = CPU is incompatible with host CPU: Host CPU does not provide required featu= res: monitor 1064) QEMU XML-2-ARGV cpu-check-default-partial2.x86_64-latest ...= libvirt: CPU Driver error : the CPU is incompatible with host CPU: Host CP= U does not provide required features: monitor FAILED 2023-09-14 13:01:23.885+0000: 4113077: error : virCPUx86Compare:1954 : the = CPU is incompatible with host CPU: Host CPU does not provide required featu= res: monitor 3 tests failed. Fixes: 54257ed51b5132032cedb7e1e7b8c34b9ae52115 Signed-off-by: Boris Fiuczynski Reviewed-by: Michal Privoznik --- tests/qemuxml2argvtest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0dd10f1fab..c3f05e83b9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1035,7 +1035,7 @@ mymain(void) DO_TEST_CAPS_VER("clock-hpet-off", "7.2.0"); DO_TEST_CAPS_LATEST("clock-hpet-off"); DO_TEST_CAPS_LATEST("clock-catchup"); - DO_TEST_CAPS_LATEST("cpu-kvmclock"); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-kvmclock", "x86_64", ARG_CAPS_HOST_= CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_LATEST("cpu-host-kvmclock"); DO_TEST_CAPS_LATEST("kvmclock"); DO_TEST_CAPS_LATEST("clock-timer-hyperv-rtc"); @@ -2201,13 +2201,13 @@ mymain(void) DO_TEST_CAPS_LATEST("memfd-memory-default-hugepage"); =20 DO_TEST_CAPS_LATEST("cpu-check-none"); - DO_TEST_CAPS_LATEST("cpu-check-partial"); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-check-partial", "x86_64", ARG_CAPS_= HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); DO_TEST_CAPS_LATEST("cpu-check-full"); DO_TEST_CAPS_LATEST("cpu-check-default-none"); DO_TEST_CAPS_LATEST("cpu-check-default-none2"); /* this test case uses 'cpu=3D"host-model"', run it with Haswell host = cpu to prevent test case churn */ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-check-default-partial", "x86_64", A= RG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); - DO_TEST_CAPS_LATEST("cpu-check-default-partial2"); + DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-check-default-partial2", "x86_64", = ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL); =20 DO_TEST_CAPS_LATEST("cpu-cache-disable"); /* this test case uses 'cpu=3D"host-model"', run it with Haswell host = cpu to prevent test case churn */ --=20 2.41.0