From mboxrd@z Thu Jan 1 00:00:00 1970 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 A766DC2D0A3 for ; Wed, 4 Nov 2020 08:44:58 +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 12D1B208C7 for ; Wed, 4 Nov 2020 08:44:58 +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="KClRyIm9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12D1B208C7 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]:58686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaEPY-0008UL-UU for qemu-devel@archiver.kernel.org; Wed, 04 Nov 2020 03:44:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46554) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaEOU-0006jD-2d for qemu-devel@nongnu.org; Wed, 04 Nov 2020 03:43:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaEOS-0005uN-DR for qemu-devel@nongnu.org; Wed, 04 Nov 2020 03:43:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604479426; 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=KClRyIm9Ad2y5f5hCELBDe/HZUCXeDoRA0kiqKsDvklnxsUyoyXfOc2M/fcPAhSaxMcfYd Zq/2mPAsZvwWZRQYR9KalRhlchlTJYwfustn4tBYcg2izx2SWOvdx12WjMMLIUTx+flWfI K5M8JHON5uWRsf2PILjd7UPCUvieFtk= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-cvYZZPjpMem8DLU1y0LgWQ-1; Wed, 04 Nov 2020 03:43:42 -0500 X-MC-Unique: cvYZZPjpMem8DLU1y0LgWQ-1 Received: by mail-wr1-f69.google.com with SMTP id t17so8985988wrm.13 for ; Wed, 04 Nov 2020 00:43:42 -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=AINBmnp1bWLA1LEpK/rcM7CoffR1YWyCikg181rfSi4=; b=N21lG8E/upIWi6G9ttziy+wr5ckuDC5f90KhYzNBhEF8lqj/67UqWUgvNgl/PLYyNj rv6Odu37GhRep+Oft/QqqbLyQbGenELruWifQCWAt2lTSVSyx0GdJUM2m9CZc34wh9Lg UKcp+r/KBVC27+Utg8xXjIgQn0tMX5aJkeRxuZ0iecyzUyF3Q/rQ5hyG/cRPrgrHD5RK DrAQRhGLCz0hFo0+tC8XXs2Lko5gPKErtlH/hwXWNPa8cSoZLAT7D0K3hVK1udbu+Wuw sUC5xJ+pvA0WuOvfNHLHgAzr+pYhIZK5ydNPYz+ekAsicbuhnWVq/dQd6bgOkv9bR0B7 kn+Q== X-Gm-Message-State: AOAM531jYMyPTR/1BSNVzmhb7SG7y2nfRpMqPGM8Pwui/Y7r83Lqu1bj 51uj9K7sErlrdb3jiKPYrj8BOm2idJelqTLWgf7xgXaCs3ijuFyvKuHRmm5S/7KQN6qfJvQzYAD LTXPZEY2C4pS79QA= X-Received: by 2002:a1c:6782:: with SMTP id b124mr3528107wmc.117.1604479421390; 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) 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.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: 8bit 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=unavailable 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?Philippe=20Mathieu-Daud=C3=A9?= , 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?Alex=20Benn=C3=A9e?= , Paul Durrant , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Fixes './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 Signed-off-by: Philippe Mathieu-Daudé --- 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 -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')) -- 2.26.2