From patchwork Wed Jun 15 18:39:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 9179165 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 CFA2460831 for ; Wed, 15 Jun 2016 18:49:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF98F20223 for ; Wed, 15 Jun 2016 18:49:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B48DD27EED; Wed, 15 Jun 2016 18:49:43 +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 DF81620223 for ; Wed, 15 Jun 2016 18:49:42 +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 1bDFqR-0002RS-An; Wed, 15 Jun 2016 18:47:19 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDFqQ-0002Qp-2F for xen-devel@lists.xenproject.org; Wed, 15 Jun 2016 18:47:18 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id ED/40-25713-5B2A1675; Wed, 15 Jun 2016 18:47:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRWlGSWpSXmKPExsXitHSDve7WRYn hBgu+MVp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnfO08yFnTIVay89oq9gbFBoouRk0NCwF/i dt8BZhCbTUBPYt7xryxdjBwcIgIqErf3GoCEmQWiJCb3NDCB2MICQRJdvXNZQWwWAVWJ2a1X2 UFsXgEPiTfbJjJBjJSTOH/8J9hITgFPifMnZ7OA2EJANRemTGOCsFUlFj84CtUrKHFy5hMWiF 0SEgdfvGAGOUFCgFvib7f9BEa+WUiqZiGpWsDItIpRvTi1qCy1SNdIL6koMz2jJDcxM0fX0MB MLze1uDgxPTUnMalYLzk/dxMjMJwYgGAH47K/TocYJTmYlER5N01KDBfiS8pPqcxILM6ILyrN SS0+xCjDwaEkwXtnIVBOsCg1PbUiLTMHGNgwaQkOHiUR3o8gad7igsTc4sx0iNQpRl2OeZN2H WMSYsnLz0uVEuedCVIkAFKUUZoHNwIWZZcYZaWEeRmBjhLiKUgtys0sQZV/xSjOwagkzPsUZA pPZl4J3KZXQEcwAR1hMz0e5IiSRISUVAOjzq/I6ylHz2k9mvh0z9UKn/jn4offzE8WcdlT8U3 cJWdJ49o7nsvTLwrPkXF9ka5uwnp81SPv5v16i/2erTiY+17t5QQph617nhR/ivgi4OLzvPWI 3wUut2uXT7xSlOkrv/nnbX/hzYwTT8WuKrEyfGewTvw1+/saG7vqr8VbGvg9RF6avykLVmIpz kg01GIuKk4EAFCDXAatAgAA X-Env-Sender: prvs=96798de7a=George.Dunlap@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1466016434!19106193!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53118 invoked from network); 15 Jun 2016 18:47:16 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jun 2016 18:47:16 -0000 X-IronPort-AV: E=Sophos;i="5.26,477,1459814400"; d="scan'208";a="367567116" From: George Dunlap To: Date: Wed, 15 Jun 2016 19:39:26 +0100 Message-ID: <1466015966-26097-2-git-send-email-george.dunlap@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466015966-26097-1-git-send-email-george.dunlap@citrix.com> References: <1466015966-26097-1-git-send-email-george.dunlap@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Stefano Stabellini , George Dunlap Subject: [Xen-devel] [PATCH raisin v3] Update to 4.7, update qemu and qemu_traditional recipes 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 Add a 4.7 config file, make it the default. Also update the qemu and qemu_traditional recipies after Ian Cambell's work to split off separate libraries. Signed-off-by: George Dunlap Acked-by: Stefano Stabellini --- Changes in v3: - Reword comment - Don't use tabs Changes in v2: - Only add the extra #defines when building 4.7 or master, and add an explanation of what they're for. CC: Stefano Stabellini --- components/qemu | 32 +++++++++++++++++++++++--------- components/qemu_traditional | 2 +- configs/config-4.7 | 8 ++++++++ defconfig | 2 +- 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/components/qemu b/components/qemu index e0d92a5..b49ed1d 100644 --- a/components/qemu +++ b/components/qemu @@ -20,18 +20,32 @@ function qemu_check_package() { } function qemu_build() { + local QEMU_EXTRA_CFLAGS cd "$BASEDIR" git-checkout $QEMU_URL $QEMU_REVISION qemu-dir cd qemu-dir - ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \ - --extra-cflags="-I$INST_DIR/$PREFIX/include" \ - --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \ - -L$INST_DIR/$PREFIX/lib64 -Wl,-rpath-link=$INST_DIR/$PREFIX/lib64" \ - --disable-kvm \ - --disable-docs \ - --bindir=$PREFIX/lib/xen/bin \ - --datadir=$PREFIX/share/qemu-xen \ - --disable-guest-agent + + QEMU_EXTRA_CFLAGS="-I$INST_DIR/$PREFIX/include" + + if [[ "$XEN_RELEASE" == "4.7" || "$XEN_RELEASE" == "master" ]] ; then + # qemu-xen released with 4.7.0 doesn't use the new libxc api, + # nor does it know how to ask for the compat api, so we need + # to tell it to do so manually. + QEMU_EXTRA_CFLAGS="$QEMU_EXTRA_CFLAGS -DXC_WANT_COMPAT_EVTCHN_API=1 \ + -DXC_WANT_COMPAT_GNTTAB_API=1 \ + -DXC_WANT_COMPAT_MAP_FOREIGN_API=1" + fi + + ./configure --enable-xen --target-list=i386-softmmu \ + --prefix=$PREFIX \ + --extra-cflags="$QEMU_EXTRA_CFLAGS" \ + --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \ + -L$INST_DIR/$PREFIX/lib64 -Wl,-rpath-link=$INST_DIR/$PREFIX/lib64" \ + --bindir=$PREFIX/lib/xen/bin \ + --datadir=$PREFIX/share/qemu-xen \ + --disable-kvm \ + --disable-docs \ + --disable-guest-agent $RAISIN_MAKE all $RAISIN_MAKE install DESTDIR="$INST_DIR" cd "$BASEDIR" diff --git a/components/qemu_traditional b/components/qemu_traditional index 3150c3e..8732fe2 100644 --- a/components/qemu_traditional +++ b/components/qemu_traditional @@ -30,7 +30,7 @@ function qemu_traditional_build() { export CONFIG_BLKTAP1=n export XEN_ROOT="$BASEDIR"/xen-dir - ./xen-setup + ./xen-setup --extra-cflags="-D__XEN_TOOLS__" $RAISIN_MAKE all $RAISIN_MAKE install DESTDIR="$INST_DIR" cd "$BASEDIR" diff --git a/configs/config-4.7 b/configs/config-4.7 new file mode 100644 index 0000000..66fe467 --- /dev/null +++ b/configs/config-4.7 @@ -0,0 +1,8 @@ +XEN_REVISION="origin/stable-4.7" +QEMU_REVISION="origin/stable-4.7" +QEMU_TRADITIONAL_REVISION="origin/stable-4.7" +SEABIOS_REVISION="rel-1.9.2" +GRUB_REVISION="master" +LIBVIRT_REVISION="origin/v1.3.3-maint" +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d" +LINUX_REVISION="master" diff --git a/defconfig b/defconfig index 8e79a43..f8ef398 100644 --- a/defconfig +++ b/defconfig @@ -2,7 +2,7 @@ # Setup a Xen based system. # Available options: 4.5, 4.6, master (for development branch) -XEN_RELEASE="4.6" +XEN_RELEASE="4.7" # Components ## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux