Commit 51eae1e7 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael S. Tsirkin
Browse files

hw/pci-host: Use the IEC binary prefix definitions 



IEC binary prefixes ease code review: the unit is explicit.

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200601142930.29408-6-f4bug@amsat.org>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 37e7211c

hw/pci-host/i440fx.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "qemu/range.h"

#include "hw/i386/pc.h"

#include "hw/pci/pci.h"
@@ -301,7 +302,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, 
    memory_region_set_enabled(&f->smram_region, true);



    /* smram, as seen by SMM CPUs */

    memory_region_init(&f->smram, OBJECT(d), "smram", 1ull << 32);

    memory_region_init(&f->smram, OBJECT(d), "smram", 4 * GiB);

    memory_region_set_enabled(&f->smram, true);

    memory_region_init_alias(&f->low_smram, OBJECT(d), "smram-low",

                             f->ram_memory, 0xa0000, 0x20000);

hw/pci-host/q35.c

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static void mch_realize(PCIDevice *d, Error **errp) 
    memory_region_set_enabled(&mch->open_high_smram, false);



    /* smram, as seen by SMM CPUs */

    memory_region_init(&mch->smram, OBJECT(mch), "smram", 1ull << 32);

    memory_region_init(&mch->smram, OBJECT(mch), "smram", 4 * GiB);

    memory_region_set_enabled(&mch->smram, true);

    memory_region_init_alias(&mch->low_smram, OBJECT(mch), "smram-low",

                             mch->ram_memory, MCH_HOST_BRIDGE_SMRAM_C_BASE,

hw/pci-host/versatile.c

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu/units.h"

#include "hw/sysbus.h"

#include "migration/vmstate.h"

#include "hw/irq.h"
@@ -399,8 +400,8 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp) 
    pci_map_irq_fn mapfn;

    int i;



    memory_region_init(&s->pci_io_space, OBJECT(s), "pci_io", 1ULL << 32);

    memory_region_init(&s->pci_mem_space, OBJECT(s), "pci_mem", 1ULL << 32);

    memory_region_init(&s->pci_io_space, OBJECT(s), "pci_io", 4 * GiB);

    memory_region_init(&s->pci_mem_space, OBJECT(s), "pci_mem", 4 * GiB);



    pci_root_bus_new_inplace(&s->pci_bus, sizeof(s->pci_bus), dev, "pci",

                             &s->pci_mem_space, &s->pci_io_space,