[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/47] vdi: Use definitions from "qemu/units.h"
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/47] vdi: Use definitions from "qemu/units.h" |
Date: |
Sat, 30 Jun 2018 08:09:57 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/vdi.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 1d8ed67..6555cff 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -50,6 +50,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "qapi/error.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
@@ -83,9 +84,6 @@
/* Command line option for static images. */
#define BLOCK_OPT_STATIC "static"
-#define KiB 1024
-#define MiB (KiB * KiB)
-
#define SECTOR_SIZE 512
#define DEFAULT_CLUSTER_SIZE (1 * MiB)
@@ -434,7 +432,8 @@ static int vdi_open(BlockDriverState *bs, QDict *options,
int flags,
goto fail;
} else if (header.block_size != DEFAULT_CLUSTER_SIZE) {
error_setg(errp, "unsupported VDI image (block size %" PRIu32
- " is not %u)", header.block_size, DEFAULT_CLUSTER_SIZE);
+ " is not %" PRIu64 ")",
+ header.block_size, DEFAULT_CLUSTER_SIZE);
ret = -ENOTSUP;
goto fail;
} else if (header.disk_size >
--
1.8.3.1
- [Qemu-devel] [PULL 00/47] More misc patches for 3.0 soft freeze, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 03/47] include: Add IEC binary prefixes in "qemu/units.h", Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 02/47] configure: add sanity check to catch builds from "git archive", Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 05/47] x86/cpu: Use definitions from "qemu/units.h", Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 06/47] checkpatch: Recognize IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 04/47] vdi: Use definitions from "qemu/units.h",
Paolo Bonzini <=
- [Qemu-devel] [PULL 01/47] i386/kvm: add support for Hyper-V TLB flush, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 08/47] hw: Directly use "qemu/units.h" instead of "qemu/cutils.h", Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 09/47] hw/ivshmem: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 07/47] hw: Use IEC binary prefix definitions from "qemu/units.h", Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 10/47] hw/ipack: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 13/47] hw/xen: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 12/47] hw/smbios: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 11/47] hw/scsi: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 17/47] hw/misc: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30
- [Qemu-devel] [PULL 18/47] hw/riscv: Use the IEC binary prefix definitions, Paolo Bonzini, 2018/06/30