From nobody Mon Nov 25 12:40:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1715274225; cv=none; d=zohomail.com; s=zohoarc; b=nrFPPLTxzGscApxsrBBm0M870OzpRCu4tn7A+Dcq9Pzp7iW2smrHCcBDsKPrXQvunD2m/uK02IxsS6ufFvYg0gEaRAX6dP9DCip0CcQZPqBzTDSi4hoNGXIbzXTx+lbKwlxEuYYiYDk+T84bqvRC4+0nTBEjDjNI+jeVrhYLfMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715274225; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tfwFcUpcowXHmSd2Ge81kDPkuiKnyaodHB6RPGeDEk8=; b=a0Jd7ttx1ajymbM9aa5nWimFyleIOxXF2lrx8quDqN+CL50VIb3HWSfDeOaYdkaSvZXTzHWTSV2j5KxsiznDNUpbPM+wa8yp+3G5MOgqxHhBD6huRM99bFF3NurfqJvsRwz+ZLgj7amaxA1vnIc/F1NXGdlxzSDYnRb/wti7wec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715274225433236.64203217730562; Thu, 9 May 2024 10:03:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s579K-0002Ut-Lf; Thu, 09 May 2024 13:01:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s579E-0002Tt-9g for qemu-devel@nongnu.org; Thu, 09 May 2024 13:01:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s5799-0003d1-NW for qemu-devel@nongnu.org; Thu, 09 May 2024 13:01:36 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-426-QEbgvFLNNCenoEE-bZjfbw-1; Thu, 09 May 2024 13:00:58 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a599dbd2b6aso58964166b.2 for ; Thu, 09 May 2024 10:00:58 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a179c7ebcsm91884466b.117.2024.05.09.10.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 10:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715274091; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=tfwFcUpcowXHmSd2Ge81kDPkuiKnyaodHB6RPGeDEk8=; b=ZuvsuOH9DtLPvLZRzl7pNuBctAKNV0AsLYEjzVVMf67/FEQJmnEiS+0d4A2QK6n721S8Qr Nnl2qK5NdQuCIZsUVXYq8a8BiurzuTqgQpsGzqojKQHRR5ZxTR3U4cdTyEwaFdQYCtPLgr 60xf99GlNNMPM9gh2pUvEBI5hIClTkc= X-MC-Unique: QEbgvFLNNCenoEE-bZjfbw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715274056; x=1715878856; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tfwFcUpcowXHmSd2Ge81kDPkuiKnyaodHB6RPGeDEk8=; b=sGta77f6rwL5wt9/AYgjEFH1TkD6G0EB0deOEGltiW9cBqs1zjdDu8MOfLfpUobbPs YRv4y8GXkIDpUYKwNr0Aa0fRasxuJhlOC/v2QtxT/CSLUDzcaeCK9yd9EyJLnzOaaQCZ zfjdKNDaRe6fU3YKcJKWhX8VBg9Dsv6NWR7m9c8xVHlmh4ckKklZa3+tEo2lb8IgJlok XrNcEHR395MdD179VuxB2nPdXc2Ypz3+uIAf/jjVciLHVJ/GL9Dq2fopPunp+782xmCG LZnp3GQAUu3/K3Wds8Hea6T7H505kD0Tq1ztH+c0aSqf2ra6WAqDmYLFn98fiO8tu6zc Ia1g== X-Gm-Message-State: AOJu0YzM5aQjAJ/B7xGjPiA9mnVqoZSeaM6zFdFhWunLmFTlo7n7jEqI hW+SSRt2OKtihANw7xZ3eChVts8E/oc1lVcCtJ+9tTXqdBCA08K0EXD7pzFnJ90/gal5exTsGHC GIjNNsHSARb1i++nn0NOQMvvCdC9Zii6i3N4MFHe9hXMNunmEZQjh4x+aEI9ggLTiSR917mWBo6 rfpoJiOd37JOoUd6/9v1xCXJFZdff5xjNfa72O X-Received: by 2002:a17:907:7da3:b0:a59:d063:f5f3 with SMTP id a640c23a62f3a-a5a2d673401mr16521966b.63.1715274056446; Thu, 09 May 2024 10:00:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE9LZyJu+Hm3YRCK3W7zrnGKvxq2cylzn9xsCzrd2jeQC1+YO5WhwNzZsClGWl6H0UwHXXAUw== X-Received: by 2002:a17:907:7da3:b0:a59:d063:f5f3 with SMTP id a640c23a62f3a-a5a2d673401mr16520666b.63.1715274056114; Thu, 09 May 2024 10:00:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: thuth@redhat.com Subject: [PATCH 05/13] tests/qtest: s390x: fix operation in a build without any boards or devices Date: Thu, 9 May 2024 19:00:36 +0200 Message-ID: <20240509170044.190795-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240509170044.190795-1-pbonzini@redhat.com> References: <20240509170044.190795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.581, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715274248854100009 Content-Type: text/plain; charset="utf-8" Do the bare minimum to ensure that at least a vanilla --without-default-devices build works for all targets except i386, x86_64 and ppc64. In particular this fixes s390x-softmmu; i386 and x86_64 have about a dozen failing tests that do not pass -M and therefore require a default machine type; ppc64 has the same issue, though only with numa-test. If we can for now ignore the cases where boards and devices are picked by hand, drive_del-test however can be fixed easily; almost all tests check for the virtio-blk or virtio-scsi device that they use, and are already skipped. Only one didn't get the memo; plus another one does not need a machine at all and can be run with -M none. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- tests/qtest/drive_del-test.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c index 8a6f3ac963d..7b67a4bbee4 100644 --- a/tests/qtest/drive_del-test.c +++ b/tests/qtest/drive_del-test.c @@ -173,7 +173,7 @@ static void test_drive_without_dev(void) QTestState *qts; =20 /* Start with an empty drive */ - qts =3D qtest_init("-drive if=3Dnone,id=3Ddrive0"); + qts =3D qtest_init("-drive if=3Dnone,id=3Ddrive0 -M none"); =20 /* Delete the drive */ drive_del(qts); @@ -192,6 +192,11 @@ static void test_after_failed_device_add(void) QDict *response; QTestState *qts; =20 + if (!has_device_builtin("virtio-blk")) { + g_test_skip("Device virtio-blk is not available"); + return; + } + snprintf(driver, sizeof(driver), "virtio-blk-%s", qvirtio_get_dev_type()); =20 --=20 2.45.0