From nobody Fri Oct 24 20:18:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of _spf.google.com designates 209.85.220.195 as permitted sender) client-ip=209.85.220.195; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-qk0-f195.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of _spf.google.com designates 209.85.220.195 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by mx.zohomail.com with SMTPS id 1518669026837511.0952391937906; Wed, 14 Feb 2018 20:30:26 -0800 (PST) Received: by mail-qk0-f195.google.com with SMTP id b130so12328247qkg.9 for ; Wed, 14 Feb 2018 20:30:26 -0800 (PST) Return-Path: Return-Path: Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:25 -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=wcYbXffxxh/1hw6GaMGMI8mhUVMIi4AXYjwbEClsbHY=; b=Wevts7Pi+uKbEHXtFHgsbzzSiL2BLosL8oy+71UvkDD7Eej7vkVgjhujQdqqtBt+0d /Le1m93wFbf2aHZHIlU1i7o3Y6+AipjhKlCqCSpai9bAzQVY+cZdqBst6FS89bNcNw0M kN27uZV3tAOXG7rPUcCjU8QwSMu0PAD/6bztxjm/6KIyD8zROH11C2brpF/hLt9ajbek 1IPtVTR2mEa8j1Unptw808DT0CdjQ83ZqW9mplwvSqCUFXXS+sl7gF+Z+7Qz7duelfeY PTUax9QYgVKCgkXidWX+5LZlyg8oyIOJ2GcjoSbPBekxrNflGseLX5mOXBdEjgsvnXlD Waag== 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=wcYbXffxxh/1hw6GaMGMI8mhUVMIi4AXYjwbEClsbHY=; b=OdB/mHcyMXT0/nrCfocJ6rRYNiuTA/nGTylhFawPCzpd0Y+XX+Z8GinhSW9WKfFm/Z BVctAGKUUVsVuRX9iDrxQixFOMfjpIuPkps7v8wAa0GeTclL2vRRuysLKKWINaPz+xrk duoa424+I93xp4UH2vN8b+H73a99V9rpXLPasZijLCwZ6fwK7FOl1fWI+YAfBssE3che kclLQTFfd5ZW6lqtWAH+oeyuePEczr1cEbB2tbgCQOTnCVc5A1j4PbTkmbFizEsBn5JM jvSqzGIWbTZnJR37Q7fZVvCYzf4t1IGXgYJhc7fLh7JtlXqiVt1CCw0ddFwBYwlFdiWh 4e6A== X-Gm-Message-State: APf1xPCnYj5zhQOOXWXM+CuQnCKS5c6oyhIi3sqpB2SSnEyYK1vHQKmq Xe//v5CsYPniE4ePAMf9eSQ= X-Google-Smtp-Source: AH8x2240BgXPm4lBLOrg/LbuwoUi3Sdg57da3+4xVYraUzGMOTB/nIpo8kBnAA5I4dQNmJZrox4Iig== X-Received: by 10.55.154.13 with SMTP id c13mr2090746qke.347.1518669025992; Wed, 14 Feb 2018 20:30:25 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alex Williamson Subject: [PATCH 27/30] vfio/pci: use the BYTE-based definitions Date: Thu, 15 Feb 2018 01:28:57 -0300 Message-Id: <20180215042900.16078-28-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-ZohoMail-DKIM: pass (identity @gmail.com) X-ZohoMail: RDKM_0 RSF_0 Z_629925259 SPT_0 It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/vfio/pci-quirks.c | 8 ++++---- hw/vfio/pci.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index e5779a7ad3..3c091106dd 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1255,9 +1255,9 @@ static int vfio_igd_gtt_max(VFIOPCIDevice *vdev) ggms =3D 1 << ggms; } =20 - ggms *=3D 1024 * 1024; + ggms *=3D M_BYTE; =20 - return (ggms / (4 * 1024)) * (gen < 8 ? 4 : 8); + return (ggms / (4 * K_BYTE)) * (gen < 8 ? 4 : 8); } =20 /* @@ -1514,7 +1514,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *= vdev, int nr) igd->vdev =3D vdev; igd->index =3D ~0; igd->bdsm =3D vfio_pci_read_config(&vdev->pdev, IGD_BDSM, 4); - igd->bdsm &=3D ~((1 << 20) - 1); /* 1MB aligned */ + igd->bdsm &=3D ~((1 * M_BYTE) - 1); /* 1MB aligned */ =20 memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_igd_index_qu= irk, igd, "vfio-igd-index-quirk", 4); @@ -1561,7 +1561,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *= vdev, int nr) * config offset 0x5C. */ bdsm_size =3D g_malloc(sizeof(*bdsm_size)); - *bdsm_size =3D cpu_to_le64((ggms_mb + gms_mb) * 1024 * 1024); + *bdsm_size =3D cpu_to_le64((ggms_mb + gms_mb) * M_BYTE); fw_cfg_add_file(fw_cfg_find(), "etc/igd-bdsm-size", bdsm_size, sizeof(*bdsm_size)); =20 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 033cc8dea1..db337476ef 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -1408,7 +1408,7 @@ static void vfio_pci_relocate_msix(VFIOPCIDevice *vde= v, Error **errp) } =20 /* 2GB max size for 32-bit BARs, cannot double if already > 1G */ - if (vdev->bars[target_bar].size > (1 * 1024 * 1024 * 1024) && + if (vdev->bars[target_bar].size > 1 * G_BYTE && !vdev->bars[target_bar].mem64) { error_setg(errp, "Invalid MSI-X relocation BAR %d, " "no space to extend 32-bit BAR", target_bar); --=20 2.16.1