From patchwork Tue Jul 28 10:04:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Alrae X-Patchwork-Id: 501124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3FDEE140322 for ; Tue, 28 Jul 2015 20:06:01 +1000 (AEST) Received: from localhost ([::1]:57817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1ln-0008Ht-Au for incoming@patchwork.ozlabs.org; Tue, 28 Jul 2015 06:05:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1kx-0006sA-HK for qemu-devel@nongnu.org; Tue, 28 Jul 2015 06:05:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK1kt-00084A-MX for qemu-devel@nongnu.org; Tue, 28 Jul 2015 06:05:07 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:57349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK1kt-00082m-Gv for qemu-devel@nongnu.org; Tue, 28 Jul 2015 06:05:03 -0400 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id B29C86918C8B3 for ; Tue, 28 Jul 2015 11:05:00 +0100 (IST) Received: from lalrae-linux.kl.imgtec.org (192.168.14.163) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Tue, 28 Jul 2015 11:05:02 +0100 From: Leon Alrae To: Date: Tue, 28 Jul 2015 11:04:44 +0100 Message-ID: <1438077888-10384-2-git-send-email-leon.alrae@imgtec.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1438077888-10384-1-git-send-email-leon.alrae@imgtec.com> References: <1438077888-10384-1-git-send-email-leon.alrae@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.14.163] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Subject: [Qemu-devel] [PULL 1/5] target-mips: fix passing incompatible pointer type in machine.c 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 Reported-by: Peter Maydell Signed-off-by: Leon Alrae --- target-mips/machine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-mips/machine.c b/target-mips/machine.c index 8fa755c..b15c43a 100644 --- a/target-mips/machine.c +++ b/target-mips/machine.c @@ -153,6 +153,7 @@ static void put_tlb(QEMUFile *f, void *pv, size_t size) { r4k_tlb_t *v = pv; + uint8_t asid = v->ASID; uint16_t flags = ((v->EHINV << 15) | (v->RI1 << 14) | (v->RI0 << 13) | @@ -168,7 +169,7 @@ static void put_tlb(QEMUFile *f, void *pv, size_t size) qemu_put_betls(f, &v->VPN); qemu_put_be32s(f, &v->PageMask); - qemu_put_8s(f, &v->ASID); + qemu_put_8s(f, &asid); qemu_put_be16s(f, &flags); qemu_put_be64s(f, &v->PFN[0]); qemu_put_be64s(f, &v->PFN[1]);