Diff for /qemu/block.c between versions 1.1.1.10 and 1.1.1.17

version 1.1.1.10, 2018/04/24 17:06:50 version 1.1.1.17, 2018/04/24 18:16:35
Line 22 Line 22
  * THE SOFTWARE.   * THE SOFTWARE.
  */   */
 #include "config-host.h"  #include "config-host.h"
 #ifdef _BSD  
 /* include native header before sys-queue.h */  
 #include <sys/queue.h>  
 #endif  
   
 #include "qemu-common.h"  #include "qemu-common.h"
 #include "console.h"  #include "monitor.h"
 #include "block_int.h"  #include "block_int.h"
   #include "module.h"
   #include "qemu-objects.h"
   
 #ifdef _BSD  #ifdef CONFIG_BSD
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/stat.h>  #include <sys/stat.h>
 #include <sys/ioctl.h>  #include <sys/ioctl.h>
   #include <sys/queue.h>
   #ifndef __DragonFly__
 #include <sys/disk.h>  #include <sys/disk.h>
 #endif  #endif
   #endif
   
 #define SECTOR_BITS 9  #ifdef _WIN32
 #define SECTOR_SIZE (1 << SECTOR_BITS)  #include <windows.h>
   #endif
 static AIOPool vectored_aio_pool;  
   
 typedef struct BlockDriverAIOCBSync {  
     BlockDriverAIOCB common;  
     QEMUBH *bh;  
     int ret;  
 } BlockDriverAIOCBSync;  
   
 static BlockDriverAIOCB *bdrv_aio_read_em(BlockDriverState *bs,  static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs,
         int64_t sector_num, uint8_t *buf, int nb_sectors,          int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
         BlockDriverCompletionFunc *cb, void *opaque);          BlockDriverCompletionFunc *cb, void *opaque);
 static BlockDriverAIOCB *bdrv_aio_write_em(BlockDriverState *bs,  static BlockDriverAIOCB *bdrv_aio_writev_em(BlockDriverState *bs,
         int64_t sector_num, const uint8_t *buf, int nb_sectors,          int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
           BlockDriverCompletionFunc *cb, void *opaque);
   static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs,
         BlockDriverCompletionFunc *cb, void *opaque);          BlockDriverCompletionFunc *cb, void *opaque);
 static void bdrv_aio_cancel_em(BlockDriverAIOCB *acb);  
 static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num,  static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num,
                         uint8_t *buf, int nb_sectors);                          uint8_t *buf, int nb_sectors);
 static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,  static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
Line 65  BlockDriverState *bdrv_first; Line 59  BlockDriverState *bdrv_first;
   
 static BlockDriver *first_drv;  static BlockDriver *first_drv;
   
   /* If non-zero, use only whitelisted block drivers */
   static int use_bdrv_whitelist;
   
 int path_is_absolute(const char *path)  int path_is_absolute(const char *path)
 {  {
     const char *p;      const char *p;
Line 129  void path_combine(char *dest, int dest_s Line 126  void path_combine(char *dest, int dest_s
     }      }
 }  }
   
   void bdrv_register(BlockDriver *bdrv)
 static void bdrv_register(BlockDriver *bdrv)  
 {  {
     if (!bdrv->bdrv_aio_read) {      if (!bdrv->bdrv_aio_readv) {
         /* add AIO emulation layer */          /* add AIO emulation layer */
         bdrv->bdrv_aio_read = bdrv_aio_read_em;          bdrv->bdrv_aio_readv = bdrv_aio_readv_em;
         bdrv->bdrv_aio_write = bdrv_aio_write_em;          bdrv->bdrv_aio_writev = bdrv_aio_writev_em;
         bdrv->bdrv_aio_cancel = bdrv_aio_cancel_em;      } else if (!bdrv->bdrv_read) {
         bdrv->aiocb_size = sizeof(BlockDriverAIOCBSync);  
     } else if (!bdrv->bdrv_read && !bdrv->bdrv_pread) {  
         /* add synchronous IO emulation layer */          /* add synchronous IO emulation layer */
         bdrv->bdrv_read = bdrv_read_em;          bdrv->bdrv_read = bdrv_read_em;
         bdrv->bdrv_write = bdrv_write_em;          bdrv->bdrv_write = bdrv_write_em;
     }      }
     aio_pool_init(&bdrv->aio_pool, bdrv->aiocb_size, bdrv->bdrv_aio_cancel);  
       if (!bdrv->bdrv_aio_flush)
           bdrv->bdrv_aio_flush = bdrv_aio_flush_em;
   
     bdrv->next = first_drv;      bdrv->next = first_drv;
     first_drv = bdrv;      first_drv = bdrv;
 }  }
Line 175  BlockDriver *bdrv_find_format(const char Line 172  BlockDriver *bdrv_find_format(const char
     return NULL;      return NULL;
 }  }
   
 int bdrv_create(BlockDriver *drv,  static int bdrv_is_whitelisted(BlockDriver *drv)
                 const char *filename, int64_t size_in_sectors,  {
                 const char *backing_file, int flags)      static const char *whitelist[] = {
           CONFIG_BDRV_WHITELIST
       };
       const char **p;
   
       if (!whitelist[0])
           return 1;               /* no whitelist, anything goes */
   
       for (p = whitelist; *p; p++) {
           if (!strcmp(drv->format_name, *p)) {
               return 1;
           }
       }
       return 0;
   }
   
   BlockDriver *bdrv_find_whitelisted_format(const char *format_name)
   {
       BlockDriver *drv = bdrv_find_format(format_name);
       return drv && bdrv_is_whitelisted(drv) ? drv : NULL;
   }
   
   int bdrv_create(BlockDriver *drv, const char* filename,
       QEMUOptionParameter *options)
 {  {
     if (!drv->bdrv_create)      if (!drv->bdrv_create)
         return -ENOTSUP;          return -ENOTSUP;
     return drv->bdrv_create(filename, size_in_sectors, backing_file, flags);  
       return drv->bdrv_create(filename, options);
 }  }
   
 #ifdef _WIN32  #ifdef _WIN32
