[gentoo-commits] proj/qemu-kvm:qemu-kvm-1.2.0-gentoo commit in: /

["Doug Goldstein" <cardoe@gentoo.org>]

commit:     1bdf9ca5a7de88ec43c5b7aa997941de73f81401
Author:     Richard Henderson <rth <AT> twiddle <DOT> net>
AuthorDate: Mon Nov 19 20:43:14 2012 +0000
Commit:     Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 21:31:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qemu-kvm.git;a=commit;h=1bdf9ca5

tci: Fix type of tci_read_label

Fixes the pointer truncation that was occurring for branches.

Cc: Stefan Weil <sw <AT> weilnetz.de>
Cc: Blue Swirl <blauwirbel <AT> gmail.com>
Signed-off-by: Richard Henderson <rth <AT> twiddle.net>
Reviewed-by: Stefan Weil <sw <AT> weilnetz.de>
Tested-by: Stefan Weil <sw <AT> weilnetz.de>
Signed-off-by: Blue Swirl <blauwirbel <AT> gmail.com>
(cherry picked from commit c6c5063c7a5bb1d3fe6b9931a1ec15294e39b8b1)

Signed-off-by: Michael Roth <mdroth <AT> linux.vnet.ibm.com>
(cherry picked from commit 38c6d17e75f83363ef92582dd366a4b1d936dc2f)

---
 tci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tci.c b/tci.c
index a4f7b78..bb456d2 100644
--- a/tci.c
+++ b/tci.c
@@ -338,9 +338,9 @@ static uint64_t tci_read_ri64(uint8_t **tb_ptr)
 }
 #endif
 
-static target_ulong tci_read_label(uint8_t **tb_ptr)
+static tcg_target_ulong tci_read_label(uint8_t **tb_ptr)
 {
-    target_ulong label = tci_read_i(tb_ptr);
+    tcg_target_ulong label = tci_read_i(tb_ptr);
     assert(label != 0);
     return label;
 }