From patchwork Fri Feb 19 18:22:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 45872 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 AFCC0B7CF7 for ; Sat, 20 Feb 2010 05:41:39 +1100 (EST) Received: from localhost ([127.0.0.1]:38369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NiXdy-0000l0-4A for incoming@patchwork.ozlabs.org; Fri, 19 Feb 2010 13:32:02 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NiXUt-0006yB-TB for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:39 -0500 Received: from [199.232.76.173] (port=44324 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NiXUt-0006xw-G3 for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:39 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NiXUo-00006M-9H for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:39 -0500 Received: from thoth.sbs.de ([192.35.17.2]:20630) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NiXUk-0008WU-TE for qemu-devel@nongnu.org; Fri, 19 Feb 2010 13:22:31 -0500 Received: from mail3.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id o1JIMSFI007059; Fri, 19 Feb 2010 19:22:28 +0100 Received: from localhost.localdomain (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail3.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o1JIMRG6025400; Fri, 19 Feb 2010 19:22:27 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Fri, 19 Feb 2010 19:22:19 +0100 Message-Id: <6a31a939392c2c1a20867987ff9ba69884f4a80c.1266603744.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 , qemu-devel@nongnu.org, kvm@vger.kernel.org, Gleb Natapov Subject: [Qemu-devel] [PATCH 1/9] 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 Upstream has proper support now. Drop the old half-broken approach and all surrounding diffs. 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 e9db6de..6c9d7c9 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" #include "kvm.h" //#define VMPORT_DEBUG @@ -60,10 +58,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); cpu_synchronize_state(env); @@ -82,12 +76,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)