Line 215  static int is_windows_drive_prefix(const Line 236  static int is_windows_drive_prefix(const
             filename[1] == ':');              filename[1] == ':');
 }  }
   
 static int is_windows_drive(const char *filename)  int is_windows_drive(const char *filename)
 {  {
     if (is_windows_drive_prefix(filename) &&      if (is_windows_drive_prefix(filename) &&
         filename[2] == '\0')          filename[2] == '\0')
Line 237  static BlockDriver *find_protocol(const  Line 258  static BlockDriver *find_protocol(const 
 #ifdef _WIN32  #ifdef _WIN32
     if (is_windows_drive(filename) ||      if (is_windows_drive(filename) ||
         is_windows_drive_prefix(filename))          is_windows_drive_prefix(filename))
         return &bdrv_raw;          return bdrv_find_format("raw");
 #endif  #endif
     p = strchr(filename, ':');      p = strchr(filename, ':');
     if (!p)      if (!p)
         return &bdrv_raw;          return bdrv_find_format("raw");
     len = p - filename;      len = p - filename;
     if (len > sizeof(protocol) - 1)      if (len > sizeof(protocol) - 1)
         len = sizeof(protocol) - 1;          len = sizeof(protocol) - 1;
Line 255  static BlockDriver *find_protocol(const  Line 276  static BlockDriver *find_protocol(const 
     return NULL;      return NULL;
 }  }
   
 /* XXX: force raw format if block or character device ? It would  /*
    simplify the BSD case */   * Detect host devices. By convention, /dev/cdrom[N] is always
    * recognized as a host CDROM.
    */
   static BlockDriver *find_hdev_driver(const char *filename)
   {
       int score_max = 0, score;
       BlockDriver *drv = NULL, *d;
   
       for (d = first_drv; d; d = d->next) {
           if (d->bdrv_probe_device) {
               score = d->bdrv_probe_device(filename);
               if (score > score_max) {
                   score_max = score;
                   drv = d;
               }
           }
       }
   
       return drv;
   }
   
 static BlockDriver *find_image_format(const char *filename)  static BlockDriver *find_image_format(const char *filename)
 {  {
     int ret, score, score_max;      int ret, score, score_max;
Line 264  static BlockDriver *find_image_format(co Line 305  static BlockDriver *find_image_format(co
     uint8_t buf[2048];      uint8_t buf[2048];
     BlockDriverState *bs;      BlockDriverState *bs;
   
     /* detect host devices. By convention, /dev/cdrom[N] is always  
        recognized as a host CDROM */  
     if (strstart(filename, "/dev/cdrom", NULL))  
         return &bdrv_host_device;  
 #ifdef _WIN32  
     if (is_windows_drive(filename))  
         return &bdrv_host_device;  
 #else  
     {  
         struct stat st;  
         if (stat(filename, &st) >= 0 &&  
             (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) {  
             return &bdrv_host_device;  
         }  
     }  
 #endif  
   
     drv = find_protocol(filename);      drv = find_protocol(filename);
     /* no need to test disk image formats for vvfat */      /* no need to test disk image formats for vvfat */
     if (drv == &bdrv_vvfat)      if (drv && strcmp(drv->format_name, "vvfat") == 0)
         return drv;          return drv;
   
     ret = bdrv_file_open(&bs, filename, BDRV_O_RDONLY);      ret = bdrv_file_open(&bs, filename, BDRV_O_RDONLY);
Line 332  int bdrv_open(BlockDriverState *bs, cons Line 356  int bdrv_open(BlockDriverState *bs, cons
 int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,  int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
                BlockDriver *drv)                 BlockDriver *drv)
 {  {
     int ret, open_flags;      int ret, open_flags, try_rw;
     char tmp_filename[PATH_MAX];      char tmp_filename[PATH_MAX];
     char backing_filename[PATH_MAX];      char backing_filename[PATH_MAX];
   
     bs->read_only = 0;  
     bs->is_temporary = 0;      bs->is_temporary = 0;
     bs->encrypted = 0;      bs->encrypted = 0;
     bs->valid_key = 0;      bs->valid_key = 0;
       /* buffer_alignment defaulted to 512, drivers can change this value */
       bs->buffer_alignment = 512;
   
     if (flags & BDRV_O_SNAPSHOT) {      if (flags & BDRV_O_SNAPSHOT) {
         BlockDriverState *bs1;          BlockDriverState *bs1;
         int64_t total_size;          int64_t total_size;
         int is_protocol = 0;          int is_protocol = 0;
           BlockDriver *bdrv_qcow2;
           QEMUOptionParameter *options;
   
         /* if snapshot, we create a temporary backing file and open it          /* if snapshot, we create a temporary backing file and open it
            instead of opening 'filename' directly */             instead of opening 'filename' directly */
   
         /* if there is a backing file, use it */          /* if there is a backing file, use it */
         bs1 = bdrv_new("");          bs1 = bdrv_new("");
         ret = bdrv_open(bs1, filename, 0);          ret = bdrv_open2(bs1, filename, 0, drv);
         if (ret < 0) {          if (ret < 0) {
             bdrv_delete(bs1);              bdrv_delete(bs1);
             return ret;              return ret;
         }          }
         total_size = bdrv_getlength(bs1) >> SECTOR_BITS;          total_size = bdrv_getlength(bs1) >> BDRV_SECTOR_BITS;
   
         if (bs1->drv && bs1->drv->protocol_name)          if (bs1->drv && bs1->drv->protocol_name)
             is_protocol = 1;              is_protocol = 1;
Line 372  int bdrv_open2(BlockDriverState *bs, con Line 399  int bdrv_open2(BlockDriverState *bs, con
         else          else
             realpath(filename, backing_filename);              realpath(filename, backing_filename);
   
         ret = bdrv_create(&bdrv_qcow2, tmp_filename,          bdrv_qcow2 = bdrv_find_format("qcow2");
                           total_size, backing_filename, 0);          options = parse_option_parameters("", bdrv_qcow2->create_options, NULL);
   
           set_option_parameter_int(options, BLOCK_OPT_SIZE, total_size * 512);
           set_option_parameter(options, BLOCK_OPT_BACKING_FILE, backing_filename);
           if (drv) {
               set_option_parameter(options, BLOCK_OPT_BACKING_FMT,
                   drv->format_name);
           }
   
           ret = bdrv_create(bdrv_qcow2, tmp_filename, options);
         if (ret < 0) {          if (ret < 0) {
             return ret;              return ret;
         }          }
   
         filename = tmp_filename;          filename = tmp_filename;
           drv = bdrv_qcow2;
         bs->is_temporary = 1;          bs->is_temporary = 1;
     }      }
   
Line 385  int bdrv_open2(BlockDriverState *bs, con Line 423  int bdrv_open2(BlockDriverState *bs, con
     if (flags & BDRV_O_FILE) {      if (flags & BDRV_O_FILE) {
         drv = find_protocol(filename);          drv = find_protocol(filename);
     } else if (!drv) {      } else if (!drv) {
         drv = find_image_format(filename);          drv = find_hdev_driver(filename);
           if (!drv) {
               drv = find_image_format(filename);
           }
     }      }
     if (!drv) {      if (!drv) {
         ret = -ENOENT;          ret = -ENOENT;
Line 393  int bdrv_open2(BlockDriverState *bs, con Line 434  int bdrv_open2(BlockDriverState *bs, con
     }      }
     bs->drv = drv;      bs->drv = drv;
     bs->opaque = qemu_mallocz(drv->instance_size);      bs->opaque = qemu_mallocz(drv->instance_size);
   
       /*
        * Yes, BDRV_O_NOCACHE aka O_DIRECT means we have to present a
        * write cache to the guest.  We do need the fdatasync to flush
        * out transactions for block allocations, and we maybe have a
        * volatile write cache in our backing device to deal with.
        */
       if (flags & (BDRV_O_CACHE_WB|BDRV_O_NOCACHE))
           bs->enable_write_cache = 1;
   
     /* Note: for compatibility, we open disk image files as RDWR, and      /* Note: for compatibility, we open disk image files as RDWR, and
        RDONLY as fallback */         RDONLY as fallback */
       try_rw = !bs->read_only || bs->is_temporary;
     if (!(flags & BDRV_O_FILE))      if (!(flags & BDRV_O_FILE))
         open_flags = BDRV_O_RDWR | (flags & BDRV_O_CACHE_MASK);          open_flags = (try_rw ? BDRV_O_RDWR : 0) |
               (flags & (BDRV_O_CACHE_MASK|BDRV_O_NATIVE_AIO));
     else      else
         open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT);          open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT);
     ret = drv->bdrv_open(bs, filename, open_flags);  
       bs->open_flags = open_flags;
       if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv))
           ret = -ENOTSUP;
       else
           ret = drv->bdrv_open(bs, filename, open_flags);
     if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) {      if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) {
         ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR);          ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR);
         bs->read_only = 1;          bs->read_only = 1;
Line 414  int bdrv_open2(BlockDriverState *bs, con Line 472  int bdrv_open2(BlockDriverState *bs, con
         return ret;          return ret;
     }      }
     if (drv->bdrv_getlength) {      if (drv->bdrv_getlength) {
         bs->total_sectors = bdrv_getlength(bs) >> SECTOR_BITS;          bs->total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
     }      }
 #ifndef _WIN32  #ifndef _WIN32
     if (bs->is_temporary) {      if (bs->is_temporary) {
Line 423  int bdrv_open2(BlockDriverState *bs, con Line 481  int bdrv_open2(BlockDriverState *bs, con
 #endif  #endif
     if (bs->backing_file[0] != '\0') {      if (bs->backing_file[0] != '\0') {
         /* if there is a backing file, use it */          /* if there is a backing file, use it */
           BlockDriver *back_drv = NULL;
         bs->backing_hd = bdrv_new("");          bs->backing_hd = bdrv_new("");
           /* pass on read_only property to the backing_hd */
           bs->backing_hd->read_only = bs->read_only;
         path_combine(backing_filename, sizeof(backing_filename),          path_combine(backing_filename, sizeof(backing_filename),
                      filename, bs->backing_file);                       filename, bs->backing_file);
         ret = bdrv_open(bs->backing_hd, backing_filename, open_flags);          if (bs->backing_format[0] != '\0')
               back_drv = bdrv_find_format(bs->backing_format);
           ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags,
                            back_drv);
         if (ret < 0) {          if (ret < 0) {
             bdrv_close(bs);              bdrv_close(bs);
             return ret;              return ret;
         }          }
     }      }
   
     /* call the change callback */      if (!bdrv_key_required(bs)) {
     bs->media_changed = 1;          /* call the change callback */
     if (bs->change_cb)          bs->media_changed = 1;
         bs->change_cb(bs->change_opaque);          if (bs->change_cb)
               bs->change_cb(bs->change_opaque);
       }
     return 0;      return 0;
 }  }
   
Line 477  void bdrv_delete(BlockDriverState *bs) Line 542  void bdrv_delete(BlockDriverState *bs)
     qemu_free(bs);      qemu_free(bs);
 }  }
   
   /*
    * Run consistency checks on an image
    *
    * Returns the number of errors or -errno when an internal error occurs
    */
   int bdrv_check(BlockDriverState *bs)
   {
       if (bs->drv->bdrv_check == NULL) {
           return -ENOTSUP;
       }
   
       return bs->drv->bdrv_check(bs);
   }
   
 /* commit COW file into the raw image */  /* commit COW file into the raw image */
 int bdrv_commit(BlockDriverState *bs)  int bdrv_commit(BlockDriverState *bs)
 {  {
Line 496  int bdrv_commit(BlockDriverState *bs) Line 575  int bdrv_commit(BlockDriverState *bs)
         return -ENOTSUP;          return -ENOTSUP;
     }      }
   
     total_sectors = bdrv_getlength(bs) >> SECTOR_BITS;      total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
     for (i = 0; i < total_sectors;) {      for (i = 0; i < total_sectors;) {
         if (drv->bdrv_is_allocated(bs, i, 65536, &n)) {          if (drv->bdrv_is_allocated(bs, i, 65536, &n)) {
             for(j = 0; j < n; j++) {              for(j = 0; j < n; j++) {
Line 533  static int bdrv_check_byte_request(Block Line 612  static int bdrv_check_byte_request(Block
   
     len = bdrv_getlength(bs);      len = bdrv_getlength(bs);
   
     if ((offset + size) > len)      if (offset < 0)
           return -EIO;
   
       if ((offset > len) || (len - offset < size))
         return -EIO;          return -EIO;
   
     return 0;      return 0;
Line 542  static int bdrv_check_byte_request(Block Line 624  static int bdrv_check_byte_request(Block
 static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,  static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,
                               int nb_sectors)                                int nb_sectors)
 {  {
     int64_t offset;      return bdrv_check_byte_request(bs, sector_num * 512, nb_sectors * 512);
   
     /* Deal with byte accesses */  
     if (sector_num < 0)  
         offset = -sector_num;  
     else  
         offset = sector_num * 512;  
   
     return bdrv_check_byte_request(bs, offset, nb_sectors * 512);  
 }  }
   
 /* return < 0 if error. See bdrv_write() for the return codes */  /* return < 0 if error. See bdrv_write() for the return codes */
Line 564  int bdrv_read(BlockDriverState *bs, int6 Line 638  int bdrv_read(BlockDriverState *bs, int6
     if (bdrv_check_request(bs, sector_num, nb_sectors))      if (bdrv_check_request(bs, sector_num, nb_sectors))
         return -EIO;          return -EIO;
   
     if (drv->bdrv_pread) {      return drv->bdrv_read(bs, sector_num, buf, nb_sectors);
         int ret, len;  }
         len = nb_sectors * 512;  
         ret = drv->bdrv_pread(bs, sector_num * 512, buf, len);  static void set_dirty_bitmap(BlockDriverState *bs, int64_t sector_num,
         if (ret < 0)                               int nb_sectors, int dirty)
             return ret;  {
         else if (ret != len)      int64_t start, end;
             return -EINVAL;      unsigned long val, idx, bit;
         else {  
             bs->rd_bytes += (unsigned) len;      start = sector_num / BDRV_SECTORS_PER_DIRTY_CHUNK;
             bs->rd_ops ++;      end = (sector_num + nb_sectors - 1) / BDRV_SECTORS_PER_DIRTY_CHUNK;
             return 0;  
         }      for (; start <= end; start++) {
     } else {          idx = start / (sizeof(unsigned long) * 8);
         return drv->bdrv_read(bs, sector_num, buf, nb_sectors);          bit = start % (sizeof(unsigned long) * 8);
           val = bs->dirty_bitmap[idx];
           if (dirty) {
               val |= 1 << bit;
           } else {
               val &= ~(1 << bit);
           }
           bs->dirty_bitmap[idx] = val;
     }      }
 }  }
   
Line 599  int bdrv_write(BlockDriverState *bs, int Line 680  int bdrv_write(BlockDriverState *bs, int
     if (bdrv_check_request(bs, sector_num, nb_sectors))      if (bdrv_check_request(bs, sector_num, nb_sectors))
         return -EIO;          return -EIO;
   
     if (drv->bdrv_pwrite) {      if (bs->dirty_bitmap) {
         int ret, len, count = 0;          set_dirty_bitmap(bs, sector_num, nb_sectors, 1);
         len = nb_sectors * 512;  
         do {  
             ret = drv->bdrv_pwrite(bs, sector_num * 512, buf, len - count);  
             if (ret < 0) {  
                 printf("bdrv_write ret=%d\n", ret);  
                 return ret;  
             }  
             count += ret;  
             buf += ret;  
         } while (count != len);  
         bs->wr_bytes += (unsigned) len;  
         bs->wr_ops ++;  
         return 0;  
     }      }
   
     return drv->bdrv_write(bs, sector_num, buf, nb_sectors);      return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
 }  }
   
 static int bdrv_pread_em(BlockDriverState *bs, int64_t offset,  int bdrv_pread(BlockDriverState *bs, int64_t offset,
                          uint8_t *buf, int count1)                 void *buf, int count1)
 {  {
     uint8_t tmp_buf[SECTOR_SIZE];      uint8_t tmp_buf[BDRV_SECTOR_SIZE];
     int len, nb_sectors, count;      int len, nb_sectors, count;
     int64_t sector_num;      int64_t sector_num;
       int ret;
   
     count = count1;      count = count1;
     /* first read to align to sector start */      /* first read to align to sector start */
     len = (SECTOR_SIZE - offset) & (SECTOR_SIZE - 1);      len = (BDRV_SECTOR_SIZE - offset) & (BDRV_SECTOR_SIZE - 1);
     if (len > count)      if (len > count)
         len = count;          len = count;
     sector_num = offset >> SECTOR_BITS;      sector_num = offset >> BDRV_SECTOR_BITS;
     if (len > 0) {      if (len > 0) {
         if (bdrv_read(bs, sector_num, tmp_buf, 1) < 0)          if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
             return -EIO;              return ret;
         memcpy(buf, tmp_buf + (offset & (SECTOR_SIZE - 1)), len);          memcpy(buf, tmp_buf + (offset & (BDRV_SECTOR_SIZE - 1)), len);
         count -= len;          count -= len;
         if (count == 0)          if (count == 0)
             return count1;              return count1;
Line 643  static int bdrv_pread_em(BlockDriverStat Line 713  static int bdrv_pread_em(BlockDriverStat
     }      }
   
     /* read the sectors "in place" */      /* read the sectors "in place" */
     nb_sectors = count >> SECTOR_BITS;      nb_sectors = count >> BDRV_SECTOR_BITS;
     if (nb_sectors > 0) {      if (nb_sectors > 0) {
         if (bdrv_read(bs, sector_num, buf, nb_sectors) < 0)          if ((ret = bdrv_read(bs, sector_num, buf, nb_sectors)) < 0)
             return -EIO;              return ret;
         sector_num += nb_sectors;          sector_num += nb_sectors;
         len = nb_sectors << SECTOR_BITS;          len = nb_sectors << BDRV_SECTOR_BITS;
         buf += len;          buf += len;
         count -= len;          count -= len;
     }      }
   
     /* add data from the last sector */      /* add data from the last sector */
     if (count > 0) {      if (count > 0) {
         if (bdrv_read(bs, sector_num, tmp_buf, 1) < 0)          if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
             return -EIO;              return ret;
         memcpy(buf, tmp_buf, count);          memcpy(buf, tmp_buf, count);
     }      }
     return count1;      return count1;
 }  }
   
 static int bdrv_pwrite_em(BlockDriverState *bs, int64_t offset,  int bdrv_pwrite(BlockDriverState *bs, int64_t offset,
                           const uint8_t *buf, int count1)                  const void *buf, int count1)
 {  {
     uint8_t tmp_buf[SECTOR_SIZE];      uint8_t tmp_buf[BDRV_SECTOR_SIZE];
     int len, nb_sectors, count;      int len, nb_sectors, count;
     int64_t sector_num;      int64_t sector_num;
       int ret;
   
     count = count1;      count = count1;
     /* first write to align to sector start */      /* first write to align to sector start */
     len = (SECTOR_SIZE - offset) & (SECTOR_SIZE - 1);      len = (BDRV_SECTOR_SIZE - offset) & (BDRV_SECTOR_SIZE - 1);
     if (len > count)      if (len > count)
         len = count;          len = count;
     sector_num = offset >> SECTOR_BITS;      sector_num = offset >> BDRV_SECTOR_BITS;
     if (len > 0) {      if (len > 0) {
         if (bdrv_read(bs, sector_num, tmp_buf, 1) < 0)          if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
             return -EIO;              return ret;
         memcpy(tmp_buf + (offset & (SECTOR_SIZE - 1)), buf, len);          memcpy(tmp_buf + (offset & (BDRV_SECTOR_SIZE - 1)), buf, len);
         if (bdrv_write(bs, sector_num, tmp_buf, 1) < 0)          if ((ret = bdrv_write(bs, sector_num, tmp_buf, 1)) < 0)
             return -EIO;              return ret;
         count -= len;          count -= len;
         if (count == 0)          if (count == 0)
             return count1;              return count1;
Line 689  static int bdrv_pwrite_em(BlockDriverSta Line 760  static int bdrv_pwrite_em(BlockDriverSta
     }      }
   
     /* write the sectors "in place" */      /* write the sectors "in place" */
     nb_sectors = count >> SECTOR_BITS;      nb_sectors = count >> BDRV_SECTOR_BITS;
     if (nb_sectors > 0) {      if (nb_sectors > 0) {
         if (bdrv_write(bs, sector_num, buf, nb_sectors) < 0)          if ((ret = bdrv_write(bs, sector_num, buf, nb_sectors)) < 0)
             return -EIO;              return ret;
         sector_num += nb_sectors;          sector_num += nb_sectors;
         len = nb_sectors << SECTOR_BITS;          len = nb_sectors << BDRV_SECTOR_BITS;
         buf += len;          buf += len;
         count -= len;          count -= len;
     }      }
   
     /* add data from the last sector */      /* add data from the last sector */
     if (count > 0) {      if (count > 0) {
         if (bdrv_read(bs, sector_num, tmp_buf, 1) < 0)          if ((ret = bdrv_read(bs, sector_num, tmp_buf, 1)) < 0)
             return -EIO;              return ret;
         memcpy(tmp_buf, buf, count);          memcpy(tmp_buf, buf, count);
         if (bdrv_write(bs, sector_num, tmp_buf, 1) < 0)          if ((ret = bdrv_write(bs, sector_num, tmp_buf, 1)) < 0)
             return -EIO;              return ret;
     }      }
     return count1;      return count1;
 }  }
   
 /**  /*
  * Read with byte offsets (needed only for file protocols)   * Writes to the file and ensures that no writes are reordered across this
    * request (acts as a barrier)
    *
    * Returns 0 on success, -errno in error cases.
  */   */
 int bdrv_pread(BlockDriverState *bs, int64_t offset,  int bdrv_pwrite_sync(BlockDriverState *bs, int64_t offset,
                void *buf1, int count1)      const void *buf, int count)
 {  {
     BlockDriver *drv = bs->drv;      int ret;
   
     if (!drv)      ret = bdrv_pwrite(bs, offset, buf, count);
         return -ENOMEDIUM;      if (ret < 0) {
     if (bdrv_check_byte_request(bs, offset, count1))          return ret;
         return -EIO;      }
   
     if (!drv->bdrv_pread)      /* No flush needed for cache=writethrough, it uses O_DSYNC */
         return bdrv_pread_em(bs, offset, buf1, count1);      if ((bs->open_flags & BDRV_O_CACHE_MASK) != 0) {
     return drv->bdrv_pread(bs, offset, buf1, count1);          bdrv_flush(bs);
       }
   
       return 0;
 }  }
   
 /**  /*
  * Write with byte offsets (needed only for file protocols)   * Writes to the file and ensures that no writes are reordered across this
    * request (acts as a barrier)
    *
    * Returns 0 on success, -errno in error cases.
  */   */
 int bdrv_pwrite(BlockDriverState *bs, int64_t offset,  int bdrv_write_sync(BlockDriverState *bs, int64_t sector_num,
                 const void *buf1, int count1)      const uint8_t *buf, int nb_sectors)
 {  {
     BlockDriver *drv = bs->drv;      return bdrv_pwrite_sync(bs, BDRV_SECTOR_SIZE * sector_num,
           buf, BDRV_SECTOR_SIZE * nb_sectors);
     if (!drv)  
         return -ENOMEDIUM;  
     if (bdrv_check_byte_request(bs, offset, count1))  
         return -EIO;  
   
     if (!drv->bdrv_pwrite)  
         return bdrv_pwrite_em(bs, offset, buf1, count1);  
     return drv->bdrv_pwrite(bs, offset, buf1, count1);  
 }  }
   
 /**  /**
Line 756  int bdrv_truncate(BlockDriverState *bs,  Line 828  int bdrv_truncate(BlockDriverState *bs, 
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_truncate)      if (!drv->bdrv_truncate)
         return -ENOTSUP;          return -ENOTSUP;
       if (bs->read_only)
           return -EACCES;
     return drv->bdrv_truncate(bs, offset);      return drv->bdrv_truncate(bs, offset);
 }  }
   
Line 769  int64_t bdrv_getlength(BlockDriverState  Line 843  int64_t bdrv_getlength(BlockDriverState 
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_getlength) {      if (!drv->bdrv_getlength) {
         /* legacy mode */          /* legacy mode */
         return bs->total_sectors * SECTOR_SIZE;          return bs->total_sectors * BDRV_SECTOR_SIZE;
     }      }
     return drv->bdrv_getlength(bs);      return drv->bdrv_getlength(bs);
 }  }
Line 782  void bdrv_get_geometry(BlockDriverState  Line 856  void bdrv_get_geometry(BlockDriverState 
     if (length < 0)      if (length < 0)
         length = 0;          length = 0;
     else      else
         length = length >> SECTOR_BITS;          length = length >> BDRV_SECTOR_BITS;
     *nb_sectors_ptr = length;      *nb_sectors_ptr = length;
 }  }
   
Line 950  int bdrv_is_read_only(BlockDriverState * Line 1024  int bdrv_is_read_only(BlockDriverState *
     return bs->read_only;      return bs->read_only;
 }  }
   
   int bdrv_set_read_only(BlockDriverState *bs, int read_only)
   {
       int ret = bs->read_only;
       bs->read_only = read_only;
       return ret;
   }
   
 int bdrv_is_sg(BlockDriverState *bs)  int bdrv_is_sg(BlockDriverState *bs)
 {  {
     return bs->sg;      return bs->sg;
 }  }
   
   int bdrv_enable_write_cache(BlockDriverState *bs)
   {
       return bs->enable_write_cache;
   }
   
 /* XXX: no longer used */  /* XXX: no longer used */
 void bdrv_set_change_cb(BlockDriverState *bs,  void bdrv_set_change_cb(BlockDriverState *bs,
                         void (*change_cb)(void *opaque), void *opaque)                          void (*change_cb)(void *opaque), void *opaque)
Line 992  int bdrv_set_key(BlockDriverState *bs, c Line 1078  int bdrv_set_key(BlockDriverState *bs, c
     if (!bs->encrypted || !bs->drv || !bs->drv->bdrv_set_key)      if (!bs->encrypted || !bs->drv || !bs->drv->bdrv_set_key)
         return -1;          return -1;
     ret = bs->drv->bdrv_set_key(bs, key);      ret = bs->drv->bdrv_set_key(bs, key);
     bs->valid_key = (ret == 0);      if (ret < 0) {
           bs->valid_key = 0;
       } else if (!bs->valid_key) {
           bs->valid_key = 1;
           /* call the change callback now, we skipped it on open */
           bs->media_changed = 1;
           if (bs->change_cb)
               bs->change_cb(bs->change_opaque);
       }
     return ret;      return ret;
 }  }
   
Line 1042  const char *bdrv_get_device_name(BlockDr Line 1136  const char *bdrv_get_device_name(BlockDr
   
 void bdrv_flush(BlockDriverState *bs)  void bdrv_flush(BlockDriverState *bs)
 {  {
       if (!bs->drv)
           return;
     if (bs->drv->bdrv_flush)      if (bs->drv->bdrv_flush)
         bs->drv->bdrv_flush(bs);          bs->drv->bdrv_flush(bs);
     if (bs->backing_hd)      if (bs->backing_hd)
Line 1085  int bdrv_is_allocated(BlockDriverState * Line 1181  int bdrv_is_allocated(BlockDriverState *
     return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum);      return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum);
 }  }
   
 void bdrv_info(void)  static void bdrv_print_dict(QObject *obj, void *opaque)
   {
       QDict *bs_dict;
       Monitor *mon = opaque;
   
       bs_dict = qobject_to_qdict(obj);
   
       monitor_printf(mon, "%s: type=%s removable=%d",
                           qdict_get_str(bs_dict, "device"),
                           qdict_get_str(bs_dict, "type"),
                           qdict_get_bool(bs_dict, "removable"));
   
       if (qdict_get_bool(bs_dict, "removable")) {
           monitor_printf(mon, " locked=%d", qdict_get_bool(bs_dict, "locked"));
       }
   
       if (qdict_haskey(bs_dict, "inserted")) {
           QDict *qdict = qobject_to_qdict(qdict_get(bs_dict, "inserted"));
   
           monitor_printf(mon, " file=");
           monitor_print_filename(mon, qdict_get_str(qdict, "file"));
           if (qdict_haskey(qdict, "backing_file")) {
               monitor_printf(mon, " backing_file=");
               monitor_print_filename(mon, qdict_get_str(qdict, "backing_file"));
           }
           monitor_printf(mon, " ro=%d drv=%s encrypted=%d",
                               qdict_get_bool(qdict, "ro"),
                               qdict_get_str(qdict, "drv"),
                               qdict_get_bool(qdict, "encrypted"));
       } else {
           monitor_printf(mon, " [not inserted]");
       }
   
       monitor_printf(mon, "\n");
   }
   
   void bdrv_info_print(Monitor *mon, const QObject *data)
 {  {
       qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon);
   }
   
   /**
    * bdrv_info(): Block devices information
    *
    * Each block device information is stored in a QDict and the
    * returned QObject is a QList of all devices.
    *
    * The QDict contains the following:
    *
    * - "device": device name
    * - "type": device type
    * - "removable": true if the device is removable, false otherwise
    * - "locked": true if the device is locked, false otherwise
    * - "inserted": only present if the device is inserted, it is a QDict
    *    containing the following:
    *          - "file": device file name
    *          - "ro": true if read-only, false otherwise
    *          - "drv": driver format name
    *          - "backing_file": backing file name if one is used
    *          - "encrypted": true if encrypted, false otherwise
    *
    * Example:
    *
    * [ { "device": "ide0-hd0", "type": "hd", "removable": false, "locked": false,
    *     "inserted": { "file": "/tmp/foobar", "ro": false, "drv": "qcow2" } },
    *   { "device": "floppy0", "type": "floppy", "removable": true,
    *     "locked": false } ]
    */
   void bdrv_info(Monitor *mon, QObject **ret_data)
   {
       QList *bs_list;
     BlockDriverState *bs;      BlockDriverState *bs;
   
       bs_list = qlist_new();
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {      for (bs = bdrv_first; bs != NULL; bs = bs->next) {
         term_printf("%s:", bs->device_name);          QObject *bs_obj;
         term_printf(" type=");          const char *type = "unknown";
   
         switch(bs->type) {          switch(bs->type) {
         case BDRV_TYPE_HD:          case BDRV_TYPE_HD:
             term_printf("hd");              type = "hd";
             break;              break;
         case BDRV_TYPE_CDROM:          case BDRV_TYPE_CDROM:
             term_printf("cdrom");              type = "cdrom";
             break;              break;
         case BDRV_TYPE_FLOPPY:          case BDRV_TYPE_FLOPPY:
             term_printf("floppy");              type = "floppy";
             break;              break;
         }          }
         term_printf(" removable=%d", bs->removable);  
         if (bs->removable) {          bs_obj = qobject_from_jsonf("{ 'device': %s, 'type': %s, "
             term_printf(" locked=%d", bs->locked);                                      "'removable': %i, 'locked': %i }",
         }                                      bs->device_name, type, bs->removable,
                                       bs->locked);
           assert(bs_obj != NULL);
   
         if (bs->drv) {          if (bs->drv) {
             term_printf(" file=");              QObject *obj;
             term_print_filename(bs->filename);              QDict *bs_dict = qobject_to_qdict(bs_obj);
   
               obj = qobject_from_jsonf("{ 'file': %s, 'ro': %i, 'drv': %s, "
                                        "'encrypted': %i }",
                                        bs->filename, bs->read_only,
                                        bs->drv->format_name,
                                        bdrv_is_encrypted(bs));
               assert(obj != NULL);
             if (bs->backing_file[0] != '\0') {              if (bs->backing_file[0] != '\0') {
                 term_printf(" backing_file=");                  QDict *qdict = qobject_to_qdict(obj);
                 term_print_filename(bs->backing_file);                  qdict_put(qdict, "backing_file",
             }                            qstring_from_str(bs->backing_file));
             term_printf(" ro=%d", bs->read_only);              }
             term_printf(" drv=%s", bs->drv->format_name);  
             term_printf(" encrypted=%d", bdrv_is_encrypted(bs));              qdict_put_obj(bs_dict, "inserted", obj);
         } else {  
             term_printf(" [not inserted]");  
         }          }
         term_printf("\n");          qlist_append_obj(bs_list, bs_obj);
     }      }
   
       *ret_data = QOBJECT(bs_list);
   }
   
   static void bdrv_stats_iter(QObject *data, void *opaque)
   {
       QDict *qdict;
       Monitor *mon = opaque;
   
       qdict = qobject_to_qdict(data);
       monitor_printf(mon, "%s:", qdict_get_str(qdict, "device"));
   
       qdict = qobject_to_qdict(qdict_get(qdict, "stats"));
       monitor_printf(mon, " rd_bytes=%" PRId64
                           " wr_bytes=%" PRId64
                           " rd_operations=%" PRId64
                           " wr_operations=%" PRId64
                           "\n",
                           qdict_get_int(qdict, "rd_bytes"),
                           qdict_get_int(qdict, "wr_bytes"),
                           qdict_get_int(qdict, "rd_operations"),
                           qdict_get_int(qdict, "wr_operations"));
   }
   
   void bdrv_stats_print(Monitor *mon, const QObject *data)
   {
       qlist_iter(qobject_to_qlist(data), bdrv_stats_iter, mon);
 }  }
   
 /* The "info blockstats" command. */  /**
 void bdrv_info_stats (void)   * bdrv_info_stats(): show block device statistics
    *
    * Each device statistic information is stored in a QDict and
    * the returned QObject is a QList of all devices.
    *
    * The QDict contains the following:
    *
    * - "device": device name
    * - "stats": A QDict with the statistics information, it contains:
    *     - "rd_bytes": bytes read
    *     - "wr_bytes": bytes written
    *     - "rd_operations": read operations
    *     - "wr_operations": write operations
    * 
    * Example:
    *
    * [ { "device": "ide0-hd0",
    *               "stats": { "rd_bytes": 512,
    *                          "wr_bytes": 0,
    *                          "rd_operations": 1,
    *                          "wr_operations": 0 } },
    *   { "device": "ide1-cd0",
    *               "stats": { "rd_bytes": 0,
    *                          "wr_bytes": 0,
    *                          "rd_operations": 0,
    *                          "wr_operations": 0 } } ]
    */
   void bdrv_info_stats(Monitor *mon, QObject **ret_data)
 {  {
       QObject *obj;
       QList *devices;
     BlockDriverState *bs;      BlockDriverState *bs;
   
       devices = qlist_new();
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {      for (bs = bdrv_first; bs != NULL; bs = bs->next) {
         term_printf ("%s:"          obj = qobject_from_jsonf("{ 'device': %s, 'stats': {"
                      " rd_bytes=%" PRIu64                                   "'rd_bytes': %" PRId64 ","
                      " wr_bytes=%" PRIu64                                   "'wr_bytes': %" PRId64 ","
                      " rd_operations=%" PRIu64                                   "'rd_operations': %" PRId64 ","
                      " wr_operations=%" PRIu64                                   "'wr_operations': %" PRId64
                      "\n",                                   "} }",
                      bs->device_name,                                   bs->device_name,
                      bs->rd_bytes, bs->wr_bytes,                                   bs->rd_bytes, bs->wr_bytes,
                      bs->rd_ops, bs->wr_ops);                                   bs->rd_ops, bs->wr_ops);
           assert(obj != NULL);
           qlist_append_obj(devices, obj);
     }      }
   
       *ret_data = QOBJECT(devices);
 }  }
   
 const char *bdrv_get_encrypted_filename(BlockDriverState *bs)  const char *bdrv_get_encrypted_filename(BlockDriverState *bs)
Line 1170  int bdrv_write_compressed(BlockDriverSta Line 1408  int bdrv_write_compressed(BlockDriverSta
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_write_compressed)      if (!drv->bdrv_write_compressed)
         return -ENOTSUP;          return -ENOTSUP;
       if (bdrv_check_request(bs, sector_num, nb_sectors))
           return -EIO;
   
       if (bs->dirty_bitmap) {
           set_dirty_bitmap(bs, sector_num, nb_sectors, 1);
       }
   
     return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);      return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
 }  }
   
Line 1184  int bdrv_get_info(BlockDriverState *bs,  Line 1429  int bdrv_get_info(BlockDriverState *bs, 
     return drv->bdrv_get_info(bs, bdi);      return drv->bdrv_get_info(bs, bdi);
 }  }
   
 int bdrv_put_buffer(BlockDriverState *bs, const uint8_t *buf, int64_t pos, int size)  int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
                         int64_t pos, int size)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_put_buffer)      if (!drv->bdrv_save_vmstate)
         return -ENOTSUP;          return -ENOTSUP;
     return drv->bdrv_put_buffer(bs, buf, pos, size);      return drv->bdrv_save_vmstate(bs, buf, pos, size);
 }  }
   
 int bdrv_get_buffer(BlockDriverState *bs, uint8_t *buf, int64_t pos, int size)  int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
                         int64_t pos, int size)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_get_buffer)      if (!drv->bdrv_load_vmstate)
         return -ENOTSUP;          return -ENOTSUP;
     return drv->bdrv_get_buffer(bs, buf, pos, size);      return drv->bdrv_load_vmstate(bs, buf, pos, size);
 }  }
   
 /**************************************************************/  /**************************************************************/
Line 1327  char *bdrv_snapshot_dump(char *buf, int  Line 1574  char *bdrv_snapshot_dump(char *buf, int 
 /**************************************************************/  /**************************************************************/
 /* async I/Os */  /* async I/Os */
   
 typedef struct VectorTranslationState {  
     QEMUIOVector *iov;  
     uint8_t *bounce;  
     int is_write;  
     BlockDriverAIOCB *aiocb;  
     BlockDriverAIOCB *this_aiocb;  
 } VectorTranslationState;  
   
 static void bdrv_aio_cancel_vector(BlockDriverAIOCB *acb)  
 {  
     VectorTranslationState *s = acb->opaque;  
   
     bdrv_aio_cancel(s->aiocb);  
 }  
   
 static void bdrv_aio_rw_vector_cb(void *opaque, int ret)  
 {  
     VectorTranslationState *s = opaque;  
   
     if (!s->is_write) {  
         qemu_iovec_from_buffer(s->iov, s->bounce, s->iov->size);  
     }  
     qemu_vfree(s->bounce);  
     s->this_aiocb->cb(s->this_aiocb->opaque, ret);  
     qemu_aio_release(s->this_aiocb);  
 }  
   
 static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,  
                                             int64_t sector_num,  
                                             QEMUIOVector *iov,  
                                             int nb_sectors,  
                                             BlockDriverCompletionFunc *cb,  
                                             void *opaque,  
                                             int is_write)  
   
 {  
     VectorTranslationState *s = qemu_mallocz(sizeof(*s));  
     BlockDriverAIOCB *aiocb = qemu_aio_get_pool(&vectored_aio_pool, bs,  
                                                 cb, opaque);  
   
     s->this_aiocb = aiocb;  
     s->iov = iov;  
     s->bounce = qemu_memalign(512, nb_sectors * 512);  
     s->is_write = is_write;  
     if (is_write) {  
         qemu_iovec_to_buffer(s->iov, s->bounce);  
         s->aiocb = bdrv_aio_write(bs, sector_num, s->bounce, nb_sectors,  
                                   bdrv_aio_rw_vector_cb, s);  
     } else {  
         s->aiocb = bdrv_aio_read(bs, sector_num, s->bounce, nb_sectors,  
                                  bdrv_aio_rw_vector_cb, s);  
     }  
     return aiocb;  
 }  
   
 BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,  BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,
                                  QEMUIOVector *iov, int nb_sectors,                                   QEMUIOVector *qiov, int nb_sectors,
                                  BlockDriverCompletionFunc *cb, void *opaque)                                   BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     if (bdrv_check_request(bs, sector_num, nb_sectors))  
         return NULL;  
   
     return bdrv_aio_rw_vector(bs, sector_num, iov, nb_sectors,  
                               cb, opaque, 0);  
 }  
   
 BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,  
                                   QEMUIOVector *iov, int nb_sectors,  
                                   BlockDriverCompletionFunc *cb, void *opaque)  
 {  
     if (bdrv_check_request(bs, sector_num, nb_sectors))  
         return NULL;  
   
     return bdrv_aio_rw_vector(bs, sector_num, iov, nb_sectors,  
                               cb, opaque, 1);  
 }  
   
 BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num,  
                                 uint8_t *buf, int nb_sectors,  
                                 BlockDriverCompletionFunc *cb, void *opaque)  
 {  
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     BlockDriverAIOCB *ret;      BlockDriverAIOCB *ret;
   
Line 1416  BlockDriverAIOCB *bdrv_aio_read(BlockDri Line 1586  BlockDriverAIOCB *bdrv_aio_read(BlockDri
     if (bdrv_check_request(bs, sector_num, nb_sectors))      if (bdrv_check_request(bs, sector_num, nb_sectors))
         return NULL;          return NULL;
   
     ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);      ret = drv->bdrv_aio_readv(bs, sector_num, qiov, nb_sectors,
                                 cb, opaque);
   
     if (ret) {      if (ret) {
         /* Update stats even though technically transfer has not happened. */          /* Update stats even though technically transfer has not happened. */
         bs->rd_bytes += (unsigned) nb_sectors * SECTOR_SIZE;          bs->rd_bytes += (unsigned) nb_sectors * BDRV_SECTOR_SIZE;
         bs->rd_ops ++;          bs->rd_ops ++;
     }      }
   
     return ret;      return ret;
 }  }
   
 BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num,  BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
                                  const uint8_t *buf, int nb_sectors,                                    QEMUIOVector *qiov, int nb_sectors,
                                  BlockDriverCompletionFunc *cb, void *opaque)                                    BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     BlockDriverAIOCB *ret;      BlockDriverAIOCB *ret;
Line 1441  BlockDriverAIOCB *bdrv_aio_write(BlockDr Line 1612  BlockDriverAIOCB *bdrv_aio_write(BlockDr
     if (bdrv_check_request(bs, sector_num, nb_sectors))      if (bdrv_check_request(bs, sector_num, nb_sectors))
         return NULL;          return NULL;
   
     ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);      if (bs->dirty_bitmap) {
           set_dirty_bitmap(bs, sector_num, nb_sectors, 1);
       }
   
       ret = drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors,
                                  cb, opaque);
   
     if (ret) {      if (ret) {
         /* Update stats even though technically transfer has not happened. */          /* Update stats even though technically transfer has not happened. */
         bs->wr_bytes += (unsigned) nb_sectors * SECTOR_SIZE;          bs->wr_bytes += (unsigned) nb_sectors * BDRV_SECTOR_SIZE;
         bs->wr_ops ++;          bs->wr_ops ++;
     }      }
   
     return ret;      return ret;
 }  }
   
   
   typedef struct MultiwriteCB {
       int error;
       int num_requests;
       int num_callbacks;
       struct {
           BlockDriverCompletionFunc *cb;
           void *opaque;
           QEMUIOVector *free_qiov;
           void *free_buf;
       } callbacks[];
   } MultiwriteCB;
   
   static void multiwrite_user_cb(MultiwriteCB *mcb)
   {
       int i;
   
       for (i = 0; i < mcb->num_callbacks; i++) {
           mcb->callbacks[i].cb(mcb->callbacks[i].opaque, mcb->error);
           if (mcb->callbacks[i].free_qiov) {
               qemu_iovec_destroy(mcb->callbacks[i].free_qiov);
           }
           qemu_free(mcb->callbacks[i].free_qiov);
           qemu_vfree(mcb->callbacks[i].free_buf);
       }
   }
   
   static void multiwrite_cb(void *opaque, int ret)
   {
       MultiwriteCB *mcb = opaque;
   
       if (ret < 0 && !mcb->error) {
           mcb->error = ret;
       }
   
       mcb->num_requests--;
       if (mcb->num_requests == 0) {
           multiwrite_user_cb(mcb);
           qemu_free(mcb);
       }
   }
   
   static int multiwrite_req_compare(const void *a, const void *b)
   {
       const BlockRequest *req1 = a, *req2 = b;
   
       /*
        * Note that we can't simply subtract req2->sector from req1->sector
        * here as that could overflow the return value.
        */
       if (req1->sector > req2->sector) {
           return 1;
       } else if (req1->sector < req2->sector) {
           return -1;
       } else {
           return 0;
       }
   }
   
   /*
    * Takes a bunch of requests and tries to merge them. Returns the number of
    * requests that remain after merging.
    */
   static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs,
       int num_reqs, MultiwriteCB *mcb)
   {
       int i, outidx;
   
       // Sort requests by start sector
       qsort(reqs, num_reqs, sizeof(*reqs), &multiwrite_req_compare);
   
       // Check if adjacent requests touch the same clusters. If so, combine them,
       // filling up gaps with zero sectors.
       outidx = 0;
       for (i = 1; i < num_reqs; i++) {
           int merge = 0;
           int64_t oldreq_last = reqs[outidx].sector + reqs[outidx].nb_sectors;
   
           // This handles the cases that are valid for all block drivers, namely
           // exactly sequential writes and overlapping writes.
           if (reqs[i].sector <= oldreq_last) {
               merge = 1;
           }
   
           // The block driver may decide that it makes sense to combine requests
           // even if there is a gap of some sectors between them. In this case,
           // the gap is filled with zeros (therefore only applicable for yet
           // unused space in format like qcow2).
           if (!merge && bs->drv->bdrv_merge_requests) {
               merge = bs->drv->bdrv_merge_requests(bs, &reqs[outidx], &reqs[i]);
           }
   
           if (reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1 > IOV_MAX) {
               merge = 0;
           }
   
           if (merge) {
               size_t size;
               QEMUIOVector *qiov = qemu_mallocz(sizeof(*qiov));
               qemu_iovec_init(qiov,
                   reqs[outidx].qiov->niov + reqs[i].qiov->niov + 1);
   
               // Add the first request to the merged one. If the requests are
               // overlapping, drop the last sectors of the first request.
               size = (reqs[i].sector - reqs[outidx].sector) << 9;
               qemu_iovec_concat(qiov, reqs[outidx].qiov, size);
   
               // We might need to add some zeros between the two requests
               if (reqs[i].sector > oldreq_last) {
                   size_t zero_bytes = (reqs[i].sector - oldreq_last) << 9;
                   uint8_t *buf = qemu_blockalign(bs, zero_bytes);
                   memset(buf, 0, zero_bytes);
                   qemu_iovec_add(qiov, buf, zero_bytes);
                   mcb->callbacks[i].free_buf = buf;
               }
   
               // Add the second request
               qemu_iovec_concat(qiov, reqs[i].qiov, reqs[i].qiov->size);
   
               reqs[outidx].nb_sectors = qiov->size >> 9;
               reqs[outidx].qiov = qiov;
   
               mcb->callbacks[i].free_qiov = reqs[outidx].qiov;
           } else {
               outidx++;
               reqs[outidx].sector     = reqs[i].sector;
               reqs[outidx].nb_sectors = reqs[i].nb_sectors;
               reqs[outidx].qiov       = reqs[i].qiov;
           }
       }
   
       return outidx + 1;
   }
   
   /*
    * Submit multiple AIO write requests at once.
    *
    * On success, the function returns 0 and all requests in the reqs array have
    * been submitted. In error case this function returns -1, and any of the
    * requests may or may not be submitted yet. In particular, this means that the
    * callback will be called for some of the requests, for others it won't. The
    * caller must check the error field of the BlockRequest to wait for the right
    * callbacks (if error != 0, no callback will be called).
    *
    * The implementation may modify the contents of the reqs array, e.g. to merge
    * requests. However, the fields opaque and error are left unmodified as they
    * are used to signal failure for a single request to the caller.
    */
   int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs)
   {
       BlockDriverAIOCB *acb;
       MultiwriteCB *mcb;
       int i;
   
       if (num_reqs == 0) {
           return 0;
       }
   
       // Create MultiwriteCB structure
       mcb = qemu_mallocz(sizeof(*mcb) + num_reqs * sizeof(*mcb->callbacks));
       mcb->num_requests = 0;
       mcb->num_callbacks = num_reqs;
   
       for (i = 0; i < num_reqs; i++) {
           mcb->callbacks[i].cb = reqs[i].cb;
           mcb->callbacks[i].opaque = reqs[i].opaque;
       }
   
       // Check for mergable requests
       num_reqs = multiwrite_merge(bs, reqs, num_reqs, mcb);
   
       /*
        * Run the aio requests. As soon as one request can't be submitted
        * successfully, fail all requests that are not yet submitted (we must
        * return failure for all requests anyway)
        *
        * num_requests cannot be set to the right value immediately: If
        * bdrv_aio_writev fails for some request, num_requests would be too high
        * and therefore multiwrite_cb() would never recognize the multiwrite
        * request as completed. We also cannot use the loop variable i to set it
        * when the first request fails because the callback may already have been
        * called for previously submitted requests. Thus, num_requests must be
        * incremented for each request that is submitted.
        *
        * The problem that callbacks may be called early also means that we need
        * to take care that num_requests doesn't become 0 before all requests are
        * submitted - multiwrite_cb() would consider the multiwrite request
        * completed. A dummy request that is "completed" by a manual call to
        * multiwrite_cb() takes care of this.
        */
       mcb->num_requests = 1;
   
       for (i = 0; i < num_reqs; i++) {
           mcb->num_requests++;
           acb = bdrv_aio_writev(bs, reqs[i].sector, reqs[i].qiov,
               reqs[i].nb_sectors, multiwrite_cb, mcb);
   
           if (acb == NULL) {
               // We can only fail the whole thing if no request has been
               // submitted yet. Otherwise we'll wait for the submitted AIOs to
               // complete and report the error in the callback.
               if (i == 0) {
                   goto fail;
               } else {
                   multiwrite_cb(mcb, -EIO);
                   break;
               }
           }
       }
   
       /* Complete the dummy request */
       multiwrite_cb(mcb, 0);
   
       return 0;
   
   fail:
       for (i = 0; i < mcb->num_callbacks; i++) {
           reqs[i].error = -EIO;
       }
       qemu_free(mcb);
       return -1;
   }
   
   BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs,
           BlockDriverCompletionFunc *cb, void *opaque)
   {
       BlockDriver *drv = bs->drv;
   
       if (!drv)
           return NULL;
   
       /*
        * Note that unlike bdrv_flush the driver is reponsible for flushing a
        * backing image if it exists.
        */
       return drv->bdrv_aio_flush(bs, cb, opaque);
   }
   
 void bdrv_aio_cancel(BlockDriverAIOCB *acb)  void bdrv_aio_cancel(BlockDriverAIOCB *acb)
 {  {
     acb->pool->cancel(acb);      acb->pool->cancel(acb);
Line 1461  void bdrv_aio_cancel(BlockDriverAIOCB *a Line 1875  void bdrv_aio_cancel(BlockDriverAIOCB *a
 /**************************************************************/  /**************************************************************/
 /* async block device emulation */  /* async block device emulation */
   
   typedef struct BlockDriverAIOCBSync {
       BlockDriverAIOCB common;
       QEMUBH *bh;
       int ret;
       /* vector translation state */
       QEMUIOVector *qiov;
       uint8_t *bounce;
       int is_write;
   } BlockDriverAIOCBSync;
   
   static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)
   {
       BlockDriverAIOCBSync *acb = (BlockDriverAIOCBSync *)blockacb;
       qemu_bh_delete(acb->bh);
       acb->bh = NULL;
       qemu_aio_release(acb);
   }
   
   static AIOPool bdrv_em_aio_pool = {
       .aiocb_size         = sizeof(BlockDriverAIOCBSync),
       .cancel             = bdrv_aio_cancel_em,
   };
   
 static void bdrv_aio_bh_cb(void *opaque)  static void bdrv_aio_bh_cb(void *opaque)
 {  {
     BlockDriverAIOCBSync *acb = opaque;      BlockDriverAIOCBSync *acb = opaque;
   
       if (!acb->is_write)
           qemu_iovec_from_buffer(acb->qiov, acb->bounce, acb->qiov->size);
       qemu_vfree(acb->bounce);
     acb->common.cb(acb->common.opaque, acb->ret);      acb->common.cb(acb->common.opaque, acb->ret);
       qemu_bh_delete(acb->bh);
       acb->bh = NULL;
     qemu_aio_release(acb);      qemu_aio_release(acb);
 }  }
   
 static BlockDriverAIOCB *bdrv_aio_read_em(BlockDriverState *bs,  static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
         int64_t sector_num, uint8_t *buf, int nb_sectors,                                              int64_t sector_num,
         BlockDriverCompletionFunc *cb, void *opaque)                                              QEMUIOVector *qiov,
                                               int nb_sectors,
                                               BlockDriverCompletionFunc *cb,
                                               void *opaque,
                                               int is_write)
   
 {  {
     BlockDriverAIOCBSync *acb;      BlockDriverAIOCBSync *acb;
     int ret;  
   
     acb = qemu_aio_get(bs, cb, opaque);      acb = qemu_aio_get(&bdrv_em_aio_pool, bs, cb, opaque);
       acb->is_write = is_write;
       acb->qiov = qiov;
       acb->bounce = qemu_blockalign(bs, qiov->size);
   
     if (!acb->bh)      if (!acb->bh)
         acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);          acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);
     ret = bdrv_read(bs, sector_num, buf, nb_sectors);  
     acb->ret = ret;      if (is_write) {
           qemu_iovec_to_buffer(acb->qiov, acb->bounce);
           acb->ret = bdrv_write(bs, sector_num, acb->bounce, nb_sectors);
       } else {
           acb->ret = bdrv_read(bs, sector_num, acb->bounce, nb_sectors);
       }
   
     qemu_bh_schedule(acb->bh);      qemu_bh_schedule(acb->bh);
   
     return &acb->common;      return &acb->common;
 }  }
   
 static BlockDriverAIOCB *bdrv_aio_write_em(BlockDriverState *bs,  static BlockDriverAIOCB *bdrv_aio_readv_em(BlockDriverState *bs,
         int64_t sector_num, const uint8_t *buf, int nb_sectors,          int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
           BlockDriverCompletionFunc *cb, void *opaque)
   {
       return bdrv_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 0);
   }
   
   static BlockDriverAIOCB *bdrv_aio_writev_em(BlockDriverState *bs,
           int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
           BlockDriverCompletionFunc *cb, void *opaque)
   {
       return bdrv_aio_rw_vector(bs, sector_num, qiov, nb_sectors, cb, opaque, 1);
   }
   
   static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs,
         BlockDriverCompletionFunc *cb, void *opaque)          BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     BlockDriverAIOCBSync *acb;      BlockDriverAIOCBSync *acb;
     int ret;  
   
     acb = qemu_aio_get(bs, cb, opaque);      acb = qemu_aio_get(&bdrv_em_aio_pool, bs, cb, opaque);
       acb->is_write = 1; /* don't bounce in the completion hadler */
       acb->qiov = NULL;
       acb->bounce = NULL;
       acb->ret = 0;
   
     if (!acb->bh)      if (!acb->bh)
         acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);          acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);
     ret = bdrv_write(bs, sector_num, buf, nb_sectors);  
     acb->ret = ret;      bdrv_flush(bs);
     qemu_bh_schedule(acb->bh);      qemu_bh_schedule(acb->bh);
     return &acb->common;      return &acb->common;
 }  }
   
 static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)  
 {  
     BlockDriverAIOCBSync *acb = (BlockDriverAIOCBSync *)blockacb;  
     qemu_bh_cancel(acb->bh);  
     qemu_aio_release(acb);  
 }  
   
 /**************************************************************/  /**************************************************************/
 /* sync block device emulation */  /* sync block device emulation */
   
