From nobody Sun Feb 8 18:39:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 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=1572960607; cv=none; d=zoho.com; s=zohoarc; b=HCJCHEc3UqcC0aSwaIGxClOM3eRaCtgKgInn/kMAfkVgG25KrhSFnrlz97UT7tZjhbHyvCz3aex2YPOUZ2sGH0qjeS7NRJjyZvcM5Yj/Bls/gkCy82+o7A3EBmFhbZQExGCWKsQYAvrhReTale2O66oVsLPbyk3dPdER5dpFxvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572960607; 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=WuZxDworlLbP1FTNe9H2INup/yXZXoV8k/LZRgFtF+c=; b=S8RXXj1kzkdNKnFcSKmvuIJ0c/il8RMbWQotnYXWlKDiTFVQ072h4eTe8jXMQHK/tBHxlejfKG8633M2VQ5nzlzm0UhBzYXCVDJ7WDQxbBX36Bjx+k18S4+TgnWLQ41vFaGtU+D91/BmN/MMkeDHq9PixcSX0JULuSpZXn3aSUA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1572960606991275.7616450069909; Tue, 5 Nov 2019 05:30:06 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-i6TOEB5wMS-Rj7hkNJfYfA-1; Tue, 05 Nov 2019 08:29:02 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50FACDB2C; Tue, 5 Nov 2019 13:28:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 27F75608B5; Tue, 5 Nov 2019 13:28:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D781618033AE; Tue, 5 Nov 2019 13:28:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xA5DS2xf004102 for ; Tue, 5 Nov 2019 08:28:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6D64727065; Tue, 5 Nov 2019 13:28:02 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.188]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42E2E27064 for ; Tue, 5 Nov 2019 13:28:02 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 699D2105D89; Tue, 5 Nov 2019 14:27:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1572960606; 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=WuZxDworlLbP1FTNe9H2INup/yXZXoV8k/LZRgFtF+c=; b=bQtVnoIB9s0sDRspgPfnacMnOwp2wQZGZn65NxzvpcC5PyhWlPZXN+eRpOhCzhUF5JoW8k XJmDweAO30ItN5yddPfjLxrvvdz9P32880zGUMlzTvBLK0gfpurJecwRymjJ87DvIkB9tq rDCjYnYDU+ctarZuOS2yo6DcRWsjRO0= From: Jiri Denemark To: libvir-list@redhat.com Date: Tue, 5 Nov 2019 14:27:45 +0100 Message-Id: <58e0ae6dd1f1b2041512a682dcaa295acadb21cc.1572958255.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 47/52] qemuxml2argvtest: Update host arch for DO_TEST*ARCH* tests X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: i6TOEB5wMS-Rj7hkNJfYfA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" To avoid mismatch between host and QEMU capabilities. Signed-off-by: Jiri Denemark Reviewed-by: J=C3=A1n Tomko --- Notes: Version 3: - new patch tests/qemuxml2argvtest.c | 4 ++++ tests/testutilsqemu.c | 6 +++--- tests/testutilsqemu.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd330df3e0..7c00c72aff 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -717,9 +717,13 @@ mymain(void) VIR_TEST_DEBUG("Failed to generate paths for '%s'", _name); \ return EXIT_FAILURE; \ } \ + if (info.arch !=3D VIR_ARCH_NONE && info.arch !=3D VIR_ARCH_X86_64= ) \ + qemuTestSetHostArch(driver.caps, info.arch); \ if (virTestRun("QEMU XML-2-ARGV " _name _suffix, \ testCompareXMLToArgv, &info) < 0) \ ret =3D -1; \ + if (info.arch !=3D VIR_ARCH_NONE && info.arch !=3D VIR_ARCH_X86_64= ) \ + qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE); \ testQemuInfoClear(&info); \ } while (0) =20 diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 54d6b1a0ac..ba9b56003a 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -1061,6 +1061,8 @@ testQemuInfoSetArgs(struct testQemuInfo *info, if (!qemuCaps && capsarch && capsver) { bool stripmachinealiases =3D false; =20 + info->arch =3D virArchFromString(capsarch); + if (STREQ(capsver, "latest")) { capsfile =3D g_strdup(virHashLookup(capslatest, capsarch)); stripmachinealiases =3D true; @@ -1069,10 +1071,8 @@ testQemuInfoSetArgs(struct testQemuInfo *info, goto cleanup; } =20 - if (!(qemuCaps =3D qemuTestParseCapabilitiesArch(virArchFromString= (capsarch), - capsfile))) { + if (!(qemuCaps =3D qemuTestParseCapabilitiesArch(info->arch, capsf= ile))) goto cleanup; - } =20 if (stripmachinealiases) virQEMUCapsStripMachineAliases(qemuCaps); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 714a95bb7a..da3bf3ab7a 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -63,6 +63,7 @@ struct testQemuInfo { int migrateFd; unsigned int flags; unsigned int parseFlags; + virArch arch; }; =20 virCapsPtr testQemuCapsInit(void); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list