qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Leon Alrae <leon.alrae@imgtec.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 1/5] target-mips: fix passing incompatible pointer type in machine.c
Date: Tue, 28 Jul 2015 11:04:44 +0100	[thread overview]
Message-ID: <1438077888-10384-2-git-send-email-leon.alrae@imgtec.com> (raw)
In-Reply-To: <1438077888-10384-1-git-send-email-leon.alrae@imgtec.com>

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
---
 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]);
-- 
2.1.0

  reply	other threads:[~2015-07-28 10:05 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-28 10:04 [Qemu-devel] [PULL 0/5] target-mips queue for 2.4 Leon Alrae
2015-07-28 10:04 ` Leon Alrae [this message]
2015-07-28 10:04 ` [Qemu-devel] [PULL 2/5] target-mips: fix offset calculation for Interrupts Leon Alrae
2015-07-28 10:04 ` [Qemu-devel] [PULL 3/5] net/dp8393x: disable user creation Leon Alrae
2015-07-28 10:04 ` [Qemu-devel] [PULL 4/5] net/dp8393x: remove check of runt packets Leon Alrae
2015-07-28 10:04 ` [Qemu-devel] [PULL 5/5] net/dp8393x: do not use memory_region_init_rom_device with NULL Leon Alrae
2015-07-28 16:09 ` [Qemu-devel] [PULL 0/5] target-mips queue for 2.4 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438077888-10384-2-git-send-email-leon.alrae@imgtec.com \
    --to=leon.alrae@imgtec.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).