From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkDj4-0003kV-HF for qemu-devel@nongnu.org; Mon, 20 Apr 2015 11:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkDj3-0007ZZ-LL for qemu-devel@nongnu.org; Mon, 20 Apr 2015 11:35:10 -0400 From: Thomas Huth Date: Mon, 20 Apr 2015 17:34:56 +0200 Message-Id: <1429544096-1387-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH] hw/ppc/spapr_iommu: Fix the check for invalid upper bits in liobn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, agraf@suse.de Cc: aik@ozlabs.ru, david@gibson.dropbear.id.au The check "liobn & 0xFFFFFFFF00000000ULL" in spapr_tce_find_by_liobn() is completely useless since liobn is only declared as an uint32_t parameter. Fix this by using target_ulong instead (this is what most of the callers of this function are using, too). And while we're at it, change the error message printing into a proper qemu_log_mask(LOG_GUEST_ERROR, ...) call so that it is also possible to enable this warning without recompiling the binary. Signed-off-by: Thomas Huth --- hw/ppc/spapr_iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index f3990fd..cd26a06 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -41,18 +41,19 @@ enum sPAPRTCEAccess { static QLIST_HEAD(spapr_tce_tables, sPAPRTCETable) spapr_tce_tables; -static sPAPRTCETable *spapr_tce_find_by_liobn(uint32_t liobn) +static sPAPRTCETable *spapr_tce_find_by_liobn(target_ulong liobn) { sPAPRTCETable *tcet; if (liobn & 0xFFFFFFFF00000000ULL) { - hcall_dprintf("Request for out-of-bounds LIOBN 0x" TARGET_FMT_lx "\n", + qemu_log_mask(LOG_GUEST_ERROR, + "Request for out-of-bounds LIOBN 0x" TARGET_FMT_lx "\n", liobn); return NULL; } QLIST_FOREACH(tcet, &spapr_tce_tables, list) { - if (tcet->liobn == liobn) { + if (tcet->liobn == (uint32_t)liobn) { return tcet; } } -- 1.8.3.1