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: 80792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1JINCVQ029086 for ; Fri, 19 Feb 2010 18:23:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755459Ab0BSSXE (ORCPT ); Fri, 19 Feb 2010 13:23:04 -0500 Received: from thoth.sbs.de ([192.35.17.2]:20713 "EHLO thoth.sbs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755428Ab0BSSXA (ORCPT ); Fri, 19 Feb 2010 13:23:00 -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 Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Anthony Liguori , Gleb Natapov Subject: [PATCH 1/9] qemu-kvm: Drop vmport changes 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: 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.3 (demeter.kernel.org [140.211.167.41]); Fri, 19 Feb 2010 18:23:12 +0000 (UTC) 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)