From patchwork Wed Dec 11 14:24:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1207685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; 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 Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q9JX01Zp"; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 47Xzkb26lQz9sR8 for ; Thu, 12 Dec 2019 01:26:15 +1100 (AEDT) Received: from localhost ([::1]:43182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if2wO-0007SI-62 for incoming@patchwork.ozlabs.org; Wed, 11 Dec 2019 09:26:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43932) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if2vE-00076B-3f for qemu-devel@nongnu.org; Wed, 11 Dec 2019 09:25:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1if2vD-0005NG-3I for qemu-devel@nongnu.org; Wed, 11 Dec 2019 09:24:59 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1if2vC-0005MC-T1 for qemu-devel@nongnu.org; Wed, 11 Dec 2019 09:24:59 -0500 Received: by mail-wm1-x343.google.com with SMTP id b11so7305254wmj.4 for ; Wed, 11 Dec 2019 06:24:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=X8hK4OmxbRe74okeViqqk8QWGsS7awYMg615kR03rjI=; b=q9JX01ZpYzSX+ZiU9W7RiB0KJj8CQXR+Cn4W3GdXBwgxNKtmXkr8iJRVgdgVMNIleh 3kygUOT0ZyBTjgRpFFYDdTNMuHzu81xTbnmQ7NXqYzPbFTXu7+bgxP9SPD5nHAu3Tcrs iP2EJH9hI+lj46AS/8pS8B1Da+9ZWbOwVq6aftzIMZCIFPVRCA2DLGzZUxDz4e/23AVm VCHFaJuI8nbmI+tch+rJIKs6u3agQVXSY67qdGafNU9GhW4myIIUyEeaDHZ+KvNyPemU +gVzdxTtJGKmhvlXgqP/d8/cjVBdoDfbsVYZd52Dv7M3+jYZTWRoSgRz7Km3EPM+HUfB 3sGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=X8hK4OmxbRe74okeViqqk8QWGsS7awYMg615kR03rjI=; b=ZkKxhMJ8N0J7cKk+riRuLb8Wawcjk3S5oICp4fZFs24seBBc6TdQADl101Na7whVV+ GZnrV5BDTemWbQaGUlV+nC6+iKJQKr9AET/hyRfrJRCv45Qz08ncnJVDQxmgPiat7uIy BlqWXUSZ4WVKeY/4nMUijLAK2IHhxrIQlYNuQCTs45D2x2LDtEEGarDwLGkQPdDwwyQ0 0S6KcgiI+OrqaZxjYHAxrD2zEAyeZk2Ff1o38M4DgIqoNtNfVPra4EhtyFpbv2pxqVU0 fpGzykvuzHuv5qg8XvYHjGxuSx6Pag2qDNf10zXdIKIdjbZ+FIzLX71VxoDpXinksRUR Xp3w== X-Gm-Message-State: APjAAAUOkq6JDtEqS/3o48SsSksNC4sWV3GEDEpM+td55jhOTa0c6AKz bTsjVUefPrYKQw0KK8XQPz54gokC X-Google-Smtp-Source: APXvYqz2kerJEsLYxSigGFjDoeoBwFJG6tBMqTSTi4vvs2LOE6qOUSoXXU5Ef+gHTwjlInau7p+4YQ== X-Received: by 2002:a1c:9e0d:: with SMTP id h13mr71941wme.110.1576074297670; Wed, 11 Dec 2019 06:24:57 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id l22sm2340980wmj.42.2019.12.11.06.24.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2019 06:24:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] configure: simplify vhost condition with Kconfig Date: Wed, 11 Dec 2019 15:24:56 +0100 Message-Id: <1576074296-53617-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Kconfig.host | 5 +++++ hw/virtio/Kconfig | 3 +++ hw/virtio/Makefile.objs | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Kconfig.host b/Kconfig.host index bb6e116..55136e0 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -25,6 +25,11 @@ config TPM config VHOST_USER bool + select VHOST + +config VHOST_KERNEL + bool + select VHOST config XEN bool diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 3724ff8..f87def2 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -1,3 +1,6 @@ +config VHOST + bool + config VIRTIO bool diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index e2f70fb..de0f5fc 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -2,8 +2,8 @@ ifeq ($(CONFIG_VIRTIO),y) common-obj-y += virtio-bus.o obj-y += virtio.o -obj-$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL)) += vhost.o vhost-backend.o -common-obj-$(call lnot,$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL))) += vhost-stub.o +obj-$(CONFIG_VHOST) += vhost.o vhost-backend.o +common-obj-$(call lnot,$(CONFIG_VHOST)) += vhost-stub.o obj-$(CONFIG_VHOST_USER) += vhost-user.o common-obj-$(CONFIG_VIRTIO_RNG) += virtio-rng.o