[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v2 30/30] xen: use the BYTE-based definitions
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-trivial] [PATCH v2 30/30] xen: use the BYTE-based definitions |
Date: |
Mon, 5 Mar 2018 08:27:32 -0300 |
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: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alan Robinson <address@hidden>
---
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)
}
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);
/* 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..7c8bde20cd 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);
/* 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);
/* cpus */
for (i = 0; i < smp_cpus; i++) {
@@ -260,7 +260,7 @@ int xen_domain_build_pv(const char *kernel, const char
*ramdisk,
}
#endif
- rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10);
+ rc = 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 = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0);
console_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0);
- rc = xc_linux_build(xen_xc, xen_domid, ram_size >> 20,
+ rc = xc_linux_build(xen_xc, xen_domid, ram_size / M_BYTE,
kernel, ramdisk, cmdline,
0, flags,
xenstore_port, &xenstore_mfn,
--
2.16.2
- [Qemu-trivial] [PATCH v2 21/30] hw/misc: use the BYTE-based definitions, (continued)
- [Qemu-trivial] [PATCH v2 21/30] hw/misc: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 25/30] hw/scsi: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 23/30] hw/net: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 24/30] hw/ipack: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 28/30] ivshmem: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 26/30] hw/smbios: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 27/30] vfio/pci: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 29/30] tpm: use the BYTE-based definitions, Philippe Mathieu-Daudé, 2018/03/05
- [Qemu-trivial] [PATCH v2 30/30] xen: use the BYTE-based definitions,
Philippe Mathieu-Daudé <=
- Message not available