On Mon, Jun 25, 2018 at 09:41:52AM -0300, Philippe Mathieu-Daudé wrote: > Hi, > > This series: > > - split the byte-based definitions from "qemu/cutils.h" to "qemu/units.h" > (this now triggers WARNING: 1 added file, does MAINTAINERS need updating?) > - clean hw/ includes; > - replace different constants used for byte size with their corresponding > IEC binary prefix definitions.
Series: Acked-by: Michael S. Tsirkin <m...@redhat.com> > Since v4: > - fixed checkpatch (do not match the IEC binary prefix as camelcase typedefs) > - use signed format for size (Richard) > - fix 32-bit (Thomas) > - update '[<>][<>]= ?[1-5]0', adding 5 new patches (Eric) > > Since v3: > - use IEC binary prefix definitions (Stefan Weil) > - rebased > - added R-b tags > > Since v2: > - use "qemu/units.h" instead of "qemu/cunits.h" (Daniel P. Berrangé) > - avoid rebuilding the world including "qemu/units.h" in "hw/hw.h" (Thomas > Huth) > - more constant replaced > > Since v1: > - corrected Xen mult -> div (Alan Robinson) > - tagged 'include "qemu/cunits.h" in "hw/hw.h" as RFC > - fixed mips_r4k 'params_size' (Thomas Huth) > - added command used to generate patch in each commit (Alistair Francis) > - use G_BYTE for the raspi3 machine > - added Reviewed-by tags > > Regards, > > Phil. > > [----] : patches are identical > [####] : number of functional differences between upstream/downstream patch > [down] : patch is downstream-only > The flags [FC] indicate (F)unctional and (C)ontextual differences, > respectively > > 001/46:[0012] [FC] 'include: Add IEC binary prefixes in "qemu/units.h"' > 002/46:[0005] [FC] 'vdi: Use definitions from "qemu/units.h"' > 003/46:[----] [--] 'x86/cpu: Use definitions from "qemu/units.h"' > 004/46:[0002] [FC] 'checkpatch: Recognize IEC binary prefix definitions' > 005/46:[----] [-C] 'hw: Use IEC binary prefix definitions from "qemu/units.h"' > 006/46:[----] [--] 'hw: Directly use "qemu/units.h" instead of > "qemu/cutils.h"' > 007/46:[----] [--] 'hw/ivshmem: Use the IEC binary prefix definitions' > 008/46:[----] [--] 'hw/ipack: Use the IEC binary prefix definitions' > 009/46:[----] [--] 'hw/scsi: Use the IEC binary prefix definitions' > 010/46:[----] [--] 'hw/smbios: Use the IEC binary prefix definitions' > 011/46:[0002] [FC] 'hw/xen: Use the IEC binary prefix definitions' > 012/46:[----] [--] 'hw/tpm: Use the IEC binary prefix definitions' > 013/46:[----] [--] 'hw/block: Use the IEC binary prefix definitions' > 014/46:[0008] [FC] 'hw/display: Use the IEC binary prefix definitions' > 015/46:[----] [--] 'hw/misc: Use the IEC binary prefix definitions' > 016/46:[----] [--] 'hw/riscv: Use the IEC binary prefix definitions' > 017/46:[----] [--] 'hw/m68k: Use the IEC binary prefix definitions' > 018/46:[0006] [FC] 'hw/sparc: Use the IEC binary prefix definitions' > 019/46:[0003] [FC] 'hw/s390x: Use the IEC binary prefix definitions' > 020/46:[0004] [FC] 'hw/hppa: Use the IEC binary prefix definitions' > 021/46:[0009] [FC] 'hw/xtensa: Use the IEC binary prefix definitions' > 022/46:[----] [--] 'hw/alpha: Use the IEC binary prefix definitions' > 023/46:[----] [--] 'hw/tricore: Use the IEC binary prefix definitions' > 024/46:[----] [--] 'hw/microblaze: Use the IEC binary prefix definitions' > 025/46:[----] [--] 'hw/nios2: Use the IEC binary prefix definitions' > 026/46:[----] [--] 'hw/cris: Use the IEC binary prefix definitions' > 027/46:[----] [--] 'hw/lm32: Use the IEC binary prefix definitions' > 028/46:[----] [--] 'hw/sh4: Use the IEC binary prefix definitions' > 029/46:[----] [--] 'hw/mips/r4k: Constify params_size' > 030/46:[0012] [FC] 'hw/mips: Use the IEC binary prefix definitions' > 031/46:[----] [--] 'hw/arm: Use the IEC binary prefix definitions' > 032/46:[0022] [FC] 'hw/ppc: Use the IEC binary prefix definitions' > 033/46:[0006] [FC] 'hw/i386: Use the IEC binary prefix definitions' > 034/46:[----] [--] 'hw/net: Use the IEC binary prefix definitions' > 035/46:[0002] [FC] 'hw/usb: Use the IEC binary prefix definitions' > 036/46:[0002] [FC] 'hw/sd: Use the IEC binary prefix definitions' > 037/46:[----] [--] 'hw/vfio: Use the IEC binary prefix definitions' > 038/46:[----] [--] 'hw/virtio: Use the IEC binary prefix definitions' > 039/46:[----] [--] 'hw/rdma: Use the IEC binary prefix definitions' > 040/46:[----] [--] 'cutils: Do not include "qemu/units.h" directly' > 041/46:[0148] [FC] 'hw/ppc: Use the IEC binary prefix definitions' > 042/46:[down] 'monitor: Use the IEC binary prefix definitions' > 043/46:[down] 'vl: Use the IEC binary prefix definitions' > 044/46:[down] 'tests/crypto: Use the IEC binary prefix definitions' > 045/46:[down] 'linux-user: Use the IEC binary prefix definitions' > 046/46:[down] 'bsd-user: Use the IEC binary prefix definitions' > > Philippe Mathieu-Daudé (46): > include: Add IEC binary prefixes in "qemu/units.h" > vdi: Use definitions from "qemu/units.h" > x86/cpu: Use definitions from "qemu/units.h" > checkpatch: Recognize IEC binary prefix definitions > hw: Use IEC binary prefix definitions from "qemu/units.h" > hw: Directly use "qemu/units.h" instead of "qemu/cutils.h" > hw/ivshmem: Use the IEC binary prefix definitions > hw/ipack: Use the IEC binary prefix definitions > hw/scsi: Use the IEC binary prefix definitions > hw/smbios: Use the IEC binary prefix definitions > hw/xen: Use the IEC binary prefix definitions > hw/tpm: Use the IEC binary prefix definitions > hw/block: Use the IEC binary prefix definitions > hw/display: Use the IEC binary prefix definitions > hw/misc: Use the IEC binary prefix definitions > hw/riscv: Use the IEC binary prefix definitions > hw/m68k: Use the IEC binary prefix definitions > hw/sparc: Use the IEC binary prefix definitions > hw/s390x: Use the IEC binary prefix definitions > hw/hppa: Use the IEC binary prefix definitions > hw/xtensa: Use the IEC binary prefix definitions > hw/alpha: Use the IEC binary prefix definitions > hw/tricore: Use the IEC binary prefix definitions > hw/microblaze: Use the IEC binary prefix definitions > hw/nios2: Use the IEC binary prefix definitions > hw/cris: Use the IEC binary prefix definitions > hw/lm32: Use the IEC binary prefix definitions > hw/sh4: Use the IEC binary prefix definitions > hw/mips/r4k: Constify params_size > hw/mips: Use the IEC binary prefix definitions > hw/arm: Use the IEC binary prefix definitions > hw/ppc: Use the IEC binary prefix definitions > hw/i386: Use the IEC binary prefix definitions > hw/net: Use the IEC binary prefix definitions > hw/usb: Use the IEC binary prefix definitions > hw/sd: Use the IEC binary prefix definitions > hw/vfio: Use the IEC binary prefix definitions > hw/virtio: Use the IEC binary prefix definitions > hw/rdma: Use the IEC binary prefix definitions > cutils: Do not include "qemu/units.h" directly > hw/ppc: Use the IEC binary prefix definitions > monitor: Use the IEC binary prefix definitions > vl: Use the IEC binary prefix definitions > tests/crypto: Use the IEC binary prefix definitions > linux-user: Use the IEC binary prefix definitions > bsd-user: Use the IEC binary prefix definitions > > hw/net/ne2000.h | 5 ++-- > hw/ppc/mac.h | 3 ++- > hw/rdma/vmw/pvrdma.h | 3 ++- > include/hw/acpi/tpm.h | 3 ++- > include/hw/arm/fsl-imx7.h | 5 ++-- > include/hw/arm/stm32f205_soc.h | 5 ++-- > include/hw/display/xlnx_dp.h | 5 ++-- > include/hw/i386/ich9.h | 3 ++- > include/hw/intc/mips_gic.h | 3 ++- > include/hw/mips/bios.h | 3 ++- > include/hw/net/allwinner_emac.h | 5 ++-- > include/hw/ppc/spapr.h | 5 ++-- > include/hw/virtio/virtio-net.h | 3 ++- > include/qemu/cutils.h | 7 ------ > include/qemu/units.h | 20 ++++++++++++++++ > block/vdi.c | 7 +++--- > bsd-user/main.c | 5 ++-- > hw/alpha/typhoon.c | 17 +++++++------- > hw/arm/bcm2835_peripherals.c | 3 ++- > hw/arm/boot.c | 7 +++--- > hw/arm/collie.c | 5 ++-- > hw/arm/digic_boards.c | 7 +++--- > hw/arm/exynos4_boards.c | 3 ++- > hw/arm/gumstix.c | 3 ++- > hw/arm/integratorcp.c | 3 ++- > hw/arm/mainstone.c | 3 ++- > hw/arm/msf2-soc.c | 6 ++--- > hw/arm/msf2-som.c | 8 +++---- > hw/arm/musicpal.c | 9 +++---- > hw/arm/omap_sx1.c | 11 +++++---- > hw/arm/raspi.c | 5 ++-- > hw/arm/smmu-common.c | 3 ++- > hw/arm/stellaris.c | 5 ++-- > hw/arm/versatilepb.c | 5 ++-- > hw/arm/vexpress.c | 7 +++--- > hw/arm/virt.c | 5 ++-- > hw/arm/xilinx_zynq.c | 7 +++--- > hw/block/m25p80.c | 5 ++-- > hw/block/nvme.c | 3 ++- > hw/block/tc58128.c | 3 ++- > hw/block/xen_disk.c | 3 ++- > hw/core/loader-fit.c | 3 ++- > hw/core/machine.c | 4 ++-- > hw/cris/axis_dev88.c | 3 ++- > hw/display/bochs-display.c | 9 +++---- > hw/display/cirrus_vga.c | 10 ++++---- > hw/display/g364fb.c | 4 ++-- > hw/display/qxl.c | 30 +++++++++++------------- > hw/display/sm501.c | 16 ++++++------- > hw/display/vga-isa-mm.c | 5 ++-- > hw/display/vga.c | 5 ++-- > hw/display/virtio-gpu.c | 4 ++-- > hw/display/vmware_vga.c | 3 ++- > hw/display/xenfb.c | 3 ++- > hw/hppa/dino.c | 5 ++-- > hw/hppa/machine.c | 12 +++++----- > hw/i386/acpi-build.c | 5 ++-- > hw/i386/pc.c | 19 ++++++++------- > hw/i386/pc_piix.c | 4 ++-- > hw/i386/pc_q35.c | 3 ++- > hw/i386/pc_sysfw.c | 9 +++---- > hw/i386/xen/xen-mapcache.c | 3 ++- > hw/intc/apic_common.c | 3 ++- > hw/ipack/tpci200.c | 5 ++-- > hw/lm32/lm32_boards.c | 13 +++++----- > hw/lm32/milkymist.c | 10 ++++---- > hw/m68k/mcf5208.c | 3 ++- > hw/microblaze/petalogix_ml605_mmu.c | 7 +++--- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 7 +++--- > hw/mips/boston.c | 30 ++++++++++++------------ > hw/mips/mips_fulong2e.c | 7 +++--- > hw/mips/mips_malta.c | 25 +++++++++++--------- > hw/mips/mips_r4k.c | 15 ++++++------ > hw/misc/aspeed_sdmc.c | 9 +++---- > hw/misc/auxbus.c | 3 ++- > hw/misc/edu.c | 3 ++- > hw/misc/imx7_gpr.c | 3 ++- > hw/misc/ivshmem.c | 3 ++- > hw/misc/mips_itu.c | 3 ++- > hw/misc/omap_gpmc.c | 5 ++-- > hw/net/e1000e.c | 7 +++--- > hw/net/e1000x_common.c | 3 ++- > hw/net/eepro100.c | 3 +-- > hw/nios2/boot.c | 6 ++--- > hw/nvram/spapr_nvram.c | 11 +++++---- > hw/pci-host/designware.c | 3 ++- > hw/pci-host/gpex.c | 3 ++- > hw/pci-host/piix.c | 5 ++-- > hw/pci-host/prep.c | 3 ++- > hw/pci-host/q35.c | 17 +++++++------- > hw/pci-host/xilinx-pcie.c | 5 ++-- > hw/ppc/e500.c | 13 +++++----- > hw/ppc/e500plat.c | 3 ++- > hw/ppc/mac_newworld.c | 1 - > hw/ppc/mac_oldworld.c | 9 ++++--- > hw/ppc/pnv.c | 6 ++--- > hw/ppc/ppc405_boards.c | 9 +++---- > hw/ppc/ppc405_uc.c | 7 +++--- > hw/ppc/ppc440_bamboo.c | 5 ++-- > hw/ppc/ppc440_uc.c | 28 +++++++++++----------- > hw/ppc/ppc4xx_devs.c | 22 +++++++++-------- > hw/ppc/ppce500_spin.c | 3 ++- > hw/ppc/prep.c | 6 ++--- > hw/ppc/rs6000_mc.c | 13 +++++----- > hw/ppc/sam460ex.c | 18 +++++++------- > hw/ppc/spapr.c | 12 +++++----- > hw/ppc/spapr_rtas.c | 2 +- > hw/ppc/virtex_ml507.c | 7 +++--- > hw/riscv/virt.c | 3 ++- > hw/s390x/s390-skeys.c | 3 ++- > hw/s390x/s390-stattrib.c | 3 ++- > hw/s390x/sclp.c | 3 ++- > hw/scsi/scsi-disk.c | 9 +++---- > hw/sd/sd.c | 8 +++---- > hw/sd/sdhci.c | 8 +++---- > hw/sh4/r2d.c | 3 ++- > hw/smbios/smbios.c | 15 +++++------- > hw/sparc/leon3.c | 10 ++++---- > hw/sparc/sun4m.c | 10 ++++---- > hw/sparc64/niagara.c | 3 ++- > hw/sparc64/sun4u.c | 4 ++-- > hw/ssi/aspeed_smc.c | 29 ++++++++++++----------- > hw/tricore/tricore_testboard.c | 13 +++++----- > hw/usb/ccid-card-passthru.c | 5 ++-- > hw/usb/combined-packet.c | 3 ++- > hw/usb/dev-smartcard-reader.c | 3 ++- > hw/usb/redirect.c | 3 ++- > hw/vfio/pci-quirks.c | 9 +++---- > hw/vfio/pci.c | 3 ++- > hw/xenpv/xen_domainbuild.c | 13 +++++----- > hw/xtensa/xtfpga.c | 9 +++---- > linux-user/main.c | 5 ++-- > monitor.c | 3 ++- > target/i386/cpu.c | 4 +--- > target/ppc/mmu_helper.c | 8 +++---- > target/xtensa/helper.c | 5 ++-- > tests/benchmark-crypto-cipher.c | 6 ++--- > tests/benchmark-crypto-hash.c | 5 ++-- > tests/benchmark-crypto-hmac.c | 6 ++--- > tests/test-cutils.c | 18 +++++++------- > tests/test-keyval.c | 6 ++--- > tests/test-qemu-opts.c | 7 +++--- > vl.c | 3 ++- > scripts/checkpatch.pl | 1 + > 144 files changed, 565 insertions(+), 453 deletions(-) > create mode 100644 include/qemu/units.h > > -- > 2.18.0
