Commit e0255bb1 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/vfio: Use the IEC binary prefix definitions 



It eases code review, unit is explicit.

Patch generated using:

  $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/

and modified manually.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180625124238.25339-38-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4c8f9735

hw/vfio/pci-quirks.c

+5 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qemu/error-report.h"

#include "qemu/main-loop.h"

#include "qemu/range.h"
@@ -1448,9 +1449,9 @@ static int vfio_igd_gtt_max(VFIOPCIDevice *vdev) 
        ggms = 1 << ggms;

    }



    ggms *= 1024 * 1024;

    ggms *= MiB;



    return (ggms / (4 * 1024)) * (gen < 8 ? 4 : 8);

    return (ggms / (4 * KiB)) * (gen < 8 ? 4 : 8);

}



/*
@@ -1705,7 +1706,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) 
    igd->vdev = vdev;

    igd->index = ~0;

    igd->bdsm = vfio_pci_read_config(&vdev->pdev, IGD_BDSM, 4);

    igd->bdsm &= ~((1 << 20) - 1); /* 1MB aligned */

    igd->bdsm &= ~((1 * MiB) - 1); /* 1MB aligned */



    memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_igd_index_quirk,

                          igd, "vfio-igd-index-quirk", 4);
@@ -1752,7 +1753,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) 
     * config offset 0x5C.

     */

    bdsm_size = g_malloc(sizeof(*bdsm_size));

    *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * 1024 * 1024);

    *bdsm_size = cpu_to_le64((ggms_mb + gms_mb) * MiB);

    fw_cfg_add_file(fw_cfg_find(), "etc/igd-bdsm-size",

                    bdsm_size, sizeof(*bdsm_size));

hw/vfio/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "qemu/error-report.h"

#include "qemu/option.h"

#include "qemu/range.h"

#include "qemu/units.h"

#include "sysemu/kvm.h"

#include "sysemu/sysemu.h"

#include "pci.h"
@@ -1417,7 +1418,7 @@ static void vfio_pci_relocate_msix(VFIOPCIDevice *vdev, Error **errp) 
    }



    /* 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 * GiB &&

        !vdev->bars[target_bar].mem64) {

        error_setg(errp, "Invalid MSI-X relocation BAR %d, "

                   "no space to extend 32-bit BAR", target_bar);