Line 1522  static int bdrv_read_em(BlockDriverState Line 1990  static int bdrv_read_em(BlockDriverState
 {  {
     int async_ret;      int async_ret;
     BlockDriverAIOCB *acb;      BlockDriverAIOCB *acb;
       struct iovec iov;
       QEMUIOVector qiov;
   
       async_context_push();
   
     async_ret = NOT_DONE;      async_ret = NOT_DONE;
     acb = bdrv_aio_read(bs, sector_num, buf, nb_sectors,      iov.iov_base = (void *)buf;
                         bdrv_rw_em_cb, &async_ret);      iov.iov_len = nb_sectors * 512;
     if (acb == NULL)      qemu_iovec_init_external(&qiov, &iov, 1);
         return -1;      acb = bdrv_aio_readv(bs, sector_num, &qiov, nb_sectors,
           bdrv_rw_em_cb, &async_ret);
       if (acb == NULL) {
           async_ret = -1;
           goto fail;
       }
   
     while (async_ret == NOT_DONE) {      while (async_ret == NOT_DONE) {
         qemu_aio_wait();          qemu_aio_wait();
     }      }
   
   
   fail:
       async_context_pop();
     return async_ret;      return async_ret;
 }  }
   
Line 1541  static int bdrv_write_em(BlockDriverStat Line 2021  static int bdrv_write_em(BlockDriverStat
 {  {
     int async_ret;      int async_ret;
     BlockDriverAIOCB *acb;      BlockDriverAIOCB *acb;
       struct iovec iov;
       QEMUIOVector qiov;
   
       async_context_push();
   
     async_ret = NOT_DONE;      async_ret = NOT_DONE;
     acb = bdrv_aio_write(bs, sector_num, buf, nb_sectors,      iov.iov_base = (void *)buf;
                          bdrv_rw_em_cb, &async_ret);      iov.iov_len = nb_sectors * 512;
     if (acb == NULL)      qemu_iovec_init_external(&qiov, &iov, 1);
         return -1;      acb = bdrv_aio_writev(bs, sector_num, &qiov, nb_sectors,
           bdrv_rw_em_cb, &async_ret);
       if (acb == NULL) {
           async_ret = -1;
           goto fail;
       }
     while (async_ret == NOT_DONE) {      while (async_ret == NOT_DONE) {
         qemu_aio_wait();          qemu_aio_wait();
     }      }
   
   fail:
       async_context_pop();
     return async_ret;      return async_ret;
 }  }
   
 void bdrv_init(void)  void bdrv_init(void)
 {  {
     aio_pool_init(&vectored_aio_pool, sizeof(BlockDriverAIOCB),      module_call_init(MODULE_INIT_BLOCK);
                   bdrv_aio_cancel_vector);  }
   
     bdrv_register(&bdrv_raw);  void bdrv_init_with_whitelist(void)
     bdrv_register(&bdrv_host_device);  {
 #ifndef _WIN32      use_bdrv_whitelist = 1;
     bdrv_register(&bdrv_cow);      bdrv_init();
 #endif  
     bdrv_register(&bdrv_qcow);  
     bdrv_register(&bdrv_vmdk);  
     bdrv_register(&bdrv_cloop);  
     bdrv_register(&bdrv_dmg);  
     bdrv_register(&bdrv_bochs);  
     bdrv_register(&bdrv_vpc);  
     bdrv_register(&bdrv_vvfat);  
     bdrv_register(&bdrv_qcow2);  
     bdrv_register(&bdrv_parallels);  
     bdrv_register(&bdrv_nbd);  
 }  
   
 void aio_pool_init(AIOPool *pool, int aiocb_size,  
                    void (*cancel)(BlockDriverAIOCB *acb))  
 {  
     pool->aiocb_size = aiocb_size;  
     pool->cancel = cancel;  
     pool->free_aiocb = NULL;  
 }  }
   
 void *qemu_aio_get_pool(AIOPool *pool, BlockDriverState *bs,  void *qemu_aio_get(AIOPool *pool, BlockDriverState *bs,
                         BlockDriverCompletionFunc *cb, void *opaque)                     BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     BlockDriverAIOCB *acb;      BlockDriverAIOCB *acb;
   
Line 1601  void *qemu_aio_get_pool(AIOPool *pool, B Line 2074  void *qemu_aio_get_pool(AIOPool *pool, B
     return acb;      return acb;
 }  }
   
 void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,  
                    void *opaque)  
 {  
     return qemu_aio_get_pool(&bs->drv->aio_pool, bs, cb, opaque);  
 }  
   
 void qemu_aio_release(void *p)  void qemu_aio_release(void *p)
 {  {
     BlockDriverAIOCB *acb = (BlockDriverAIOCB *)p;      BlockDriverAIOCB *acb = (BlockDriverAIOCB *)p;
Line 1655  int bdrv_media_changed(BlockDriverState  Line 2122  int bdrv_media_changed(BlockDriverState 
 /**  /**
  * If eject_flag is TRUE, eject the media. Otherwise, close the tray   * If eject_flag is TRUE, eject the media. Otherwise, close the tray
  */   */
 void bdrv_eject(BlockDriverState *bs, int eject_flag)  int bdrv_eject(BlockDriverState *bs, int eject_flag)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     int ret;      int ret;
   
       if (bs->locked) {
           return -EBUSY;
       }
   
     if (!drv || !drv->bdrv_eject) {      if (!drv || !drv->bdrv_eject) {
         ret = -ENOTSUP;          ret = -ENOTSUP;
     } else {      } else {
Line 1668  void bdrv_eject(BlockDriverState *bs, in Line 2139  void bdrv_eject(BlockDriverState *bs, in
     if (ret == -ENOTSUP) {      if (ret == -ENOTSUP) {
         if (eject_flag)          if (eject_flag)
             bdrv_close(bs);              bdrv_close(bs);
           ret = 0;
     }      }
   
       return ret;
 }  }
   
 int bdrv_is_locked(BlockDriverState *bs)  int bdrv_is_locked(BlockDriverState *bs)
Line 1700  int bdrv_ioctl(BlockDriverState *bs, uns Line 2174  int bdrv_ioctl(BlockDriverState *bs, uns
         return drv->bdrv_ioctl(bs, req, buf);          return drv->bdrv_ioctl(bs, req, buf);
     return -ENOTSUP;      return -ENOTSUP;
 }  }
   
   BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
           unsigned long int req, void *buf,
           BlockDriverCompletionFunc *cb, void *opaque)
   {
       BlockDriver *drv = bs->drv;
   
       if (drv && drv->bdrv_aio_ioctl)
           return drv->bdrv_aio_ioctl(bs, req, buf, cb, opaque);
       return NULL;
   }
   
   
   
   void *qemu_blockalign(BlockDriverState *bs, size_t size)
   {
       return qemu_memalign((bs && bs->buffer_alignment) ? bs->buffer_alignment : 512, size);
   }
   
   void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable)
   {
       int64_t bitmap_size;
   
       if (enable) {
           if (!bs->dirty_bitmap) {
               bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS) +
                       BDRV_SECTORS_PER_DIRTY_CHUNK * 8 - 1;
               bitmap_size /= BDRV_SECTORS_PER_DIRTY_CHUNK * 8;
   
               bs->dirty_bitmap = qemu_mallocz(bitmap_size);
           }
       } else {
           if (bs->dirty_bitmap) {
               qemu_free(bs->dirty_bitmap);
               bs->dirty_bitmap = NULL;
           }
       }
   }
   
   int bdrv_get_dirty(BlockDriverState *bs, int64_t sector)
   {
       int64_t chunk = sector / (int64_t)BDRV_SECTORS_PER_DIRTY_CHUNK;
   
       if (bs->dirty_bitmap &&
           (sector << BDRV_SECTOR_BITS) < bdrv_getlength(bs)) {
           return bs->dirty_bitmap[chunk / (sizeof(unsigned long) * 8)] &
               (1 << (chunk % (sizeof(unsigned long) * 8)));
       } else {
           return 0;
       }
   }
   
   void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector,
                         int nr_sectors)
   {
       set_dirty_bitmap(bs, cur_sector, nr_sectors, 0);
   }

Removed from v.1.1.1.10  
changed lines
  Added in v.1.1.1.17


unix.superglobalmegacorp.com