[Qemu-devel] [PATCH 3/4] Move SECTOR_BITS/SECTOR_SIZE to block.h

[Eduardo Habkost]

We will use those defines on other parts of the Qemu code.

Remove redundant SECTOR_SIZE define from block-vmdk.c, also.

Signed-off-by: Eduardo Habkost <address@hidden>
---
 block-vmdk.c |    1 -
 block.c      |    3 ---
 block.h      |    3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/block-vmdk.c b/block-vmdk.c
index 416fb95..7ac79b3 100644
--- a/block-vmdk.c
+++ b/block-vmdk.c
@@ -110,7 +110,6 @@ static int vmdk_probe(const uint8_t *buf, int buf_size, 
const char *filename)
 
 #define CHECK_CID 1
 
-#define SECTOR_SIZE 512
 #define DESC_SIZE 20*SECTOR_SIZE       // 20 sectors of 512 bytes each
 #define HEADER_SIZE 512                        // first sector of 512 bytes
 
diff --git a/block.c b/block.c
index 4f4bf7c..ba7fcf6 100644
--- a/block.c
+++ b/block.c
@@ -38,9 +38,6 @@
 #include <sys/disk.h>
 #endif
 
-#define SECTOR_BITS 9
-#define SECTOR_SIZE (1 << SECTOR_BITS)
-
 typedef struct BlockDriverAIOCBSync {
     BlockDriverAIOCB common;
     QEMUBH *bh;
diff --git a/block.h b/block.h
index e1927dd..ee0d403 100644
--- a/block.h
+++ b/block.h
@@ -4,6 +4,9 @@
 #include "qemu-aio.h"
 #include "qemu-common.h"
 
+#define SECTOR_BITS 9
+#define SECTOR_SIZE (1 << SECTOR_BITS)
+
 /* block.c */
 typedef struct BlockDriver BlockDriver;
 
-- 
1.6.1