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: 99442 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 DB4D1B6EE9 for ; Thu, 9 Jun 2011 00:43:41 +1000 (EST) Received: from localhost ([::1]:33151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUJys-0003BG-55 for incoming@patchwork.ozlabs.org; Wed, 08 Jun 2011 10:43:38 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46857) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUJTZ-0003zF-Of for qemu-devel@nongnu.org; Wed, 08 Jun 2011 10:11:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUJTT-00053I-Qc for qemu-devel@nongnu.org; Wed, 08 Jun 2011 10:11:17 -0400 Received: from goliath.siemens.de ([192.35.17.28]:31818) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUJTS-00052O-UV for qemu-devel@nongnu.org; Wed, 08 Jun 2011 10:11:11 -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 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: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf Subject: [Qemu-devel] [PATCH 05/12] 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 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); }