From patchwork Mon Mar 5 15:42:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Miroslav Rezanina X-Patchwork-Id: 881555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zw43F0f8Fz9s3p for ; Tue, 6 Mar 2018 02:44:41 +1100 (AEDT) Received: from localhost ([::1]:50045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1essI3-0001JP-5a for incoming@patchwork.ozlabs.org; Mon, 05 Mar 2018 10:44:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1essGb-0000FL-Gg for qemu-devel@nongnu.org; Mon, 05 Mar 2018 10:43:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1essGY-0007Iy-Qm for qemu-devel@nongnu.org; Mon, 05 Mar 2018 10:43:09 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60838 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1essGY-0007IC-Lq for qemu-devel@nongnu.org; Mon, 05 Mar 2018 10:43:06 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9F4E484221 for ; Mon, 5 Mar 2018 15:43:02 +0000 (UTC) Received: from workimage.localdomain (unknown [10.40.205.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F0A820A846E; Mon, 5 Mar 2018 15:42:57 +0000 (UTC) From: mrezanin@redhat.com To: qemu-devel@nongnu.org Date: Mon, 5 Mar 2018 16:42:55 +0100 Message-Id: <1520264575-26506-1-git-send-email-mrezanin@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 05 Mar 2018 15:43:02 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Mon, 05 Mar 2018 15:43:02 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mrezanin@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH] Use CONFIG_VHOST_USER_SCSI to enable vhost-scsi-pci X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Miroslav Rezanina Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Miroslav Rezanina Currently, "defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)" is used to enable/disable vhost-scsi-pci build as this condition is used to enable/disable CONFIG_VHOST_USER_SCSI too. However, when CONFIG_VHOST_USER_SCSI is manually disable vhost-scsi-pci is still registered although it should be disabled. Changing condition to use CONFIG_VHOST_USER_SCSI so vhost-scsi-pci can be controled by CONFIG_VHOST_USER_SCSI option. Signed-off-by: Miroslav Rezanina Reviewed-by: Marc-André Lureau --- hw/virtio/virtio-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 1e8ab7b..df59d6b 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2163,7 +2163,7 @@ static const TypeInfo vhost_scsi_pci_info = { }; #endif -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) +#if defined(CONFIG_VHOST_USER_SCSI) /* vhost-user-scsi-pci */ static Property vhost_user_scsi_pci_properties[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, @@ -2696,7 +2696,7 @@ static void virtio_pci_register_types(void) #ifdef CONFIG_VHOST_SCSI type_register_static(&vhost_scsi_pci_info); #endif -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) +#if defined(CONFIG_VHOST_USER_SCSI) type_register_static(&vhost_user_scsi_pci_info); #endif #ifdef CONFIG_VHOST_VSOCK