From patchwork Mon Sep 4 13:44:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9937177 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1CB0C603F9 for ; Mon, 4 Sep 2017 13:47:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EF99287EF for ; Mon, 4 Sep 2017 13:47:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03F1C287F1; Mon, 4 Sep 2017 13:47:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CDD51287EE for ; Mon, 4 Sep 2017 13:47:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dorgM-0002xp-Fo; Mon, 04 Sep 2017 13:44:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dorgL-0002x1-Dd for xen-devel@lists.xenproject.org; Mon, 04 Sep 2017 13:44:53 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id BB/F5-03283-4D85DA95; Mon, 04 Sep 2017 13:44:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpO6ViLW RBs3/xC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1owNx2+wF3zmrDixZS5zA+Ndji5GTg4JAX+J WQtb2UBsNgFliZ+dvWC2iICeRNOB54wgNrOAl8SLdf/AbGEBY4lTzatZQWwWARWJlm3zmUFsX gELiQtX5rBCzJSX2NV2EczmFLCUmL6vjQnEFgKqWTbvHzuErSDRMf0YE0SvoMTJmU9YIHZJSB x88YJ5AiPvLCSpWUhSCxiZVjFqFKcWlaUW6RqZ6yUVZaZnlOQmZuboGhqY6eWmFhcnpqfmJCY V6yXn525iBAYPAxDsYFy8NvAQoyQHk5Io79GQtZFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHh3 hwPlBItS01Mr0jJzgGEMk5bg4FES4V0PkuYtLkjMLc5Mh0idYtTl2LB6/RcmIZa8/LxUKXHeN SBFAiBFGaV5cCNgMXWJUVZKmJcR6CghnoLUotzMElT5V4ziHIxKwrzywAgV4snMK4Hb9AroCC agI6pergE5oiQRISXVwDi7cGfzmoALDm5TfCaVbRN897qFtWXCPC/mS3YfPkdsqOYItDBb0WH MslviWMbutV/ytokVsd7ltT53Z3uTa+KFM+zrFlybZvby7o5db7p3v/pmtOzJtKaVjb9Oa6xI ufVb8NkS9wvpx5+73TbN3fDvWKBxh+GeC1sMYsKmLphq+5jlVZTJX0NBJZbijERDLeai4kQA/ sf4PqQCAAA= X-Env-Sender: prvs=413cdd9d7=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1504532689!115061985!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32305 invoked from network); 4 Sep 2017 13:44:52 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 4 Sep 2017 13:44:52 -0000 X-IronPort-AV: E=Sophos;i="5.41,474,1498521600"; d="scan'208";a="438290589" From: Wei Liu To: Xen-devel Date: Mon, 4 Sep 2017 14:44:47 +0100 Message-ID: <20170904134447.19176-5-wei.liu2@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170904134447.19176-1-wei.liu2@citrix.com> References: <20170904134447.19176-1-wei.liu2@citrix.com> MIME-Version: 1.0 Cc: Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH 4/4] tools: eliminate LIBXL_BLKTAP2 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use CONFIG_BLKTAP2 directly. There is no reason why one would want to set LIBXL_BLKTAP2 separately as things stand. Signed-off-by: Wei Liu --- Cc: Ian Jackson --- tools/Rules.mk | 4 +--- tools/libxl/Makefile | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 4592601db1..dbc7635112 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -163,9 +163,7 @@ else CFLAGS += -O2 -fomit-frame-pointer endif -LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) - -ifeq ($(LIBXL_BLKTAP),y) +ifeq ($(CONFIG_BLKTAP2),y) CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) SHDEPS_libblktapctl = LDLIBS_libblktapctl = $(SHDEPS_libblktapctl) $(XEN_BLKTAP2)/control/libblktapctl$(libextension) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 082af8f716..bbfc0c0708 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -46,7 +46,7 @@ LIBXL_LIBS += $(LIBXL_LIBS-y) LIBXLU_LIBS = $(LDLIBS_libxenlight) LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o -ifeq ($(LIBXL_BLKTAP),y) +ifeq ($(CONFIG_BLKTAP2),y) LIBXL_OBJS-y += libxl_blktap2.o else LIBXL_OBJS-y += libxl_noblktap2.o