optionrom: remove use of implicit RM variable

[qemu.git] / qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index b317305ff33cb59b07413d3035c7c293ca4570a7..204f618c6e86820df5342f5a5398d5518ca0d2cc 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -31,10 +31,10 @@
 #include <windows.h>
 #endif
 
-typedef struct img_cmd {
+typedef struct img_cmd_t {
     const char *name;
     int (*handler)(int argc, char **argv);
-} a_img_cmd;
+} img_cmd_t;
 
 /* Default to cache=writeback as data integrity is not important for qemu-tcg. */
 #define BRDV_O_FLAGS BDRV_O_CACHE_WB
@@ -530,7 +530,7 @@ static int is_allocated_sectors(const uint8_t *buf, int n, int *pnum)
     return v;
 }
 
-#define IO_BUF_SIZE 65536
+#define IO_BUF_SIZE (2 * 1024 * 1024)
 
 static int img_convert(int argc, char **argv)
 {
@@ -1035,7 +1035,7 @@ static int img_snapshot(int argc, char **argv)
     return 0;
 }
 
-static const a_img_cmd img_cmds[] = {
+static const img_cmd_t img_cmds[] = {
 #define DEF(option, callback, arg_string)        \
     { option, callback },
 #include "qemu-img-cmds.h"
@@ -1046,7 +1046,7 @@ static const a_img_cmd img_cmds[] = {
 
 int main(int argc, char **argv)
 {
-    const a_img_cmd *cmd;
+    const img_cmd_t *cmd;
     const char *cmdname;
 
     bdrv_init();