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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A8E60C433F5 for ; Sat, 30 Apr 2022 14:16:46 +0000 (UTC) Received: from localhost ([::1]:38250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkntt-0006Gq-RK for qemu-devel@archiver.kernel.org; Sat, 30 Apr 2022 10:16:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkniu-00076b-HV for qemu-devel@nongnu.org; Sat, 30 Apr 2022 10:05:25 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:47054) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nknir-0002gK-RX for qemu-devel@nongnu.org; Sat, 30 Apr 2022 10:05:23 -0400 Received: by mail-ej1-x630.google.com with SMTP id j6so20231002ejc.13 for ; Sat, 30 Apr 2022 07:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=acHhYzc+A7BFacZXWe6fJJd5B4PcLsFSN/fGPcaUWEk=; b=YYRPmxfFs0v6ZUZORfztPkRONRWBG7OWR+NYVqs8hGRUyuUnat33PF9INRYxC7NeSF tURw3Swuwu7DmfiJuLbuGGvDrUTXt5gMHTf2QCaSIK8l7oGHddfO854mgIQdcx9swAKD uf96WOvIn5OLjd8EKaQCrc3vLYun5u7axbk7wSle/6+UuKIHi2nKV0hBL3pqlaiFKRlV ZzQuJwQWJbm9v94zhqjtb4jA0XnkKRYHBdkbGJacxwTl0NqyfbO2m06yNrlAMH6z1ytl K/Y8gvGXz5tOkqJHdXhS6Hub9NKdK7S+kIIWLHPZ2haNBchdkBSp32M+5ZGCVjZV5HQR iXtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=acHhYzc+A7BFacZXWe6fJJd5B4PcLsFSN/fGPcaUWEk=; b=b50APShKqfplKqjvvqQs+yn5YletX+J98sjiQVShCShxAVYrRuaX6O5UeafgXttHJn h89+7oNHS+NvTniyrVrkYg9b/U2i1uAMceOYU3jq8csvoNhiQX/BPrGwKd6cF/lFIC9X 1Jq5+G5oxOBERNQItEL8iwszCkCsPG/bdWJWrYFrQOK9BXgQm/YKRpzsSFuiHCqX+Mqf aPheo1n9bVfATCXXITpi0wWJP+ocxqQlQwBLSwZeYyBnWGiw6YR9zAN+NpSYjCKqFY6q PKuG0egAK0qfx9+56Ym0pmVv5AYvjxU6+F27BzNoWklKOgLKsvFvcJ2XHZ8PkgzMdkB9 raZw== X-Gm-Message-State: AOAM530PFaC0qeHwBvCgTErO3P4fj3ne2r2soKGr0EkubjnimB6AoLiO qDGG+2i0mxw2XZbbiNbugH63S4/qWeZIuA== X-Google-Smtp-Source: ABdhPJwWzt8ZZJwkuPF5iIh0ExyPhx1NCvMumCGUVZxYUoW4d+s2k9aD01KaoL8VM3TtywFpVgncjA== X-Received: by 2002:a17:907:9687:b0:6f3:6b4a:cb9b with SMTP id hd7-20020a170907968700b006f36b4acb9bmr3970775ejc.603.1651327520365; Sat, 30 Apr 2022 07:05:20 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id s26-20020aa7c55a000000b0042617ba6392sm4101003edr.28.2022.04.30.07.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Apr 2022 07:05:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL v3 20/25] build: move vhost-scsi configuration to Kconfig Date: Sat, 30 Apr 2022 16:05:17 +0200 Message-Id: <20220430140517.460997-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220430140517.460997-1-pbonzini@redhat.com> References: <20220430140517.460997-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" vhost-scsi and vhost-user-scsi are two devices of their own; it should be possible to enable/disable them with --without-default-devices, not --without-default-features. Compute their default value in Kconfig to obtain the more intuitive behavior. Reviewed-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- configure | 15 --------------- hw/scsi/Kconfig | 5 +++++ include/hw/virtio/virtio-scsi.h | 2 -- meson.build | 1 - scripts/ci/org.centos/stream/8/x86_64/configure | 1 - 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 603434fc7f..d268a9cf49 100755 --- a/configure +++ b/configure @@ -285,7 +285,6 @@ EXTRA_LDFLAGS="" vhost_kernel="$default_feature" vhost_net="$default_feature" vhost_crypto="$default_feature" -vhost_scsi="$default_feature" vhost_user="no" vhost_user_fs="$default_feature" vhost_vdpa="$default_feature" @@ -874,10 +873,6 @@ for opt do ;; --enable-vhost-crypto) vhost_crypto="yes" ;; - --disable-vhost-scsi) vhost_scsi="no" - ;; - --enable-vhost-scsi) vhost_scsi="yes" - ;; --disable-vhost-user-fs) vhost_user_fs="no" ;; --enable-vhost-user-fs) vhost_user_fs="yes" @@ -1104,7 +1099,6 @@ cat << EOF safe-stack SafeStack Stack Smash Protection. Depends on clang/llvm >= 3.7 and requires coroutine backend ucontext. vhost-net vhost-net kernel acceleration support - vhost-scsi vhost-scsi kernel target support vhost-crypto vhost-user-crypto backend support vhost-kernel vhost kernel backend support vhost-user vhost-user backend support @@ -1538,12 +1532,6 @@ if test "$vhost_kernel" = "yes" && test "$linux" != "yes"; then error_exit "vhost-kernel is only available on Linux" fi -# vhost-kernel devices -test "$vhost_scsi" = "" && vhost_scsi=$vhost_kernel -if test "$vhost_scsi" = "yes" && test "$vhost_kernel" != "yes"; then - error_exit "--enable-vhost-scsi requires --enable-vhost-kernel" -fi - # vhost-user backends test "$vhost_crypto" = "" && vhost_crypto=$vhost_user if test "$vhost_crypto" = "yes" && test "$vhost_user" = "no"; then @@ -2080,9 +2068,6 @@ if test "$modules" = "yes"; then echo "CONFIG_MODULES=y" >> $config_host_mak fi -if test "$vhost_scsi" = "yes" ; then - echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak -fi if test "$vhost_net" = "yes" ; then echo "CONFIG_VHOST_NET=y" >> $config_host_mak fi diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 77d397c949..e7b34dc8e2 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -48,6 +48,11 @@ config VIRTIO_SCSI depends on VIRTIO select SCSI +config VHOST_SCSI + bool + default y + depends on VIRTIO && VHOST_KERNEL + config VHOST_USER_SCSI bool # Only PCI devices are provided for now diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index 543681bc18..0997313f0a 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -55,10 +55,8 @@ struct VirtIOSCSIConf { bool seg_max_adjust; uint32_t max_sectors; uint32_t cmd_per_lun; -#ifdef CONFIG_VHOST_SCSI char *vhostfd; char *wwpn; -#endif CharBackend chardev; uint32_t boot_tpgt; IOThread *iothread; diff --git a/meson.build b/meson.build index 8621f84916..db585832a4 100644 --- a/meson.build +++ b/meson.build @@ -3690,7 +3690,6 @@ summary_info += {'QOM debugging': get_option('qom_cast_debug')} summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')} summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')} summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')} -summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')} summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')} summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server} summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')} diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index 54e55ea328..ef893c40dc 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -132,7 +132,6 @@ --disable-vhost-crypto \ --disable-vhost-kernel \ --disable-vhost-net \ ---disable-vhost-scsi \ --disable-vhost-user \ --disable-vhost-user-blk-server \ --disable-vhost-vdpa \ -- 2.35.1