From patchwork Wed Nov 4 11:57:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 316189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A99F5C2D0A3 for ; Wed, 4 Nov 2020 11:59:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 026F320759 for ; Wed, 4 Nov 2020 11:59:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U7EkixLp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 026F320759 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaHRQ-0008KP-0H for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 06:59:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHPq-0006eM-Hz for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:57:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:31985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaHPo-0005Vj-NY for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:57:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491043; 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=U7EkixLp3oIJKD8K/nsFlav+CQ74QclDBbBoQksVZb5xr9fnVNSZU4AU2RewJQsqiYrh8J k0e4HYBfQDAiqMBEpUmiRdbRwJSzHO7WeSQcFTY4ACTZ4yf5kD8t+612kI+4dgAe3vwJwU dBq83HMaUAtuEWZqo06J6m4y2ghDM1Y= 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-516-j_Am8wAaPcSGDLB3RMRM4w-1; Wed, 04 Nov 2020 06:57:21 -0500 X-MC-Unique: j_Am8wAaPcSGDLB3RMRM4w-1 Received: by mail-wm1-f70.google.com with SMTP id t201so1128842wmt.1 for ; Wed, 04 Nov 2020 03:57:21 -0800 (PST) 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=TDXmx+8Miy5ATepUb9/Z+XJ7HUI9ExlzX2uY1tPc0xozmdpEaq05IiJLuvyjiykn8Y MH3rui9YDdySosFMdUkciAmt71zRSduYRCrmzNCk2BaNMfXRhJ7et5LP1WrCZWzRdnkz /QyarYlNi9/QqzKZr/RrjAOLHvoRwJTEJkfm5HWwhC/7Us0QUoGvmILLGMsmltxH9Hx0 HnUQidyPGHEURdupNBf2dYT0QtahiLXdNH/Pxhso6K7EOZavCXPfoQFUIciMcvmJPRLZ rosWV82quFQnbLsAY9zZTKNlvwwHYMwLDkMcHr7zWFGHdDAU3I8scD/9pJfto4ge7dA7 rljw== X-Gm-Message-State: AOAM531aW6IAkbFMaVh20LFMG0yiBsJcoUdC40uSkb6SElWOf6FXufEa A/7C2Pg4rvTtR3EQokACndySCxlkRaRJCNnElAOaplPnW9J9b5KOhhNSk8C/+doZgCicvQXmNhy nUwfCjNtnWOn7hYs= X-Received: by 2002:adf:f20e:: with SMTP id p14mr30747723wro.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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.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 Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , Stefano Stabellini , "Daniel P . Berrange" , Matthew Rosato , David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , Christian Schoenebeck , Greg Kurz , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Paul Durrant , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 `xen_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): undefined reference to `local_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x20): undefined reference to `synth_ops' /usr/bin/ld: libcommon.fa.p/fsdev_qemu-fsdev.c.o:(.data.rel+0x38): undefined 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é 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 -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) specific_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-9p-device.c')) From patchwork Wed Nov 4 11:57:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 316188 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B32EC2D0A3 for ; Wed, 4 Nov 2020 12:01:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60BB220786 for ; Wed, 4 Nov 2020 12:01:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cBiwwy+J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60BB220786 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaHTs-0002qX-DC for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 07:01:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaHQ0-0006qx-Ty for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:57:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaHPz-0005an-4y for qemu-devel@nongnu.org; Wed, 04 Nov 2020 06:57:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604491054; 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=cBiwwy+JkPpqeHpw8YSODb8NyFHXFU4UXuHlVba15h+f9m+kJMgx/5J46r6HYD9o98YF24 E6oZKchC7y52crsRk71zmImsDgYtAyKAS0T81vxEepX8XWIFmZqThIkyXL5fZBs8SAnbZk 9YRBsIXTwROPOeZiAqz6hxyIPA4IIJI= 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-560-S5w8-6qTNFCr4cXV4mPTCw-1; Wed, 04 Nov 2020 06:57:33 -0500 X-MC-Unique: S5w8-6qTNFCr4cXV4mPTCw-1 Received: by mail-wm1-f72.google.com with SMTP id t201so1128970wmt.1 for ; Wed, 04 Nov 2020 03:57:32 -0800 (PST) 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=HePRx2lgGfAVG1corqsRs/lchIPcxFcurldu2KL74XLWMPBORyR06C+AP340CgPMIQ WWmMKhW6sQa2i1U1NSirL5Heqnd75N2nE76HGikMqr5gMUCSf82gvrssd9/msRu5kAGJ 7WQb89ctlIpVGc3AtA1RyzXIEuw+yXhCWAqe0qOX6tLpKVWnJEWcPGOQ3LtArI9viZC4 anHlkGd1c2g5FC0D9GczksZ1e4pjzMs6TFB1x9sRVxhw5oVLY6uqQ4Xrt+WdiBnso1v1 thFTExNl9R1w66LNAkccIQLIDRcgxNowWsIl7BS4Pq0xtvp21K7ySNhgk9DRG3xymVwT luZg== X-Gm-Message-State: AOAM53354AthbyPpnbq3jqX0J16uFwfGL+la3H9okAT+ejrQnbSptBxy +fUvStVOlo/QMCSEFFHqU8dmtAheamE/SxpgDiZJbDAsSgMBLZUGhS8+JV0XLKuRb4Uhp9ms6zH lC5PtR6m0QYa2A1w= X-Received: by 2002:a1c:205:: with SMTP id 5mr4055040wmc.7.1604491050557; 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 22:09:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , "Daniel P . Berrange" , Matthew Rosato , David Hildenbrand , =?utf-8?q?Alex_Benn=C3=A9e?= , Cornelia Huck , Christian Schoenebeck , Greg Kurz , Wainer dos Santos Moschetta , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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 - # We manually include builds which we disable "make check" for - - name: "GCC without-default-devices (softmmu)" - env: - - CONFIG="--without-default-devices --disable-user" - - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-default" - - TEST_CMD="" - - # We don't need to exercise every backend with every front-end - name: "GCC trace log,simple,syslog (user)" env: