From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Thu, 07 May 2009 10:51:19 +0000
Subject: Re: [patch] fix qemu-kvm to build when gdbstub is disabled
Message-Id: <4A02BD27.5050401@siemens.com>
List-Id: <kvm-ia64.vger.kernel.org>
References: <4A01AFE8.3020008@sgi.com>
In-Reply-To: <4A01AFE8.3020008@sgi.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: kvm-ia64@vger.kernel.org

Avi Kivity wrote:
> Zhang, Xiantao wrote:
>> Jes Sorensen wrote:
>>  
>>> Hi,
>>>
>>> The latest changes to qemu-kvm breaks miserably if one tries to build
>>> without CONFIG_GDBSTUB.
>>>
>>> Jes
>>>     
>>
>> --- qemu-kvm.orig/vl.c
>> +++ qemu-kvm/vl.c
>> @@ -4417,13 +4417,11 @@
>>          }
>>          if (cpu_can_run(env))
>>              ret = qemu_cpu_exec(env);
>> -#ifndef CONFIG_GDBSTUB
>> ^^^^^^^^^^^
>> Don't know why change #ifdef to #ifndef in upstream, and I remember it
>> should be ifdef before. I believe this stuff should be compiled only
>> if CONFIG_GDBSTUB is defined.    
> 
> This was introduced by
> 
> commit 704aec581c1683750e313832ba3aa4813d59cbd0
> Author: Xiantao Zhang <xiantao.zhang@intel.com>
> Date:   Thu Nov 27 17:23:27 2008 +0800
> 
>    Build fix for !CONFIG_GDBSTUB case
>      Once CONFIG_GDBSTUB not configured, compile will generate error
> 
> In upstream.  Please fix it in upstream and qemu-kvm.git will get the
> fix from there.

Given that CONFIG_GDBSTUB is always true upstream, I tend to say:
Finally drop it upstream and keep this (or a more arch-local) workaround
for missing ia64 gdbstub support downstream.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux