From patchwork Fri Mar 26 10:40:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Majia X-Patchwork-Id: 88444 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2QAh9FQ017228 for ; Fri, 26 Mar 2010 10:43:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753186Ab0CZKnH (ORCPT ); Fri, 26 Mar 2010 06:43:07 -0400 Received: from mail-vw0-f46.google.com ([209.85.212.46]:59145 "EHLO mail-vw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752907Ab0CZKnE (ORCPT ); Fri, 26 Mar 2010 06:43:04 -0400 Received: by vws8 with SMTP id 8so1373423vws.19 for ; Fri, 26 Mar 2010 03:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:reply-to:references:mime-version:content-type :content-disposition:in-reply-to:user-agent; bh=T5XMBHEyccNddixkO57/FtRk7BlLNBwdgfPKTtSHmfQ=; b=weT4+EfDlESKneTtqPBJ086SMCvU81FN+X5rLZCxoXNnZA+If4Oy/KXa4qnLT6aBNv FhuPY9ct2acgPlrTek0TUqip1RLHyJcwS4zyTgPizSJ9IDNArDAtKIo/lwWs648cQ+6j YOxH+3WpPAa4LRH+hJX2Ef/I3TluapKSLBSQ0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:reply-to:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=uBgytOD00hgDVP86SQFkFCAPVrPjDe5Dw5AybDNoj6yZFg5SvzXzHwYleDhvXS9Ct5 T6c7VH8LzU6s7jyoOKDWjALrVg+h5PIj4+IHbPkdVWbA7We6OH1WXIGpc8MpeL8NGt1F oZ+n93ZYsxlPifX41qp1SB5PKsLy1mZphxXuo= Received: by 10.220.158.76 with SMTP id e12mr532069vcx.31.1269600182033; Fri, 26 Mar 2010 03:43:02 -0700 (PDT) Received: from localhost ([61.48.44.31]) by mx.google.com with ESMTPS id 25sm18250676vws.9.2010.03.26.03.42.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 26 Mar 2010 03:43:01 -0700 (PDT) Date: Fri, 26 Mar 2010 18:40:59 +0800 From: Bruce Majia To: Alexander Graf Cc: Avi Kivity , kvm@vger.kernel.org, kvm-ppc , Liu Yu Subject: Re: [PATCH] KVM: PPC: E500 compile fix Message-ID: <20100326104059.GA26690@localhost> Reply-To: Bruce Majia References: <1263142908-8995-1-git-send-email-agraf@suse.de> <4B530B43.6070705@redhat.com> <20100326071519.GA24375@localhost> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-08-17) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 26 Mar 2010 10:43:10 +0000 (UTC) diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c index 4d686cc..0cde83b 100644 --- a/arch/powerpc/kvm/booke.c +++ b/arch/powerpc/kvm/booke.c @@ -137,7 +137,7 @@ static int kvmppc_booke_irqprio_deliver(struct kvm_vcpu *vcpu, unsigned int priority) { int allowed = 0; - ulong msr_mask; + ulong msr_mask = 0; bool update_esr = false, update_dear = false; switch (priority) { diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c index 0d772e6..c52e8c2 100644 --- a/arch/powerpc/kvm/e500_tlb.c +++ b/arch/powerpc/kvm/e500_tlb.c @@ -225,8 +225,10 @@ static void kvmppc_e500_stlbe_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500, kvmppc_e500_shadow_release(vcpu_e500, tlbsel, esel); stlbe->mas1 = 0; +#if 0 trace_kvm_stlb_inval(index_of(tlbsel, esel), stlbe->mas1, stlbe->mas2, stlbe->mas3, stlbe->mas7); +#endif } static void kvmppc_e500_tlb1_invalidate(struct kvmppc_vcpu_e500 *vcpu_e500, diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c index 51aedd7..372b678 100644 --- a/arch/powerpc/kvm/powerpc.c +++ b/arch/powerpc/kvm/powerpc.c @@ -277,7 +277,7 @@ static void kvmppc_complete_dcr_load(struct kvm_vcpu *vcpu, static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu, struct kvm_run *run) { - ulong gpr; + ulong gpr = 0; if (run->mmio.len > sizeof(gpr)) { printk(KERN_ERR "bad MMIO length: %d\n", run->mmio.len);