motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-30 21:42:06 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/xen: Use the IEC binary prefix definitions

Browse source 
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é <f4bug@amsat.org>
Reviewed-by: Alan Robinson <Alan.Robinson@ts.fujitsu.com>
Message-Id: <20180625124238.25339-12-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2018-06-25 09:42:03 -03:00 • committed by Paolo Bonzini
parent 968dfd0516
commit 8f951a13f0
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/block/xen_disk.c
View file

@ -20,6 +20,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/uio.h> #include <sys/uio.h>
@ -814,7 +815,7 @@ static int blk_connect(struct XenDevice *xendev)
xen_pv_printf(xendev, 1, "type \"%s\", fileproto \"%s\", filename \"%s\"," xen_pv_printf(xendev, 1, "type \"%s\", fileproto \"%s\", filename \"%s\","
" size %" PRId64 " (%" PRId64 " MB)\n", " size %" PRId64 " (%" PRId64 " MB)\n",
blkdev->type, blkdev->fileproto, blkdev->filename, blkdev->type, blkdev->fileproto, blkdev->filename,
blkdev->file_size, blkdev->file_size >> 20); blkdev->file_size, blkdev->file_size / MiB);
/* Fill in number of sector size and number of sectors */ /* Fill in number of sector size and number of sectors */
xenstore_write_be_int(xendev, "sector-size", blkdev->file_blk); xenstore_write_be_int(xendev, "sector-size", blkdev->file_blk);

3
hw/i386/xen/xen-mapcache.c
View file

@ -9,6 +9,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include <sys/resource.h> #include <sys/resource.h>
@ -46,7 +47,7 @@
* From empirical tests I observed that qemu use 75MB more than the * From empirical tests I observed that qemu use 75MB more than the
* max_mcache_size. * max_mcache_size.
*/ */
#define NON_MCACHE_MEMORY_SIZE (80 * 1024 * 1024) #define NON_MCACHE_MEMORY_SIZE (80 * MiB)
typedef struct MapCacheEntry { typedef struct MapCacheEntry {
hwaddr paddr_index; hwaddr paddr_index;

13
hw/xenpv/xen_domainbuild.c
View file

@ -1,4 +1,5 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "hw/xen/xen_backend.h" #include "hw/xen/xen_backend.h"
#include "xen_domainbuild.h" #include "xen_domainbuild.h"
#include "qemu/timer.h" #include "qemu/timer.h"
@ -75,9 +76,9 @@ int xenstore_domain_init1(const char *kernel, const char *ramdisk,
xenstore_write_str(dom, "vm", vm); xenstore_write_str(dom, "vm", vm);
/* memory */ /* memory */
xenstore_write_int(dom, "memory/target", ram_size >> 10); // kB xenstore_write_int(dom, "memory/target", ram_size / KiB);
xenstore_write_int(vm, "memory", ram_size >> 20); // MB xenstore_write_int(vm, "memory", ram_size / MiB);
xenstore_write_int(vm, "maxmem", ram_size >> 20); // MB xenstore_write_int(vm, "maxmem", ram_size / MiB);
/* cpus */ /* cpus */
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
@ -113,7 +114,7 @@ int xenstore_domain_init2(int xenstore_port, int xenstore_mfn,
/* console */ /* console */
xenstore_write_str(dom, "console/type", "ioemu"); xenstore_write_str(dom, "console/type", "ioemu");
xenstore_write_int(dom, "console/limit", 128 * 1024); xenstore_write_int(dom, "console/limit", 128 * KiB);
xenstore_write_int(dom, "console/ring-ref", console_mfn); xenstore_write_int(dom, "console/ring-ref", console_mfn);
xenstore_write_int(dom, "console/port", console_port); xenstore_write_int(dom, "console/port", console_port);
xen_config_dev_console(0); xen_config_dev_console(0);
@ -260,7 +261,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
} }
#endif #endif
rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size >> 10); rc = xc_domain_setmaxmem(xen_xc, xen_domid, ram_size / KiB);
if (rc < 0) { if (rc < 0) {
fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n"); fprintf(stderr, "xen: xc_domain_setmaxmem() failed\n");
goto err; goto err;
@ -269,7 +270,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk,
xenstore_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0); xenstore_port = xc_evtchn_alloc_unbound(xen_xc, xen_domid, 0);
console_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 / MiB,
kernel, ramdisk, cmdline, kernel, ramdisk, cmdline,
0, flags, 0, flags,
xenstore_port, &xenstore_mfn, xenstore_port, &xenstore_mfn,