From patchwork Tue Jun 21 17:07:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 101321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 10E6CB6F71 for ; Wed, 22 Jun 2011 03:25:18 +1000 (EST) Received: from localhost ([::1]:45501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZ4hO-0002io-MA for incoming@patchwork.ozlabs.org; Tue, 21 Jun 2011 13:25:14 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZ4Rj-0006zx-UA for qemu-devel@nongnu.org; Tue, 21 Jun 2011 13:09:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QZ4Rf-0000wg-9M for qemu-devel@nongnu.org; Tue, 21 Jun 2011 13:09:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZ4Re-0000wB-M6 for qemu-devel@nongnu.org; Tue, 21 Jun 2011 13:08:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5LH8vdN022547 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 21 Jun 2011 13:08:57 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5LH8vUk007762; Tue, 21 Jun 2011 13:08:57 -0400 Received: from amt.cnet (vpn-9-196.rdu.redhat.com [10.11.9.196]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p5LH8uMi020364; Tue, 21 Jun 2011 13:08:56 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id BC2E766E115; Tue, 21 Jun 2011 14:08:27 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id p5LH8PcY006982; Tue, 21 Jun 2011 14:08:25 -0300 From: Marcelo Tosatti To: Anthony Liguori Date: Tue, 21 Jun 2011 14:07:55 -0300 Message-Id: <0bed3bba7d68b35e4b0c63d597b377c49a14e509.1308676084.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jan Kiszka , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf Subject: [Qemu-devel] [PATCH 06/15] kvm: ppc: Drop CONFIG_KVM_PPC_PVR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Required header support is now unconditionally available. CC: Alexander Graf Signed-off-by: Jan Kiszka Reviewed-by: Alexander Graf Signed-off-by: Marcelo Tosatti --- configure | 1 - target-ppc/kvm.c | 9 --------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/configure b/configure index ebd5d56..3286e33 100755 --- a/configure +++ b/configure @@ -3226,7 +3226,6 @@ case "$target_arch2" in if test $vhost_net = "yes" ; then echo "CONFIG_VHOST_NET=y" >> $config_target_mak fi - echo "CONFIG_KVM_PPC_PVR=y" >> $config_target_mak fi esac if test "$target_bigendian" = "yes" ; then diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index e7b1b10..0500e3f 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -104,21 +104,12 @@ static int kvm_arch_sync_sregs(CPUState *cenv) } } -#if !defined(CONFIG_KVM_PPC_PVR) - if (1) { - fprintf(stderr, "kvm error: missing PVR setting capability\n"); - return -ENOSYS; - } -#endif - ret = kvm_vcpu_ioctl(cenv, KVM_GET_SREGS, &sregs); if (ret) { return ret; } -#ifdef CONFIG_KVM_PPC_PVR sregs.pvr = cenv->spr[SPR_PVR]; -#endif return kvm_vcpu_ioctl(cenv, KVM_SET_SREGS, &sregs); }