xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7
@ 2016-06-15 16:21 George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 1/4] components/xen: Actually disable rombios George Dunlap
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: George Dunlap @ 2016-06-15 16:21 UTC (permalink / raw)
  To: xen-devel; +Cc: George Dunlap

v2:
 - Include fixes for config-master as well
 - Only include qemu / libxc compatiblity #defines for 4.7 and master


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; fix
    config-master
  Update to 4.7, update qemu and qemu_traditional recipes

 components/qemu             | 30 +++++++++++++++++++++--------
 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       | 44 +++---------------------------------------
 configs/config-url-git      |  8 ++++++++
 configs/config-url-http     |  7 +++++++
 defconfig                   | 35 ++++++++++++++++++++++++++++++++-
 10 files changed, 91 insertions(+), 137 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH raisin v2 1/4] components/xen: Actually disable rombios
  2016-06-15 16:21 [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7 George Dunlap
@ 2016-06-15 16:21 ` George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 2/4] config: Separate config urls into a separate file George Dunlap
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 9+ messages in thread
From: George Dunlap @ 2016-06-15 16:21 UTC (permalink / raw)
  To: xen-devel; +Cc: Stefano Stabellini, 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>
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


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH raisin v2 2/4] config: Separate config urls into a separate file
  2016-06-15 16:21 [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7 George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 1/4] components/xen: Actually disable rombios George Dunlap
@ 2016-06-15 16:21 ` George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes George Dunlap
  3 siblings, 0 replies; 9+ messages in thread
From: George Dunlap @ 2016-06-15 16:21 UTC (permalink / raw)
  To: xen-devel; +Cc: Stefano Stabellini, George Dunlap

So that we're not duplicating information.

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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master
  2016-06-15 16:21 [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7 George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 1/4] components/xen: Actually disable rombios George Dunlap
  2016-06-15 16:21 ` [PATCH raisin v2 2/4] config: Separate config urls into a separate file George Dunlap
@ 2016-06-15 16:21 ` George Dunlap
  2016-06-15 17:07   ` Stefano Stabellini
  2016-06-15 16:21 ` [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes George Dunlap
  3 siblings, 1 reply; 9+ messages in thread
From: George Dunlap @ 2016-06-15 16:21 UTC (permalink / raw)
  To: xen-devel; +Cc: Stefano Stabellini, 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.

Point config-master libvirt to libvirt's "master" rather than xenbits'
xen-tested-master, to avoid having to switch to xenbits repo.

Finally, fix config-master by pointing ovmf and seabios to the correct
branch (master, not xen-tested-master).

Singed-off-by: George Dunlap <george.dunlap@citrix.com>
---
v2:
 - Use libvirt-master rather than xen-tested-master for config-master
 - Fix seabios and ovmf revisions for config-master

CC: Stefano Stabellini <sstabellini@kernel.org>
---
 configs/config-4.5     | 6 +++---
 configs/config-4.6     | 8 ++++----
 configs/config-master  | 6 +++---
 configs/config-url-git | 2 +-
 4 files changed, 11 insertions(+), 11 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..8d8ad7e 100644
--- a/configs/config-master
+++ b/configs/config-master
@@ -1,8 +1,8 @@
 XEN_REVISION="master"
 QEMU_REVISION="master"
 QEMU_TRADITIONAL_REVISION="master"
-SEABIOS_REVISION="origin/xen-tested-master"
+SEABIOS_REVISION="master"
+OVMF_REVISION="master"
 GRUB_REVISION="master"
-LIBVIRT_REVISION="origin/xen-tested-master"
-OVMF_REVISION="origin/xen-tested-master"
+LIBVIRT_REVISION="master"
 LINUX_REVISION="master"
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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes
  2016-06-15 16:21 [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7 George Dunlap
                   ` (2 preceding siblings ...)
  2016-06-15 16:21 ` [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master George Dunlap
@ 2016-06-15 16:21 ` George Dunlap
  2016-06-15 17:13   ` Stefano Stabellini
  3 siblings, 1 reply; 9+ messages in thread
From: George Dunlap @ 2016-06-15 16:21 UTC (permalink / raw)
  To: xen-devel; +Cc: Stefano Stabellini, 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>
---
Changes in v2:
 - Only add the extra #defines when building 4.7 or master, and add an
   explanation of what they're for.


CC: Stefano Stabellini <sstabellini@kernel.org>
---
 components/qemu             | 30 ++++++++++++++++++++++--------
 components/qemu_traditional |  2 +-
 configs/config-4.7          |  8 ++++++++
 defconfig                   |  2 +-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/components/qemu b/components/qemu
index e0d92a5..23e112c 100644
--- a/components/qemu
+++ b/components/qemu
@@ -20,18 +20,32 @@ function qemu_check_package() {
 }
 
 function qemu_build() {
+    local QEMU_EXTRA_CFLAGS
     cd "$BASEDIR"
     git-checkout $QEMU_URL $QEMU_REVISION qemu-dir
     cd qemu-dir
-    ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \
-        --extra-cflags="-I$INST_DIR/$PREFIX/include" \
-        --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
+
+    QEMU_EXTRA_CFLAGS="-I$INST_DIR/$PREFIX/include"
+
+    if [[ "$XEN_RELEASE" == "4.7" || "$XEN_RELEASE" == "master" ]] ; then
+	# qemu-xen released with 4.7.0 doesn't use the new libxc api,
+	# nor properly detect it so as to use the old version; so we
+	# need to tell it to do so manually.
+	QEMU_EXTRA_CFLAGS="$QEMU_EXTRA_CFLAGS -DXC_WANT_COMPAT_EVTCHN_API=1 \
+		-DXC_WANT_COMPAT_GNTTAB_API=1 \
+		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1"
+    fi
+    
+    ./configure --enable-xen --target-list=i386-softmmu \
+		--prefix=$PREFIX \
+		--extra-cflags="$QEMU_EXTRA_CFLAGS" \
+		--extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
                          -L$INST_DIR/$PREFIX/lib64 -Wl,-rpath-link=$INST_DIR/$PREFIX/lib64" \
-        --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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master
  2016-06-15 16:21 ` [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master George Dunlap
@ 2016-06-15 17:07   ` Stefano Stabellini
  0 siblings, 0 replies; 9+ messages in thread
From: Stefano Stabellini @ 2016-06-15 17:07 UTC (permalink / raw)
  To: George Dunlap; +Cc: xen-devel, Stefano Stabellini

On Wed, 15 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.
> 
> Point config-master libvirt to libvirt's "master" rather than xenbits'
> xen-tested-master, to avoid having to switch to xenbits repo.
> 
> Finally, fix config-master by pointing ovmf and seabios to the correct
> branch (master, not xen-tested-master).
> 
> Singed-off-by: George Dunlap <george.dunlap@citrix.com>

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


> v2:
>  - Use libvirt-master rather than xen-tested-master for config-master
>  - Fix seabios and ovmf revisions for config-master
> 
> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  configs/config-4.5     | 6 +++---
>  configs/config-4.6     | 8 ++++----
>  configs/config-master  | 6 +++---
>  configs/config-url-git | 2 +-
>  4 files changed, 11 insertions(+), 11 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..8d8ad7e 100644
> --- a/configs/config-master
> +++ b/configs/config-master
> @@ -1,8 +1,8 @@
>  XEN_REVISION="master"
>  QEMU_REVISION="master"
>  QEMU_TRADITIONAL_REVISION="master"
> -SEABIOS_REVISION="origin/xen-tested-master"
> +SEABIOS_REVISION="master"
> +OVMF_REVISION="master"
>  GRUB_REVISION="master"
> -LIBVIRT_REVISION="origin/xen-tested-master"
> -OVMF_REVISION="origin/xen-tested-master"
> +LIBVIRT_REVISION="master"
>  LINUX_REVISION="master"
> 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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes
  2016-06-15 16:21 ` [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes George Dunlap
@ 2016-06-15 17:13   ` Stefano Stabellini
  2016-06-15 17:18     ` George Dunlap
  0 siblings, 1 reply; 9+ messages in thread
From: Stefano Stabellini @ 2016-06-15 17:13 UTC (permalink / raw)
  To: George Dunlap; +Cc: xen-devel, Stefano Stabellini

On Wed, 15 Jun 2016, George Dunlap wrote:
> Add a 4.7 config file, make it the default.
> 
> Also update the qemu and qemu_traditional recipies after Ian Cambell's
> work to split off separate libraries.
> 
> Signed-off-by: George Dunlap <george.dunlap@citrix.com>
> ---
> Changes in v2:
>  - Only add the extra #defines when building 4.7 or master, and add an
>    explanation of what they're for.
> 
> 
> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  components/qemu             | 30 ++++++++++++++++++++++--------
>  components/qemu_traditional |  2 +-
>  configs/config-4.7          |  8 ++++++++
>  defconfig                   |  2 +-
>  4 files changed, 32 insertions(+), 10 deletions(-)
> 
> diff --git a/components/qemu b/components/qemu
> index e0d92a5..23e112c 100644
> --- a/components/qemu
> +++ b/components/qemu
> @@ -20,18 +20,32 @@ function qemu_check_package() {
>  }
>  
>  function qemu_build() {
> +    local QEMU_EXTRA_CFLAGS
>      cd "$BASEDIR"
>      git-checkout $QEMU_URL $QEMU_REVISION qemu-dir
>      cd qemu-dir
> -    ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \
> -        --extra-cflags="-I$INST_DIR/$PREFIX/include" \
> -        --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
> +
> +    QEMU_EXTRA_CFLAGS="-I$INST_DIR/$PREFIX/include"
> +
> +    if [[ "$XEN_RELEASE" == "4.7" || "$XEN_RELEASE" == "master" ]] ; then
> +	# qemu-xen released with 4.7.0 doesn't use the new libxc api,
> +	# nor properly detect it so as to use the old version; so we
                                ^ has to use ?


> +	# need to tell it to do so manually.

This patch is mixing tabs and spaces.



> +	QEMU_EXTRA_CFLAGS="$QEMU_EXTRA_CFLAGS -DXC_WANT_COMPAT_EVTCHN_API=1 \
> +		-DXC_WANT_COMPAT_GNTTAB_API=1 \
> +		-DXC_WANT_COMPAT_MAP_FOREIGN_API=1"
> +    fi
> +    
> +    ./configure --enable-xen --target-list=i386-softmmu \
> +		--prefix=$PREFIX \
> +		--extra-cflags="$QEMU_EXTRA_CFLAGS" \
> +		--extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
>                           -L$INST_DIR/$PREFIX/lib64 -Wl,-rpath-link=$INST_DIR/$PREFIX/lib64" \
> -        --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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes
  2016-06-15 17:13   ` Stefano Stabellini
@ 2016-06-15 17:18     ` George Dunlap
  2016-06-16  9:51       ` Stefano Stabellini
  0 siblings, 1 reply; 9+ messages in thread
From: George Dunlap @ 2016-06-15 17:18 UTC (permalink / raw)
  To: Stefano Stabellini; +Cc: xen-devel

On 15/06/16 18:13, Stefano Stabellini wrote:
> On Wed, 15 Jun 2016, George Dunlap wrote:
>> Add a 4.7 config file, make it the default.
>>
>> Also update the qemu and qemu_traditional recipies after Ian Cambell's
>> work to split off separate libraries.
>>
>> Signed-off-by: George Dunlap <george.dunlap@citrix.com>
>> ---
>> Changes in v2:
>>  - Only add the extra #defines when building 4.7 or master, and add an
>>    explanation of what they're for.
>>
>>
>> CC: Stefano Stabellini <sstabellini@kernel.org>
>> ---
>>  components/qemu             | 30 ++++++++++++++++++++++--------
>>  components/qemu_traditional |  2 +-
>>  configs/config-4.7          |  8 ++++++++
>>  defconfig                   |  2 +-
>>  4 files changed, 32 insertions(+), 10 deletions(-)
>>
>> diff --git a/components/qemu b/components/qemu
>> index e0d92a5..23e112c 100644
>> --- a/components/qemu
>> +++ b/components/qemu
>> @@ -20,18 +20,32 @@ function qemu_check_package() {
>>  }
>>  
>>  function qemu_build() {
>> +    local QEMU_EXTRA_CFLAGS
>>      cd "$BASEDIR"
>>      git-checkout $QEMU_URL $QEMU_REVISION qemu-dir
>>      cd qemu-dir
>> -    ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \
>> -        --extra-cflags="-I$INST_DIR/$PREFIX/include" \
>> -        --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
>> +
>> +    QEMU_EXTRA_CFLAGS="-I$INST_DIR/$PREFIX/include"
>> +
>> +    if [[ "$XEN_RELEASE" == "4.7" || "$XEN_RELEASE" == "master" ]] ; then
>> +	# qemu-xen released with 4.7.0 doesn't use the new libxc api,
>> +	# nor properly detect it so as to use the old version; so we
>                                 ^ has to use ?

No, but it is rather an unusual grammar construction so maybe it could
be reworded. What about:

"qemu-xen released with 4.7.0 doesn't use the new libxc api, nor does it
know how to ask for the compat api, so we need to tell it to do so
manually."

> 
> 
>> +	# need to tell it to do so manually.
> 
> This patch is mixing tabs and spaces.

So it does.  I'll have to figure out how to get emacs to behave.

 -George


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes
  2016-06-15 17:18     ` George Dunlap
@ 2016-06-16  9:51       ` Stefano Stabellini
  0 siblings, 0 replies; 9+ messages in thread
From: Stefano Stabellini @ 2016-06-16  9:51 UTC (permalink / raw)
  To: George Dunlap; +Cc: xen-devel, Stefano Stabellini

On Wed, 15 Jun 2016, George Dunlap wrote:
> On 15/06/16 18:13, Stefano Stabellini wrote:
> > On Wed, 15 Jun 2016, George Dunlap wrote:
> >> Add a 4.7 config file, make it the default.
> >>
> >> Also update the qemu and qemu_traditional recipies after Ian Cambell's
> >> work to split off separate libraries.
> >>
> >> Signed-off-by: George Dunlap <george.dunlap@citrix.com>
> >> ---
> >> Changes in v2:
> >>  - Only add the extra #defines when building 4.7 or master, and add an
> >>    explanation of what they're for.
> >>
> >>
> >> CC: Stefano Stabellini <sstabellini@kernel.org>
> >> ---
> >>  components/qemu             | 30 ++++++++++++++++++++++--------
> >>  components/qemu_traditional |  2 +-
> >>  configs/config-4.7          |  8 ++++++++
> >>  defconfig                   |  2 +-
> >>  4 files changed, 32 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/components/qemu b/components/qemu
> >> index e0d92a5..23e112c 100644
> >> --- a/components/qemu
> >> +++ b/components/qemu
> >> @@ -20,18 +20,32 @@ function qemu_check_package() {
> >>  }
> >>  
> >>  function qemu_build() {
> >> +    local QEMU_EXTRA_CFLAGS
> >>      cd "$BASEDIR"
> >>      git-checkout $QEMU_URL $QEMU_REVISION qemu-dir
> >>      cd qemu-dir
> >> -    ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \
> >> -        --extra-cflags="-I$INST_DIR/$PREFIX/include" \
> >> -        --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
> >> +
> >> +    QEMU_EXTRA_CFLAGS="-I$INST_DIR/$PREFIX/include"
> >> +
> >> +    if [[ "$XEN_RELEASE" == "4.7" || "$XEN_RELEASE" == "master" ]] ; then
> >> +	# qemu-xen released with 4.7.0 doesn't use the new libxc api,
> >> +	# nor properly detect it so as to use the old version; so we
> >                                 ^ has to use ?
> 
> No, but it is rather an unusual grammar construction so maybe it could
> be reworded. What about:
> 
> "qemu-xen released with 4.7.0 doesn't use the new libxc api, nor does it
> know how to ask for the compat api, so we need to tell it to do so
> manually."

that's fine


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

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-06-16  9:51 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-15 16:21 [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7 George Dunlap
2016-06-15 16:21 ` [PATCH raisin v2 1/4] components/xen: Actually disable rombios George Dunlap
2016-06-15 16:21 ` [PATCH raisin v2 2/4] config: Separate config urls into a separate file George Dunlap
2016-06-15 16:21 ` [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master George Dunlap
2016-06-15 17:07   ` Stefano Stabellini
2016-06-15 16:21 ` [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes George Dunlap
2016-06-15 17:13   ` Stefano Stabellini
2016-06-15 17:18     ` George Dunlap
2016-06-16  9:51       ` Stefano Stabellini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).