From nobody Sat Sep 28 15:07:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548229174461226.55633840164523; Tue, 22 Jan 2019 23:39:34 -0800 (PST) Received: from localhost ([127.0.0.1]:57376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmD8H-0000YF-FA for importer@patchew.org; Wed, 23 Jan 2019 02:39:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmCXI-0005tZ-5p for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:01:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmCXA-0004GQ-Ii for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:01:15 -0500 Received: from mga18.intel.com ([134.134.136.126]:36924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmCX6-0002Nr-H5 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 02:01:10 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2019 22:59:57 -0800 Received: from he.bj.intel.com ([10.238.157.85]) by orsmga001.jf.intel.com with ESMTP; 22 Jan 2019 22:59:55 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,510,1539673200"; d="scan'208";a="129981135" From: Yang Zhong To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 14:56:18 +0800 Message-Id: <20190123065618.3520-45-yang.zhong@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123065618.3520-1-yang.zhong@intel.com> References: <20190123065618.3520-1-yang.zhong@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [RFC PATCH v4 44/44] Makefile: only support defconfig 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: yang.zhong@intel.com, peter.maydell@linaro.org, thuth@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, sameo@linux.intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" add CONFIG_VHOST_USER and CONFIG_LINUX in Kconfig.host, the current Makefile only support defconfig because of randconfig does not work. Signed-off-by: Yang Zhong --- Kconfig.host | 6 ++++++ Makefile | 16 ++++++++-------- hw/block/Kconfig | 2 ++ hw/scsi/Kconfig | 2 ++ hw/tpm/Kconfig | 2 ++ 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Kconfig.host b/Kconfig.host index d7f503d0ca..3772627a3a 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -16,3 +16,9 @@ config TPM =20 config XEN bool + +config VHOST_USER + bool + +config LINUX + bool diff --git a/Makefile b/Makefile index 97c6453415..b8f1e71977 100644 --- a/Makefile +++ b/Makefile @@ -312,6 +312,9 @@ endif SUBDIR_MAKEFLAGS=3D$(if $(V),,--no-print-directory --quiet) BUILD_DIR=3D$(= BUILD_DIR) SUBDIR_DEVICES_MAK=3D$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) SUBDIR_DEVICES_MAK_DEP=3D$(patsubst %, %-config-devices.mak.d, $(TARGET_DI= RS)) +SUBDIR_TARGET_MAK=3D$(patsubst %, %/config-target.mak, $(TARGET_DIRS)) + +-include $(SUBDIR_TARGET_MAK) =20 ifeq ($(SUBDIR_DEVICES_MAK),) config-all-devices.mak: @@ -332,16 +335,13 @@ MINIKCONF_ARGS =3D \ CONFIG_SPICE=3D$(CONFIG_SPICE) \ CONFIG_TPM=3D$(CONFIG_TPM) \ CONFIG_XEN=3D$(CONFIG_XEN) \ - CONFIG_OPENGL=3D$(CONFIG_OPENGL) - -MINIKCONF =3D $(SHELL) $(SRC_PATH)/scripts/minikconf.sh + CONFIG_OPENGL=3D$(CONFIG_OPENGL) \ + CONFIG_VHOST_USER=3D$(CONFIG_VHOST_USER) \ + CONFIG_LINUX=3D$(CONFIG_LINUX) =20 -.PHONY: allyesconfig allnoconfig defconfig randconfig -allyesconfig allnoconfig defconfig randconfig: - rm */config-devices.mak config-all-devices.mak - $(MAKE) MINIKCONF=3D"$(MINIKCONF) --$<" config-all-devices.mak +MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py --defconfig =20 -%/config-devices.mak: default-configs/%-softmmu.mak Kconfig.host hw/Kconfig +%/config-devices.mak: default-configs/%.mak Kconfig.host $(SRC_PATH)/hw/Kc= onfig $(call quiet-command, \ $(MINIKCONF) $@ $*-config-devices.mak.d $^ $(MINIKCONF_ARGS) >= $@.tmp, " GEN $@.tmp") $(call quiet-command, if test -f $@; then \ diff --git a/hw/block/Kconfig b/hw/block/Kconfig index 771967ad9f..b2f1de9eca 100644 --- a/hw/block/Kconfig +++ b/hw/block/Kconfig @@ -33,3 +33,5 @@ config VIRTIO_BLK =20 config VHOST_USER_BLK bool + default y + depends on VHOST_USER && LINUX diff --git a/hw/scsi/Kconfig b/hw/scsi/Kconfig index 22281213ba..e5d5bcaa5c 100644 --- a/hw/scsi/Kconfig +++ b/hw/scsi/Kconfig @@ -48,3 +48,5 @@ config VIRTIO_SCSI =20 config VHOST_USER_SCSI bool + default y + depends on VHOST_USER && LINUX diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 28acdb745e..6d383b7209 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -13,6 +13,8 @@ config TPM_CRB =20 config TPM_PASSTHROUGH bool + depends on TPM =20 config TPM_EMULATOR bool + depends on TPM --=20 2.17.1