From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPB3F-0006q4-Lb for qemu-devel@nongnu.org; Mon, 08 Apr 2013 08:20:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPB3A-0008EP-K3 for qemu-devel@nongnu.org; Mon, 08 Apr 2013 08:19:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPB3A-0008EI-CT for qemu-devel@nongnu.org; Mon, 08 Apr 2013 08:19:52 -0400 Date: Mon, 8 Apr 2013 15:19:50 +0300 From: Gleb Natapov Message-ID: <20130408121950.GA9425@redhat.com> References: <1363984637-18132-1-git-send-email-pbonzini@redhat.com> <1363984637-18132-2-git-send-email-pbonzini@redhat.com> <20130402132932.GF3889@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20130402132932.GF3889@redhat.com> Subject: Re: [Qemu-devel] [PATCH uq/master v2 1/2] kvm: reset state from the CPU's reset method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf On Tue, Apr 02, 2013 at 04:29:32PM +0300, Gleb Natapov wrote: > > static void kvm_sw_tlb_put(PowerPCCPU *cpu) > > { > > CPUPPCState *env = &cpu->env; > > diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c > > index 23fe51f..6321384 100644 > > --- a/target-s390x/cpu.c > > +++ b/target-s390x/cpu.c > > @@ -84,6 +84,10 @@ static void s390_cpu_reset(CPUState *s) > > * after incrementing the cpu counter */ > > #if !defined(CONFIG_USER_ONLY) > > s->halted = 1; > > + > > + if (kvm_enabled()) { > > + kvm_arch_reset_vcpu(s); > Does this compile with kvm support disabled? > Well, it does not: CC s390x-softmmu/target-s390x/cpu.o /users/gleb/work/qemu/target-s390x/cpu.c: In function 's390_cpu_reset': /users/gleb/work/qemu/target-s390x/cpu.c:89:9: error: implicit declaration of function 'kvm_arch_reset_vcpu' [-Werror=implicit-function-declaration] /users/gleb/work/qemu/target-s390x/cpu.c:89:9: error: nested extern declaration of 'kvm_arch_reset_vcpu' [-Werror=nested-externs] cc1: all warnings being treated as errors I wonder if it is portable between compilers to rely on code in if(0){} to be dropped in all levels of optimizations. -- Gleb.