Update to 4.7, update qemu and qemu_traditional recipes

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 <george.dunlap@citrix.com>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>

diff --git a/components/qemu b/components/qemu
index e0d92a5a0d3469d450eaf383b8569afeebcbbae7..b49ed1d147fa4df22b0aac81abd3bec5823d6d01 100644 (file)
--- 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 3150c3e51fd99c9fcb8f782ae9691310dcd90424..8732fe222acb549e792d7f54909715d5b82ed609 100644 (file)
--- 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 (file)
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 8e79a43944c1e631c4062ce29441f8ad20ab87a7..f8ef398152864e90ad3ba48de8c8c31abcecfa76 100644 (file)
--- 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