From patchwork Wed Jun 8 14:10:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 861602 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p58I6rwm010696 for ; Wed, 8 Jun 2011 18:07:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756088Ab1FHOLh (ORCPT ); Wed, 8 Jun 2011 10:11:37 -0400 Received: from goliath.siemens.de ([192.35.17.28]:15183 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755977Ab1FHOLP (ORCPT ); Wed, 8 Jun 2011 10:11:15 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p58EB82p012129; Wed, 8 Jun 2011 16:11:08 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p58EB6vc024799; Wed, 8 Jun 2011 16:11:08 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Alexander Graf Subject: [PATCH 05/12] kvm: ppc: Drop CONFIG_KVM_PPC_PVR Date: Wed, 8 Jun 2011 16:10:59 +0200 Message-Id: <1c9a696e32c2ef483758b52fb2ce2e1398fcaeff.1307542247.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: 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.6 (demeter2.kernel.org [140.211.167.43]); Wed, 08 Jun 2011 18:07:19 +0000 (UTC) Required header support is now unconditionally available. CC: Alexander Graf Signed-off-by: Jan Kiszka Reviewed-by: Alexander Graf --- configure | 1 - target-ppc/kvm.c | 9 --------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/configure b/configure index ed54db9..0947f98 100755 --- a/configure +++ b/configure @@ -3221,7 +3221,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); }