From nobody Fri Oct 24 20:18:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518670755331849.084002613358; Wed, 14 Feb 2018 20:59:15 -0800 (PST) Received: from localhost ([::1]:38769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBdT-0000vm-JX for importer@patchew.org; Wed, 14 Feb 2018 23:59:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBr-000071-AN for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBq-0004je-Cx for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:35 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBq-0004jW-8g; Wed, 14 Feb 2018 23:30:34 -0500 Received: by mail-qt0-x243.google.com with SMTP id g14so10491381qti.2; Wed, 14 Feb 2018 20:30:34 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HIXdqXfcNvBEd4yVZGk1YqTRgThhZ5cz8kqGu+ZWyvA=; b=rY2AVoHfHv6noliAr0Y2TRT3IEpa9oA7d4d9+V3eqG01gq0TjnWAs/8i3xRL3728mE IFCuDL/IEPlqYF1mRUpE12MIiuvkW6Hm9b5fqrvl6hM6h+MrCte75BqPggYICgDqPnRg QJ9Eo5rkmMoJ+XRfh7JRuh9iK5EuRx5crXTnXc2vJdrB0G7O1UzXthdmoSMPN3qfKlMo yVpOA30zECpINfYaj90Z7I/VnODWo6JzT8JnXxXzfOZYgCkyFgNhOAKZtX8a8MoTv8sY gXMjE5kM/8cOKJR54PM0ozocNZ+8Wa7VX75sYyiiL19FFbPysI9tPxE4E7YZx9ofb32t 7gxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HIXdqXfcNvBEd4yVZGk1YqTRgThhZ5cz8kqGu+ZWyvA=; b=cBIqc+ZNwG0I9Qw3Qxg81K95AHeAJALidzEJ0NyjkB/eJFz97u+GU7adGoQWlAq3KA 5ETk/cz/VD4oDjBLbsdMFbHNIDlo36RB6TwPmUnhj8IudnmBCp3yN4UboHJ3xoW7ESl8 BZn05MXyjcZ2zZLsXsMCiNdB1yaQny5g3V5bJRWmx/oVyBZeYIMv/m3BIgVR1GUn1uH3 EIrlkA2I3t/lW0nS+bmVWHJ0rzyFcggWUYATTFHrBrepmsFfMWlC4bOYw73FIdGvjwSH WjHtAPNsrkH/ZY5CHXQt4HPfXbOOn8pmXmswe7aMwkUCiCI3nTAj1CJjNDj9G8CsYue6 vc/g== X-Gm-Message-State: APf1xPDCPINqX2MQoNFmaDJa5+y1lyDT/fkZ9yXi7geYfWKbZHn52EDn ISfmU8elpCE7W/5jyM0VBn4CX59l+cM= X-Google-Smtp-Source: AH8x226qIfEZLfklTOqny/nPoVcjAezP7gWZu6h9XdQAfXZQmssrb4cOEwVwOraTwg/joM4LuT4+VQ== X-Received: by 10.200.20.149 with SMTP id l21mr2362789qtj.332.1518669033691; Wed, 14 Feb 2018 20:30:33 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:29:00 -0300 Message-Id: <20180215042900.16078-31-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 30/30] xen: use the BYTE-based definitions 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: Kevin Wolf , Stefano Stabellini , "open list:Block layer core" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Reitz , Anthony Perard , "open list:X86" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/xen_disk.c | 4 ++-- hw/xenpv/xen_domainbuild.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index f74fcd42d1..557005b5e5 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -1153,9 +1153,9 @@ static int blk_connect(struct XenDevice *xendev) } =20 xen_pv_printf(xendev, 1, "type \"%s\", fileproto \"%s\", filename \"%s= \"," - " size %" PRId64 " (%" PRId64 " MB)\n", + " size %" PRId64 " (%llu MB)\n", blkdev->type, blkdev->fileproto, blkdev->filename, - blkdev->file_size, blkdev->file_size >> 20); + blkdev->file_size, blkdev->file_size / M_BYTE); =20 /* Fill in number of sector size and number of sectors */ xenstore_write_be_int(&blkdev->xendev, "sector-size", blkdev->file_blk= ); diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index 027f76fad1..083fb80ee5 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -75,9 +75,9 @@ int xenstore_domain_init1(const char *kernel, const char = *ramdisk, xenstore_write_str(dom, "vm", vm); =20 /* memory */ - xenstore_write_int(dom, "memory/target", ram_size >> 10); // kB - xenstore_write_int(vm, "memory", ram_size >> 20); // MB - xenstore_write_int(vm, "maxmem", ram_size >> 20); // MB + xenstore_write_int(dom, "memory/target", ram_size * K_BYTE); + xenstore_write_int(vm, "memory", ram_size * M_BYTE); + xenstore_write_int(vm, "maxmem", ram_size * M_BYTE); =20 /* cpus */ for (i =3D 0; i < smp_cpus; i++) { @@ -260,7 +260,7 @@ int xen_domain_build_pv(const char *kernel, const char = *ramdisk, } #endif =20 - rc =3D xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10); + rc =3D xc_domain_setmaxmem(xen_xc, xen_domid, ram_size / K_BYTE); if (rc < 0) { fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n"); goto err; @@ -269,7 +269,7 @@ int xen_domain_build_pv(const char *kernel, const char = *ramdisk, xenstore_port =3D xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); console_port =3D xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); =20 - rc =3D xc_linux_build(xen_xc, xen_domid, ram_size >> 20, + rc =3D xc_linux_build(xen_xc, xen_domid, ram_size / M_BYTE, kernel, ramdisk, cmdline, 0, flags, xenstore_port, &xenstore_mfn, --=20 2.16.1