From nobody Mon Feb 9 17:22:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1555777026; cv=none; d=zoho.com; s=zohoarc; b=ncNs6QKMeHH6ygVRWtUzHEgmMbMna7k5m6Fxr+i44it/yNkVnhvIV8usvwBJ9gDuBGK8EGU6/dZAbyX9OCaPKVP0AIl942UEHqe1QR7f5rQB+IpyxUb9Wp/p9sfW98sDElOlVS+ek18YoxVsdDZmSFQ5KhyoMayr9ziTR78/Eg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555777026; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=r3Jtft8lSmafyHvM/QIfK3f6RiL1dgUnclr6+lM0mBM=; b=EvrQOVSwrSAddgK9l9hN6w8dCFFyjZ+dv644yl6gPCjGIgOXg0yLlCTtLB45zPplrrTuTZ6gN8P6qnnzpTKRhrHXePTKr5wK4MszlzWdM4OxO9Jzz2/YlG06QW7Yz61J5mhmn/GsfhBZDHGLKk0Am2Ecs9MMPqr/mNbLjqUy2Kg= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1555777026576272.3563901906193; Sat, 20 Apr 2019 09:17:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:43112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHsfk-0005zt-N9 for importer@patchew.org; Sat, 20 Apr 2019 12:17:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHsdr-0004st-5r for qemu-devel@nongnu.org; Sat, 20 Apr 2019 12:15:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHsdo-0001vE-Az for qemu-devel@nongnu.org; Sat, 20 Apr 2019 12:15:02 -0400 Received: from m12-13.163.com ([220.181.12.13]:43634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHsdk-0001qd-AW for qemu-devel@nongnu.org; Sat, 20 Apr 2019 12:15:00 -0400 Received: from localhost.localdomain (unknown [183.159.69.175]) by smtp9 (Coremail) with SMTP id DcCowAAXzKN4RbtcjaXHAg--.9660S5; Sun, 21 Apr 2019 00:14:53 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=r3Jtft8lSmafyHvM/Q IfK3f6RiL1dgUnclr6+lM0mBM=; b=B3IEMdO3a0MwLoe5xqRDrCw704vRWs38+5 Y0DXK2m896fDbz5QbWmXUEqPQvr3OzAzOEqT2ccyWs7BCohUFssDpP0hzyYuuDpi 6IBI14W3V4JKbfwD6LPSR+vz1QR9Myi/96SrZVrWqlHI1wiJT//KKpcht48lxQ0z XeyV2X25U= From: Li Qiang To: jslaby@suse.cz, pbonzini@redhat.com Date: Sat, 20 Apr 2019 09:14:46 -0700 Message-Id: <20190420161446.2274-4-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190420161446.2274-1-liq3ea@163.com> References: <20190420161446.2274-1-liq3ea@163.com> X-CM-TRANSID: DcCowAAXzKN4RbtcjaXHAg--.9660S5 X-Coremail-Antispam: 1Uf129KBjvJXoW7tF43CF1UGr48tw15Zr43Wrg_yoW8Zr1Dp3 45Grn3XF4FgFyfJryjyw4DXFn5Grn8JFWrK3y8CwsY9ayrWFs7CFyUC3429ryxWryIvr1f uFZYqF43uF42vrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j52-nUUUUU= X-Originating-IP: [183.159.69.175] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiFAucbVaD0UJ5bwAAs+ X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 Subject: [Qemu-devel] [PATCH v2 3/3] edu: uses uint64_t in dma operation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The dma related variable is dma_addr_t, it is uint64_t in x64 platform. Change these usage from uint32_to uint64_t to avoid trancation. Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- Change since v1: Fix format compile error on Windows hw/misc/edu.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 4018dddcb8..f4a6d5f1c5 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -98,23 +98,24 @@ static void edu_lower_irq(EduState *edu, uint32_t val) } } =20 -static bool within(uint32_t addr, uint32_t start, uint32_t end) +static bool within(uint64_t addr, uint64_t start, uint64_t end) { return start <=3D addr && addr < end; } =20 -static void edu_check_range(uint32_t addr, uint32_t size1, uint32_t start, +static void edu_check_range(uint64_t addr, uint64_t size1, uint64_t start, uint32_t size2) { - uint32_t end1 =3D addr + size1; - uint32_t end2 =3D start + size2; + uint64_t end1 =3D addr + size1; + uint64_t end2 =3D start + size2; =20 if (within(addr, start, end2) && end1 > addr && within(end1, start, end2)) { return; } =20 - hw_error("EDU: DMA range 0x%.8x-0x%.8x out of bounds (0x%.8x-0x%.8x)!", + hw_error("EDU: DMA range 0x%016"PRIx64"-0x%016"PRIx64 + " out of bounds (0x%016"PRIx64"-0x%016"PRIx64")!", addr, end1 - 1, start, end2 - 1); } =20 @@ -139,13 +140,13 @@ static void edu_dma_timer(void *opaque) } =20 if (EDU_DMA_DIR(edu->dma.cmd) =3D=3D EDU_DMA_FROM_PCI) { - uint32_t dst =3D edu->dma.dst; + uint64_t dst =3D edu->dma.dst; edu_check_range(dst, edu->dma.cnt, DMA_START, DMA_SIZE); dst -=3D DMA_START; pci_dma_read(&edu->pdev, edu_clamp_addr(edu, edu->dma.src), edu->dma_buf + dst, edu->dma.cnt); } else { - uint32_t src =3D edu->dma.src; + uint64_t src =3D edu->dma.src; edu_check_range(src, edu->dma.cnt, DMA_START, DMA_SIZE); src -=3D DMA_START; pci_dma_write(&edu->pdev, edu_clamp_addr(edu, edu->dma.dst), --=20 2.17.1