Re: [Xen-devel] [PATCH raisin v3] Update to 4.7, update qemu and qemu_traditional recipes

2016-06-16 Thread George Dunlap 
On 16/06/16 10:52, Stefano Stabellini wrote:
> On Wed, 15 Jun 2016, George Dunlap wrote:
>> 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 

Great, thanks.
 -George


___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH raisin v3] Update to 4.7, update qemu and qemu_traditional recipes

2016-06-16 Thread Stefano Stabellini 
On Wed, 15 Jun 2016, George Dunlap wrote:
> 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 000..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
> -- 
> 2.1.4
> 

___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

[Xen-devel] [PATCH raisin v3] Update to 4.7, update qemu and qemu_traditional recipes

2016-06-15 Thread George Dunlap 
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 
---
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 000..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
-- 
2.1.4


___
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel