From patchwork Tue Feb 2 08:18:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 44253 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EE2B7B7D2F for ; Tue, 2 Feb 2010 20:24:06 +1100 (EST) Received: from localhost ([127.0.0.1]:41168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcEoS-0004S5-7S for incoming@patchwork.ozlabs.org; Tue, 02 Feb 2010 04:12:48 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NcEdl-0000J2-Ix for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:01:45 -0500 Received: from [199.232.76.173] (port=34884 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NcEdk-0000Hf-Me for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:01:44 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NcEdi-0001uW-76 for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:01:44 -0500 Received: from goliath.siemens.de ([192.35.17.28]:19148) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NcEdh-0001ss-3O for qemu-devel@nongnu.org; Tue, 02 Feb 2010 04:01:41 -0500 Received: from mail2.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o128J92e013799; Tue, 2 Feb 2010 09:19:09 +0100 Received: from localhost.localdomain ([139.25.173.39]) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o128J7sH008551; Tue, 2 Feb 2010 09:19:08 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Tue, 2 Feb 2010 09:18:47 +0100 Message-Id: <4dd0881b79972ce0434b5ed69093110ab99a7e78.1265098706.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Anthony Liguori , Glauber Costa , Alexander Graf , kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 01/21] qemu-kvm: Drop vmport changes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This attempt to make vmport KVM compatible is half-broken and is scheduled to be replaced by proper upstream support. Signed-off-by: Jan Kiszka --- hw/vmport.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/hw/vmport.c b/hw/vmport.c index 648861b..884af3f 100644 --- a/hw/vmport.c +++ b/hw/vmport.c @@ -21,12 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ - #include "hw.h" #include "isa.h" #include "pc.h" #include "sysemu.h" -#include "qemu-kvm.h" //#define VMPORT_DEBUG @@ -59,10 +57,6 @@ static uint32_t vmport_ioport_read(void *opaque, uint32_t addr) CPUState *env = cpu_single_env; unsigned char command; uint32_t eax; - uint32_t ret; - - if (kvm_enabled()) - kvm_save_registers(env); eax = env->regs[R_EAX]; if (eax != VMPORT_MAGIC) @@ -79,12 +73,7 @@ static uint32_t vmport_ioport_read(void *opaque, uint32_t addr) return eax; } - ret = s->func[command](s->opaque[command], addr); - - if (kvm_enabled()) - kvm_load_registers(env); - - return ret; + return s->func[command](s->opaque[command], addr); } static void vmport_ioport_write(void *opaque, uint32_t addr, uint32_t val)