From patchwork Sun Sep 18 12:44:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 115234 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 11F5DB6FA0 for ; Sun, 18 Sep 2011 22:44:51 +1000 (EST) Received: from localhost ([::1]:59870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gjj-00067J-Nz for incoming@patchwork.ozlabs.org; Sun, 18 Sep 2011 08:44:43 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gjd-000670-Kh for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:44:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5Gjc-00069Q-6I for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:44:37 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:35682) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5Gjb-000699-Sc for qemu-devel@nongnu.org; Sun, 18 Sep 2011 08:44:36 -0400 Received: from smtp08.web.de ( [172.20.5.216]) by fmmailgate02.web.de (Postfix) with ESMTP id DDA2F1AB945EC; Sun, 18 Sep 2011 14:44:20 +0200 (CEST) Received: from [88.65.36.224] (helo=mchn199C.mchp.siemens.de) by smtp08.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1R5GjM-00067x-00; Sun, 18 Sep 2011 14:44:20 +0200 Message-ID: <4E75E7A4.50702@web.de> Date: Sun, 18 Sep 2011 14:44:20 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity X-Enigmail-Version: 1.3.1 X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+yBI3BzCekCP5fcUQohbjrj6k1xVM7AAXfc10T Mhi/gVN8lJsx9c4jmmmqUPgZh9m1AUBxtzsmLr9O5MiI7KVI+I eJmGe4b7g= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.227 Cc: qemu-devel , Richard Henderson Subject: [Qemu-devel] [PATCH 1/2] memory: Fix old portio word accesses 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 From: Jan Kiszka As we register old portio regions via ioport_register, we are also responsible for providing the word access wrapper. Signed-off-by: Jan Kiszka --- memory.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/memory.c b/memory.c index b3ee232..f712d95 100644 --- a/memory.c +++ b/memory.c @@ -397,6 +397,11 @@ static void memory_region_iorange_read(IORange *iorange, *data = ((uint64_t)1 << (width * 8)) - 1; if (mrp) { *data = mrp->read(mr->opaque, offset + mr->offset); + } else if (width == 2) { + mrp = find_portio(mr, offset, 1, false); + assert(mrp); + *data = mrp->read(mr->opaque, offset + mr->offset) | + mrp->read(mr->opaque, offset + mr->offset + 1); } return; } @@ -419,6 +424,11 @@ static void memory_region_iorange_write(IORange *iorange, if (mrp) { mrp->write(mr->opaque, offset + mr->offset, data); + } else if (width == 2) { + mrp = find_portio(mr, offset, 1, false); + assert(mrp); + mrp->write(mr->opaque, offset + mr->offset, data & 0xff); + mrp->write(mr->opaque, offset + mr->offset + 1, data >> 8); } return; }