From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: Re: [PATCH 3/9] raisin: add QEMU upstream component
Date: Thu, 16 Apr 2015 11:29:54 +0100
Message-ID: <alpine.DEB.2.02.1504161056050.7690@kaball.uk.xensource.com>
References: <alpine.DEB.2.02.1504151602460.7690@kaball.uk.xensource.com>
	<1429110900-8286-3-git-send-email-stefano.stabellini@eu.citrix.com>
	<552EB66F.7090105@citrix.com>
	<alpine.DEB.2.02.1504161049550.7690@kaball.uk.xensource.com>
	<552F86EB.50803@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <552F86EB.50803@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Julien Grall <julien.grall@citrix.com>, xen-devel@lists.xensource.com, Stefano Stabellini <stefano.stabellini@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

On Thu, 16 Apr 2015, George Dunlap wrote:
> On 04/16/2015 10:51 AM, Stefano Stabellini wrote:
> > On Wed, 15 Apr 2015, Julien Grall wrote:
> >> Hi Stefano,
> >>
> >> On 15/04/2015 16:14, Stefano Stabellini wrote:
> >>> diff --git a/components/series b/components/series
> >>> index 3c3124d..8f614f0 100644
> >>> --- a/components/series
> >>> +++ b/components/series
> >>> @@ -1,3 +1,4 @@
> >>>   xen
> >>> +qemu
> >>>   grub
> >>>   libvirt
> >>> diff --git a/components/xen b/components/xen
> >>> index 2d345a8..dcf2f92 100644
> >>> --- a/components/xen
> >>> +++ b/components/xen
> >>> @@ -23,7 +23,7 @@ function xen_build() {
> >>>       cd "$BASEDIR"
> >>>       git-checkout $XEN_UPSTREAM_URL $XEN_UPSTREAM_REVISION xen-dir
> >>>       cd xen-dir
> >>> -    ./configure --prefix=$PREFIX
> >>> +    ./configure --prefix=$PREFIX
> >>> --with-system-qemu=/usr/bin/qemu-system-i386
> >>
> >> Currently the QEMU built by Xen is installed in a Xen directory (IIRC
> >> /usr/lib/xen/bin). Should not you use a similar path for raisin? Otherwise you
> >> would override the QEMU installed via the distrib package
> >> manager.
> > 
> > This was done on purpose because the QEMU component built by Raisin
> > should be generally usable, even without Xen.
> 
> Do we want raisin to clobber / conflict with a system qemu by befault?
> 
> I think if our goal is, "A Xen-focused configuration that Just Works",
> putting it in /usr/lib/xen/bin is probably better.

I don't have a strong opinion on this, so here is the patch:

---

raisin: build QEMU more specifically for Xen and install under /usr/lib/xen/bin

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --git a/components/qemu b/components/qemu
index 85db58e..6ba03c8 100644
--- a/components/qemu
+++ b/components/qemu
@@ -19,12 +19,14 @@ function qemu_build() {
     cd "$BASEDIR"
     git-checkout $QEMU_URL $QEMU_REVISION qemu-dir
     cd qemu-dir
-    ./configure --enable-xen --target-list=i386-softmmu,x86_64-softmmu --prefix=$PREFIX \
+    ./configure --enable-xen --target-list=i386-softmmu --prefix=$PREFIX \
         --extra-cflags="-I$INST_DIR/$PREFIX/include" \
         --extra-ldflags="-L$INST_DIR/$PREFIX/lib -Wl,-rpath-link=$INST_DIR/$PREFIX/lib \
                          -L$INST_DIR/$PREFIX/lib64 -Wl,-rpath-link=$INST_DIR/$PREFIX/lib64" \
         --disable-kvm \
         --disable-docs \
+        --bindir=$PREFIX/lib/xen/bin \
+        --datadir=$PREFIX/share/qemu-xen \
         --disable-guest-agent
     $RAISIN_MAKE all
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
diff --git a/components/xen b/components/xen
index a0c0034..f8959be 100644
--- a/components/xen
+++ b/components/xen
@@ -23,7 +23,7 @@ function xen_build() {
     cd "$BASEDIR"
     git-checkout $XEN_URL $XEN_REVISION xen-dir
     cd xen-dir
-    ./configure --prefix=$PREFIX --with-system-qemu=/usr/bin/qemu-system-i386
+    ./configure --prefix=$PREFIX --with-system-qemu=$PREFIX/lib/xen/bin/qemu-system-i386
     $RAISIN_MAKE
     $RAISIN_MAKE install DESTDIR="$INST_DIR"
     cd "$BASEDIR"