Fix most warnings that would be caused by gcc flag -Wundef

[qemu.git] / block-cow.c

diff --git a/block-cow.c b/block-cow.c
index 8880c1cb6a5d5d9aa6f1ff291d14ba0ab9f52f2b..9e7b64602fc943bbce608de57568cec5a00c88ca 100644 (file)
--- a/block-cow.c
+++ b/block-cow.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #ifndef _WIN32
-#include "vl.h"
+#include "qemu-common.h"
 #include "block_int.h"
 #include <sys/mman.h>
 
@@ -85,14 +85,14 @@ static int cow_open(BlockDriverState *bs, const char *filename, int flags)
         be32_to_cpu(cow_header.version) != COW_VERSION) {
         goto fail;
     }
-       
+
     /* cow image found */
     size = be64_to_cpu(cow_header.size);
     bs->total_sectors = size / 512;
 
     pstrcpy(bs->backing_file, sizeof(bs->backing_file),
             cow_header.backing_file);
-   
+
     /* mmap the bitmap */
     s->cow_bitmap_size = ((bs->total_sectors + 7) >> 3) + sizeof(cow_header);
     s->cow_bitmap_addr = mmap(get_mmap_addr(s->cow_bitmap_size),
@@ -155,7 +155,7 @@ static int cow_read(BlockDriverState *bs, int64_t sector_num,
 {
     BDRVCowState *s = bs->opaque;
     int ret, n;
-   
+
     while (nb_sectors > 0) {
         if (is_changed(s->cow_bitmap, sector_num, nb_sectors, &n)) {
             lseek(s->fd, s->cow_sectors_offset + sector_num * 512, SEEK_SET);
@@ -184,7 +184,7 @@ static int cow_write(BlockDriverState *bs, int64_t sector_num,
 {
     BDRVCowState *s = bs->opaque;
     int ret, i;
-   
+
     lseek(s->fd, s->cow_sectors_offset + sector_num * 512, SEEK_SET);
     ret = write(s->fd, buf, nb_sectors * 512);
     if (ret != nb_sectors * 512)