[PATCH raisin 0/4] Fixes for 4.6, update to 4.7

[PATCH raisin 0/4] Fixes for 4.6, update to 4.7

[George Dunlap]

George Dunlap (4):
  components/xen: Actually disable rombios
  config: Separate config urls into a separate file
  Update config-4.6 and config-4.5 to point to stable branches
  Update to 4.7, update qemu and qemu_traditional recipes

 components/qemu             | 21 ++++++++++++--------
 components/qemu_traditional |  2 +-
 components/xen              |  2 +-
 configs/config-4.5          | 45 +++----------------------------------------
 configs/config-4.6          | 47 ++++-----------------------------------------
 configs/config-4.7          |  8 ++++++++
 configs/config-master       | 39 ++-----------------------------------
 configs/config-url-git      |  8 ++++++++
 configs/config-url-http     |  7 +++++++
 defconfig                   | 35 ++++++++++++++++++++++++++++++++-
 10 files changed, 81 insertions(+), 133 deletions(-)
 create mode 100644 configs/config-4.7
 create mode 100644 configs/config-url-git
 create mode 100644 configs/config-url-http
 mode change 120000 => 100644 defconfig

-- 
2.1.4


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

[PATCH raisin 1/4] components/xen: Actually disable rombios

[George Dunlap]

Commit 5fe3855 meant to disable rombios, but didn't.  This causes the following
build failure:

gcc   -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing
-std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement
-Wno-unused-but-set-variable -Wno-unused-local-typedefs
-D__XEN_TOOLS__ -MMD -MF .rombios.o.d -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -mno-tls-direct-seg-refs  -DNDEBUG -Werror
-fno-stack-protector -fno-exceptions -fno-builtin -msoft-float
-I/usr/local/src/xenboil/raisin/xen-dir-remote/tools/firmware/hvmloader/../../../tools/include
-U__XEN_TOOLS__
-D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
-DENABLE_OVMF -DENABLE_ROMBIOS -DENABLE_SEABIOS  -c -o rombios.o rombios.c
rombios.c: In function ‘rombios_load_roms’:
rombios.c:103:39: error: ‘etherboot’ undeclared (first use in this function)
                                       etherboot);

Disable rombios instead.

Reported-by: Holger Schramm <lists@schramm.by>
Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---
CC: Stefano Stabellini <sstabellini@kernel.org>
---
 components/xen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/xen b/components/xen
