From nobody Sun May 19 02:06:50 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=1604479422; cv=none; d=zohomail.com; s=zohoarc; b=gBA2mwm92tSiS+mWBbwzCbjbCwUHf1vMiGq+Fjhk8kYYLHyoZj84Uhfiv057Lyk8i9lNzblH8eGoGqdqQjT0C3p8V+IFSxY6oR+TaPesJRsbMJXnd5IowqsvwVYobpW9NM2Pkj2BfYmARKmUgyJOt0avq+zH3c1vhQCZBWQQWBk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604479422; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=tGrjmCEXBoBaCsyPVGeYrGNhz2JCmoDnznUDdTUcGTA=; b=JpRYADkuuGkZv1Zla5LLuw3Mp1trJ623dgPXQdmbqsYCvuHhdoeBvr8zZ1yxRJVan4hiFjYtdq2XDpElxMGthFK4uonQDjU1HwZxE7gqMbiQRsO+883ombwTbex+c/iYLvaoCSSva4t+QQ5/HtW/sNHFaQJI9XgKpI5cdNW6AZM= 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 1604479422219903.1079970689466; Wed, 4 Nov 2020 00:43:42 -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-347-o_HaRTaUNS2e29vKUiw3IQ-1; Wed, 04 Nov 2020 03:43:37 -0500 Received: by mail-wr1-f70.google.com with SMTP id w1so8953848wrr.5 for ; Wed, 04 Nov 2020 00:43:37 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id m4sm1513423wrr.47.2020.11.04.00.43.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 00:43:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604479421; 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=tGrjmCEXBoBaCsyPVGeYrGNhz2JCmoDnznUDdTUcGTA=; b=BXt2KbaEnC6ZHSOMZgvJPJpcPSimJdkduOSXNviPHtIqb0B+h82aOO0HhibosSpq1BCi2r XSDSy4M6fhw3xjDL3LSl8wJYDhxX7jJmpPzUqAblEp7xbDUuQhu829m7QoBkHE5Ve8KBBD XX9pPycW0yLD8uHxZQwncEQYKnBQsWs= X-MC-Unique: o_HaRTaUNS2e29vKUiw3IQ-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=tGrjmCEXBoBaCsyPVGeYrGNhz2JCmoDnznUDdTUcGTA=; b=XenUVshULf+pUPMar2bTVc7VHQxz5FPrJSlLKIVobXcn7pXCFJbunnPatoVsABQACV lRnXNLtK4pWOletQ6VragtrxLRhUEPeM2K6jnN7Rs/AlsVSPSATZknVLMD0twkbDZR1J WNUPw/VUR1WW+6NE6G1oR8ha0raQqj1c+9CyUph62CEbfVy+/Y8/EqqXhoL5e2t2B1xW Uy/c798hH7oRp3SG4GAD0nHOzQgYH+3ahD/plQ+xat7YpOmBImJAvxLxe6GczjiiUWH4 e7Y2OpXCZyI8XW/mFI20UaYUKGveBVARNsNpoA+qWNH6U6zJEdHg5FUpSw2dI7jDiPkU KlQQ== X-Gm-Message-State: AOAM530GDLuf7PTSDLdMhp/ius4mIuG3AyHX2yeGL7FTkv5t5EckchoI 1T78VV+6n+5mwnifta2a2tmI4qiihuJUf5S/e5XQ47U3gj/6Vlc0tBkqZv4BK0oBJrfgq2P9rkh v+9399weN6nEC4g== X-Received: by 2002:a1c:328a:: with SMTP id y132mr3270199wmy.134.1604479416174; Wed, 04 Nov 2020 00:43:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAKBMbrYMVmfktTukMP82vBC6mMWUm7JJP3Ip5nEjHwOa1kocaNQENSOogMMSxmOQs/LYjew== X-Received: by 2002:a1c:328a:: with SMTP id y132mr3270172wmy.134.1604479415976; Wed, 04 Nov 2020 00:43:35 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Christian Borntraeger , Greg Kurz , Fam Zheng , Richard Henderson , Cornelia Huck , Halil Pasic , qemu-s390x@nongnu.org, Matthew Rosato , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Christian Schoenebeck , Wainer dos Santos Moschetta , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , Thomas Huth Subject: [PATCH-for-5.2 v2 1/4] s390x: fix build for --without-default-devices Date: Wed, 4 Nov 2020 09:43:24 +0100 Message-Id: <20201104084327.3010593-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104084327.3010593-1-philmd@redhat.com> References: <20201104084327.3010593-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> 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 Sun May 19 02:06:50 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=1604479425; cv=none; d=zohomail.com; s=zohoarc; b=BECndt+u/Dp/bR6xohjqHIj+GzJPRVFNvHWmqDsOdXocuHIuQ4rdp1trC7yv/J2Rr51PKlRnM/OfB4Q6fWSz8MEFqF9qDLa9xj1CIUE3C/tSUU2nXGCkNlUZKx5D69cqLdkau53jy9hXBHEiSHajCPW81wB8ERRD+/zdO66mc9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604479425; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=AINBmnp1bWLA1LEpK/rcM7CoffR1YWyCikg181rfSi4=; b=DWZoRX/t/x/k2tObfZzwXeixLjDfamKtt6taqgQWMNLG7XDTV8jCj8mXI3xGidwx+UT/tTAcNBNEi6LG6tuPmqmwn6asD2ROV0Nn9QCCi77gaqn6oa5lqUPVy89qqj/1BmftpmzclSiEJ4H1Q0zg1j6fF/xcKONvFjlJ8TkomHA= 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 1604479425274760.9531620270919; Wed, 4 Nov 2020 00:43:45 -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-92-5plzxog4PX6Xier8DJHcTw-1; Wed, 04 Nov 2020 03:43:42 -0500 Received: by mail-wr1-f70.google.com with SMTP id j13so9029723wrn.4 for ; Wed, 04 Nov 2020 00:43:42 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id u5sm1311657wml.13.2020.11.04.00.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 00:43:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604479424; 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=AINBmnp1bWLA1LEpK/rcM7CoffR1YWyCikg181rfSi4=; b=JlOwjAsBoxX4KdjWUg+aAwhAOsmaDxiv5iMXa7iMHzscaHs6ktPZv0PLMXhj3YIWPQAgFe JKTBnlHNknkrG+1/5NffNkmMm+jf7KYPp2MrZOp6/dThVfZ+gREr8rReCfiD2ugFAuit3B 7qBOFg4YntVyxXIirTBD8Wzm8DH9xBs= X-MC-Unique: 5plzxog4PX6Xier8DJHcTw-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=AINBmnp1bWLA1LEpK/rcM7CoffR1YWyCikg181rfSi4=; b=LbT4YIw42zSKE+VBi2DwrbGjWFr9pKEyyByLBy2vSSkLzT5lJQCfCnPVWVdnhosoua 94oMPG7VxYv7pXaq1n2GElQjGo2fuhXoFRs4U7HdiRtr0pIzIM30DolNYguAxHdsn/dz x+e+rkVQWik1Nx52svHDHY7mrrjYkWlJXnZY0qCoqZDfws88g7ot0Qt4AT52HF0YDJCS GWAW1uVZTU82ODDbA41ieMD/9zo8cczEiUpWYMSHWou/8Qny0vu1Qqon1kQ8d/FmG69t YXRYbATuJkj7ed9XGavPaA3ARe5VrgCFGOGPA6+r0ZRvZik5VIns69KUbiM6X4ILz2EI fpAg== X-Gm-Message-State: AOAM533pWGLj5f7nKtmAR4OMwdzuBtLDkzmZAtdZxBZIaVD+AeBXC91N 2iodORtcVFkfjFqT20Ut9mbsAMC0wauFIqTl9VZ4DD7igXZVcSCEStG3FvYIvyRJpkERiy21raC 1MBv+cgL/LIupWQ== X-Received: by 2002:a1c:6782:: with SMTP id b124mr3528110wmc.117.1604479421391; Wed, 04 Nov 2020 00:43:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyO4zhDM8ZE9YI+Bb3lljj4jjXBr4C5MlBdNUU1BGAXUMIJaqRRVxrwdwAf4OskguQTBvWGag== X-Received: by 2002:a1c:6782:: with SMTP id b124mr3528078wmc.117.1604479421239; Wed, 04 Nov 2020 00:43:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Christian Borntraeger , Greg Kurz , Fam Zheng , Richard Henderson , Cornelia Huck , Halil Pasic , qemu-s390x@nongnu.org, Matthew Rosato , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Christian Schoenebeck , Wainer dos Santos Moschetta , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , Thomas Huth , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org Subject: [PATCH-for-5.2 v2 2/4] hw/9pfs: Fix Kconfig dependency problem between 9pfs and Xen Date: Wed, 4 Nov 2020 09:43:25 +0100 Message-Id: <20201104084327.3010593-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104084327.3010593-1-philmd@redhat.com> References: <20201104084327.3010593-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) Fixes './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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Greg Kurz Tested-by: Greg Kurz --- I'm not sure b2c00bce54c is the real culprit 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 Sun May 19 02:06:50 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=1604479430; cv=none; d=zohomail.com; s=zohoarc; b=lgrROADD/FuCJ48M1wMOYZO6YgmoIS6qmA6cVw88V7xevjkjCXUKxEKpQp3c+BDsbEZXG9VyvgksNB5xbbQeWU/Z3vXknF9RWh0yb0odz5YzarPostUZTTxD/PY3qIo70LV27GarZRO7GgO+sIv57jp6K/T8q0zRRQpfHYdX8iM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604479430; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=x5HpIir+o8Ur2wMjB/JxhGBH9R3J5tpzLrgdobgdzjI=; b=K6/6b0QQUhuSXSYP3DnM5PwHdmpxl6LUsxDxQRWEOTZdA3lwsIJfaAP3FWZCtjZopwQRFbmJZsPD118BKLgaTqlcNhlSt+73K18wvKf9Kam6r+zbygtJamWuJV2brBk+9Coeb4whZLPUNMlTjVm7dgfogaOLaaATFiWE+3evHu4= 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 1604479430475144.32745839520487; Wed, 4 Nov 2020 00:43:50 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-B3rWdH2hN9qK3qHG0aif9g-1; Wed, 04 Nov 2020 03:43:47 -0500 Received: by mail-wr1-f72.google.com with SMTP id i1so8939641wrb.18 for ; Wed, 04 Nov 2020 00:43:47 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id z5sm1533531wrw.87.2020.11.04.00.43.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 00:43:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604479429; 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=x5HpIir+o8Ur2wMjB/JxhGBH9R3J5tpzLrgdobgdzjI=; b=Q2dnftBGu9ZZRxUDS4Dp6EL1M3Hec9+QKkymhMpA5F3dFg7/0sZbwT7O5gNRgbXZP96x8G JGKhp1qvqPVgvQpnVaX/ziEcnnq8kqK08GGtTaKU659GjFZGAxNEcKTTC/sZ3msHC16TW6 yhPr7/ImwspmdRmFJ7WvpRh0OrjZ5gg= X-MC-Unique: B3rWdH2hN9qK3qHG0aif9g-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=x5HpIir+o8Ur2wMjB/JxhGBH9R3J5tpzLrgdobgdzjI=; b=c63Gl+c2qZwYkLkcu2SJnI5mwbGBop5FXFbv93GM9aV34Na1NO8q9szE5ltTxtS2kQ 4denKYgm3GwcrGHpnqTigkSsue/hU987ezoQAx3769DBZYSItFEpQvI8E6nSjPEc4oRJ cDp6FpQcee4ssnlkRflR7aiWT9AxgL3L2be+Rp6jBVshQMVCqW1r/6Ctp8yFzbGqyShN Ua3DPSmOc+5iZuRtTmzXLtT5C5jp9maqV9640VofnK9cYyhTdnoXgskLjs1XXMDFkuEW YghIkM13qI4bvMnvEA/1e0VeDVBG2hYPAUPXvdcmWXh5aXW9wDFw+vnss0aPSWAK/2tc AWpA== X-Gm-Message-State: AOAM531rth7UnBPMqNqQ7uv74P/UxhLdWiIfh2110zghX6vTc+44bnwE M8acycnx2VMQchR1iLimPZsEmP7gI8bJ8PnwT+jtAB6Oamd5Qr/BBz6uuw4xPIZoZ1kZAY0iH/A qWA0La3wledzHVQ== X-Received: by 2002:adf:eb4d:: with SMTP id u13mr29352767wrn.146.1604479426623; Wed, 04 Nov 2020 00:43:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJz5hSljV8ZtOnvNJ7BrhMIygJ0P0z9XOD5YTEBmW+fusGsgaBkUMKFz/cG9o5k8COXeOpsUng== X-Received: by 2002:adf:eb4d:: with SMTP id u13mr29352739wrn.146.1604479426503; Wed, 04 Nov 2020 00:43:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Christian Borntraeger , Greg Kurz , Fam Zheng , Richard Henderson , Cornelia Huck , Halil Pasic , qemu-s390x@nongnu.org, Matthew Rosato , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Christian Schoenebeck , Wainer dos Santos Moschetta , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , Thomas Huth Subject: [PATCH-for-5.2 v2 3/4] gitlab-ci: Add a job to cover the --without-default-devices config Date: Wed, 4 Nov 2020 09:43:26 +0100 Message-Id: <20201104084327.3010593-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104084327.3010593-1-philmd@redhat.com> References: <20201104084327.3010593-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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b15ae5c302..321cca2c216 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 + build-clang: <<: *native_build_job_definition variables: --=20 2.26.2 From nobody Sun May 19 02:06:50 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=1604479436; cv=none; d=zohomail.com; s=zohoarc; b=RvMepdKUoPSTOX1DMkBCZNyTijl+fyCtb/U/jlm6DwlqEi7fIxIFb9Ra6deDQZS/+9ofTlCq41cZerE3BVCyQ34VjdN3Qg6lErhii0NIN6CmEJwkzwjuVUPAXbE65/CDND1i9UXvILGOmC4I4HHeYwaHMUH7Rcn5r7rcwwJ/9mA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604479436; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ZwDUJFjz9JABmwe+3ZrGGChU+tAgL0zg4MdKFtTFkJg=; b=hd2/51woMapQYsEb/IrhpeBAOhf6zeGX7KDUeYYahYIQh53sUPJPr1QyfAqjOqMQwLiUcKb84vaJNB51xGbvXYU22NqYnt8Hkys+a4Ca5KaT7nm9odn2e/olwzG7c4Di8bdSImxtRW1NEndPy8wujR7msv4FJ2vgDtebFEmQ5hI= 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 1604479436697353.23076043296874; Wed, 4 Nov 2020 00:43:56 -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-385-1Vt9MvSNOje02_Rnmb4W0g-1; Wed, 04 Nov 2020 03:43:53 -0500 Received: by mail-wr1-f70.google.com with SMTP id b6so8897323wrn.17 for ; Wed, 04 Nov 2020 00:43:52 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id o7sm1490765wrp.23.2020.11.04.00.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Nov 2020 00:43:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604479434; 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=PdfPcT2ty/HJbNFP8nTmr5OxLDOU9qAHC78nXHCmq60ko9DVleV4rlJEEXSXKnAhrFaCLg c0KNX+IDACyZ3CmWOOf//rEboijhc8igxyKVb8UJWb4l9HeAGS3jMRvgkk3ECq/lsqcox6 f6KYnE2K0AEpRV0BCNJLWPPNyhOKiug= X-MC-Unique: 1Vt9MvSNOje02_Rnmb4W0g-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=R6DJYRaPf7b2lqs84hGDj+2L6786S2sujCrZgIUQabXK/V0ZjwNyL98tf/n86ETRfZ 3iccbAbH6tUVgqEE/HR51W6mfqJ2nlxJmt3mqrrK5nnsoHzlNeVzYYovBjmaoolUzzyu MSvFNqvGJYcRza09FQxnZMF9hxFAtvGpt0WV/mRVhMD1McxrqDDNyUCDeYxaMqOmtfbY vUgG5dd+aJjAih6MgAVpdvO3tRXtb+zhDTtfA4V+9oKrWVZ97clPkE/D/VLAVPwC7Xau iYaZYqsoqlN11eaBibOYh5uwYQJiHTLQBuer+GmltYVWEV7TVZ760RLIEQldj2xoTKaP H9ew== X-Gm-Message-State: AOAM530LtC508M0eqs9rj60ZmuxKSCfsg8m7cPt3ujifSe+7meYeQv6q xgEFYmVnzzTDf77cxN/7Uf0xHb1VIAbVIepw+02TSNIUoBSAT0cM6YCBwXBSiTF+D9GPzwe2XgI yepSq1vjIp0S0Tg== X-Received: by 2002:a05:6000:1046:: with SMTP id c6mr6336537wrx.315.1604479431929; Wed, 04 Nov 2020 00:43:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJzeVlDgUrZBYkvkHMCqHU568OoUWtm47TYzRSs8nhu6I7ALy135n/dMwGZBiC6s2EO0WL7UIw== X-Received: by 2002:a05:6000:1046:: with SMTP id c6mr6336512wrx.315.1604479431799; Wed, 04 Nov 2020 00:43:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Christian Borntraeger , Greg Kurz , Fam Zheng , Richard Henderson , Cornelia Huck , Halil Pasic , qemu-s390x@nongnu.org, Matthew Rosato , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , Christian Schoenebeck , Wainer dos Santos Moschetta , "Daniel P . Berrange" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Hildenbrand , Thomas Huth Subject: [PATCH-for-5.2 v2 4/4] travis-ci: Remove the --without-default-devices job Date: Wed, 4 Nov 2020 09:43:27 +0100 Message-Id: <20201104084327.3010593-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201104084327.3010593-1-philmd@redhat.com> References: <20201104084327.3010593-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 --- .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