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

[George Dunlap <george.dunlap@citrix.com>]

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