index 894d119..ea290aa 100644
--- a/components/xen
+++ b/components/xen
@@ -45,7 +45,7 @@ function xen_build() {
     export ETHERBOOT_NICS=""
     ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \
         --disable-stubdom --disable-qemu-traditional \
-        --enable-rombios $seabios_opt $ovmf_opt
+        --disable-rombios $seabios_opt $ovmf_opt
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     unset ETHERBOOT_NICS
-- 
2.1.4


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

[PATCH raisin 2/4] config: Separate config urls into a separate file

[George Dunlap]

So that we're not duplicating information.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---
CC: Stefano Stabellini <sstabellini@kernel.org>
---
 configs/config-4.5      | 39 ---------------------------------------
 configs/config-4.6      | 39 ---------------------------------------
 configs/config-master   | 38 --------------------------------------
 configs/config-url-git  |  8 ++++++++
 configs/config-url-http |  7 +++++++
 defconfig               | 35 ++++++++++++++++++++++++++++++++++-
 6 files changed, 49 insertions(+), 117 deletions(-)

diff --git a/configs/config-4.5 b/configs/config-4.5
index e3b92d5..4163b68 100644
--- a/configs/config-4.5
+++ b/configs/config-4.5
@@ -1,37 +1,3 @@
-# Config variables for raisin
-# Setup a Xen 4.5 based system
-
-# Components
-## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
-## Core xen functionality: xen
-## Remove a component from the list below, if you want to disable it
-## You can manually overwrite this list using the COMPONENTS
-## environmental variable.
-ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
-
-# Build config
-## Make command to run
-MAKE="make -j2"
-## Installation prefix (configure --prefix)
-PREFIX="/usr"
-## Install everything under DESTDIR
-## If you want to install under / run raise.sh -i
-DESTDIR=dist
-
-# Git urls. Use the http urls if you are behind a firewall.
-#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
-#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
-#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
-XEN_URL="git://xenbits.xen.org/xen.git"
-QEMU_URL="git://xenbits.xen.org/qemu-upstream-4.5-testing.git"
-QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-4.5-testing.git"
-SEABIOS_URL="git://xenbits.xen.org/seabios.git"
-GRUB_URL="git://git.savannah.gnu.org/grub.git"
-LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
-OVMF_URL="git://xenbits.xen.org/ovmf.git"
-LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-
-# Software versions.
 XEN_REVISION="origin/stable-4.5"
 QEMU_REVISION="master"
 QEMU_TRADITIONAL_REVISION="master"
@@ -40,8 +6,3 @@ GRUB_REVISION="master"
 LIBVIRT_REVISION="origin/xen-tested-master"
 OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
 LINUX_REVISION="master"
-
-# Tests
-## All tests: busybox-pv busybox-hvm
-## ENABLED_TESTS is the list of test run by raise test
-ENABLED_TESTS="busybox-pv busybox-hvm"
diff --git a/configs/config-4.6 b/configs/config-4.6
index ebd45e7..e8b2a09 100644
--- a/configs/config-4.6
+++ b/configs/config-4.6
@@ -1,37 +1,3 @@
-# Config variables for raisin
-# Setup a Xen 4.6 based system
-
-# Components
-## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
-## Core xen functionality: xen
-## Remove a component from the list below, if you want to disable it
-## You can manually overwrite this list using the COMPONENTS
-## environmental variable.
-ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
-
-# Build config
-## Make command to run
-MAKE="make -j2"
-## Installation prefix (configure --prefix)
-PREFIX="/usr"
-## Install everything under DESTDIR
-## If you want to install under / run raise.sh -i
-DESTDIR=dist
-
-# Git urls. Use the http urls if you are behind a firewall.
-#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
-#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
-#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
-XEN_URL="git://xenbits.xen.org/xen.git"
-QEMU_URL="git://xenbits.xen.org/qemu-upstream-4.6-testing.git"
-QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-4.6-testing.git"
-SEABIOS_URL="git://xenbits.xen.org/seabios.git"
-GRUB_URL="git://git.savannah.gnu.org/grub.git"
-LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
-OVMF_URL="git://xenbits.xen.org/ovmf.git"
-LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-
-# Software versions.
 XEN_REVISION="origin/stable-4.6"
 QEMU_REVISION="master"
 QEMU_TRADITIONAL_REVISION="master"
@@ -40,8 +6,3 @@ GRUB_REVISION="master"
 LIBVIRT_REVISION="origin/xen-tested-master"
 OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
 LINUX_REVISION="master"
-
-# Tests
-## All tests: busybox-pv busybox-hvm
-## ENABLED_TESTS is the list of test run by raise test
-ENABLED_TESTS="busybox-pv busybox-hvm"
diff --git a/configs/config-master b/configs/config-master
index b218708..bd26ce3 100644
--- a/configs/config-master
+++ b/configs/config-master
@@ -1,36 +1,3 @@
-# Config variables for raisin
-
-# Components
-## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
-## Core xen functionality: xen
-## Remove a component from the list below, if you want to disable it
-## You can manually overwrite this list using the COMPONENTS
-## environmental variable.
-ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
-
-# Build config
-## Make command to run
-MAKE="make -j2"
-## Installation prefix (configure --prefix)
-PREFIX="/usr"
-## Install everything under DESTDIR
-## If you want to install under / run raise.sh -i
-DESTDIR=dist
-
-# Git urls. Use the http urls if you are behind a firewall.
-#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
-#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
-#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
-XEN_URL="git://xenbits.xen.org/xen.git"
-QEMU_URL="git://xenbits.xen.org/qemu-upstream-unstable.git"
-QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
-SEABIOS_URL="git://xenbits.xen.org/osstest/seabios.git"
-GRUB_URL="git://git.savannah.gnu.org/grub.git"
-LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
-OVMF_URL="git://xenbits.xen.org/osstest/ovmf.git"
-LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-
-# Software versions.
 XEN_REVISION="master"
 QEMU_REVISION="master"
 QEMU_TRADITIONAL_REVISION="master"
@@ -39,8 +6,3 @@ GRUB_REVISION="master"
 LIBVIRT_REVISION="origin/xen-tested-master"
 OVMF_REVISION="origin/xen-tested-master"
 LINUX_REVISION="master"
-
-# Tests
-## All tests: busybox-pv busybox-hvm
-## ENABLED_TESTS is the list of test run by raise test
-ENABLED_TESTS="busybox-pv busybox-hvm"
diff --git a/configs/config-url-git b/configs/config-url-git
new file mode 100644
index 0000000..79813c4
--- /dev/null
+++ b/configs/config-url-git
@@ -0,0 +1,8 @@
+XEN_URL="git://xenbits.xen.org/xen.git"
+QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
+QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
+SEABIOS_URL="git://xenbits.xen.org/seabios.git"
+GRUB_URL="git://git.savannah.gnu.org/grub.git"
+LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
+OVMF_URL="git://xenbits.xen.org/ovmf.git"
+LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
diff --git a/configs/config-url-http b/configs/config-url-http
new file mode 100644
index 0000000..0ea8484
--- /dev/null
+++ b/configs/config-url-http
@@ -0,0 +1,7 @@
+XEN_URL="http://xenbits.xen.org/git-http/xen.git"
+QEMU_URL="http://xenbits.xen.org/git-http/qemu-xen.git"
+QEMU_TRADITIONAL_URL="http://xenbits.xen.org/git-http/qemu-xen-traditional.git"
+SEABIOS_URL="http://xenbits.xen.org/git-http/seabios.git"
+GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
+LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
+OVMF_URL="http://xenbits.xen.org/git-http/ovmf.git"
diff --git a/defconfig b/defconfig
deleted file mode 120000
index 7ba643e..0000000
--- a/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-configs/config-4.6
\ No newline at end of file
diff --git a/defconfig b/defconfig
new file mode 100644
index 0000000..8e79a43
--- /dev/null
+++ b/defconfig
@@ -0,0 +1,34 @@
+# Config variables for raisin
+# Setup a Xen based system.
+
+# Available options: 4.5, 4.6, master (for development branch)
+XEN_RELEASE="4.6"
+
+# Components
+## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
+## Core xen functionality: xen
+## Remove a component from the list below, if you want to disable it
+## You can manually overwrite this list using the COMPONENTS
+## environmental variable.
+ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
+
+# Build config
+## Make command to run
+MAKE="make -j2"
+## Installation prefix (configure --prefix)
+PREFIX="/usr"
+## Install everything under DESTDIR
+## If you want to install under / run raise.sh -i
+DESTDIR=dist
+
+# Git transport.  Use "http" if you're behind a firewall
+GIT_TRANSPORT="git"
+. configs/config-url-${GIT_TRANSPORT}
+
+# Software versions.
+. configs/config-${XEN_RELEASE}
+
+# Tests
+## All tests: busybox-pv busybox-hvm
+## ENABLED_TESTS is the list of test run by raise test
+ENABLED_TESTS="busybox-pv busybox-hvm"
-- 
2.1.4


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

[PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap]

Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.

And point the default libvirt to point to the libvirt 1.3.3
maintenance branch, rather than xen-tested-master.

Also update OVMF revision for 4.6 to a version that builds with modern
gccs.

Singed-off-by: George Dunlap <george.dunlap@citrix.com>
---
CC: Stefano Stabellini <sstabellini@kernel.org>
---
 configs/config-4.5     | 6 +++---
 configs/config-4.6     | 8 ++++----
 configs/config-master  | 3 +++
 configs/config-url-git | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/configs/config-4.5 b/configs/config-4.5
index 4163b68..8db9a9d 100644
--- a/configs/config-4.5
+++ b/configs/config-4.5
@@ -1,8 +1,8 @@
 XEN_REVISION="origin/stable-4.5"
-QEMU_REVISION="master"
-QEMU_TRADITIONAL_REVISION="master"
+QEMU_REVISION="origin/stable-4.5"
+QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
 SEABIOS_REVISION="rel-1.7.5"
 GRUB_REVISION="master"
-LIBVIRT_REVISION="origin/xen-tested-master"
+LIBVIRT_REVISION="origin/v1.3.3-maint"
 OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
 LINUX_REVISION="master"
diff --git a/configs/config-4.6 b/configs/config-4.6
index e8b2a09..b003a30 100644
--- a/configs/config-4.6
+++ b/configs/config-4.6
@@ -1,8 +1,8 @@
 XEN_REVISION="origin/stable-4.6"
-QEMU_REVISION="master"
-QEMU_TRADITIONAL_REVISION="master"
+QEMU_REVISION="origin/stable-4.6"
+QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
 SEABIOS_REVISION="rel-1.8.2"
 GRUB_REVISION="master"
-LIBVIRT_REVISION="origin/xen-tested-master"
-OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
+LIBVIRT_REVISION="origin/v1.3.3-maint"
+OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
 LINUX_REVISION="master"
diff --git a/configs/config-master b/configs/config-master
index bd26ce3..fce7436 100644
--- a/configs/config-master
+++ b/configs/config-master
@@ -6,3 +6,6 @@ GRUB_REVISION="master"
 LIBVIRT_REVISION="origin/xen-tested-master"
 OVMF_REVISION="origin/xen-tested-master"
 LINUX_REVISION="master"
+
+# oss-tested branch
+LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
diff --git a/configs/config-url-git b/configs/config-url-git
index 79813c4..614f522 100644
--- a/configs/config-url-git
+++ b/configs/config-url-git
@@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
 QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
 SEABIOS_URL="git://xenbits.xen.org/seabios.git"
 GRUB_URL="git://git.savannah.gnu.org/grub.git"
-LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
+LIBVIRT_URL="git://libvirt.org/libvirt.git"
 OVMF_URL="git://xenbits.xen.org/ovmf.git"
 LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-- 
2.1.4


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

[PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[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 <george.dunlap@citrix.com>
---
CC: Stefano Stabellini <sstabellini@kernel.org>
---
 components/qemu             | 21 +++++++++++++--------
 components/qemu_traditional |  2 +-
 configs/config-4.7          |  8 ++++++++
 defconfig                   |  2 +-
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/components/qemu b/components/qemu
index e0d92a5..8624b50 100644
--- a/components/qemu
+++ b/components/qemu
@@ -23,15 +23,20 @@ function qemu_build() {
     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 \
+
+    ./configure --enable-xen --target-list=i386-softmmu \
+		--prefix=$PREFIX \
+		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
+		-DXC_WANT_COMPAT_GNTTAB_API=1 \
+		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
+                -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
+		--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
-- 
2.1.4


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

Re: [PATCH raisin 1/4] components/xen: Actually disable rombios

[Stefano Stabellini]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1872 bytes --]

On Mon, 13 Jun 2016, George Dunlap wrote:
> Commit 5fe3855 meant to disable rombios, but didn't.  This causes the following
> build failure:
> 
> gcc   -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing
> -std=gnu99 -Wall -Wstrict-prototypes -Wdeclaration-after-statement
> -Wno-unused-but-set-variable -Wno-unused-local-typedefs
> -D__XEN_TOOLS__ -MMD -MF .rombios.o.d -D_LARGEFILE_SOURCE
> -D_LARGEFILE64_SOURCE -mno-tls-direct-seg-refs  -DNDEBUG -Werror
> -fno-stack-protector -fno-exceptions -fno-builtin -msoft-float
> -I/usr/local/src/xenboil/raisin/xen-dir-remote/tools/firmware/hvmloader/../../../tools/include
> -U__XEN_TOOLS__
> -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
> -DENABLE_OVMF -DENABLE_ROMBIOS -DENABLE_SEABIOS  -c -o rombios.o rombios.c
> rombios.c: In function ‘rombios_load_roms’:
> rombios.c:103:39: error: ‘etherboot’ undeclared (first use in this function)
>                                        etherboot);
> 
> Disable rombios instead.
> 
> Reported-by: Holger Schramm <lists@schramm.by>
> Signed-off-by: George Dunlap <george.dunlap@citrix.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  components/xen | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/components/xen b/components/xen
> index 894d119..ea290aa 100644
> --- a/components/xen
> +++ b/components/xen
> @@ -45,7 +45,7 @@ function xen_build() {
>      export ETHERBOOT_NICS=""
>      ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386 \
>          --disable-stubdom --disable-qemu-traditional \
> -        --enable-rombios $seabios_opt $ovmf_opt
> +        --disable-rombios $seabios_opt $ovmf_opt
>      $RAISIN_MAKE
>      $RAISIN_MAKE install DESTDIR="$INST_DIR"
>      unset ETHERBOOT_NICS
> -- 
> 2.1.4
> 

[-- Attachment #2: Type: text/plain, Size: 126 bytes --]

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

Re: [PATCH raisin 2/4] config: Separate config urls into a separate file

[Stefano Stabellini]

On Mon, 13 Jun 2016, George Dunlap wrote:
> So that we're not duplicating information.
> 
> Signed-off-by: George Dunlap <george.dunlap@citrix.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


>  configs/config-4.5      | 39 ---------------------------------------
>  configs/config-4.6      | 39 ---------------------------------------
>  configs/config-master   | 38 --------------------------------------
>  configs/config-url-git  |  8 ++++++++
>  configs/config-url-http |  7 +++++++
>  defconfig               | 35 ++++++++++++++++++++++++++++++++++-
>  6 files changed, 49 insertions(+), 117 deletions(-)
> 
> diff --git a/configs/config-4.5 b/configs/config-4.5
> index e3b92d5..4163b68 100644
> --- a/configs/config-4.5
> +++ b/configs/config-4.5
> @@ -1,37 +1,3 @@
> -# Config variables for raisin
> -# Setup a Xen 4.5 based system
> -
> -# Components
> -## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
> -## Core xen functionality: xen
> -## Remove a component from the list below, if you want to disable it
> -## You can manually overwrite this list using the COMPONENTS
> -## environmental variable.
> -ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
> -
> -# Build config
> -## Make command to run
> -MAKE="make -j2"
> -## Installation prefix (configure --prefix)
> -PREFIX="/usr"
> -## Install everything under DESTDIR
> -## If you want to install under / run raise.sh -i
> -DESTDIR=dist
> -
> -# Git urls. Use the http urls if you are behind a firewall.
> -#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
> -#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
> -#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
> -XEN_URL="git://xenbits.xen.org/xen.git"
> -QEMU_URL="git://xenbits.xen.org/qemu-upstream-4.5-testing.git"
> -QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-4.5-testing.git"
> -SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> -GRUB_URL="git://git.savannah.gnu.org/grub.git"
> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> -OVMF_URL="git://xenbits.xen.org/ovmf.git"
> -LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
> -
> -# Software versions.
>  XEN_REVISION="origin/stable-4.5"
>  QEMU_REVISION="master"
>  QEMU_TRADITIONAL_REVISION="master"
> @@ -40,8 +6,3 @@ GRUB_REVISION="master"
>  LIBVIRT_REVISION="origin/xen-tested-master"
>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>  LINUX_REVISION="master"
> -
> -# Tests
> -## All tests: busybox-pv busybox-hvm
> -## ENABLED_TESTS is the list of test run by raise test
> -ENABLED_TESTS="busybox-pv busybox-hvm"
> diff --git a/configs/config-4.6 b/configs/config-4.6
> index ebd45e7..e8b2a09 100644
> --- a/configs/config-4.6
> +++ b/configs/config-4.6
> @@ -1,37 +1,3 @@
> -# Config variables for raisin
> -# Setup a Xen 4.6 based system
> -
> -# Components
> -## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
> -## Core xen functionality: xen
> -## Remove a component from the list below, if you want to disable it
> -## You can manually overwrite this list using the COMPONENTS
> -## environmental variable.
> -ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
> -
> -# Build config
> -## Make command to run
> -MAKE="make -j2"
> -## Installation prefix (configure --prefix)
> -PREFIX="/usr"
> -## Install everything under DESTDIR
> -## If you want to install under / run raise.sh -i
> -DESTDIR=dist
> -
> -# Git urls. Use the http urls if you are behind a firewall.
> -#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
> -#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
> -#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
> -XEN_URL="git://xenbits.xen.org/xen.git"
> -QEMU_URL="git://xenbits.xen.org/qemu-upstream-4.6-testing.git"
> -QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-4.6-testing.git"
> -SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> -GRUB_URL="git://git.savannah.gnu.org/grub.git"
> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> -OVMF_URL="git://xenbits.xen.org/ovmf.git"
> -LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
> -
> -# Software versions.
>  XEN_REVISION="origin/stable-4.6"
>  QEMU_REVISION="master"
>  QEMU_TRADITIONAL_REVISION="master"
> @@ -40,8 +6,3 @@ GRUB_REVISION="master"
>  LIBVIRT_REVISION="origin/xen-tested-master"
>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>  LINUX_REVISION="master"
> -
> -# Tests
> -## All tests: busybox-pv busybox-hvm
> -## ENABLED_TESTS is the list of test run by raise test
> -ENABLED_TESTS="busybox-pv busybox-hvm"
> diff --git a/configs/config-master b/configs/config-master
> index b218708..bd26ce3 100644
> --- a/configs/config-master
> +++ b/configs/config-master
> @@ -1,36 +1,3 @@
> -# Config variables for raisin
> -
> -# Components
> -## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
> -## Core xen functionality: xen
> -## Remove a component from the list below, if you want to disable it
> -## You can manually overwrite this list using the COMPONENTS
> -## environmental variable.
> -ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
> -
> -# Build config
> -## Make command to run
> -MAKE="make -j2"
> -## Installation prefix (configure --prefix)
> -PREFIX="/usr"
> -## Install everything under DESTDIR
> -## If you want to install under / run raise.sh -i
> -DESTDIR=dist
> -
> -# Git urls. Use the http urls if you are behind a firewall.
> -#XEN_URL="http://xenbits.xen.org/git-http/xen.git"
> -#GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
> -#LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
> -XEN_URL="git://xenbits.xen.org/xen.git"
> -QEMU_URL="git://xenbits.xen.org/qemu-upstream-unstable.git"
> -QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-unstable.git"
> -SEABIOS_URL="git://xenbits.xen.org/osstest/seabios.git"
> -GRUB_URL="git://git.savannah.gnu.org/grub.git"
> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> -OVMF_URL="git://xenbits.xen.org/osstest/ovmf.git"
> -LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
> -
> -# Software versions.
>  XEN_REVISION="master"
>  QEMU_REVISION="master"
>  QEMU_TRADITIONAL_REVISION="master"
> @@ -39,8 +6,3 @@ GRUB_REVISION="master"
>  LIBVIRT_REVISION="origin/xen-tested-master"
>  OVMF_REVISION="origin/xen-tested-master"
>  LINUX_REVISION="master"
> -
> -# Tests
> -## All tests: busybox-pv busybox-hvm
> -## ENABLED_TESTS is the list of test run by raise test
> -ENABLED_TESTS="busybox-pv busybox-hvm"
> diff --git a/configs/config-url-git b/configs/config-url-git
> new file mode 100644
> index 0000000..79813c4
> --- /dev/null
> +++ b/configs/config-url-git
> @@ -0,0 +1,8 @@
> +XEN_URL="git://xenbits.xen.org/xen.git"
> +QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
> +QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
> +SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> +GRUB_URL="git://git.savannah.gnu.org/grub.git"
> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> +OVMF_URL="git://xenbits.xen.org/ovmf.git"
> +LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
> diff --git a/configs/config-url-http b/configs/config-url-http
> new file mode 100644
> index 0000000..0ea8484
> --- /dev/null
> +++ b/configs/config-url-http
> @@ -0,0 +1,7 @@
> +XEN_URL="http://xenbits.xen.org/git-http/xen.git"
> +QEMU_URL="http://xenbits.xen.org/git-http/qemu-xen.git"
> +QEMU_TRADITIONAL_URL="http://xenbits.xen.org/git-http/qemu-xen-traditional.git"
> +SEABIOS_URL="http://xenbits.xen.org/git-http/seabios.git"
> +GRUB_URL="http://git.savannah.gnu.org/r/grub.git"
> +LIBVIRT_URL="https://gitorious.org/libvirt/libvirt.git"
> +OVMF_URL="http://xenbits.xen.org/git-http/ovmf.git"
> diff --git a/defconfig b/defconfig
> deleted file mode 120000
> index 7ba643e..0000000
> --- a/defconfig
> +++ /dev/null
> @@ -1 +0,0 @@
> -configs/config-4.6
> \ No newline at end of file
> diff --git a/defconfig b/defconfig
> new file mode 100644
> index 0000000..8e79a43
> --- /dev/null
> +++ b/defconfig
> @@ -0,0 +1,34 @@
> +# Config variables for raisin
> +# Setup a Xen based system.
> +
> +# Available options: 4.5, 4.6, master (for development branch)
> +XEN_RELEASE="4.6"
> +
> +# Components
> +## All components: seabios ovmf xen qemu qemu_traditional grub libvirt linux
> +## Core xen functionality: xen
> +## Remove a component from the list below, if you want to disable it
> +## You can manually overwrite this list using the COMPONENTS
> +## environmental variable.
> +ENABLED_COMPONENTS="seabios ovmf xen qemu qemu_traditional grub libvirt"
> +
> +# Build config
> +## Make command to run
> +MAKE="make -j2"
> +## Installation prefix (configure --prefix)
> +PREFIX="/usr"
> +## Install everything under DESTDIR
> +## If you want to install under / run raise.sh -i
> +DESTDIR=dist
> +
> +# Git transport.  Use "http" if you're behind a firewall
> +GIT_TRANSPORT="git"
> +. configs/config-url-${GIT_TRANSPORT}
> +
> +# Software versions.
> +. configs/config-${XEN_RELEASE}
> +
> +# Tests
> +## All tests: busybox-pv busybox-hvm
> +## ENABLED_TESTS is the list of test run by raise test
> +ENABLED_TESTS="busybox-pv busybox-hvm"
> -- 
> 2.1.4
> 

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[Stefano Stabellini]

On Mon, 13 Jun 2016, George Dunlap wrote:
> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
> 
> And point the default libvirt to point to the libvirt 1.3.3
> maintenance branch, rather than xen-tested-master.
> 
> Also update OVMF revision for 4.6 to a version that builds with modern
> gccs.
> 
> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  configs/config-4.5     | 6 +++---
>  configs/config-4.6     | 8 ++++----
>  configs/config-master  | 3 +++
>  configs/config-url-git | 2 +-
>  4 files changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/configs/config-4.5 b/configs/config-4.5
> index 4163b68..8db9a9d 100644
> --- a/configs/config-4.5
> +++ b/configs/config-4.5
> @@ -1,8 +1,8 @@
>  XEN_REVISION="origin/stable-4.5"
> -QEMU_REVISION="master"
> -QEMU_TRADITIONAL_REVISION="master"
> +QEMU_REVISION="origin/stable-4.5"
> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>  SEABIOS_REVISION="rel-1.7.5"
>  GRUB_REVISION="master"
> -LIBVIRT_REVISION="origin/xen-tested-master"
> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>  LINUX_REVISION="master"
> diff --git a/configs/config-4.6 b/configs/config-4.6
> index e8b2a09..b003a30 100644
> --- a/configs/config-4.6
> +++ b/configs/config-4.6
> @@ -1,8 +1,8 @@
>  XEN_REVISION="origin/stable-4.6"
> -QEMU_REVISION="master"
> -QEMU_TRADITIONAL_REVISION="master"
> +QEMU_REVISION="origin/stable-4.6"
> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>  SEABIOS_REVISION="rel-1.8.2"
>  GRUB_REVISION="master"
> -LIBVIRT_REVISION="origin/xen-tested-master"
> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>  LINUX_REVISION="master"
> diff --git a/configs/config-master b/configs/config-master
> index bd26ce3..fce7436 100644
> --- a/configs/config-master
> +++ b/configs/config-master
> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>  LIBVIRT_REVISION="origin/xen-tested-master"
>  OVMF_REVISION="origin/xen-tested-master"
>  LINUX_REVISION="master"
> +
> +# oss-tested branch
> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"

Why keep this around? I would remove it.



> diff --git a/configs/config-url-git b/configs/config-url-git
> index 79813c4..614f522 100644
> --- a/configs/config-url-git
> +++ b/configs/config-url-git
> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
>  OVMF_URL="git://xenbits.xen.org/ovmf.git"
>  LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
> -- 
> 2.1.4
> 

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[Stefano Stabellini]

On Mon, 13 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 <george.dunlap@citrix.com>
> ---
> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  components/qemu             | 21 +++++++++++++--------
>  components/qemu_traditional |  2 +-
>  configs/config-4.7          |  8 ++++++++
>  defconfig                   |  2 +-
>  4 files changed, 23 insertions(+), 10 deletions(-)
> 
> diff --git a/components/qemu b/components/qemu
> index e0d92a5..8624b50 100644
> --- a/components/qemu
> +++ b/components/qemu
> @@ -23,15 +23,20 @@ function qemu_build() {
>      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 \
> +
> +    ./configure --enable-xen --target-list=i386-softmmu \
> +		--prefix=$PREFIX \
> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> +                -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
> +		--bindir=$PREFIX/lib/xen/bin \
> +		--datadir=$PREFIX/share/qemu-xen \
> +		--disable-kvm \
> +		--disable-docs \
> +		--disable-guest-agent

This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
make this change, will raisin still be able to buil an older qemu
against an older xen?



>      $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

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap]

On 14/06/16 10:40, Stefano Stabellini wrote:
> On Mon, 13 Jun 2016, George Dunlap wrote:
>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
>>
>> And point the default libvirt to point to the libvirt 1.3.3
>> maintenance branch, rather than xen-tested-master.
>>
>> Also update OVMF revision for 4.6 to a version that builds with modern
>> gccs.
>>
>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
>>
>> CC: Stefano Stabellini <sstabellini@kernel.org>
>> ---
>>  configs/config-4.5     | 6 +++---
>>  configs/config-4.6     | 8 ++++----
>>  configs/config-master  | 3 +++
>>  configs/config-url-git | 2 +-
>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>
>> diff --git a/configs/config-4.5 b/configs/config-4.5
>> index 4163b68..8db9a9d 100644
>> --- a/configs/config-4.5
>> +++ b/configs/config-4.5
>> @@ -1,8 +1,8 @@
>>  XEN_REVISION="origin/stable-4.5"
>> -QEMU_REVISION="master"
>> -QEMU_TRADITIONAL_REVISION="master"
>> +QEMU_REVISION="origin/stable-4.5"
>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>>  SEABIOS_REVISION="rel-1.7.5"
>>  GRUB_REVISION="master"
>> -LIBVIRT_REVISION="origin/xen-tested-master"
>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>  LINUX_REVISION="master"
>> diff --git a/configs/config-4.6 b/configs/config-4.6
>> index e8b2a09..b003a30 100644
>> --- a/configs/config-4.6
>> +++ b/configs/config-4.6
>> @@ -1,8 +1,8 @@
>>  XEN_REVISION="origin/stable-4.6"
>> -QEMU_REVISION="master"
>> -QEMU_TRADITIONAL_REVISION="master"
>> +QEMU_REVISION="origin/stable-4.6"
>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>>  SEABIOS_REVISION="rel-1.8.2"
>>  GRUB_REVISION="master"
>> -LIBVIRT_REVISION="origin/xen-tested-master"
>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>>  LINUX_REVISION="master"
>> diff --git a/configs/config-master b/configs/config-master
>> index bd26ce3..fce7436 100644
>> --- a/configs/config-master
>> +++ b/configs/config-master
>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>>  LIBVIRT_REVISION="origin/xen-tested-master"
>>  OVMF_REVISION="origin/xen-tested-master"
>>  LINUX_REVISION="master"
>> +
>> +# oss-tested branch
>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> 
> Why keep this around? I would remove it.

Because...

>> diff --git a/configs/config-url-git b/configs/config-url-git
>> index 79813c4..614f522 100644
>> --- a/configs/config-url-git
>> +++ b/configs/config-url-git
>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"

...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
so that the stable releases can be pointed to v1.3.3-maint instead. The
xen.org repo doesn't contain the v1.3.3-maint branch, and the
libvirt.org repo doesn't contain the 'xen-tested-master' branch.

I admit this is a bit ugly, *almost* separating things entirely but then
not. But I don't see another easy way of having both the 1.3.3
maintenance branch and the oss-tested branch. (Unless we started having
osstest test the maintenance branch as well.)

 -George

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[Stefano Stabellini]

On Tue, 14 Jun 2016, George Dunlap wrote:
> On 14/06/16 10:40, Stefano Stabellini wrote:
> > On Mon, 13 Jun 2016, George Dunlap wrote:
> >> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
> >>
> >> And point the default libvirt to point to the libvirt 1.3.3
> >> maintenance branch, rather than xen-tested-master.
> >>
> >> Also update OVMF revision for 4.6 to a version that builds with modern
> >> gccs.
> >>
> >> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
> >>
> >> CC: Stefano Stabellini <sstabellini@kernel.org>
> >> ---
> >>  configs/config-4.5     | 6 +++---
> >>  configs/config-4.6     | 8 ++++----
> >>  configs/config-master  | 3 +++
> >>  configs/config-url-git | 2 +-
> >>  4 files changed, 11 insertions(+), 8 deletions(-)
> >>
> >> diff --git a/configs/config-4.5 b/configs/config-4.5
> >> index 4163b68..8db9a9d 100644
> >> --- a/configs/config-4.5
> >> +++ b/configs/config-4.5
> >> @@ -1,8 +1,8 @@
> >>  XEN_REVISION="origin/stable-4.5"
> >> -QEMU_REVISION="master"
> >> -QEMU_TRADITIONAL_REVISION="master"
> >> +QEMU_REVISION="origin/stable-4.5"
> >> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
> >>  SEABIOS_REVISION="rel-1.7.5"
> >>  GRUB_REVISION="master"
> >> -LIBVIRT_REVISION="origin/xen-tested-master"
> >> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>  LINUX_REVISION="master"
> >> diff --git a/configs/config-4.6 b/configs/config-4.6
> >> index e8b2a09..b003a30 100644
> >> --- a/configs/config-4.6
> >> +++ b/configs/config-4.6
> >> @@ -1,8 +1,8 @@
> >>  XEN_REVISION="origin/stable-4.6"
> >> -QEMU_REVISION="master"
> >> -QEMU_TRADITIONAL_REVISION="master"
> >> +QEMU_REVISION="origin/stable-4.6"
> >> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
> >>  SEABIOS_REVISION="rel-1.8.2"
> >>  GRUB_REVISION="master"
> >> -LIBVIRT_REVISION="origin/xen-tested-master"
> >> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
> >>  LINUX_REVISION="master"
> >> diff --git a/configs/config-master b/configs/config-master
> >> index bd26ce3..fce7436 100644
> >> --- a/configs/config-master
> >> +++ b/configs/config-master
> >> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
> >>  LIBVIRT_REVISION="origin/xen-tested-master"
> >>  OVMF_REVISION="origin/xen-tested-master"
> >>  LINUX_REVISION="master"
> >> +
> >> +# oss-tested branch
> >> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> > 
> > Why keep this around? I would remove it.
> 
> Because...
> 
> >> diff --git a/configs/config-url-git b/configs/config-url-git
> >> index 79813c4..614f522 100644
> >> --- a/configs/config-url-git
> >> +++ b/configs/config-url-git
> >> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
> >>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
> >>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> >>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
> >> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
> 
> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
> so that the stable releases can be pointed to v1.3.3-maint instead. The
> xen.org repo doesn't contain the v1.3.3-maint branch, and the
> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
> 
> I admit this is a bit ugly, *almost* separating things entirely but then
> not. But I don't see another easy way of having both the 1.3.3
> maintenance branch and the oss-tested branch. (Unless we started having
> osstest test the maintenance branch as well.)
 
I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
entirely and just stick to v1.3.3-maint everywhere. Or the other way
around.

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[George Dunlap]

On 14/06/16 10:46, Stefano Stabellini wrote:
> On Mon, 13 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 <george.dunlap@citrix.com>
>> ---
>> CC: Stefano Stabellini <sstabellini@kernel.org>
>> ---
>>  components/qemu             | 21 +++++++++++++--------
>>  components/qemu_traditional |  2 +-
>>  configs/config-4.7          |  8 ++++++++
>>  defconfig                   |  2 +-
>>  4 files changed, 23 insertions(+), 10 deletions(-)
>>
>> diff --git a/components/qemu b/components/qemu
>> index e0d92a5..8624b50 100644
>> --- a/components/qemu
>> +++ b/components/qemu
>> @@ -23,15 +23,20 @@ function qemu_build() {
>>      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 \
>> +
>> +    ./configure --enable-xen --target-list=i386-softmmu \
>> +		--prefix=$PREFIX \
>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
>> +                -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
>> +		--bindir=$PREFIX/lib/xen/bin \
>> +		--datadir=$PREFIX/share/qemu-xen \
>> +		--disable-kvm \
>> +		--disable-docs \
>> +		--disable-guest-agent
> 
> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
> make this change, will raisin still be able to buil an older qemu
> against an older xen?

I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
fine.  The #define is just ignored, since neither Xen nor qemu in the
4.5 and 4.6 branches know anything about it.

If part of our goal is to be a repository of the canonical way to build
things, though, perhaps it would be better to have the extra flags be
conditional on the value of XEN_RELEASE.

 -George

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[Stefano Stabellini]

On Tue, 14 Jun 2016, George Dunlap wrote:
> On 14/06/16 10:46, Stefano Stabellini wrote:
> > On Mon, 13 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 <george.dunlap@citrix.com>
> >> ---
> >> CC: Stefano Stabellini <sstabellini@kernel.org>
> >> ---
> >>  components/qemu             | 21 +++++++++++++--------
> >>  components/qemu_traditional |  2 +-
> >>  configs/config-4.7          |  8 ++++++++
> >>  defconfig                   |  2 +-
> >>  4 files changed, 23 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/components/qemu b/components/qemu
> >> index e0d92a5..8624b50 100644
> >> --- a/components/qemu
> >> +++ b/components/qemu
> >> @@ -23,15 +23,20 @@ function qemu_build() {
> >>      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 \
> >> +
> >> +    ./configure --enable-xen --target-list=i386-softmmu \
> >> +		--prefix=$PREFIX \
> >> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
> >> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> >> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> >> +                -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
> >> +		--bindir=$PREFIX/lib/xen/bin \
> >> +		--datadir=$PREFIX/share/qemu-xen \
> >> +		--disable-kvm \
> >> +		--disable-docs \
> >> +		--disable-guest-agent
> > 
> > This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
> > make this change, will raisin still be able to buil an older qemu
> > against an older xen?
> 
> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
> fine.  The #define is just ignored, since neither Xen nor qemu in the
> 4.5 and 4.6 branches know anything about it.
> 
> If part of our goal is to be a repository of the canonical way to build
> things, though, perhaps it would be better to have the extra flags be
> conditional on the value of XEN_RELEASE.

If we are sure that it's ignored than it might be benign. Maybe we
should just add an in-code comment to explain why we added it though.

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap]

On 14/06/16 11:01, Stefano Stabellini wrote:
> On Tue, 14 Jun 2016, George Dunlap wrote:
>> On 14/06/16 10:40, Stefano Stabellini wrote:
>>> On Mon, 13 Jun 2016, George Dunlap wrote:
>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
>>>>
>>>> And point the default libvirt to point to the libvirt 1.3.3
>>>> maintenance branch, rather than xen-tested-master.
>>>>
>>>> Also update OVMF revision for 4.6 to a version that builds with modern
>>>> gccs.
>>>>
>>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
>>>>
>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>> ---
>>>>  configs/config-4.5     | 6 +++---
>>>>  configs/config-4.6     | 8 ++++----
>>>>  configs/config-master  | 3 +++
>>>>  configs/config-url-git | 2 +-
>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>>>
>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
>>>> index 4163b68..8db9a9d 100644
>>>> --- a/configs/config-4.5
>>>> +++ b/configs/config-4.5
>>>> @@ -1,8 +1,8 @@
>>>>  XEN_REVISION="origin/stable-4.5"
>>>> -QEMU_REVISION="master"
>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>> +QEMU_REVISION="origin/stable-4.5"
>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>>>>  SEABIOS_REVISION="rel-1.7.5"
>>>>  GRUB_REVISION="master"
>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>  LINUX_REVISION="master"
>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
>>>> index e8b2a09..b003a30 100644
>>>> --- a/configs/config-4.6
>>>> +++ b/configs/config-4.6
>>>> @@ -1,8 +1,8 @@
>>>>  XEN_REVISION="origin/stable-4.6"
>>>> -QEMU_REVISION="master"
>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>> +QEMU_REVISION="origin/stable-4.6"
>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>>>>  SEABIOS_REVISION="rel-1.8.2"
>>>>  GRUB_REVISION="master"
>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>>>>  LINUX_REVISION="master"
>>>> diff --git a/configs/config-master b/configs/config-master
>>>> index bd26ce3..fce7436 100644
>>>> --- a/configs/config-master
>>>> +++ b/configs/config-master
>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
>>>>  OVMF_REVISION="origin/xen-tested-master"
>>>>  LINUX_REVISION="master"
>>>> +
>>>> +# oss-tested branch
>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>
>>> Why keep this around? I would remove it.
>>
>> Because...
>>
>>>> diff --git a/configs/config-url-git b/configs/config-url-git
>>>> index 79813c4..614f522 100644
>>>> --- a/configs/config-url-git
>>>> +++ b/configs/config-url-git
>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
>>
>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
>> so that the stable releases can be pointed to v1.3.3-maint instead. The
>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
>>
>> I admit this is a bit ugly, *almost* separating things entirely but then
>> not. But I don't see another easy way of having both the 1.3.3
>> maintenance branch and the oss-tested branch. (Unless we started having
>> osstest test the maintenance branch as well.)
>  
> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
> entirely and just stick to v1.3.3-maint everywhere. Or the other way
> around.

Well I assume that people building one of the releases want something
relatively stable and supported, so xen-tested-master is obviously
unsuitable (and might not actually be capable of building against Xen
versions older than a certain point due to the fact that libxl cannot be
both forward- and backward-compatible).  And I also assume that people
building with XEN_RELEASE="master" want the bleeding edge of everything
so that they can test new features (or indeed, so that they can write
new features).  So I think we actually do want both -- a maintenance
branch for releases, and xen-tested-master for developers and
bleeding-edge users.

 -George

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[George Dunlap]

On 14/06/16 11:08, Stefano Stabellini wrote:
> On Tue, 14 Jun 2016, George Dunlap wrote:
>> On 14/06/16 10:46, Stefano Stabellini wrote:
>>> On Mon, 13 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 <george.dunlap@citrix.com>
>>>> ---
>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>> ---
>>>>  components/qemu             | 21 +++++++++++++--------
>>>>  components/qemu_traditional |  2 +-
>>>>  configs/config-4.7          |  8 ++++++++
>>>>  defconfig                   |  2 +-
>>>>  4 files changed, 23 insertions(+), 10 deletions(-)
>>>>
>>>> diff --git a/components/qemu b/components/qemu
>>>> index e0d92a5..8624b50 100644
>>>> --- a/components/qemu
>>>> +++ b/components/qemu
>>>> @@ -23,15 +23,20 @@ function qemu_build() {
>>>>      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 \
>>>> +
>>>> +    ./configure --enable-xen --target-list=i386-softmmu \
>>>> +		--prefix=$PREFIX \
>>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
>>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
>>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
>>>> +                -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
>>>> +		--bindir=$PREFIX/lib/xen/bin \
>>>> +		--datadir=$PREFIX/share/qemu-xen \
>>>> +		--disable-kvm \
>>>> +		--disable-docs \
>>>> +		--disable-guest-agent
>>>
>>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
>>> make this change, will raisin still be able to buil an older qemu
>>> against an older xen?
>>
>> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
>> fine.  The #define is just ignored, since neither Xen nor qemu in the
>> 4.5 and 4.6 branches know anything about it.
>>
>> If part of our goal is to be a repository of the canonical way to build
>> things, though, perhaps it would be better to have the extra flags be
>> conditional on the value of XEN_RELEASE.
> 
> If we are sure that it's ignored than it might be benign. Maybe we
> should just add an in-code comment to explain why we added it though.

Well really, I think that the detection should be put into the qemu
configure scripts -- i.e., it should detect that there's the new API and
add the appropriate #defines itself.  But that's the sort of change I
don't think there will be a lot of enthusiasm for. :-)

I'll add a comment.

 -George



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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[Stefano Stabellini]

On Tue, 14 Jun 2016, George Dunlap wrote:
> On 14/06/16 11:08, Stefano Stabellini wrote:
> > On Tue, 14 Jun 2016, George Dunlap wrote:
> >> On 14/06/16 10:46, Stefano Stabellini wrote:
> >>> On Mon, 13 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 <george.dunlap@citrix.com>
> >>>> ---
> >>>> CC: Stefano Stabellini <sstabellini@kernel.org>
> >>>> ---
> >>>>  components/qemu             | 21 +++++++++++++--------
> >>>>  components/qemu_traditional |  2 +-
> >>>>  configs/config-4.7          |  8 ++++++++
> >>>>  defconfig                   |  2 +-
> >>>>  4 files changed, 23 insertions(+), 10 deletions(-)
> >>>>
> >>>> diff --git a/components/qemu b/components/qemu
> >>>> index e0d92a5..8624b50 100644
> >>>> --- a/components/qemu
> >>>> +++ b/components/qemu
> >>>> @@ -23,15 +23,20 @@ function qemu_build() {
> >>>>      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 \
> >>>> +
> >>>> +    ./configure --enable-xen --target-list=i386-softmmu \
> >>>> +		--prefix=$PREFIX \
> >>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
> >>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> >>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> >>>> +                -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
> >>>> +		--bindir=$PREFIX/lib/xen/bin \
> >>>> +		--datadir=$PREFIX/share/qemu-xen \
> >>>> +		--disable-kvm \
> >>>> +		--disable-docs \
> >>>> +		--disable-guest-agent
> >>>
> >>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
> >>> make this change, will raisin still be able to buil an older qemu
> >>> against an older xen?
> >>
> >> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
> >> fine.  The #define is just ignored, since neither Xen nor qemu in the
> >> 4.5 and 4.6 branches know anything about it.
> >>
> >> If part of our goal is to be a repository of the canonical way to build
> >> things, though, perhaps it would be better to have the extra flags be
> >> conditional on the value of XEN_RELEASE.
> > 
> > If we are sure that it's ignored than it might be benign. Maybe we
> > should just add an in-code comment to explain why we added it though.
> 
> Well really, I think that the detection should be put into the qemu
> configure scripts -- i.e., it should detect that there's the new API and
> add the appropriate #defines itself.  But that's the sort of change I
> don't think there will be a lot of enthusiasm for. :-)

Actually there is already code in QEMU configure script for the
detection. In fact I was wondering if explicitly passing XC_WANT_* is
actually necessary. I don't think it is from QEMU POV.


> I'll add a comment.


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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[George Dunlap]

On 14/06/16 11:31, Stefano Stabellini wrote:
> On Tue, 14 Jun 2016, George Dunlap wrote:
>> On 14/06/16 11:08, Stefano Stabellini wrote:
>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>> On 14/06/16 10:46, Stefano Stabellini wrote:
>>>>> On Mon, 13 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 <george.dunlap@citrix.com>
>>>>>> ---
>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>>>> ---
>>>>>>  components/qemu             | 21 +++++++++++++--------
>>>>>>  components/qemu_traditional |  2 +-
>>>>>>  configs/config-4.7          |  8 ++++++++
>>>>>>  defconfig                   |  2 +-
>>>>>>  4 files changed, 23 insertions(+), 10 deletions(-)
>>>>>>
>>>>>> diff --git a/components/qemu b/components/qemu
>>>>>> index e0d92a5..8624b50 100644
>>>>>> --- a/components/qemu
>>>>>> +++ b/components/qemu
>>>>>> @@ -23,15 +23,20 @@ function qemu_build() {
>>>>>>      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 \
>>>>>> +
>>>>>> +    ./configure --enable-xen --target-list=i386-softmmu \
>>>>>> +		--prefix=$PREFIX \
>>>>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
>>>>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
>>>>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
>>>>>> +                -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
>>>>>> +		--bindir=$PREFIX/lib/xen/bin \
>>>>>> +		--datadir=$PREFIX/share/qemu-xen \
>>>>>> +		--disable-kvm \
>>>>>> +		--disable-docs \
>>>>>> +		--disable-guest-agent
>>>>>
>>>>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
>>>>> make this change, will raisin still be able to buil an older qemu
>>>>> against an older xen?
>>>>
>>>> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
>>>> fine.  The #define is just ignored, since neither Xen nor qemu in the
>>>> 4.5 and 4.6 branches know anything about it.
>>>>
>>>> If part of our goal is to be a repository of the canonical way to build
>>>> things, though, perhaps it would be better to have the extra flags be
>>>> conditional on the value of XEN_RELEASE.
>>>
>>> If we are sure that it's ignored than it might be benign. Maybe we
>>> should just add an in-code comment to explain why we added it though.
>>
>> Well really, I think that the detection should be put into the qemu
>> configure scripts -- i.e., it should detect that there's the new API and
>> add the appropriate #defines itself.  But that's the sort of change I
>> don't think there will be a lot of enthusiasm for. :-)
> 
> Actually there is already code in QEMU configure script for the
> detection. In fact I was wondering if explicitly passing XC_WANT_* is
> actually necessary. I don't think it is from QEMU POV.

That code might be in qemu-upstream, but it's not in the qemu-xen trees;
if you revert this bit of the patch and try to build with raisin it will
fail.  That's why I even bothered to add these in in the first place;
and why IanC added these runes to tools/Makefile.

Anthony, can you comment more authoritatively here on what's going on?
Would it be possible for 4.7.1 to backport the configure auto-detection
stuff?

 -George

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[Anthony PERARD]

On Tue, Jun 14, 2016 at 11:34:43AM +0100, George Dunlap wrote:
> On 14/06/16 11:31, Stefano Stabellini wrote:
> > On Tue, 14 Jun 2016, George Dunlap wrote:
> >> On 14/06/16 11:08, Stefano Stabellini wrote:
> >>> On Tue, 14 Jun 2016, George Dunlap wrote:
> >>>> On 14/06/16 10:46, Stefano Stabellini wrote:
> >>>>> On Mon, 13 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 <george.dunlap@citrix.com>
> >>>>>> ---
> >>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
> >>>>>> ---
> >>>>>>  components/qemu             | 21 +++++++++++++--------
> >>>>>>  components/qemu_traditional |  2 +-
> >>>>>>  configs/config-4.7          |  8 ++++++++
> >>>>>>  defconfig                   |  2 +-
> >>>>>>  4 files changed, 23 insertions(+), 10 deletions(-)
> >>>>>>
> >>>>>> diff --git a/components/qemu b/components/qemu
> >>>>>> index e0d92a5..8624b50 100644
> >>>>>> --- a/components/qemu
> >>>>>> +++ b/components/qemu
> >>>>>> @@ -23,15 +23,20 @@ function qemu_build() {
> >>>>>>      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 \
> >>>>>> +
> >>>>>> +    ./configure --enable-xen --target-list=i386-softmmu \
> >>>>>> +		--prefix=$PREFIX \
> >>>>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
> >>>>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> >>>>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> >>>>>> +                -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
> >>>>>> +		--bindir=$PREFIX/lib/xen/bin \
> >>>>>> +		--datadir=$PREFIX/share/qemu-xen \
> >>>>>> +		--disable-kvm \
> >>>>>> +		--disable-docs \
> >>>>>> +		--disable-guest-agent
> >>>>>
> >>>>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
> >>>>> make this change, will raisin still be able to buil an older qemu
> >>>>> against an older xen?
> >>>>
> >>>> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
> >>>> fine.  The #define is just ignored, since neither Xen nor qemu in the
> >>>> 4.5 and 4.6 branches know anything about it.
> >>>>
> >>>> If part of our goal is to be a repository of the canonical way to build
> >>>> things, though, perhaps it would be better to have the extra flags be
> >>>> conditional on the value of XEN_RELEASE.
> >>>
> >>> If we are sure that it's ignored than it might be benign. Maybe we
> >>> should just add an in-code comment to explain why we added it though.
> >>
> >> Well really, I think that the detection should be put into the qemu
> >> configure scripts -- i.e., it should detect that there's the new API and
> >> add the appropriate #defines itself.  But that's the sort of change I
> >> don't think there will be a lot of enthusiasm for. :-)
> > 
> > Actually there is already code in QEMU configure script for the
> > detection. In fact I was wondering if explicitly passing XC_WANT_* is
> > actually necessary. I don't think it is from QEMU POV.
> 
> That code might be in qemu-upstream, but it's not in the qemu-xen trees;
> if you revert this bit of the patch and try to build with raisin it will
> fail.  That's why I even bothered to add these in in the first place;
> and why IanC added these runes to tools/Makefile.
> 
> Anthony, can you comment more authoritatively here on what's going on?

Yes, easy, xen-4.7 introduce a new API but qemu-xen-4.7 does not know
about it, so qemu-xen will fail to compile. But there are some magic
flags that are use to provide an compatible API and can qemu-xen
compile.

QEMU have been taught about the new API and will use it, without the
magic flags. QEMU will actually ignore the magic flags with a bunch of
#undef.

> Would it be possible for 4.7.1 to backport the configure auto-detection
> stuff?

I think that would be possible. But backporting the use of the new api
will probably be harder. I guess we could just have qemu-xen define the
magic flags itself instead of relying on them been given via a configure
option.


Is that answer your questions?

-- 
Anthony PERARD

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[George Dunlap]

On 14/06/16 14:53, Anthony PERARD wrote:
> On Tue, Jun 14, 2016 at 11:34:43AM +0100, George Dunlap wrote:
>> On 14/06/16 11:31, Stefano Stabellini wrote:
>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>> On 14/06/16 11:08, Stefano Stabellini wrote:
>>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>>>> On 14/06/16 10:46, Stefano Stabellini wrote:
>>>>>>> On Mon, 13 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 <george.dunlap@citrix.com>
>>>>>>>> ---
>>>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>>>>>> ---
>>>>>>>>  components/qemu             | 21 +++++++++++++--------
>>>>>>>>  components/qemu_traditional |  2 +-
>>>>>>>>  configs/config-4.7          |  8 ++++++++
>>>>>>>>  defconfig                   |  2 +-
>>>>>>>>  4 files changed, 23 insertions(+), 10 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/components/qemu b/components/qemu
>>>>>>>> index e0d92a5..8624b50 100644
>>>>>>>> --- a/components/qemu
>>>>>>>> +++ b/components/qemu
>>>>>>>> @@ -23,15 +23,20 @@ function qemu_build() {
>>>>>>>>      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 \
>>>>>>>> +
>>>>>>>> +    ./configure --enable-xen --target-list=i386-softmmu \
>>>>>>>> +		--prefix=$PREFIX \
>>>>>>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
>>>>>>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
>>>>>>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
>>>>>>>> +                -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
>>>>>>>> +		--bindir=$PREFIX/lib/xen/bin \
>>>>>>>> +		--datadir=$PREFIX/share/qemu-xen \
>>>>>>>> +		--disable-kvm \
>>>>>>>> +		--disable-docs \
>>>>>>>> +		--disable-guest-agent
>>>>>>>
>>>>>>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
>>>>>>> make this change, will raisin still be able to buil an older qemu
>>>>>>> against an older xen?
>>>>>>
>>>>>> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
>>>>>> fine.  The #define is just ignored, since neither Xen nor qemu in the
>>>>>> 4.5 and 4.6 branches know anything about it.
>>>>>>
>>>>>> If part of our goal is to be a repository of the canonical way to build
>>>>>> things, though, perhaps it would be better to have the extra flags be
>>>>>> conditional on the value of XEN_RELEASE.
>>>>>
>>>>> If we are sure that it's ignored than it might be benign. Maybe we
>>>>> should just add an in-code comment to explain why we added it though.
>>>>
>>>> Well really, I think that the detection should be put into the qemu
>>>> configure scripts -- i.e., it should detect that there's the new API and
>>>> add the appropriate #defines itself.  But that's the sort of change I
>>>> don't think there will be a lot of enthusiasm for. :-)
>>>
>>> Actually there is already code in QEMU configure script for the
>>> detection. In fact I was wondering if explicitly passing XC_WANT_* is
>>> actually necessary. I don't think it is from QEMU POV.
>>
>> That code might be in qemu-upstream, but it's not in the qemu-xen trees;
>> if you revert this bit of the patch and try to build with raisin it will
>> fail.  That's why I even bothered to add these in in the first place;
>> and why IanC added these runes to tools/Makefile.
>>
>> Anthony, can you comment more authoritatively here on what's going on?
> 
> Yes, easy, xen-4.7 introduce a new API but qemu-xen-4.7 does not know
> about it, so qemu-xen will fail to compile. But there are some magic
> flags that are use to provide an compatible API and can qemu-xen
> compile.
> 
> QEMU have been taught about the new API and will use it, without the
> magic flags. QEMU will actually ignore the magic flags with a bunch of
> #undef.

So wait, I'm confused.  Isn't qemu-xen supposed to be upstream qemu plus
a handful of patches on top?  Or has there not been a QEMU release since
the time the new API?  Why on earth are we shipping in 4.7 a qemu that
can't use the new API we define in 4.7?

>> Would it be possible for 4.7.1 to backport the configure auto-detection
>> stuff?
> 
> I think that would be possible. But backporting the use of the new api
> will probably be harder. I guess we could just have qemu-xen define the
> magic flags itself instead of relying on them been given via a configure
> option.

Well at this point it's a bit late to import support for the new API
into qemu-xen-4.7; but it would be good for 4.7.1 to have qemu-xen's
configure set the necessary flags rather than bodging them in via
"--extra-cflags" in the Xen makefile.

 -George


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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[Anthony PERARD]

On Tue, Jun 14, 2016 at 03:00:12PM +0100, George Dunlap wrote:
> On 14/06/16 14:53, Anthony PERARD wrote:
> > On Tue, Jun 14, 2016 at 11:34:43AM +0100, George Dunlap wrote:
> >> That code might be in qemu-upstream, but it's not in the qemu-xen trees;
> >> if you revert this bit of the patch and try to build with raisin it will
> >> fail.  That's why I even bothered to add these in in the first place;
> >> and why IanC added these runes to tools/Makefile.
> >>
> >> Anthony, can you comment more authoritatively here on what's going on?
> > 
> > Yes, easy, xen-4.7 introduce a new API but qemu-xen-4.7 does not know
> > about it, so qemu-xen will fail to compile. But there are some magic
> > flags that are use to provide an compatible API and can qemu-xen
> > compile.
> > 
> > QEMU have been taught about the new API and will use it, without the
> > magic flags. QEMU will actually ignore the magic flags with a bunch of
> > #undef.
> 
> So wait, I'm confused.  Isn't qemu-xen supposed to be upstream qemu plus
> a handful of patches on top?  Or has there not been a QEMU release since
> the time the new API?

The first release to include the new stuff appear to be 2.6, which have
been released a month ago. So the answer is no.

> Why on earth are we shipping in 4.7 a qemu that
> can't use the new API we define in 4.7?

Who knows...

> >> Would it be possible for 4.7.1 to backport the configure auto-detection
> >> stuff?
> > 
> > I think that would be possible. But backporting the use of the new api
> > will probably be harder. I guess we could just have qemu-xen define the
> > magic flags itself instead of relying on them been given via a configure
> > option.
> 
> Well at this point it's a bit late to import support for the new API
> into qemu-xen-4.7; but it would be good for 4.7.1 to have qemu-xen's
> configure set the necessary flags rather than bodging them in via
> "--extra-cflags" in the Xen makefile.

Yes.

-- 
Anthony PERARD

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[George Dunlap]

On 14/06/16 15:23, Anthony PERARD wrote:
> On Tue, Jun 14, 2016 at 03:00:12PM +0100, George Dunlap wrote:
>> On 14/06/16 14:53, Anthony PERARD wrote:
>>> On Tue, Jun 14, 2016 at 11:34:43AM +0100, George Dunlap wrote:
>>>> That code might be in qemu-upstream, but it's not in the qemu-xen trees;
>>>> if you revert this bit of the patch and try to build with raisin it will
>>>> fail.  That's why I even bothered to add these in in the first place;
>>>> and why IanC added these runes to tools/Makefile.
>>>>
>>>> Anthony, can you comment more authoritatively here on what's going on?
>>>
>>> Yes, easy, xen-4.7 introduce a new API but qemu-xen-4.7 does not know
>>> about it, so qemu-xen will fail to compile. But there are some magic
>>> flags that are use to provide an compatible API and can qemu-xen
>>> compile.
>>>
>>> QEMU have been taught about the new API and will use it, without the
>>> magic flags. QEMU will actually ignore the magic flags with a bunch of
>>> #undef.
>>
>> So wait, I'm confused.  Isn't qemu-xen supposed to be upstream qemu plus
>> a handful of patches on top?  Or has there not been a QEMU release since
>> the time the new API?
> 
> The first release to include the new stuff appear to be 2.6, which have
> been released a month ago. So the answer is no.

OK, but presumably you'll pull in / rebase qemu-unstable at some point
in the next few weeks and then we can take the magic runes out of
tools/Makefile.

So back to raisin: I'll make a conditional to only add this for 4.7,
with an explanation; and when it gets fixed for 4.7.1 I'll take it out.

Thanks.
 -George

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[Stefano Stabellini]

On Tue, 14 Jun 2016, George Dunlap wrote:
> On 14/06/16 11:01, Stefano Stabellini wrote:
> > On Tue, 14 Jun 2016, George Dunlap wrote:
> >> On 14/06/16 10:40, Stefano Stabellini wrote:
> >>> On Mon, 13 Jun 2016, George Dunlap wrote:
> >>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
> >>>>
> >>>> And point the default libvirt to point to the libvirt 1.3.3
> >>>> maintenance branch, rather than xen-tested-master.
> >>>>
> >>>> Also update OVMF revision for 4.6 to a version that builds with modern
> >>>> gccs.
> >>>>
> >>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
> >>>>
> >>>> CC: Stefano Stabellini <sstabellini@kernel.org>
> >>>> ---
> >>>>  configs/config-4.5     | 6 +++---
> >>>>  configs/config-4.6     | 8 ++++----
> >>>>  configs/config-master  | 3 +++
> >>>>  configs/config-url-git | 2 +-
> >>>>  4 files changed, 11 insertions(+), 8 deletions(-)
> >>>>
> >>>> diff --git a/configs/config-4.5 b/configs/config-4.5
> >>>> index 4163b68..8db9a9d 100644
> >>>> --- a/configs/config-4.5
> >>>> +++ b/configs/config-4.5
> >>>> @@ -1,8 +1,8 @@
> >>>>  XEN_REVISION="origin/stable-4.5"
> >>>> -QEMU_REVISION="master"
> >>>> -QEMU_TRADITIONAL_REVISION="master"
> >>>> +QEMU_REVISION="origin/stable-4.5"
> >>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
> >>>>  SEABIOS_REVISION="rel-1.7.5"
> >>>>  GRUB_REVISION="master"
> >>>> -LIBVIRT_REVISION="origin/xen-tested-master"
> >>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>>>  LINUX_REVISION="master"
> >>>> diff --git a/configs/config-4.6 b/configs/config-4.6
> >>>> index e8b2a09..b003a30 100644
> >>>> --- a/configs/config-4.6
> >>>> +++ b/configs/config-4.6
> >>>> @@ -1,8 +1,8 @@
> >>>>  XEN_REVISION="origin/stable-4.6"
> >>>> -QEMU_REVISION="master"
> >>>> -QEMU_TRADITIONAL_REVISION="master"
> >>>> +QEMU_REVISION="origin/stable-4.6"
> >>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
> >>>>  SEABIOS_REVISION="rel-1.8.2"
> >>>>  GRUB_REVISION="master"
> >>>> -LIBVIRT_REVISION="origin/xen-tested-master"
> >>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
> >>>>  LINUX_REVISION="master"
> >>>> diff --git a/configs/config-master b/configs/config-master
> >>>> index bd26ce3..fce7436 100644
> >>>> --- a/configs/config-master
> >>>> +++ b/configs/config-master
> >>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
> >>>>  LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>  OVMF_REVISION="origin/xen-tested-master"
> >>>>  LINUX_REVISION="master"
> >>>> +
> >>>> +# oss-tested branch
> >>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >>>
> >>> Why keep this around? I would remove it.
> >>
> >> Because...
> >>
> >>>> diff --git a/configs/config-url-git b/configs/config-url-git
> >>>> index 79813c4..614f522 100644
> >>>> --- a/configs/config-url-git
> >>>> +++ b/configs/config-url-git
> >>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
> >>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
> >>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> >>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
> >>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
> >>
> >> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
> >> so that the stable releases can be pointed to v1.3.3-maint instead. The
> >> xen.org repo doesn't contain the v1.3.3-maint branch, and the
> >> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
> >>
> >> I admit this is a bit ugly, *almost* separating things entirely but then
> >> not. But I don't see another easy way of having both the 1.3.3
> >> maintenance branch and the oss-tested branch. (Unless we started having
> >> osstest test the maintenance branch as well.)
> >  
> > I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
> > entirely and just stick to v1.3.3-maint everywhere. Or the other way
> > around.
> 
> Well I assume that people building one of the releases want something
> relatively stable and supported, so xen-tested-master is obviously
> unsuitable (and might not actually be capable of building against Xen
> versions older than a certain point due to the fact that libxl cannot be
> both forward- and backward-compatible).  And I also assume that people
> building with XEN_RELEASE="master" want the bleeding edge of everything
> so that they can test new features (or indeed, so that they can write
> new features).  So I think we actually do want both -- a maintenance
> branch for releases, and xen-tested-master for developers and
> bleeding-edge users.

Sure, we need to support both, but do they really need to be both
enabled in one of the example config files? We could just have the
libvirt xenbits tree as a comment.

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap]

On 15/06/16 11:24, Stefano Stabellini wrote:
> On Tue, 14 Jun 2016, George Dunlap wrote:
>> On 14/06/16 11:01, Stefano Stabellini wrote:
>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>> On 14/06/16 10:40, Stefano Stabellini wrote:
>>>>> On Mon, 13 Jun 2016, George Dunlap wrote:
>>>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
>>>>>>
>>>>>> And point the default libvirt to point to the libvirt 1.3.3
>>>>>> maintenance branch, rather than xen-tested-master.
>>>>>>
>>>>>> Also update OVMF revision for 4.6 to a version that builds with modern
>>>>>> gccs.
>>>>>>
>>>>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
>>>>>>
>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>>>> ---
>>>>>>  configs/config-4.5     | 6 +++---
>>>>>>  configs/config-4.6     | 8 ++++----
>>>>>>  configs/config-master  | 3 +++
>>>>>>  configs/config-url-git | 2 +-
>>>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>>>>>
>>>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
>>>>>> index 4163b68..8db9a9d 100644
>>>>>> --- a/configs/config-4.5
>>>>>> +++ b/configs/config-4.5
>>>>>> @@ -1,8 +1,8 @@
>>>>>>  XEN_REVISION="origin/stable-4.5"
>>>>>> -QEMU_REVISION="master"
>>>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>>>> +QEMU_REVISION="origin/stable-4.5"
>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>>>>>>  SEABIOS_REVISION="rel-1.7.5"
>>>>>>  GRUB_REVISION="master"
>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>>>  LINUX_REVISION="master"
>>>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
>>>>>> index e8b2a09..b003a30 100644
>>>>>> --- a/configs/config-4.6
>>>>>> +++ b/configs/config-4.6
>>>>>> @@ -1,8 +1,8 @@
>>>>>>  XEN_REVISION="origin/stable-4.6"
>>>>>> -QEMU_REVISION="master"
>>>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>>>> +QEMU_REVISION="origin/stable-4.6"
>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>>>>>>  SEABIOS_REVISION="rel-1.8.2"
>>>>>>  GRUB_REVISION="master"
>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>>>>>>  LINUX_REVISION="master"
>>>>>> diff --git a/configs/config-master b/configs/config-master
>>>>>> index bd26ce3..fce7436 100644
>>>>>> --- a/configs/config-master
>>>>>> +++ b/configs/config-master
>>>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>>>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>  OVMF_REVISION="origin/xen-tested-master"
>>>>>>  LINUX_REVISION="master"
>>>>>> +
>>>>>> +# oss-tested branch
>>>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>>>
>>>>> Why keep this around? I would remove it.
>>>>
>>>> Because...
>>>>
>>>>>> diff --git a/configs/config-url-git b/configs/config-url-git
>>>>>> index 79813c4..614f522 100644
>>>>>> --- a/configs/config-url-git
>>>>>> +++ b/configs/config-url-git
>>>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>>>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>>>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>>>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
>>>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
>>>>
>>>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
>>>> so that the stable releases can be pointed to v1.3.3-maint instead. The
>>>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
>>>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
>>>>
>>>> I admit this is a bit ugly, *almost* separating things entirely but then
>>>> not. But I don't see another easy way of having both the 1.3.3
>>>> maintenance branch and the oss-tested branch. (Unless we started having
>>>> osstest test the maintenance branch as well.)
>>>  
>>> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
>>> entirely and just stick to v1.3.3-maint everywhere. Or the other way
>>> around.
>>
>> Well I assume that people building one of the releases want something
>> relatively stable and supported, so xen-tested-master is obviously
>> unsuitable (and might not actually be capable of building against Xen
>> versions older than a certain point due to the fact that libxl cannot be
>> both forward- and backward-compatible).  And I also assume that people
>> building with XEN_RELEASE="master" want the bleeding edge of everything
>> so that they can test new features (or indeed, so that they can write
>> new features).  So I think we actually do want both -- a maintenance
>> branch for releases, and xen-tested-master for developers and
>> bleeding-edge users.
> 
> Sure, we need to support both, but do they really need to be both
> enabled in one of the example config files? We could just have the
> libvirt xenbits tree as a comment.

Well for that matter, why have a config-master at all?  Just say how to
make one in the comments. :-)

I thought part of the point of raisin was to be able to get up and
running with a reasonable template without having to read or change a
lot of the comments.  I don't really understand why anyone would want
the development versions of Xen and qemu, but the stable maintenance
release of libvirt.  Doesn't it make more sense to have "config-master"
get you the development versions of everything?

 -George

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[Stefano Stabellini]

On Tue, 14 Jun 2016, Anthony PERARD wrote:
> On Tue, Jun 14, 2016 at 11:34:43AM +0100, George Dunlap wrote:
> > On 14/06/16 11:31, Stefano Stabellini wrote:
> > > On Tue, 14 Jun 2016, George Dunlap wrote:
> > >> On 14/06/16 11:08, Stefano Stabellini wrote:
> > >>> On Tue, 14 Jun 2016, George Dunlap wrote:
> > >>>> On 14/06/16 10:46, Stefano Stabellini wrote:
> > >>>>> On Mon, 13 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 <george.dunlap@citrix.com>
> > >>>>>> ---
> > >>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
> > >>>>>> ---
> > >>>>>>  components/qemu             | 21 +++++++++++++--------
> > >>>>>>  components/qemu_traditional |  2 +-
> > >>>>>>  configs/config-4.7          |  8 ++++++++
> > >>>>>>  defconfig                   |  2 +-
> > >>>>>>  4 files changed, 23 insertions(+), 10 deletions(-)
> > >>>>>>
> > >>>>>> diff --git a/components/qemu b/components/qemu
> > >>>>>> index e0d92a5..8624b50 100644
> > >>>>>> --- a/components/qemu
> > >>>>>> +++ b/components/qemu
> > >>>>>> @@ -23,15 +23,20 @@ function qemu_build() {
> > >>>>>>      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 \
> > >>>>>> +
> > >>>>>> +    ./configure --enable-xen --target-list=i386-softmmu \
> > >>>>>> +		--prefix=$PREFIX \
> > >>>>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
> > >>>>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> > >>>>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
> > >>>>>> +                -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
> > >>>>>> +		--bindir=$PREFIX/lib/xen/bin \
> > >>>>>> +		--datadir=$PREFIX/share/qemu-xen \
> > >>>>>> +		--disable-kvm \
> > >>>>>> +		--disable-docs \
> > >>>>>> +		--disable-guest-agent
> > >>>>>
> > >>>>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
> > >>>>> make this change, will raisin still be able to buil an older qemu
> > >>>>> against an older xen?
> > >>>>
> > >>>> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
> > >>>> fine.  The #define is just ignored, since neither Xen nor qemu in the
> > >>>> 4.5 and 4.6 branches know anything about it.
> > >>>>
> > >>>> If part of our goal is to be a repository of the canonical way to build
> > >>>> things, though, perhaps it would be better to have the extra flags be
> > >>>> conditional on the value of XEN_RELEASE.
> > >>>
> > >>> If we are sure that it's ignored than it might be benign. Maybe we
> > >>> should just add an in-code comment to explain why we added it though.
> > >>
> > >> Well really, I think that the detection should be put into the qemu
> > >> configure scripts -- i.e., it should detect that there's the new API and
> > >> add the appropriate #defines itself.  But that's the sort of change I
> > >> don't think there will be a lot of enthusiasm for. :-)
> > > 
> > > Actually there is already code in QEMU configure script for the
> > > detection. In fact I was wondering if explicitly passing XC_WANT_* is
> > > actually necessary. I don't think it is from QEMU POV.
> > 
> > That code might be in qemu-upstream, but it's not in the qemu-xen trees;
> > if you revert this bit of the patch and try to build with raisin it will
> > fail.  That's why I even bothered to add these in in the first place;
> > and why IanC added these runes to tools/Makefile.
> > 
> > Anthony, can you comment more authoritatively here on what's going on?
> 
> Yes, easy, xen-4.7 introduce a new API but qemu-xen-4.7 does not know
> about it, so qemu-xen will fail to compile. But there are some magic
> flags that are use to provide an compatible API and can qemu-xen
> compile.
> 
> QEMU have been taught about the new API and will use it, without the
> magic flags. QEMU will actually ignore the magic flags with a bunch of
> #undef.
 
Looking a bit more closely, these flags are to enable backward
compatibility in libxc, which of course is not supposed to break any
QEMUs, old or new. To the contrary, it helps older QEMUs to build
properly against newer Xen versions (qemu-xen-4.7 falls in this
category). In addition new QEMU is able to ignore these flags when it
knows that it can use the new interface. So overall I would just pass
them unconditionally with a comment as explanation.

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

Re: [PATCH raisin 4/4] Update to 4.7, update qemu and qemu_traditional recipes

[George Dunlap]

On 15/06/16 11:39, Stefano Stabellini wrote:
> On Tue, 14 Jun 2016, Anthony PERARD wrote:
>> On Tue, Jun 14, 2016 at 11:34:43AM +0100, George Dunlap wrote:
>>> On 14/06/16 11:31, Stefano Stabellini wrote:
>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>>> On 14/06/16 11:08, Stefano Stabellini wrote:
>>>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>>>>> On 14/06/16 10:46, Stefano Stabellini wrote:
>>>>>>>> On Mon, 13 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 <george.dunlap@citrix.com>
>>>>>>>>> ---
>>>>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>>>>>>> ---
>>>>>>>>>  components/qemu             | 21 +++++++++++++--------
>>>>>>>>>  components/qemu_traditional |  2 +-
>>>>>>>>>  configs/config-4.7          |  8 ++++++++
>>>>>>>>>  defconfig                   |  2 +-
>>>>>>>>>  4 files changed, 23 insertions(+), 10 deletions(-)
>>>>>>>>>
>>>>>>>>> diff --git a/components/qemu b/components/qemu
>>>>>>>>> index e0d92a5..8624b50 100644
>>>>>>>>> --- a/components/qemu
>>>>>>>>> +++ b/components/qemu
>>>>>>>>> @@ -23,15 +23,20 @@ function qemu_build() {
>>>>>>>>>      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 \
>>>>>>>>> +
>>>>>>>>> +    ./configure --enable-xen --target-list=i386-softmmu \
>>>>>>>>> +		--prefix=$PREFIX \
>>>>>>>>> +		--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
>>>>>>>>> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
>>>>>>>>> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1 \
>>>>>>>>> +                -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
>>>>>>>>> +		--bindir=$PREFIX/lib/xen/bin \
>>>>>>>>> +		--datadir=$PREFIX/share/qemu-xen \
>>>>>>>>> +		--disable-kvm \
>>>>>>>>> +		--disable-docs \
>>>>>>>>> +		--disable-guest-agent
>>>>>>>>
>>>>>>>> This is adding XC_WANT_COMPAT_EVTCHN_API=1, etc, unconditionally. If we
>>>>>>>> make this change, will raisin still be able to buil an older qemu
>>>>>>>> against an older xen?
>>>>>>>
>>>>>>> I've tested this with XEN_RELEASE set to 4.5 and 4.6, and it builds just
>>>>>>> fine.  The #define is just ignored, since neither Xen nor qemu in the
>>>>>>> 4.5 and 4.6 branches know anything about it.
>>>>>>>
>>>>>>> If part of our goal is to be a repository of the canonical way to build
>>>>>>> things, though, perhaps it would be better to have the extra flags be
>>>>>>> conditional on the value of XEN_RELEASE.
>>>>>>
>>>>>> If we are sure that it's ignored than it might be benign. Maybe we
>>>>>> should just add an in-code comment to explain why we added it though.
>>>>>
>>>>> Well really, I think that the detection should be put into the qemu
>>>>> configure scripts -- i.e., it should detect that there's the new API and
>>>>> add the appropriate #defines itself.  But that's the sort of change I
>>>>> don't think there will be a lot of enthusiasm for. :-)
>>>>
>>>> Actually there is already code in QEMU configure script for the
>>>> detection. In fact I was wondering if explicitly passing XC_WANT_* is
>>>> actually necessary. I don't think it is from QEMU POV.
>>>
>>> That code might be in qemu-upstream, but it's not in the qemu-xen trees;
>>> if you revert this bit of the patch and try to build with raisin it will
>>> fail.  That's why I even bothered to add these in in the first place;
>>> and why IanC added these runes to tools/Makefile.
>>>
>>> Anthony, can you comment more authoritatively here on what's going on?
>>
>> Yes, easy, xen-4.7 introduce a new API but qemu-xen-4.7 does not know
>> about it, so qemu-xen will fail to compile. But there are some magic
>> flags that are use to provide an compatible API and can qemu-xen
>> compile.
>>
>> QEMU have been taught about the new API and will use it, without the
>> magic flags. QEMU will actually ignore the magic flags with a bunch of
>> #undef.
>  
> Looking a bit more closely, these flags are to enable backward
> compatibility in libxc, which of course is not supposed to break any
> QEMUs, old or new. To the contrary, it helps older QEMUs to build
> properly against newer Xen versions (qemu-xen-4.7 falls in this
> category). In addition new QEMU is able to ignore these flags when it
> knows that it can use the new interface. So overall I would just pass
> them unconditionally with a comment as explanation.

Well I've already updated the patch to enable them conditionally (with a
comment), so I think I'll just use the new version. :-)

 -George


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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[Stefano Stabellini]

On Wed, 15 Jun 2016, George Dunlap wrote:
> On 15/06/16 11:24, Stefano Stabellini wrote:
> > On Tue, 14 Jun 2016, George Dunlap wrote:
> >> On 14/06/16 11:01, Stefano Stabellini wrote:
> >>> On Tue, 14 Jun 2016, George Dunlap wrote:
> >>>> On 14/06/16 10:40, Stefano Stabellini wrote:
> >>>>> On Mon, 13 Jun 2016, George Dunlap wrote:
> >>>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
> >>>>>>
> >>>>>> And point the default libvirt to point to the libvirt 1.3.3
> >>>>>> maintenance branch, rather than xen-tested-master.
> >>>>>>
> >>>>>> Also update OVMF revision for 4.6 to a version that builds with modern
> >>>>>> gccs.
> >>>>>>
> >>>>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
> >>>>>>
> >>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
> >>>>>> ---
> >>>>>>  configs/config-4.5     | 6 +++---
> >>>>>>  configs/config-4.6     | 8 ++++----
> >>>>>>  configs/config-master  | 3 +++
> >>>>>>  configs/config-url-git | 2 +-
> >>>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
> >>>>>>
> >>>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
> >>>>>> index 4163b68..8db9a9d 100644
> >>>>>> --- a/configs/config-4.5
> >>>>>> +++ b/configs/config-4.5
> >>>>>> @@ -1,8 +1,8 @@
> >>>>>>  XEN_REVISION="origin/stable-4.5"
> >>>>>> -QEMU_REVISION="master"
> >>>>>> -QEMU_TRADITIONAL_REVISION="master"
> >>>>>> +QEMU_REVISION="origin/stable-4.5"
> >>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
> >>>>>>  SEABIOS_REVISION="rel-1.7.5"
> >>>>>>  GRUB_REVISION="master"
> >>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>>>>>  LINUX_REVISION="master"
> >>>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
> >>>>>> index e8b2a09..b003a30 100644
> >>>>>> --- a/configs/config-4.6
> >>>>>> +++ b/configs/config-4.6
> >>>>>> @@ -1,8 +1,8 @@
> >>>>>>  XEN_REVISION="origin/stable-4.6"
> >>>>>> -QEMU_REVISION="master"
> >>>>>> -QEMU_TRADITIONAL_REVISION="master"
> >>>>>> +QEMU_REVISION="origin/stable-4.6"
> >>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
> >>>>>>  SEABIOS_REVISION="rel-1.8.2"
> >>>>>>  GRUB_REVISION="master"
> >>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
> >>>>>>  LINUX_REVISION="master"
> >>>>>> diff --git a/configs/config-master b/configs/config-master
> >>>>>> index bd26ce3..fce7436 100644
> >>>>>> --- a/configs/config-master
> >>>>>> +++ b/configs/config-master
> >>>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
> >>>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>>>  OVMF_REVISION="origin/xen-tested-master"
> >>>>>>  LINUX_REVISION="master"
> >>>>>> +
> >>>>>> +# oss-tested branch
> >>>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >>>>>
> >>>>> Why keep this around? I would remove it.
> >>>>
> >>>> Because...
> >>>>
> >>>>>> diff --git a/configs/config-url-git b/configs/config-url-git
> >>>>>> index 79813c4..614f522 100644
> >>>>>> --- a/configs/config-url-git
> >>>>>> +++ b/configs/config-url-git
> >>>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
> >>>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
> >>>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> >>>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
> >>>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >>>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
> >>>>
> >>>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
> >>>> so that the stable releases can be pointed to v1.3.3-maint instead. The
> >>>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
> >>>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
> >>>>
> >>>> I admit this is a bit ugly, *almost* separating things entirely but then
> >>>> not. But I don't see another easy way of having both the 1.3.3
> >>>> maintenance branch and the oss-tested branch. (Unless we started having
> >>>> osstest test the maintenance branch as well.)
> >>>  
> >>> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
> >>> entirely and just stick to v1.3.3-maint everywhere. Or the other way
> >>> around.
> >>
> >> Well I assume that people building one of the releases want something
> >> relatively stable and supported, so xen-tested-master is obviously
> >> unsuitable (and might not actually be capable of building against Xen
> >> versions older than a certain point due to the fact that libxl cannot be
> >> both forward- and backward-compatible).  And I also assume that people
> >> building with XEN_RELEASE="master" want the bleeding edge of everything
> >> so that they can test new features (or indeed, so that they can write
> >> new features).  So I think we actually do want both -- a maintenance
> >> branch for releases, and xen-tested-master for developers and
> >> bleeding-edge users.
> > 
> > Sure, we need to support both, but do they really need to be both
> > enabled in one of the example config files? We could just have the
> > libvirt xenbits tree as a comment.
> 
> Well for that matter, why have a config-master at all?  Just say how to
> make one in the comments. :-)
> 
> I thought part of the point of raisin was to be able to get up and
> running with a reasonable template without having to read or change a
> lot of the comments.  I don't really understand why anyone would want
> the development versions of Xen and qemu, but the stable maintenance
> release of libvirt.  Doesn't it make more sense to have "config-master"
> get you the development versions of everything?

The idea is to provide good templates and be very transparent on what
get cloned and built. It's the transparency here that it is weakening:
as a user I would prefer the libvirt tree not to change depending on the
version I write in the main config file. As a user, I would be surprised
if I saw this happening. That's why I was suggesting to keep to one
libvirt tree. Or if you would like to have two, then make the choice
obvious, not a consequence of a seemingly unrelated version setting.

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap]

On 15/06/16 11:53, Stefano Stabellini wrote:
> On Wed, 15 Jun 2016, George Dunlap wrote:
>> On 15/06/16 11:24, Stefano Stabellini wrote:
>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>> On 14/06/16 11:01, Stefano Stabellini wrote:
>>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>>>> On 14/06/16 10:40, Stefano Stabellini wrote:
>>>>>>> On Mon, 13 Jun 2016, George Dunlap wrote:
>>>>>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
>>>>>>>>
>>>>>>>> And point the default libvirt to point to the libvirt 1.3.3
>>>>>>>> maintenance branch, rather than xen-tested-master.
>>>>>>>>
>>>>>>>> Also update OVMF revision for 4.6 to a version that builds with modern
>>>>>>>> gccs.
>>>>>>>>
>>>>>>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
>>>>>>>>
>>>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>>>>>> ---
>>>>>>>>  configs/config-4.5     | 6 +++---
>>>>>>>>  configs/config-4.6     | 8 ++++----
>>>>>>>>  configs/config-master  | 3 +++
>>>>>>>>  configs/config-url-git | 2 +-
>>>>>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
>>>>>>>> index 4163b68..8db9a9d 100644
>>>>>>>> --- a/configs/config-4.5
>>>>>>>> +++ b/configs/config-4.5
>>>>>>>> @@ -1,8 +1,8 @@
>>>>>>>>  XEN_REVISION="origin/stable-4.5"
>>>>>>>> -QEMU_REVISION="master"
>>>>>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>>>>>> +QEMU_REVISION="origin/stable-4.5"
>>>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>>>>>>>>  SEABIOS_REVISION="rel-1.7.5"
>>>>>>>>  GRUB_REVISION="master"
>>>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>>>>>  LINUX_REVISION="master"
>>>>>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
>>>>>>>> index e8b2a09..b003a30 100644
>>>>>>>> --- a/configs/config-4.6
>>>>>>>> +++ b/configs/config-4.6
>>>>>>>> @@ -1,8 +1,8 @@
>>>>>>>>  XEN_REVISION="origin/stable-4.6"
>>>>>>>> -QEMU_REVISION="master"
>>>>>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>>>>>> +QEMU_REVISION="origin/stable-4.6"
>>>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>>>>>>>>  SEABIOS_REVISION="rel-1.8.2"
>>>>>>>>  GRUB_REVISION="master"
>>>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>>>>>>>>  LINUX_REVISION="master"
>>>>>>>> diff --git a/configs/config-master b/configs/config-master
>>>>>>>> index bd26ce3..fce7436 100644
>>>>>>>> --- a/configs/config-master
>>>>>>>> +++ b/configs/config-master
>>>>>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>>>>>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>>>  OVMF_REVISION="origin/xen-tested-master"
>>>>>>>>  LINUX_REVISION="master"
>>>>>>>> +
>>>>>>>> +# oss-tested branch
>>>>>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>>>>>
>>>>>>> Why keep this around? I would remove it.
>>>>>>
>>>>>> Because...
>>>>>>
>>>>>>>> diff --git a/configs/config-url-git b/configs/config-url-git
>>>>>>>> index 79813c4..614f522 100644
>>>>>>>> --- a/configs/config-url-git
>>>>>>>> +++ b/configs/config-url-git
>>>>>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>>>>>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>>>>>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>>>>>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
>>>>>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>>>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
>>>>>>
>>>>>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
>>>>>> so that the stable releases can be pointed to v1.3.3-maint instead. The
>>>>>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
>>>>>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
>>>>>>
>>>>>> I admit this is a bit ugly, *almost* separating things entirely but then
>>>>>> not. But I don't see another easy way of having both the 1.3.3
>>>>>> maintenance branch and the oss-tested branch. (Unless we started having
>>>>>> osstest test the maintenance branch as well.)
>>>>>  
>>>>> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
>>>>> entirely and just stick to v1.3.3-maint everywhere. Or the other way
>>>>> around.
>>>>
>>>> Well I assume that people building one of the releases want something
>>>> relatively stable and supported, so xen-tested-master is obviously
>>>> unsuitable (and might not actually be capable of building against Xen
>>>> versions older than a certain point due to the fact that libxl cannot be
>>>> both forward- and backward-compatible).  And I also assume that people
>>>> building with XEN_RELEASE="master" want the bleeding edge of everything
>>>> so that they can test new features (or indeed, so that they can write
>>>> new features).  So I think we actually do want both -- a maintenance
>>>> branch for releases, and xen-tested-master for developers and
>>>> bleeding-edge users.
>>>
>>> Sure, we need to support both, but do they really need to be both
>>> enabled in one of the example config files? We could just have the
>>> libvirt xenbits tree as a comment.
>>
>> Well for that matter, why have a config-master at all?  Just say how to
>> make one in the comments. :-)
>>
>> I thought part of the point of raisin was to be able to get up and
>> running with a reasonable template without having to read or change a
>> lot of the comments.  I don't really understand why anyone would want
>> the development versions of Xen and qemu, but the stable maintenance
>> release of libvirt.  Doesn't it make more sense to have "config-master"
>> get you the development versions of everything?
> 
> The idea is to provide good templates and be very transparent on what
> get cloned and built. It's the transparency here that it is weakening:
> as a user I would prefer the libvirt tree not to change depending on the
> version I write in the main config file. As a user, I would be surprised
> if I saw this happening. That's why I was suggesting to keep to one
> libvirt tree. Or if you would like to have two, then make the choice
> obvious, not a consequence of a seemingly unrelated version setting.

By "libvirt tree", you mean the location of the libvirt repository?

I guess we have fairly different ideas about what users care about and
what they'd find unexpected. :-)  I as a user wouldn't care a bit about
URL I was downloading from, as long as I got the appropriate version.
And I would be quite surprised to specify the "master" config, and get
the bleeding edge of everything except libvirt.

We could just have it point to libvirt-master I suppose.  That risks
having things in a broken state in the time between the inevitable
regressions are introduced in libvirt-master and the time they get
noticed and fixed.  But that doesn't seem to be terribly often these
days.  What do you think?

 -George

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[Stefano Stabellini]

On Wed, 15 Jun 2016, George Dunlap wrote:
> On 15/06/16 11:53, Stefano Stabellini wrote:
> > On Wed, 15 Jun 2016, George Dunlap wrote:
> >> On 15/06/16 11:24, Stefano Stabellini wrote:
> >>> On Tue, 14 Jun 2016, George Dunlap wrote:
> >>>> On 14/06/16 11:01, Stefano Stabellini wrote:
> >>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
> >>>>>> On 14/06/16 10:40, Stefano Stabellini wrote:
> >>>>>>> On Mon, 13 Jun 2016, George Dunlap wrote:
> >>>>>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
> >>>>>>>>
> >>>>>>>> And point the default libvirt to point to the libvirt 1.3.3
> >>>>>>>> maintenance branch, rather than xen-tested-master.
> >>>>>>>>
> >>>>>>>> Also update OVMF revision for 4.6 to a version that builds with modern
> >>>>>>>> gccs.
> >>>>>>>>
> >>>>>>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
> >>>>>>>>
> >>>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
> >>>>>>>> ---
> >>>>>>>>  configs/config-4.5     | 6 +++---
> >>>>>>>>  configs/config-4.6     | 8 ++++----
> >>>>>>>>  configs/config-master  | 3 +++
> >>>>>>>>  configs/config-url-git | 2 +-
> >>>>>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
> >>>>>>>>
> >>>>>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
> >>>>>>>> index 4163b68..8db9a9d 100644
> >>>>>>>> --- a/configs/config-4.5
> >>>>>>>> +++ b/configs/config-4.5
> >>>>>>>> @@ -1,8 +1,8 @@
> >>>>>>>>  XEN_REVISION="origin/stable-4.5"
> >>>>>>>> -QEMU_REVISION="master"
> >>>>>>>> -QEMU_TRADITIONAL_REVISION="master"
> >>>>>>>> +QEMU_REVISION="origin/stable-4.5"
> >>>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
> >>>>>>>>  SEABIOS_REVISION="rel-1.7.5"
> >>>>>>>>  GRUB_REVISION="master"
> >>>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>>>>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>>>>>>>  LINUX_REVISION="master"
> >>>>>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
> >>>>>>>> index e8b2a09..b003a30 100644
> >>>>>>>> --- a/configs/config-4.6
> >>>>>>>> +++ b/configs/config-4.6
> >>>>>>>> @@ -1,8 +1,8 @@
> >>>>>>>>  XEN_REVISION="origin/stable-4.6"
> >>>>>>>> -QEMU_REVISION="master"
> >>>>>>>> -QEMU_TRADITIONAL_REVISION="master"
> >>>>>>>> +QEMU_REVISION="origin/stable-4.6"
> >>>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
> >>>>>>>>  SEABIOS_REVISION="rel-1.8.2"
> >>>>>>>>  GRUB_REVISION="master"
> >>>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
> >>>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
> >>>>>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
> >>>>>>>>  LINUX_REVISION="master"
> >>>>>>>> diff --git a/configs/config-master b/configs/config-master
> >>>>>>>> index bd26ce3..fce7436 100644
> >>>>>>>> --- a/configs/config-master
> >>>>>>>> +++ b/configs/config-master
> >>>>>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
> >>>>>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
> >>>>>>>>  OVMF_REVISION="origin/xen-tested-master"
> >>>>>>>>  LINUX_REVISION="master"
> >>>>>>>> +
> >>>>>>>> +# oss-tested branch
> >>>>>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >>>>>>>
> >>>>>>> Why keep this around? I would remove it.
> >>>>>>
> >>>>>> Because...
> >>>>>>
> >>>>>>>> diff --git a/configs/config-url-git b/configs/config-url-git
> >>>>>>>> index 79813c4..614f522 100644
> >>>>>>>> --- a/configs/config-url-git
> >>>>>>>> +++ b/configs/config-url-git
> >>>>>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
> >>>>>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
> >>>>>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
> >>>>>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
> >>>>>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
> >>>>>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
> >>>>>>
> >>>>>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
> >>>>>> so that the stable releases can be pointed to v1.3.3-maint instead. The
> >>>>>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
> >>>>>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
> >>>>>>
> >>>>>> I admit this is a bit ugly, *almost* separating things entirely but then
> >>>>>> not. But I don't see another easy way of having both the 1.3.3
> >>>>>> maintenance branch and the oss-tested branch. (Unless we started having
> >>>>>> osstest test the maintenance branch as well.)
> >>>>>  
> >>>>> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
> >>>>> entirely and just stick to v1.3.3-maint everywhere. Or the other way
> >>>>> around.
> >>>>
> >>>> Well I assume that people building one of the releases want something
> >>>> relatively stable and supported, so xen-tested-master is obviously
> >>>> unsuitable (and might not actually be capable of building against Xen
> >>>> versions older than a certain point due to the fact that libxl cannot be
> >>>> both forward- and backward-compatible).  And I also assume that people
> >>>> building with XEN_RELEASE="master" want the bleeding edge of everything
> >>>> so that they can test new features (or indeed, so that they can write
> >>>> new features).  So I think we actually do want both -- a maintenance
> >>>> branch for releases, and xen-tested-master for developers and
> >>>> bleeding-edge users.
> >>>
> >>> Sure, we need to support both, but do they really need to be both
> >>> enabled in one of the example config files? We could just have the
> >>> libvirt xenbits tree as a comment.
> >>
> >> Well for that matter, why have a config-master at all?  Just say how to
> >> make one in the comments. :-)
> >>
> >> I thought part of the point of raisin was to be able to get up and
> >> running with a reasonable template without having to read or change a
> >> lot of the comments.  I don't really understand why anyone would want
> >> the development versions of Xen and qemu, but the stable maintenance
> >> release of libvirt.  Doesn't it make more sense to have "config-master"
> >> get you the development versions of everything?
> > 
> > The idea is to provide good templates and be very transparent on what
> > get cloned and built. It's the transparency here that it is weakening:
> > as a user I would prefer the libvirt tree not to change depending on the
> > version I write in the main config file. As a user, I would be surprised
> > if I saw this happening. That's why I was suggesting to keep to one
> > libvirt tree. Or if you would like to have two, then make the choice
> > obvious, not a consequence of a seemingly unrelated version setting.
> 
> By "libvirt tree", you mean the location of the libvirt repository?
> 
> I guess we have fairly different ideas about what users care about and
> what they'd find unexpected. :-)  I as a user wouldn't care a bit about
> URL I was downloading from, as long as I got the appropriate version.
> And I would be quite surprised to specify the "master" config, and get
> the bleeding edge of everything except libvirt.
> 
> We could just have it point to libvirt-master I suppose.  That risks
> having things in a broken state in the time between the inevitable
> regressions are introduced in libvirt-master and the time they get
> noticed and fixed.  But that doesn't seem to be terribly often these
> days.  What do you think?

libvirt master is good. After all master is for developers, so it makes
sense.

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

Re: [PATCH raisin 3/4] Update config-4.6 and config-4.5 to point to stable branches

[George Dunlap]

On 15/06/16 15:02, Stefano Stabellini wrote:
> On Wed, 15 Jun 2016, George Dunlap wrote:
>> On 15/06/16 11:53, Stefano Stabellini wrote:
>>> On Wed, 15 Jun 2016, George Dunlap wrote:
>>>> On 15/06/16 11:24, Stefano Stabellini wrote:
>>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>>>> On 14/06/16 11:01, Stefano Stabellini wrote:
>>>>>>> On Tue, 14 Jun 2016, George Dunlap wrote:
>>>>>>>> On 14/06/16 10:40, Stefano Stabellini wrote:
>>>>>>>>> On Mon, 13 Jun 2016, George Dunlap wrote:
>>>>>>>>>> Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches.
>>>>>>>>>>
>>>>>>>>>> And point the default libvirt to point to the libvirt 1.3.3
>>>>>>>>>> maintenance branch, rather than xen-tested-master.
>>>>>>>>>>
>>>>>>>>>> Also update OVMF revision for 4.6 to a version that builds with modern
>>>>>>>>>> gccs.
>>>>>>>>>>
>>>>>>>>>> Singed-off-by: George Dunlap <george.dunlap@citrix.com>
>>>>>>>>>>
>>>>>>>>>> CC: Stefano Stabellini <sstabellini@kernel.org>
>>>>>>>>>> ---
>>>>>>>>>>  configs/config-4.5     | 6 +++---
>>>>>>>>>>  configs/config-4.6     | 8 ++++----
>>>>>>>>>>  configs/config-master  | 3 +++
>>>>>>>>>>  configs/config-url-git | 2 +-
>>>>>>>>>>  4 files changed, 11 insertions(+), 8 deletions(-)
>>>>>>>>>>
>>>>>>>>>> diff --git a/configs/config-4.5 b/configs/config-4.5
>>>>>>>>>> index 4163b68..8db9a9d 100644
>>>>>>>>>> --- a/configs/config-4.5
>>>>>>>>>> +++ b/configs/config-4.5
>>>>>>>>>> @@ -1,8 +1,8 @@
>>>>>>>>>>  XEN_REVISION="origin/stable-4.5"
>>>>>>>>>> -QEMU_REVISION="master"
>>>>>>>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>>>>>>>> +QEMU_REVISION="origin/stable-4.5"
>>>>>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.5"
>>>>>>>>>>  SEABIOS_REVISION="rel-1.7.5"
>>>>>>>>>>  GRUB_REVISION="master"
>>>>>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>>>>>>>  OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>>>>>>>  LINUX_REVISION="master"
>>>>>>>>>> diff --git a/configs/config-4.6 b/configs/config-4.6
>>>>>>>>>> index e8b2a09..b003a30 100644
>>>>>>>>>> --- a/configs/config-4.6
>>>>>>>>>> +++ b/configs/config-4.6
>>>>>>>>>> @@ -1,8 +1,8 @@
>>>>>>>>>>  XEN_REVISION="origin/stable-4.6"
>>>>>>>>>> -QEMU_REVISION="master"
>>>>>>>>>> -QEMU_TRADITIONAL_REVISION="master"
>>>>>>>>>> +QEMU_REVISION="origin/stable-4.6"
>>>>>>>>>> +QEMU_TRADITIONAL_REVISION="origin/stable-4.6"
>>>>>>>>>>  SEABIOS_REVISION="rel-1.8.2"
>>>>>>>>>>  GRUB_REVISION="master"
>>>>>>>>>> -LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>>>>> -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"
>>>>>>>>>> +LIBVIRT_REVISION="origin/v1.3.3-maint"
>>>>>>>>>> +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d"
>>>>>>>>>>  LINUX_REVISION="master"
>>>>>>>>>> diff --git a/configs/config-master b/configs/config-master
>>>>>>>>>> index bd26ce3..fce7436 100644
>>>>>>>>>> --- a/configs/config-master
>>>>>>>>>> +++ b/configs/config-master
>>>>>>>>>> @@ -6,3 +6,6 @@ GRUB_REVISION="master"
>>>>>>>>>>  LIBVIRT_REVISION="origin/xen-tested-master"
>>>>>>>>>>  OVMF_REVISION="origin/xen-tested-master"
>>>>>>>>>>  LINUX_REVISION="master"
>>>>>>>>>> +
>>>>>>>>>> +# oss-tested branch
>>>>>>>>>> +LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>>>>>>>
>>>>>>>>> Why keep this around? I would remove it.
>>>>>>>>
>>>>>>>> Because...
>>>>>>>>
>>>>>>>>>> diff --git a/configs/config-url-git b/configs/config-url-git
>>>>>>>>>> index 79813c4..614f522 100644
>>>>>>>>>> --- a/configs/config-url-git
>>>>>>>>>> +++ b/configs/config-url-git
>>>>>>>>>> @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git"
>>>>>>>>>>  QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git"
>>>>>>>>>>  SEABIOS_URL="git://xenbits.xen.org/seabios.git"
>>>>>>>>>>  GRUB_URL="git://git.savannah.gnu.org/grub.git"
>>>>>>>>>> -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git"
>>>>>>>>>> +LIBVIRT_URL="git://libvirt.org/libvirt.git"
>>>>>>>>
>>>>>>>> ...here, the LIBVIRT_URL in config-url-git is set to the libvirt.org URL
>>>>>>>> so that the stable releases can be pointed to v1.3.3-maint instead. The
>>>>>>>> xen.org repo doesn't contain the v1.3.3-maint branch, and the
>>>>>>>> libvirt.org repo doesn't contain the 'xen-tested-master' branch.
>>>>>>>>
>>>>>>>> I admit this is a bit ugly, *almost* separating things entirely but then
>>>>>>>> not. But I don't see another easy way of having both the 1.3.3
>>>>>>>> maintenance branch and the oss-tested branch. (Unless we started having
>>>>>>>> osstest test the maintenance branch as well.)
>>>>>>>  
>>>>>>> I would drop git://xenbits.xen.org/libvirt.git and xen-tested-master
>>>>>>> entirely and just stick to v1.3.3-maint everywhere. Or the other way
>>>>>>> around.
>>>>>>
>>>>>> Well I assume that people building one of the releases want something
>>>>>> relatively stable and supported, so xen-tested-master is obviously
>>>>>> unsuitable (and might not actually be capable of building against Xen
>>>>>> versions older than a certain point due to the fact that libxl cannot be
>>>>>> both forward- and backward-compatible).  And I also assume that people
>>>>>> building with XEN_RELEASE="master" want the bleeding edge of everything
>>>>>> so that they can test new features (or indeed, so that they can write
>>>>>> new features).  So I think we actually do want both -- a maintenance
>>>>>> branch for releases, and xen-tested-master for developers and
>>>>>> bleeding-edge users.
>>>>>
>>>>> Sure, we need to support both, but do they really need to be both
>>>>> enabled in one of the example config files? We could just have the
>>>>> libvirt xenbits tree as a comment.
>>>>
>>>> Well for that matter, why have a config-master at all?  Just say how to
>>>> make one in the comments. :-)
>>>>
>>>> I thought part of the point of raisin was to be able to get up and
>>>> running with a reasonable template without having to read or change a
>>>> lot of the comments.  I don't really understand why anyone would want
>>>> the development versions of Xen and qemu, but the stable maintenance
>>>> release of libvirt.  Doesn't it make more sense to have "config-master"
>>>> get you the development versions of everything?
>>>
>>> The idea is to provide good templates and be very transparent on what
>>> get cloned and built. It's the transparency here that it is weakening:
>>> as a user I would prefer the libvirt tree not to change depending on the
>>> version I write in the main config file. As a user, I would be surprised
>>> if I saw this happening. That's why I was suggesting to keep to one
>>> libvirt tree. Or if you would like to have two, then make the choice
>>> obvious, not a consequence of a seemingly unrelated version setting.
>>
>> By "libvirt tree", you mean the location of the libvirt repository?
>>
>> I guess we have fairly different ideas about what users care about and
>> what they'd find unexpected. :-)  I as a user wouldn't care a bit about
>> URL I was downloading from, as long as I got the appropriate version.
>> And I would be quite surprised to specify the "master" config, and get
>> the bleeding edge of everything except libvirt.
>>
>> We could just have it point to libvirt-master I suppose.  That risks
>> having things in a broken state in the time between the inevitable
>> regressions are introduced in libvirt-master and the time they get
>> noticed and fixed.  But that doesn't seem to be terribly often these
>> days.  What do you think?
> 
> libvirt master is good. After all master is for developers, so it makes
> sense.

OK, cool.  While testing libvirt-master  I discovered that config-master
was broken anyway, because it was pointing to xen-tested-master for ovmf
and seabios as well, which don't actually exist (!).  New spin of the
series on its way.

 -George

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