From nobody Wed May 15 18:19:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@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 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604491038; cv=none; d=zohomail.com; s=zohoarc; b=QNUzJPglGFmrg61sDwpsCP3KifsVgEqxI0iHF+9cKF2ac70Nbj1JPTcj14Mdki9plQeWLg9hZVG3pRBKNSNCMnqhNxrq/ERSQSnBPUV+kzikkUKPeGo4cVwBn+hxw1yBkHb9VVRk/SUo3rz05fRuPUWaBO9rW97dAn9E4FXy3kQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604491038; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=h9N9vQkOiFB/kqp8hDYxqpCMoA8SWVc+vmUYHADsYyo=; b=PaOKa0aOXDo63nA9Xz/MeBWaKDX1pZ3gI3zipcf95AUMIE1oka9S1+4drGlUWE1eUUViYzNkbA2anwD50fl/jBX6Fe64wgc58RvoryUDpp4FDA05VKhu9n3NFlN21BWVmO9ydmmoWj2Se0XN4XLX0BYCKDFAsL9W+FRoHWd5BQo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604491038247573.7202941336045; Wed, 4 Nov 2020 03:57:18 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-129-sSS2OxEfN4-R8emNy2g8tg-1; Wed, 04 Nov 2020 06:57:15 -0500 Received: by mail-wm1-f70.google.com with SMTP id p7so541277wma.9 for ; Wed, 04 Nov 2020 03:57:15 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id c10sm1816612wmb.20.2020.11.04.03.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 03:57:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491037; 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=h9N9vQkOiFB/kqp8hDYxqpCMoA8SWVc+vmUYHADsYyo=; b=fxTcmXgXxgkYlK1Hy0R5AiU1eGKN95rezBfqkd2OZKEi7DDzAm1/6aFeCWluoIb2bf+MP4 rBM4xncBq5yoKX3LHsvkKMjGiFiJ0ss5aG58KZUtBbOeolvVhM0AzWXf05VK/FoPedDVjL YV7JWXLKoBam+zca410GGEAFlfCGsqQ= X-MC-Unique: sSS2OxEfN4-R8emNy2g8tg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h9N9vQkOiFB/kqp8hDYxqpCMoA8SWVc+vmUYHADsYyo=; b=pT+nRyYwspH8Y1ybd5M+ZBYB0AVGbjMHgbyKkeMLSdqswA8Yier6jZmJM2J0RkVneb Oog0D1rIje3gfOO1a6KKTRKp1Yh+Ep4qk81LE+z4g5aNVGvnzzDcaEcX98P3vUlo/DVa vzuySmApyGse0LVN/qxXVTizvPfVqYCxFf7cs1NQ9s5RMV6A8ox0+Bc6u/4g3dDNGbvF Z7msO1G3cpg8hzE+qCytDfVxO7g3kuJrd4GQbb2rUCd0TifTxlH+1ffpWu60raZWKx4Y 2xIw8Vw/Ql0N4n+ejtNK/BfgRADTC/I6DuDUmexYtWF02Tpqo/hVeawOnNHmry9/KOEs ktOw== X-Gm-Message-State: AOAM532iaFmyXwtnkelEXKjieIsCvWpac/+Pav/XRLTgl3MUna0jo/fs bXlUeXo0cI8OHqgRaCACrUEvBj1WHFOgJ16crTLTD33hGebSealHjGfsZMA+IeIX7lR28WxtX3C 1JyOlhahnOXjcdQ== X-Received: by 2002:a5d:4d8b:: with SMTP id b11mr31372782wru.110.1604491034225; Wed, 04 Nov 2020 03:57:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJwN0koyqHk7gdH1Giv0KqVa8qQLZSKGLW9xpRE4HtdyZDUWNh5PP6cMWuWKZPub6wD79JwdMg== X-Received: by 2002:a5d:4d8b:: with SMTP id b11mr31372760wru.110.1604491034108; Wed, 04 Nov 2020 03:57:14 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Christian Schoenebeck , Thomas Huth , Cornelia Huck , Matthew Rosato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Paolo Bonzini , Richard Henderson , Fam Zheng , Christian Borntraeger , Halil Pasic , Greg Kurz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , David Hildenbrand Subject: [PATCH-for-5.2 v3 1/4] s390x: fix build for --without-default-devices Date: Wed, 4 Nov 2020 12:57:03 +0100 Message-Id: <20201104115706.3101190-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104115706.3101190-1-philmd@redhat.com> References: <20201104115706.3101190-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Cornelia Huck s390-pci-vfio.c calls into the vfio code, so we need it to be built conditionally on vfio (which implies CONFIG_LINUX). Reported-by: Philippe Mathieu-Daud=C3=A9 Fixes: cd7498d07fbb ("s390x/pci: Add routine to get the vfio dma available = count") Signed-off-by: Cornelia Huck Message-Id: <20201103123237.718242-1-cohuck@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Greg Kurz Tested-by: Greg Kurz Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/s390x/s390-pci-vfio.h | 3 ++- hw/s390x/meson.build | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/s390x/s390-pci-vfio.h b/include/hw/s390x/s390-pci-v= fio.h index c7984905b3b..ff708aef500 100644 --- a/include/hw/s390x/s390-pci-vfio.h +++ b/include/hw/s390x/s390-pci-vfio.h @@ -13,8 +13,9 @@ #define HW_S390_PCI_VFIO_H =20 #include "hw/s390x/s390-pci-bus.h" +#include CONFIG_DEVICES =20 -#ifdef CONFIG_LINUX +#ifdef CONFIG_VFIO bool s390_pci_update_dma_avail(int fd, unsigned int *avail); S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, S390PCIBusDevice *pbdev); diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build index f4663a83551..2a7818d94b9 100644 --- a/hw/s390x/meson.build +++ b/hw/s390x/meson.build @@ -27,7 +27,7 @@ )) s390x_ss.add(when: 'CONFIG_S390_CCW_VIRTIO', if_true: files('s390-virtio-c= cw.c')) s390x_ss.add(when: 'CONFIG_TERMINAL3270', if_true: files('3270-ccw.c')) -s390x_ss.add(when: 'CONFIG_LINUX', if_true: files('s390-pci-vfio.c')) +s390x_ss.add(when: 'CONFIG_VFIO', if_true: files('s390-pci-vfio.c')) =20 virtio_ss =3D ss.source_set() virtio_ss.add(files('virtio-ccw.c')) --=20 2.26.2 From nobody Wed May 15 18:19:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@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 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604491045; cv=none; d=zohomail.com; s=zohoarc; b=UR2qKfw0p5k91eGZxrPxxtVv0Gplguj7D2I6oPQk8UjSMhNWwvqvqSH0rPjYjnzUXNg6AjqL/ykKLHT8Qh3OT7v3OtkS2kNLmJi6z/8vTRaghc5DFMM0E2EJGV/N2eTQc0EkF4Wx1j7Yx+tNoQP0pyvrv/RdPh0fpngN3yEvI+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604491045; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=vFU0pp+sAaUJV7Uz07XCo0kf/Xpwz4nVfgdLF0eVzjo=; b=UMIkXedbE1IwLVj8tvIr/75kUVIscsm9IfbOuTRJIDaZgdZuq7ipqlpURx3pzR4Ui95LIYpH2yQM8Jpz/pytIIAPsGxgECybj0UpW34RpvJkF/aokD+3/f//BVUOqEHT5wJIu2jUHvDLNtatPkFTP1W+JKsMkw3QkOeYAcQOER4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604491045660198.0995332112384; Wed, 4 Nov 2020 03:57:25 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-557-k9bWU-YyMJu0RO8uZTSgLA-1; Wed, 04 Nov 2020 06:57:21 -0500 Received: by mail-wm1-f69.google.com with SMTP id z7so1113403wme.8 for ; Wed, 04 Nov 2020 03:57:20 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id a15sm2226651wrn.75.2020.11.04.03.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 03:57:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491044; 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=vFU0pp+sAaUJV7Uz07XCo0kf/Xpwz4nVfgdLF0eVzjo=; b=ReD02WzxjgIJE/RQqdOwqqAdQB8Kpo0HAgP3+5hj2Ja9XpotfFAdbntj4wkGwmceqzc1AP oCNzLym9GmiBh7zvojUOSZEWkxOZ/j3/AylF6viFdB/GoUxyYEO8OCsZqekH/++l9afPc6 S1KnvrfqA11YhIw5f+OoAx22zO1T+cM= X-MC-Unique: k9bWU-YyMJu0RO8uZTSgLA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vFU0pp+sAaUJV7Uz07XCo0kf/Xpwz4nVfgdLF0eVzjo=; b=pI20pYQCDgc7hq5Lo2QORY073LtykqNJDxvjmflupWhYDGcKAeUg8MfMrtzeq/X/s6 ir7PJ+L/qVuGD7WjnyytPCrIELLfuDp4vRnSBRtw75tj5pDSAlKFmoe//rEVSBKfZNQW FsVAZs1SPXhS6Ff/GuCGvmHDYQ0YeiPqFmrZoO7JUr20Vaf0xu/71Z0riaxbGsneU+1y F/IlJx+O/dPYe3q7U5Hsy1RrzPXnXOJzq3kG86+FZCngYWru4QP1afJeN+oFLaIFHch/ 462AkuX0ftz9MY396QhT32OGqQOe+/yNsoJBgNdniO1/13xaD4HNK10TW0pVIoRHJyuq SR9Q== X-Gm-Message-State: AOAM532hZXEyrBcmR+rSucokptn/KdAMUlidXrMv7JKh1z3c0i6/teYs VUAwMRjoSyy67Gvo6ZTOoVaBq3LXyG/ThJSGrl1rxK02ys0JKCF4HuXBWjMkxeuAZbQc3TZnunn qKYNiDvvcw1xCZA== X-Received: by 2002:adf:f20e:: with SMTP id p14mr30747721wro.376.1604491039884; Wed, 04 Nov 2020 03:57:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJx6O/flHIYR/UleClnQnn4DXbprA02Qdr+LmWU88GsHun8X3K1oAsLw14FXKYMM+joIbNDW6A== X-Received: by 2002:adf:f20e:: with SMTP id p14mr30747702wro.376.1604491039757; Wed, 04 Nov 2020 03:57:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Christian Schoenebeck , Thomas Huth , Cornelia Huck , Matthew Rosato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Paolo Bonzini , Richard Henderson , Fam Zheng , Christian Borntraeger , Halil Pasic , Greg Kurz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , David Hildenbrand , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org Subject: [PATCH-for-5.2 v3 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen Date: Wed, 4 Nov 2020 12:57:04 +0100 Message-Id: <20201104115706.3101190-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104115706.3101190-1-philmd@redhat.com> References: <20201104115706.3101190-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Commit b2c00bce54c ("meson: convert hw/9pfs, cleanup") introduced CONFIG_9PFS (probably a wrong conflict resolution). This config is not used anywhere. Backends depend on CONFIG_FSDEV_9P which itself depends on CONFIG_VIRTFS. Remove the invalid CONFIG_9PFS and use CONFIG_FSDEV_9P instead, to fix the './configure --without-default-devices --enable-xen' build: /usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function `x= en_be_register_common': hw/xen/xen-legacy-backend.c:754: undefined reference to `xen_9pfs_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x8): undefin= ed reference to `local_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x20): undefi= ned reference to `synth_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x38): undefi= ned reference to `proxy_ops' collect2: error: ld returned 1 exit status Fixes: b2c00bce54c ("meson: convert hw/9pfs, cleanup") Suggested-by: Paolo Bonzini Acked-by: Greg Kurz Tested-by: Greg Kurz Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Christian Schoenebeck --- v2: Reworded description (Greg) Cc: Stefano Stabellini Cc: Anthony Perard Cc: Paul Durrant Cc: xen-devel@lists.xenproject.org Cc: Greg Kurz Cc: Christian Schoenebeck --- hw/9pfs/Kconfig | 4 ---- hw/9pfs/meson.build | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/hw/9pfs/Kconfig b/hw/9pfs/Kconfig index d3ebd737301..3ae57496613 100644 --- a/hw/9pfs/Kconfig +++ b/hw/9pfs/Kconfig @@ -2,12 +2,8 @@ config FSDEV_9P bool depends on VIRTFS =20 -config 9PFS - bool - config VIRTIO_9P bool default y depends on VIRTFS && VIRTIO select FSDEV_9P - select 9PFS diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index cc094262122..99be5d91196 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -15,6 +15,6 @@ 'coxattr.c', )) fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) -softmmu_ss.add_all(when: 'CONFIG_9PFS', if_true: fs_ss) +softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) =20 specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device= .c')) --=20 2.26.2 From nobody Wed May 15 18:19:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@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 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604491049; cv=none; d=zohomail.com; s=zohoarc; b=UYOOJLLT4MSU3QgzH52zNPallVSIWqm05/5q8c4bJX5qna+HjDVZojLt27VYrpKSKuQ6ZQ+32uENbVBmf1p27x0VjhA7DzslIParfhWq2iOVTVG4VOoPbB6BvAN5NIxCQuorRzd3N2UzVVZ+QYr2xRincovaM3nAJw7lwX5gzMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604491049; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=DvfGSovFfbSbNaWRDvuyOO64aSfN6A/KmCqwAtM9GUA=; b=XOrf42R8isFAlbhGA3IUK1mIEpW/5SCRqpFlHsc3rIljm1FxFssgUQj+iO62oOSK7p7n973yFVj/yADR8xXT2+oD78FEclBDIcruKaEPdvE7KBsd2lgHNeIdUXl1IS4DxaxJozaKRj9TH8xjF4x/fir/H8x9uXcFYm8Fq1C2RHQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604491049938635.7658197761879; Wed, 4 Nov 2020 03:57:29 -0800 (PST) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-t5qrVkHaODyOx9MbIQQmfQ-1; Wed, 04 Nov 2020 06:57:26 -0500 Received: by mail-wr1-f70.google.com with SMTP id w3so7032337wrt.11 for ; Wed, 04 Nov 2020 03:57:26 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id u3sm6109406wme.0.2020.11.04.03.57.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 03:57:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491048; 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=DvfGSovFfbSbNaWRDvuyOO64aSfN6A/KmCqwAtM9GUA=; b=VZ4VtcaG3ucvE2Q6tV1Fqg3yghd90LgJb5SQX51L/gcEyoZU7INg31XSLmTbDpyhNW+0MG BJMgjJP7J7WL3v3PRB6KrEbY7VXZmT5Qw2q9/pWYHu4acj65DS1JD4Z9yTfdFDJMb6Mhp/ oCkmlPHc3L4g8i6IowBFciaSH8VzqhA= X-MC-Unique: t5qrVkHaODyOx9MbIQQmfQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DvfGSovFfbSbNaWRDvuyOO64aSfN6A/KmCqwAtM9GUA=; b=KpRCrrQQXu/9HCZ5i7RE3wV6q35foEcsd4htrSdHn+AbgHbq+U0QCWjIXZYUvqBheU wU66s33EsCmfYzZAQPMxQwQvgGMbfleZDO5l3FqaJFkTtZj3l+i7f9QprjU0EamNJyll TQYG9R7uSh2s0asZOix33u+tznVi1QeHLtMGdMbdwpuuN+jlHeijo7lYZF5x5RyY1bMb 38yhdP3FB62GsVtLzcq162x2YbfwZZwJGB/91S0y+lqmCI3ZgK3SdG0Ymu9MlHGTYPS+ qW2GCu94fdU+ZFQW4KPek+yD+vv42iGQzOD1P+7e9JTss8SbSdPHi2GyvHMJSs9/mCY7 kkpw== X-Gm-Message-State: AOAM531sUe94Qj20bSGuzYRFEUYczG5cdpp+7XQwV22rnZF1Jac8w3LY EvIT3PdrYbVb6ZconcKcqgAkdKQWktg5px+sjA9mTmIWLKsVohHlBq7lTk9R0qlfh1fwoJicWXE qQhaCrrBwgCP3jg== X-Received: by 2002:a1c:6782:: with SMTP id b124mr4438058wmc.117.1604491045215; Wed, 04 Nov 2020 03:57:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJxb4J1vsBP6Jcp72ana1MPrwkSkHvN43FY+n+E4Qa37eljdJRevcGBXmefauqPZqcdNkZIRHQ== X-Received: by 2002:a1c:6782:: with SMTP id b124mr4438041wmc.117.1604491045072; Wed, 04 Nov 2020 03:57:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Christian Schoenebeck , Thomas Huth , Cornelia Huck , Matthew Rosato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Paolo Bonzini , Richard Henderson , Fam Zheng , Christian Borntraeger , Halil Pasic , Greg Kurz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , David Hildenbrand Subject: [PATCH-for-5.2 v3 3/4] gitlab-ci: Add a job to cover the --without-default-devices config Date: Wed, 4 Nov 2020 12:57:05 +0100 Message-Id: <20201104115706.3101190-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104115706.3101190-1-philmd@redhat.com> References: <20201104115706.3101190-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We test './configure --without-default-devices' since commit 20885b5b169 (".travis.yml: test that no-default-device builds do not regress") in Travis-CI. Since having a single CI to look at is easier, and GitLab-CI is the preferred one, add the equivalent job there. As smoke test, run the qtests on the AVR target. Since the boards are simple SoC, there is not issue with unavailable default devices there. Also include the m68k target which works fine. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..e4eba96ff34 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -262,6 +262,13 @@ build-user-plugins: MAKE_CHECK_ARGS: check-tcg timeout: 1h 30m =20 +build-system-ubuntu-without-default-devices: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --without-default-devices --disable-user --disable-too= ls --disable-docs + MAKE_CHECK_ARGS: check-qtest-avr check-qtest-m68k + build-clang: <<: *native_build_job_definition variables: --=20 2.26.2 From nobody Wed May 15 18:19:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@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 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604491055; cv=none; d=zohomail.com; s=zohoarc; b=buqOltWI8/W3+hSzAYCSzIIOc7IIqjCYWUSxe1vVuHO5nb4e0s1AOCIeB6l+j4ITsTW0uxtoqXjrotWUIjLLL4mrBKVcjJd3YrEAiS3k7oOfBn9LirYV8Q26BMHIavIyEi98Bp1p57NkmAd+UqUQoRk2OIMtan8ykfZRYFx4C/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604491055; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZwDUJFjz9JABmwe+3ZrGGChU+tAgL0zg4MdKFtTFkJg=; b=LBwHgQt1oHbZ4X++7CKWQW/dzu3CYyuk2V/rRXnkfWmcxPgJ+EkVwNMjzrgiVX8nTwxs35RIZ44pA1tCIMh4hENx9fSYoTYFAi0WqZJgFqr10KxBlFbVyj0LFbvcQx2OOjFibe1wUndmVEQvdB/4HTOEwKtLW4fddl0Xha3yHqI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604491055047309.61392100504406; Wed, 4 Nov 2020 03:57:35 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-bgXgJ0XsOsC3cK027iJECg-1; Wed, 04 Nov 2020 06:57:32 -0500 Received: by mail-wm1-f72.google.com with SMTP id 13so1130644wmf.0 for ; Wed, 04 Nov 2020 03:57:32 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id t1sm2219508wrs.48.2020.11.04.03.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 03:57:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491053; 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=ZwDUJFjz9JABmwe+3ZrGGChU+tAgL0zg4MdKFtTFkJg=; b=MTa0l/VsV6Dg3HNC+Tslba0VxArj8wRSdE+oNkBMEydUz+cTl/Ls7NuboyMnn6/SofuEA6 9TuTw3s+KffuuckA6qqy6sowSiSRO8brIPDA7ogmkUnPkvmBpFTWD1YrCEfTVJp4S3Iv83 mi0TwOAgrRCw1L3Uq/4IABju8wr/XnU= X-MC-Unique: bgXgJ0XsOsC3cK027iJECg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZwDUJFjz9JABmwe+3ZrGGChU+tAgL0zg4MdKFtTFkJg=; b=WYJuq5FIdApLpChW3GvsOoLsodCjFWsVRr6JLK5unfquuFCeQXebN2/q3jGnAnfggK AP2ukO9/H6RI57vHQxAwFDpBpc2Aqgq4SEooBpBkrOYhoHHXuSt+y4A4+ZURrTtjM8yu H3s/izNxvXWeEQHpwQwPdrQOlbEy7E4e9AChPslHK2CEv/Zt73aZo/khRx5lsZhbZf9l lhLSis2OBK3yLI77dG490dPZl+R1OxWZgUOaCiLjLvlRd1SR9ZcACfewh1OnmlKngfsa FbZhVwdVChKYsEeoHkRdeI/QUEWkSFxfkpKzU3XY3Ww6TzzZFxoN9gldebnOWFVpCwED B57g== X-Gm-Message-State: AOAM5302HzKnhbDdSeuGmjg9ZYmkC9SDxhjfGM1sq1vL9jm1U4CvgjcQ Ud8sI49mwtrfpm3rim0L86qt3laEdV8VfMq12hxu/dXF7jK3qz6JJgOq1GpvQs9ggFAqIioK0Ll K7R6aFv4ZD5bB9g== X-Received: by 2002:a1c:205:: with SMTP id 5mr4055050wmc.7.1604491050558; Wed, 04 Nov 2020 03:57:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJziBA+5s7BTeEF85JmFv8zKVn6FUHxJUnQ6TQPu/77v+uz7IIiY+LO/TzFayN5OjhansJtXIg== X-Received: by 2002:a1c:205:: with SMTP id 5mr4055029wmc.7.1604491050435; Wed, 04 Nov 2020 03:57:30 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Christian Schoenebeck , Thomas Huth , Cornelia Huck , Matthew Rosato , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Daniel P . Berrange" , Paolo Bonzini , Richard Henderson , Fam Zheng , Christian Borntraeger , Halil Pasic , Greg Kurz , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , David Hildenbrand Subject: [PATCH-for-5.2 v3 4/4] travis-ci: Remove the --without-default-devices job Date: Wed, 4 Nov 2020 12:57:06 +0100 Message-Id: <20201104115706.3101190-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104115706.3101190-1-philmd@redhat.com> References: <20201104115706.3101190-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) We replicated the --without-default-devices job on GitLab-CI in the previous commit. We can now remove it from Travis-CI. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wainer dos Santos Moschetta --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3d78171cab..15d92291358 100644 --- a/.travis.yml +++ b/.travis.yml @@ -224,14 +224,6 @@ jobs: - ${SRC_DIR}/scripts/travis/coverage-summary.sh =20 =20 - # We manually include builds which we disable "make check" for - - name: "GCC without-default-devices (softmmu)" - env: - - CONFIG=3D"--without-default-devices --disable-user" - - CACHE_NAME=3D"${TRAVIS_BRANCH}-linux-gcc-default" - - TEST_CMD=3D"" - - # We don't need to exercise every backend with every front-end - name: "GCC trace log,simple,syslog (user)" env: --=20 2.26.2