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

version 1.1.1.17, 2018/04/24 18:16:35 version 1.1.1.19, 2018/04/24 18:34:00
Line 23 Line 23
  */   */
 #include "config-host.h"  #include "config-host.h"
 #include "qemu-common.h"  #include "qemu-common.h"
   #include "trace.h"
 #include "monitor.h"  #include "monitor.h"
 #include "block_int.h"  #include "block_int.h"
 #include "module.h"  #include "module.h"
Line 50  static BlockDriverAIOCB *bdrv_aio_writev Line 51  static BlockDriverAIOCB *bdrv_aio_writev
         BlockDriverCompletionFunc *cb, void *opaque);          BlockDriverCompletionFunc *cb, void *opaque);
 static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs,  static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs,
         BlockDriverCompletionFunc *cb, void *opaque);          BlockDriverCompletionFunc *cb, void *opaque);
   static BlockDriverAIOCB *bdrv_aio_noop_em(BlockDriverState *bs,
           BlockDriverCompletionFunc *cb, void *opaque);
 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,
                          const uint8_t *buf, int nb_sectors);                           const uint8_t *buf, int nb_sectors);
   
 BlockDriverState *bdrv_first;  static QTAILQ_HEAD(, BlockDriverState) bdrv_states =
       QTAILQ_HEAD_INITIALIZER(bdrv_states);
   
   static QLIST_HEAD(, BlockDriver) bdrv_drivers =
       QLIST_HEAD_INITIALIZER(bdrv_drivers);
   
 static BlockDriver *first_drv;  /* The device to use for VM snapshots */
   static BlockDriverState *bs_snapshots;
   
 /* If non-zero, use only whitelisted block drivers */  /* If non-zero, use only whitelisted block drivers */
 static int use_bdrv_whitelist;  static int use_bdrv_whitelist;
   
   #ifdef _WIN32
   static int is_windows_drive_prefix(const char *filename)
   {
       return (((filename[0] >= 'a' && filename[0] <= 'z') ||
                (filename[0] >= 'A' && filename[0] <= 'Z')) &&
               filename[1] == ':');
   }
   
   int is_windows_drive(const char *filename)
   {
       if (is_windows_drive_prefix(filename) &&
           filename[2] == '\0')
           return 1;
       if (strstart(filename, "\\\\.\\", NULL) ||
           strstart(filename, "//./", NULL))
           return 1;
       return 0;
   }
   #endif
   
   /* check if the path starts with "<protocol>:" */
   static int path_has_protocol(const char *path)
   {
   #ifdef _WIN32
       if (is_windows_drive(path) ||
           is_windows_drive_prefix(path)) {
           return 0;
       }
   #endif
   
       return strchr(path, ':') != NULL;
   }
   
 int path_is_absolute(const char *path)  int path_is_absolute(const char *path)
 {  {
     const char *p;      const char *p;
Line 141  void bdrv_register(BlockDriver *bdrv) Line 182  void bdrv_register(BlockDriver *bdrv)
     if (!bdrv->bdrv_aio_flush)      if (!bdrv->bdrv_aio_flush)
         bdrv->bdrv_aio_flush = bdrv_aio_flush_em;          bdrv->bdrv_aio_flush = bdrv_aio_flush_em;
   
     bdrv->next = first_drv;      QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list);
     first_drv = bdrv;  
 }  }
   
 /* create a new block device (by default it is empty) */  /* create a new block device (by default it is empty) */
 BlockDriverState *bdrv_new(const char *device_name)  BlockDriverState *bdrv_new(const char *device_name)
 {  {
     BlockDriverState **pbs, *bs;      BlockDriverState *bs;
   
     bs = qemu_mallocz(sizeof(BlockDriverState));      bs = qemu_mallocz(sizeof(BlockDriverState));
     pstrcpy(bs->device_name, sizeof(bs->device_name), device_name);      pstrcpy(bs->device_name, sizeof(bs->device_name), device_name);
     if (device_name[0] != '\0') {      if (device_name[0] != '\0') {
         /* insert at the end */          QTAILQ_INSERT_TAIL(&bdrv_states, bs, list);
         pbs = &bdrv_first;  
         while (*pbs != NULL)  
             pbs = &(*pbs)->next;  
         *pbs = bs;  
     }      }
     return bs;      return bs;
 }  }
Line 165  BlockDriverState *bdrv_new(const char *d Line 201  BlockDriverState *bdrv_new(const char *d
 BlockDriver *bdrv_find_format(const char *format_name)  BlockDriver *bdrv_find_format(const char *format_name)
 {  {
     BlockDriver *drv1;      BlockDriver *drv1;
     for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) {      QLIST_FOREACH(drv1, &bdrv_drivers, list) {
         if (!strcmp(drv1->format_name, format_name))          if (!strcmp(drv1->format_name, format_name)) {
             return drv1;              return drv1;
           }
     }      }
     return NULL;      return NULL;
 }  }
Line 205  int bdrv_create(BlockDriver *drv, const  Line 242  int bdrv_create(BlockDriver *drv, const 
     return drv->bdrv_create(filename, options);      return drv->bdrv_create(filename, options);
 }  }
   
   int bdrv_create_file(const char* filename, QEMUOptionParameter *options)
   {
       BlockDriver *drv;
   
       drv = bdrv_find_protocol(filename);
       if (drv == NULL) {
           return -ENOENT;
       }
   
       return bdrv_create(drv, filename, options);
   }
   
 #ifdef _WIN32  #ifdef _WIN32
 void get_tmp_filename(char *filename, int size)  void get_tmp_filename(char *filename, int size)
 {  {
Line 228  void get_tmp_filename(char *filename, in Line 277  void get_tmp_filename(char *filename, in
 }  }
 #endif  #endif
   
 #ifdef _WIN32  /*
 static int is_windows_drive_prefix(const char *filename)   * Detect host devices. By convention, /dev/cdrom[N] is always
    * recognized as a host CDROM.
    */
   static BlockDriver *find_hdev_driver(const char *filename)
 {  {
     return (((filename[0] >= 'a' && filename[0] <= 'z') ||      int score_max = 0, score;
              (filename[0] >= 'A' && filename[0] <= 'Z')) &&      BlockDriver *drv = NULL, *d;
             filename[1] == ':');  
 }  
   
 int is_windows_drive(const char *filename)      QLIST_FOREACH(d, &bdrv_drivers, list) {
 {          if (d->bdrv_probe_device) {
     if (is_windows_drive_prefix(filename) &&              score = d->bdrv_probe_device(filename);
         filename[2] == '\0')              if (score > score_max) {
         return 1;                  score_max = score;
     if (strstart(filename, "\\\\.\\", NULL) ||                  drv = d;
         strstart(filename, "//./", NULL))              }
         return 1;          }
     return 0;      }
   
       return drv;
 }  }
 #endif  
   
 static BlockDriver *find_protocol(const char *filename)  BlockDriver *bdrv_find_protocol(const char *filename)
 {  {
     BlockDriver *drv1;      BlockDriver *drv1;
     char protocol[128];      char protocol[128];
     int len;      int len;
     const char *p;      const char *p;
   
 #ifdef _WIN32      /* TODO Drivers without bdrv_file_open must be specified explicitly */
     if (is_windows_drive(filename) ||  
         is_windows_drive_prefix(filename))      /*
         return bdrv_find_format("raw");       * XXX(hch): we really should not let host device detection
 #endif       * override an explicit protocol specification, but moving this
        * later breaks access to device names with colons in them.
        * Thanks to the brain-dead persistent naming schemes on udev-
        * based Linux systems those actually are quite common.
        */
       drv1 = find_hdev_driver(filename);
       if (drv1) {
           return drv1;
       }
   
       if (!path_has_protocol(filename)) {
           return bdrv_find_format("file");
       }
     p = strchr(filename, ':');      p = strchr(filename, ':');
     if (!p)      assert(p != NULL);
         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;
     memcpy(protocol, filename, len);      memcpy(protocol, filename, len);
     protocol[len] = '\0';      protocol[len] = '\0';
     for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) {      QLIST_FOREACH(drv1, &bdrv_drivers, list) {
         if (drv1->protocol_name &&          if (drv1->protocol_name &&
             !strcmp(drv1->protocol_name, protocol))              !strcmp(drv1->protocol_name, protocol)) {
             return drv1;              return drv1;
     }  
     return NULL;  
 }  
   
 /*  
  * 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 NULL;
     return drv;  
 }  }
   
 static BlockDriver *find_image_format(const char *filename)  static int find_image_format(const char *filename, BlockDriver **pdrv)
 {  {
     int ret, score, score_max;      int ret, score, score_max;
     BlockDriver *drv1, *drv;      BlockDriver *drv1, *drv;
     uint8_t buf[2048];      uint8_t buf[2048];
     BlockDriverState *bs;      BlockDriverState *bs;
   
     drv = find_protocol(filename);      ret = bdrv_file_open(&bs, filename, 0);
     /* no need to test disk image formats for vvfat */      if (ret < 0) {
     if (drv && strcmp(drv->format_name, "vvfat") == 0)          *pdrv = NULL;
         return drv;          return ret;
       }
   
       /* Return the raw BlockDriver * to scsi-generic devices or empty drives */
       if (bs->sg || !bdrv_is_inserted(bs)) {
           bdrv_delete(bs);
           drv = bdrv_find_format("raw");
           if (!drv) {
               ret = -ENOENT;
           }
           *pdrv = drv;
           return ret;
       }
   
     ret = bdrv_file_open(&bs, filename, BDRV_O_RDONLY);  
     if (ret < 0)  
         return NULL;  
     ret = bdrv_pread(bs, 0, buf, sizeof(buf));      ret = bdrv_pread(bs, 0, buf, sizeof(buf));
     bdrv_delete(bs);      bdrv_delete(bs);
     if (ret < 0) {      if (ret < 0) {
         return NULL;          *pdrv = NULL;
           return ret;
     }      }
   
     score_max = 0;      score_max = 0;
     for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) {      drv = NULL;
       QLIST_FOREACH(drv1, &bdrv_drivers, list) {
         if (drv1->bdrv_probe) {          if (drv1->bdrv_probe) {
             score = drv1->bdrv_probe(buf, ret, filename);              score = drv1->bdrv_probe(buf, ret, filename);
             if (score > score_max) {              if (score > score_max) {
Line 329  static BlockDriver *find_image_format(co Line 381  static BlockDriver *find_image_format(co
             }              }
         }          }
     }      }
     return drv;      if (!drv) {
           ret = -ENOENT;
       }
       *pdrv = drv;
       return ret;
 }  }
   
   /**
    * Set the current 'total_sectors' value
    */
   static int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
   {
       BlockDriver *drv = bs->drv;
   
       /* Do not attempt drv->bdrv_getlength() on scsi-generic devices */
       if (bs->sg)
           return 0;
   
       /* query actual device if possible, otherwise just trust the hint */
       if (drv->bdrv_getlength) {
           int64_t length = drv->bdrv_getlength(bs);
           if (length < 0) {
               return length;
           }
           hint = length >> BDRV_SECTOR_BITS;
       }
   
       bs->total_sectors = hint;
       return 0;
   }
   
   /*
    * Common part for opening disk images and files
    */
   static int bdrv_open_common(BlockDriverState *bs, const char *filename,
       int flags, BlockDriver *drv)
   {
       int ret, open_flags;
   
       assert(drv != NULL);
   
       bs->file = NULL;
       bs->total_sectors = 0;
       bs->encrypted = 0;
       bs->valid_key = 0;
       bs->open_flags = flags;
       /* buffer_alignment defaulted to 512, drivers can change this value */
       bs->buffer_alignment = 512;
   
       pstrcpy(bs->filename, sizeof(bs->filename), filename);
   
       if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) {
           return -ENOTSUP;
       }
   
       bs->drv = drv;
       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;
   
       /*
        * Clear flags that are internal to the block layer before opening the
        * image.
        */
       open_flags = flags & ~(BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
   
       /*
        * Snapshots should be writeable.
        */
       if (bs->is_temporary) {
           open_flags |= BDRV_O_RDWR;
       }
   
       /* Open the image, either directly or using a protocol */
       if (drv->bdrv_file_open) {
           ret = drv->bdrv_file_open(bs, filename, open_flags);
       } else {
           ret = bdrv_file_open(&bs->file, filename, open_flags);
           if (ret >= 0) {
               ret = drv->bdrv_open(bs, open_flags);
           }
       }
   
       if (ret < 0) {
           goto free_and_fail;
       }
   
       bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR);
   
       ret = refresh_total_sectors(bs, bs->total_sectors);
       if (ret < 0) {
           goto free_and_fail;
       }
   
   #ifndef _WIN32
       if (bs->is_temporary) {
           unlink(filename);
       }
   #endif
       return 0;
   
   free_and_fail:
       if (bs->file) {
           bdrv_delete(bs->file);
           bs->file = NULL;
       }
       qemu_free(bs->opaque);
       bs->opaque = NULL;
       bs->drv = NULL;
       return ret;
   }
   
   /*
    * Opens a file using a protocol (file, host_device, nbd, ...)
    */
 int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags)  int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags)
 {  {
     BlockDriverState *bs;      BlockDriverState *bs;
       BlockDriver *drv;
     int ret;      int ret;
   
       drv = bdrv_find_protocol(filename);
       if (!drv) {
           return -ENOENT;
       }
   
     bs = bdrv_new("");      bs = bdrv_new("");
     ret = bdrv_open2(bs, filename, flags | BDRV_O_FILE, NULL);      ret = bdrv_open_common(bs, filename, flags, drv);
     if (ret < 0) {      if (ret < 0) {
         bdrv_delete(bs);          bdrv_delete(bs);
         return ret;          return ret;
Line 348  int bdrv_file_open(BlockDriverState **pb Line 525  int bdrv_file_open(BlockDriverState **pb
     return 0;      return 0;
 }  }
   
 int bdrv_open(BlockDriverState *bs, const char *filename, int flags)  /*
 {   * Opens a disk image (raw, qcow2, vmdk, ...)
     return bdrv_open2(bs, filename, flags, NULL);   */
 }  int bdrv_open(BlockDriverState *bs, const char *filename, int flags,
                 BlockDriver *drv)
 int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,  
                BlockDriver *drv)  
 {  {
     int ret, open_flags, try_rw;      int ret;
     char tmp_filename[PATH_MAX];  
     char backing_filename[PATH_MAX];  
   
     bs->is_temporary = 0;  
     bs->encrypted = 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;
Line 372  int bdrv_open2(BlockDriverState *bs, con Line 539  int bdrv_open2(BlockDriverState *bs, con
         int is_protocol = 0;          int is_protocol = 0;
         BlockDriver *bdrv_qcow2;          BlockDriver *bdrv_qcow2;
         QEMUOptionParameter *options;          QEMUOptionParameter *options;
           char tmp_filename[PATH_MAX];
           char backing_filename[PATH_MAX];
   
         /* 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_open2(bs1, filename, 0, drv);          ret = bdrv_open(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) >> BDRV_SECTOR_BITS;          total_size = bdrv_getlength(bs1) & BDRV_SECTOR_MASK;
   
         if (bs1->drv && bs1->drv->protocol_name)          if (bs1->drv && bs1->drv->protocol_name)
             is_protocol = 1;              is_protocol = 1;
Line 396  int bdrv_open2(BlockDriverState *bs, con Line 565  int bdrv_open2(BlockDriverState *bs, con
         if (is_protocol)          if (is_protocol)
             snprintf(backing_filename, sizeof(backing_filename),              snprintf(backing_filename, sizeof(backing_filename),
                      "%s", filename);                       "%s", filename);
         else          else if (!realpath(filename, backing_filename))
             realpath(filename, backing_filename);              return -errno;
   
         bdrv_qcow2 = bdrv_find_format("qcow2");          bdrv_qcow2 = bdrv_find_format("qcow2");
         options = parse_option_parameters("", bdrv_qcow2->create_options, NULL);          options = parse_option_parameters("", bdrv_qcow2->create_options, NULL);
   
         set_option_parameter_int(options, BLOCK_OPT_SIZE, total_size * 512);          set_option_parameter_int(options, BLOCK_OPT_SIZE, total_size);
         set_option_parameter(options, BLOCK_OPT_BACKING_FILE, backing_filename);          set_option_parameter(options, BLOCK_OPT_BACKING_FILE, backing_filename);
         if (drv) {          if (drv) {
             set_option_parameter(options, BLOCK_OPT_BACKING_FMT,              set_option_parameter(options, BLOCK_OPT_BACKING_FMT,
Line 410  int bdrv_open2(BlockDriverState *bs, con Line 579  int bdrv_open2(BlockDriverState *bs, con
         }          }
   
         ret = bdrv_create(bdrv_qcow2, tmp_filename, options);          ret = bdrv_create(bdrv_qcow2, tmp_filename, options);
           free_option_parameters(options);
         if (ret < 0) {          if (ret < 0) {
             return ret;              return ret;
         }          }
Line 419  int bdrv_open2(BlockDriverState *bs, con Line 589  int bdrv_open2(BlockDriverState *bs, con
         bs->is_temporary = 1;          bs->is_temporary = 1;
     }      }
   
     pstrcpy(bs->filename, sizeof(bs->filename), filename);      /* Find the right image format driver */
     if (flags & BDRV_O_FILE) {      if (!drv) {
         drv = find_protocol(filename);          ret = find_image_format(filename, &drv);
     } else if (!drv) {  
         drv = find_hdev_driver(filename);  
         if (!drv) {  
             drv = find_image_format(filename);  
         }  
     }      }
   
     if (!drv) {      if (!drv) {
         ret = -ENOENT;  
         goto unlink_and_fail;          goto unlink_and_fail;
     }      }
     bs->drv = drv;  
     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      /* Open the image */
        RDONLY as fallback */      ret = bdrv_open_common(bs, filename, flags, drv);
     try_rw = !bs->read_only || bs->is_temporary;  
     if (!(flags & BDRV_O_FILE))  
         open_flags = (try_rw ? BDRV_O_RDWR : 0) |  
             (flags & (BDRV_O_CACHE_MASK|BDRV_O_NATIVE_AIO));  
     else  
         open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT);  
   
     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)) {  
         ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR);  
         bs->read_only = 1;  
     }  
     if (ret < 0) {      if (ret < 0) {
         qemu_free(bs->opaque);          goto unlink_and_fail;
         bs->opaque = NULL;  
         bs->drv = NULL;  
     unlink_and_fail:  
         if (bs->is_temporary)  
             unlink(filename);  
         return ret;  
     }  
     if (drv->bdrv_getlength) {  
         bs->total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;  
     }  
 #ifndef _WIN32  
     if (bs->is_temporary) {  
         unlink(filename);  
     }      }
 #endif  
     if (bs->backing_file[0] != '\0') {      /* If there is a backing file, use it */
         /* if there is a backing file, use it */      if ((flags & BDRV_O_NO_BACKING) == 0 && bs->backing_file[0] != '\0') {
           char backing_filename[PATH_MAX];
           int back_flags;
         BlockDriver *back_drv = NULL;          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;          if (path_has_protocol(bs->backing_file)) {
         path_combine(backing_filename, sizeof(backing_filename),              pstrcpy(backing_filename, sizeof(backing_filename),
                      filename, bs->backing_file);                      bs->backing_file);
         if (bs->backing_format[0] != '\0')          } else {
               path_combine(backing_filename, sizeof(backing_filename),
                            filename, bs->backing_file);
           }
   
           if (bs->backing_format[0] != '\0') {
             back_drv = bdrv_find_format(bs->backing_format);              back_drv = bdrv_find_format(bs->backing_format);
         ret = bdrv_open2(bs->backing_hd, backing_filename, open_flags,          }
                          back_drv);  
           /* backing files always opened read-only */
           back_flags =
               flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT | BDRV_O_NO_BACKING);
   
           ret = bdrv_open(bs->backing_hd, backing_filename, back_flags, back_drv);
         if (ret < 0) {          if (ret < 0) {
             bdrv_close(bs);              bdrv_close(bs);
             return ret;              return ret;
         }          }
           if (bs->is_temporary) {
               bs->backing_hd->keep_read_only = !(flags & BDRV_O_RDWR);
           } else {
               /* base image inherits from "parent" */
               bs->backing_hd->keep_read_only = bs->keep_read_only;
           }
     }      }
   
     if (!bdrv_key_required(bs)) {      if (!bdrv_key_required(bs)) {
         /* call the change callback */          /* call the change callback */
         bs->media_changed = 1;          bs->media_changed = 1;
         if (bs->change_cb)          if (bs->change_cb)
             bs->change_cb(bs->change_opaque);              bs->change_cb(bs->change_opaque, CHANGE_MEDIA);
     }      }
   
     return 0;      return 0;
   
   unlink_and_fail:
       if (bs->is_temporary) {
           unlink(filename);
       }
       return ret;
 }  }
   
 void bdrv_close(BlockDriverState *bs)  void bdrv_close(BlockDriverState *bs)
 {  {
     if (bs->drv) {      if (bs->drv) {
         if (bs->backing_hd)          if (bs == bs_snapshots) {
               bs_snapshots = NULL;
           }
           if (bs->backing_hd) {
             bdrv_delete(bs->backing_hd);              bdrv_delete(bs->backing_hd);
               bs->backing_hd = NULL;
           }
         bs->drv->bdrv_close(bs);          bs->drv->bdrv_close(bs);
         qemu_free(bs->opaque);          qemu_free(bs->opaque);
 #ifdef _WIN32  #ifdef _WIN32
Line 521  void bdrv_close(BlockDriverState *bs) Line 677  void bdrv_close(BlockDriverState *bs)
         bs->opaque = NULL;          bs->opaque = NULL;
         bs->drv = NULL;          bs->drv = NULL;
   
           if (bs->file != NULL) {
               bdrv_close(bs->file);
           }
   
         /* call the change callback */          /* call the change callback */
         bs->media_changed = 1;          bs->media_changed = 1;
         if (bs->change_cb)          if (bs->change_cb)
             bs->change_cb(bs->change_opaque);              bs->change_cb(bs->change_opaque, CHANGE_MEDIA);
       }
   }
   
   void bdrv_close_all(void)
   {
       BlockDriverState *bs;
   
       QTAILQ_FOREACH(bs, &bdrv_states, list) {
           bdrv_close(bs);
     }      }
 }  }
   
 void bdrv_delete(BlockDriverState *bs)  void bdrv_delete(BlockDriverState *bs)
 {  {
     BlockDriverState **pbs;      assert(!bs->peer);
   
     pbs = &bdrv_first;      /* remove from list, if necessary */
     while (*pbs != bs && *pbs != NULL)      if (bs->device_name[0] != '\0') {
         pbs = &(*pbs)->next;          QTAILQ_REMOVE(&bdrv_states, bs, list);
     if (*pbs == bs)      }
         *pbs = bs->next;  
   
     bdrv_close(bs);      bdrv_close(bs);
       if (bs->file != NULL) {
           bdrv_delete(bs->file);
       }
   
       assert(bs != bs_snapshots);
     qemu_free(bs);      qemu_free(bs);
 }  }
   
   int bdrv_attach(BlockDriverState *bs, DeviceState *qdev)
   {
       if (bs->peer) {
           return -EBUSY;
       }
       bs->peer = qdev;
       return 0;
   }
   
   void bdrv_detach(BlockDriverState *bs, DeviceState *qdev)
   {
       assert(bs->peer == qdev);
       bs->peer = NULL;
   }
   
   DeviceState *bdrv_get_attached(BlockDriverState *bs)
   {
       return bs->peer;
   }
   
 /*  /*
  * Run consistency checks on an image   * Run consistency checks on an image
  *   *
  * Returns the number of errors or -errno when an internal error occurs   * Returns 0 if the check could be completed (it doesn't mean that the image is
    * free of errors) or -errno when an internal error occured. The results of the
    * check are stored in res.
  */   */
 int bdrv_check(BlockDriverState *bs)  int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res)
 {  {
     if (bs->drv->bdrv_check == NULL) {      if (bs->drv->bdrv_check == NULL) {
         return -ENOTSUP;          return -ENOTSUP;
     }      }
   
     return bs->drv->bdrv_check(bs);      memset(res, 0, sizeof(*res));
       return bs->drv->bdrv_check(bs, res);
 }  }
   
   #define COMMIT_BUF_SECTORS 2048
   
 /* commit COW file into the raw image */  /* commit COW file into the raw image */
 int bdrv_commit(BlockDriverState *bs)  int bdrv_commit(BlockDriverState *bs)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     int64_t i, total_sectors;      BlockDriver *backing_drv;
     int n, j;      int64_t sector, total_sectors;
     unsigned char sector[512];      int n, ro, open_flags;
       int ret = 0, rw_ret = 0;
       uint8_t *buf;
       char filename[1024];
       BlockDriverState *bs_rw, *bs_ro;
   
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
       
       if (!bs->backing_hd) {
           return -ENOTSUP;
       }
   
     if (bs->read_only) {      if (bs->backing_hd->keep_read_only) {
         return -EACCES;          return -EACCES;
     }      }
   
     if (!bs->backing_hd) {      backing_drv = bs->backing_hd->drv;
         return -ENOTSUP;      ro = bs->backing_hd->read_only;
       strncpy(filename, bs->backing_hd->filename, sizeof(filename));
       open_flags =  bs->backing_hd->open_flags;
   
       if (ro) {
           /* re-open as RW */
           bdrv_delete(bs->backing_hd);
           bs->backing_hd = NULL;
           bs_rw = bdrv_new("");
           rw_ret = bdrv_open(bs_rw, filename, open_flags | BDRV_O_RDWR,
               backing_drv);
           if (rw_ret < 0) {
               bdrv_delete(bs_rw);
               /* try to re-open read-only */
               bs_ro = bdrv_new("");
               ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR,
                   backing_drv);
               if (ret < 0) {
                   bdrv_delete(bs_ro);
                   /* drive not functional anymore */
                   bs->drv = NULL;
                   return ret;
               }
               bs->backing_hd = bs_ro;
               return rw_ret;
           }
           bs->backing_hd = bs_rw;
     }      }
   
     total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;      total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
     for (i = 0; i < total_sectors;) {      buf = qemu_malloc(COMMIT_BUF_SECTORS * BDRV_SECTOR_SIZE);
         if (drv->bdrv_is_allocated(bs, i, 65536, &n)) {  
             for(j = 0; j < n; j++) {  
                 if (bdrv_read(bs, i, sector, 1) != 0) {  
                     return -EIO;  
                 }  
   
                 if (bdrv_write(bs->backing_hd, i, sector, 1) != 0) {      for (sector = 0; sector < total_sectors; sector += n) {
                     return -EIO;          if (drv->bdrv_is_allocated(bs, sector, COMMIT_BUF_SECTORS, &n)) {
                 }  
                 i++;              if (bdrv_read(bs, sector, buf, n) != 0) {
             }                  ret = -EIO;
         } else {                  goto ro_cleanup;
             i += n;              }
   
               if (bdrv_write(bs->backing_hd, sector, buf, n) != 0) {
                   ret = -EIO;
                   goto ro_cleanup;
               }
           }
       }
   
       if (drv->bdrv_make_empty) {
           ret = drv->bdrv_make_empty(bs);
           bdrv_flush(bs);
       }
   
       /*
        * Make sure all data we wrote to the backing device is actually
        * stable on disk.
        */
       if (bs->backing_hd)
           bdrv_flush(bs->backing_hd);
   
   ro_cleanup:
       qemu_free(buf);
   
       if (ro) {
           /* re-open as RO */
           bdrv_delete(bs->backing_hd);
           bs->backing_hd = NULL;
           bs_ro = bdrv_new("");
           ret = bdrv_open(bs_ro, filename, open_flags & ~BDRV_O_RDWR,
               backing_drv);
           if (ret < 0) {
               bdrv_delete(bs_ro);
               /* drive not functional anymore */
               bs->drv = NULL;
               return ret;
         }          }
           bs->backing_hd = bs_ro;
           bs->backing_hd->keep_read_only = 0;
       }
   
       return ret;
   }
   
   void bdrv_commit_all(void)
   {
       BlockDriverState *bs;
   
       QTAILQ_FOREACH(bs, &bdrv_states, list) {
           bdrv_commit(bs);
     }      }
   }
   
     if (drv->bdrv_make_empty)  /*
         return drv->bdrv_make_empty(bs);   * Return values:
    * 0        - success
    * -EINVAL  - backing format specified, but no file
    * -ENOSPC  - can't update the backing file because no space is left in the
    *            image file header
    * -ENOTSUP - format driver doesn't support changing the backing file
    */
   int bdrv_change_backing_file(BlockDriverState *bs,
       const char *backing_file, const char *backing_fmt)
   {
       BlockDriver *drv = bs->drv;
   
     return 0;      if (drv->bdrv_change_backing_file != NULL) {
           return drv->bdrv_change_backing_file(bs, backing_file, backing_fmt);
       } else {
           return -ENOTSUP;
       }
 }  }
   
 static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,  static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,
Line 624  static int bdrv_check_byte_request(Block Line 914  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)
 {  {
     return bdrv_check_byte_request(bs, sector_num * 512, nb_sectors * 512);      return bdrv_check_byte_request(bs, sector_num * BDRV_SECTOR_SIZE,
                                      nb_sectors * BDRV_SECTOR_SIZE);
 }  }
   
 /* return < 0 if error. See bdrv_write() for the return codes */  /* return < 0 if error. See bdrv_write() for the return codes */
Line 655  static void set_dirty_bitmap(BlockDriver Line 946  static void set_dirty_bitmap(BlockDriver
         bit = start % (sizeof(unsigned long) * 8);          bit = start % (sizeof(unsigned long) * 8);
         val = bs->dirty_bitmap[idx];          val = bs->dirty_bitmap[idx];
         if (dirty) {          if (dirty) {
             val |= 1 << bit;              if (!(val & (1UL << bit))) {
                   bs->dirty_count++;
                   val |= 1UL << bit;
               }
         } else {          } else {
             val &= ~(1 << bit);              if (val & (1UL << bit)) {
                   bs->dirty_count--;
                   val &= ~(1UL << bit);
               }
         }          }
         bs->dirty_bitmap[idx] = val;          bs->dirty_bitmap[idx] = val;
     }      }
Line 684  int bdrv_write(BlockDriverState *bs, int Line 981  int bdrv_write(BlockDriverState *bs, int
         set_dirty_bitmap(bs, sector_num, nb_sectors, 1);          set_dirty_bitmap(bs, sector_num, nb_sectors, 1);
     }      }
   
       if (bs->wr_highest_sector < sector_num + nb_sectors - 1) {
           bs->wr_highest_sector = sector_num + nb_sectors - 1;
       }
   
     return drv->bdrv_write(bs, sector_num, buf, nb_sectors);      return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
 }  }
   
Line 824  int bdrv_write_sync(BlockDriverState *bs Line 1125  int bdrv_write_sync(BlockDriverState *bs
 int bdrv_truncate(BlockDriverState *bs, int64_t offset)  int bdrv_truncate(BlockDriverState *bs, int64_t offset)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
       int ret;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_truncate)      if (!drv->bdrv_truncate)
         return -ENOTSUP;          return -ENOTSUP;
     if (bs->read_only)      if (bs->read_only)
         return -EACCES;          return -EACCES;
     return drv->bdrv_truncate(bs, offset);      if (bdrv_in_use(bs))
           return -EBUSY;
       ret = drv->bdrv_truncate(bs, offset);
       if (ret == 0) {
           ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);
           if (bs->change_cb) {
               bs->change_cb(bs->change_opaque, CHANGE_SIZE);
           }
       }
       return ret;
 }  }
   
 /**  /**
Line 841  int64_t bdrv_getlength(BlockDriverState  Line 1152  int64_t bdrv_getlength(BlockDriverState 
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_getlength) {  
         /* legacy mode */      /* Fixed size devices use the total_sectors value for speed instead of
          issuing a length query (like lseek) on each call.  Also, legacy block
          drivers don't provide a bdrv_getlength function and must use
          total_sectors. */
       if (!bs->growable || !drv->bdrv_getlength) {
         return bs->total_sectors * BDRV_SECTOR_SIZE;          return bs->total_sectors * BDRV_SECTOR_SIZE;
     }      }
     return drv->bdrv_getlength(bs);      return drv->bdrv_getlength(bs);
Line 877  struct partition { Line 1192  struct partition {
 static int guess_disk_lchs(BlockDriverState *bs,  static int guess_disk_lchs(BlockDriverState *bs,
                            int *pcylinders, int *pheads, int *psectors)                             int *pcylinders, int *pheads, int *psectors)
 {  {
     uint8_t buf[512];      uint8_t buf[BDRV_SECTOR_SIZE];
     int ret, i, heads, sectors, cylinders;      int ret, i, heads, sectors, cylinders;
     struct partition *p;      struct partition *p;
     uint32_t nr_sects;      uint32_t nr_sects;
Line 1014  int bdrv_get_translation_hint(BlockDrive Line 1329  int bdrv_get_translation_hint(BlockDrive
     return bs->translation;      return bs->translation;
 }  }
   
   void bdrv_set_on_error(BlockDriverState *bs, BlockErrorAction on_read_error,
                          BlockErrorAction on_write_error)
   {
       bs->on_read_error = on_read_error;
       bs->on_write_error = on_write_error;
   }
   
   BlockErrorAction bdrv_get_on_error(BlockDriverState *bs, int is_read)
   {
       return is_read ? bs->on_read_error : bs->on_write_error;
   }
   
   void bdrv_set_removable(BlockDriverState *bs, int removable)
   {
       bs->removable = removable;
       if (removable && bs == bs_snapshots) {
           bs_snapshots = NULL;
       }
   }
   
 int bdrv_is_removable(BlockDriverState *bs)  int bdrv_is_removable(BlockDriverState *bs)
 {  {
     return bs->removable;      return bs->removable;
Line 1024  int bdrv_is_read_only(BlockDriverState * Line 1359  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;
Line 1043  int bdrv_enable_write_cache(BlockDriverS Line 1371  int bdrv_enable_write_cache(BlockDriverS
   
 /* 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, int reason),
                           void *opaque)
 {  {
     bs->change_cb = change_cb;      bs->change_cb = change_cb;
     bs->change_opaque = opaque;      bs->change_opaque = opaque;
Line 1075  int bdrv_set_key(BlockDriverState *bs, c Line 1404  int bdrv_set_key(BlockDriverState *bs, c
         if (!bs->encrypted)          if (!bs->encrypted)
             return 0;              return 0;
     }      }
     if (!bs->encrypted || !bs->drv || !bs->drv->bdrv_set_key)      if (!bs->encrypted) {
         return -1;          return -EINVAL;
       } else if (!bs->drv || !bs->drv->bdrv_set_key) {
           return -ENOMEDIUM;
       }
     ret = bs->drv->bdrv_set_key(bs, key);      ret = bs->drv->bdrv_set_key(bs, key);
     if (ret < 0) {      if (ret < 0) {
         bs->valid_key = 0;          bs->valid_key = 0;
Line 1085  int bdrv_set_key(BlockDriverState *bs, c Line 1417  int bdrv_set_key(BlockDriverState *bs, c
         /* call the change callback now, we skipped it on open */          /* call the change callback now, we skipped it on open */
         bs->media_changed = 1;          bs->media_changed = 1;
         if (bs->change_cb)          if (bs->change_cb)
             bs->change_cb(bs->change_opaque);              bs->change_cb(bs->change_opaque, CHANGE_MEDIA);
     }      }
     return ret;      return ret;
 }  }
Line 1104  void bdrv_iterate_format(void (*it)(void Line 1436  void bdrv_iterate_format(void (*it)(void
 {  {
     BlockDriver *drv;      BlockDriver *drv;
   
     for (drv = first_drv; drv != NULL; drv = drv->next) {      QLIST_FOREACH(drv, &bdrv_drivers, list) {
         it(opaque, drv->format_name);          it(opaque, drv->format_name);
     }      }
 }  }
Line 1113  BlockDriverState *bdrv_find(const char * Line 1445  BlockDriverState *bdrv_find(const char *
 {  {
     BlockDriverState *bs;      BlockDriverState *bs;
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {      QTAILQ_FOREACH(bs, &bdrv_states, list) {
         if (!strcmp(name, bs->device_name))          if (!strcmp(name, bs->device_name)) {
             return bs;              return bs;
           }
     }      }
     return NULL;      return NULL;
 }  }
   
   BlockDriverState *bdrv_next(BlockDriverState *bs)
   {
       if (!bs) {
           return QTAILQ_FIRST(&bdrv_states);
       }
       return QTAILQ_NEXT(bs, list);
   }
   
 void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque)  void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque)
 {  {
     BlockDriverState *bs;      BlockDriverState *bs;
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {      QTAILQ_FOREACH(bs, &bdrv_states, list) {
         it(opaque, bs);          it(opaque, bs);
     }      }
 }  }
Line 1134  const char *bdrv_get_device_name(BlockDr Line 1475  const char *bdrv_get_device_name(BlockDr
     return bs->device_name;      return bs->device_name;
 }  }
   
 void bdrv_flush(BlockDriverState *bs)  int bdrv_flush(BlockDriverState *bs)
 {  {
     if (!bs->drv)      if (bs->open_flags & BDRV_O_NO_FLUSH) {
         return;          return 0;
     if (bs->drv->bdrv_flush)      }
         bs->drv->bdrv_flush(bs);  
     if (bs->backing_hd)      if (bs->drv && bs->drv->bdrv_flush) {
         bdrv_flush(bs->backing_hd);          return bs->drv->bdrv_flush(bs);
       }
   
       /*
        * Some block drivers always operate in either writethrough or unsafe mode
        * and don't support bdrv_flush therefore. Usually qemu doesn't know how
        * the server works (because the behaviour is hardcoded or depends on
        * server-side configuration), so we can't ensure that everything is safe
        * on disk. Returning an error doesn't work because that would break guests
        * even if the server operates in writethrough mode.
        *
        * Let's hope the user knows what he's doing.
        */
       return 0;
 }  }
   
 void bdrv_flush_all(void)  void bdrv_flush_all(void)
 {  {
     BlockDriverState *bs;      BlockDriverState *bs;
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next)      QTAILQ_FOREACH(bs, &bdrv_states, list) {
         if (bs->drv && !bdrv_is_read_only(bs) &&           if (bs->drv && !bdrv_is_read_only(bs) &&
             (!bdrv_is_removable(bs) || bdrv_is_inserted(bs)))              (!bdrv_is_removable(bs) || bdrv_is_inserted(bs))) {
             bdrv_flush(bs);              bdrv_flush(bs);
           }
       }
   }
   
   int bdrv_has_zero_init(BlockDriverState *bs)
   {
       assert(bs->drv);
   
       if (bs->drv->bdrv_has_zero_init) {
           return bs->drv->bdrv_has_zero_init(bs);
       }
   
       return 1;
   }
   
   int bdrv_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors)
   {
       if (!bs->drv) {
           return -ENOMEDIUM;
       }
       if (!bs->drv->bdrv_discard) {
           return 0;
       }
       return bs->drv->bdrv_discard(bs, sector_num, nb_sectors);
 }  }
   
 /*  /*
Line 1181  int bdrv_is_allocated(BlockDriverState * Line 1559  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_mon_event(const BlockDriverState *bdrv,
                       BlockMonEventAction action, int is_read)
   {
       QObject *data;
       const char *action_str;
   
       switch (action) {
       case BDRV_ACTION_REPORT:
           action_str = "report";
           break;
       case BDRV_ACTION_IGNORE:
           action_str = "ignore";
           break;
       case BDRV_ACTION_STOP:
           action_str = "stop";
           break;
       default:
           abort();
       }
   
       data = qobject_from_jsonf("{ 'device': %s, 'action': %s, 'operation': %s }",
                                 bdrv->device_name,
                                 action_str,
                                 is_read ? "read" : "write");
       monitor_protocol_event(QEVENT_BLOCK_IO_ERROR, data);
   
       qobject_decref(data);
   }
   
 static void bdrv_print_dict(QObject *obj, void *opaque)  static void bdrv_print_dict(QObject *obj, void *opaque)
 {  {
     QDict *bs_dict;      QDict *bs_dict;
Line 1222  void bdrv_info_print(Monitor *mon, const Line 1629  void bdrv_info_print(Monitor *mon, const
     qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon);      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)  void bdrv_info(Monitor *mon, QObject **ret_data)
 {  {
     QList *bs_list;      QList *bs_list;
Line 1256  void bdrv_info(Monitor *mon, QObject **r Line 1636  void bdrv_info(Monitor *mon, QObject **r
   
     bs_list = qlist_new();      bs_list = qlist_new();
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {      QTAILQ_FOREACH(bs, &bdrv_states, list) {
         QObject *bs_obj;          QObject *bs_obj;
         const char *type = "unknown";          const char *type = "unknown";
   
Line 1276  void bdrv_info(Monitor *mon, QObject **r Line 1656  void bdrv_info(Monitor *mon, QObject **r
                                     "'removable': %i, 'locked': %i }",                                      "'removable': %i, 'locked': %i }",
                                     bs->device_name, type, bs->removable,                                      bs->device_name, type, bs->removable,
                                     bs->locked);                                      bs->locked);
         assert(bs_obj != NULL);  
   
         if (bs->drv) {          if (bs->drv) {
             QObject *obj;              QObject *obj;
Line 1287  void bdrv_info(Monitor *mon, QObject **r Line 1666  void bdrv_info(Monitor *mon, QObject **r
                                      bs->filename, bs->read_only,                                       bs->filename, bs->read_only,
                                      bs->drv->format_name,                                       bs->drv->format_name,
                                      bdrv_is_encrypted(bs));                                       bdrv_is_encrypted(bs));
             assert(obj != NULL);  
             if (bs->backing_file[0] != '\0') {              if (bs->backing_file[0] != '\0') {
                 QDict *qdict = qobject_to_qdict(obj);                  QDict *qdict = qobject_to_qdict(obj);
                 qdict_put(qdict, "backing_file",                  qdict_put(qdict, "backing_file",
Line 1327  void bdrv_stats_print(Monitor *mon, cons Line 1705  void bdrv_stats_print(Monitor *mon, cons
     qlist_iter(qobject_to_qlist(data), bdrv_stats_iter, mon);      qlist_iter(qobject_to_qlist(data), bdrv_stats_iter, mon);
 }  }
   
 /**  static QObject* bdrv_info_stats_bs(BlockDriverState *bs)
  * bdrv_info_stats(): show block device statistics  {
  *      QObject *res;
  * Each device statistic information is stored in a QDict and      QDict *dict;
  * the returned QObject is a QList of all devices.  
  *      res = qobject_from_jsonf("{ 'stats': {"
  * The QDict contains the following:                               "'rd_bytes': %" PRId64 ","
  *                               "'wr_bytes': %" PRId64 ","
  * - "device": device name                               "'rd_operations': %" PRId64 ","
  * - "stats": A QDict with the statistics information, it contains:                               "'wr_operations': %" PRId64 ","
  *     - "rd_bytes": bytes read                               "'wr_highest_offset': %" PRId64
  *     - "wr_bytes": bytes written                               "} }",
  *     - "rd_operations": read operations                               bs->rd_bytes, bs->wr_bytes,
  *     - "wr_operations": write operations                               bs->rd_ops, bs->wr_ops,
  *                                bs->wr_highest_sector *
  * Example:                               (uint64_t)BDRV_SECTOR_SIZE);
  *      dict  = qobject_to_qdict(res);
  * [ { "device": "ide0-hd0",  
  *               "stats": { "rd_bytes": 512,      if (*bs->device_name) {
  *                          "wr_bytes": 0,          qdict_put(dict, "device", qstring_from_str(bs->device_name));
  *                          "rd_operations": 1,      }
  *                          "wr_operations": 0 } },  
  *   { "device": "ide1-cd0",      if (bs->file) {
  *               "stats": { "rd_bytes": 0,          QObject *parent = bdrv_info_stats_bs(bs->file);
  *                          "wr_bytes": 0,          qdict_put_obj(dict, "parent", parent);
  *                          "rd_operations": 0,      }
  *                          "wr_operations": 0 } } ]  
  */      return res;
   }
   
 void bdrv_info_stats(Monitor *mon, QObject **ret_data)  void bdrv_info_stats(Monitor *mon, QObject **ret_data)
 {  {
     QObject *obj;      QObject *obj;
Line 1363  void bdrv_info_stats(Monitor *mon, QObje Line 1743  void bdrv_info_stats(Monitor *mon, QObje
   
     devices = qlist_new();      devices = qlist_new();
   
     for (bs = bdrv_first; bs != NULL; bs = bs->next) {      QTAILQ_FOREACH(bs, &bdrv_states, list) {
         obj = qobject_from_jsonf("{ 'device': %s, 'stats': {"          obj = bdrv_info_stats_bs(bs);
                                  "'rd_bytes': %" PRId64 ","  
                                  "'wr_bytes': %" PRId64 ","  
                                  "'rd_operations': %" PRId64 ","  
                                  "'wr_operations': %" PRId64  
                                  "} }",  
                                  bs->device_name,  
                                  bs->rd_bytes, bs->wr_bytes,  
                                  bs->rd_ops, bs->wr_ops);  
         assert(obj != NULL);  
         qlist_append_obj(devices, obj);          qlist_append_obj(devices, obj);
     }      }
   
Line 1393  const char *bdrv_get_encrypted_filename( Line 1764  const char *bdrv_get_encrypted_filename(
 void bdrv_get_backing_filename(BlockDriverState *bs,  void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size)                                 char *filename, int filename_size)
 {  {
     if (!bs->backing_hd) {      if (!bs->backing_file) {
         pstrcpy(filename, filename_size, "");          pstrcpy(filename, filename_size, "");
     } else {      } else {
         pstrcpy(filename, filename_size, bs->backing_file);          pstrcpy(filename, filename_size, bs->backing_file);
Line 1435  int bdrv_save_vmstate(BlockDriverState * Line 1806  int bdrv_save_vmstate(BlockDriverState *
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_save_vmstate)      if (drv->bdrv_save_vmstate)
         return -ENOTSUP;          return drv->bdrv_save_vmstate(bs, buf, pos, size);
     return drv->bdrv_save_vmstate(bs, buf, pos, size);      if (bs->file)
           return bdrv_save_vmstate(bs->file, buf, pos, size);
       return -ENOTSUP;
 }  }
   
 int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,  int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
Line 1446  int bdrv_load_vmstate(BlockDriverState * Line 1819  int bdrv_load_vmstate(BlockDriverState *
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_load_vmstate)      if (drv->bdrv_load_vmstate)
         return -ENOTSUP;          return drv->bdrv_load_vmstate(bs, buf, pos, size);
     return drv->bdrv_load_vmstate(bs, buf, pos, size);      if (bs->file)
           return bdrv_load_vmstate(bs->file, buf, pos, size);
       return -ENOTSUP;
   }
   
   void bdrv_debug_event(BlockDriverState *bs, BlkDebugEvent event)
   {
       BlockDriver *drv = bs->drv;
   
       if (!drv || !drv->bdrv_debug_event) {
           return;
       }
   
       return drv->bdrv_debug_event(bs, event);
   
 }  }
   
 /**************************************************************/  /**************************************************************/
 /* handling of snapshots */  /* handling of snapshots */
   
   int bdrv_can_snapshot(BlockDriverState *bs)
   {
       BlockDriver *drv = bs->drv;
       if (!drv || bdrv_is_removable(bs) || bdrv_is_read_only(bs)) {
           return 0;
       }
   
       if (!drv->bdrv_snapshot_create) {
           if (bs->file != NULL) {
               return bdrv_can_snapshot(bs->file);
           }
           return 0;
       }
   
       return 1;
   }
   
   int bdrv_is_snapshot(BlockDriverState *bs)
   {
       return !!(bs->open_flags & BDRV_O_SNAPSHOT);
   }
   
   BlockDriverState *bdrv_snapshots(void)
   {
       BlockDriverState *bs;
   
       if (bs_snapshots) {
           return bs_snapshots;
       }
   
       bs = NULL;
       while ((bs = bdrv_next(bs))) {
           if (bdrv_can_snapshot(bs)) {
               bs_snapshots = bs;
               return bs;
           }
       }
       return NULL;
   }
   
 int bdrv_snapshot_create(BlockDriverState *bs,  int bdrv_snapshot_create(BlockDriverState *bs,
                          QEMUSnapshotInfo *sn_info)                           QEMUSnapshotInfo *sn_info)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_snapshot_create)      if (drv->bdrv_snapshot_create)
         return -ENOTSUP;          return drv->bdrv_snapshot_create(bs, sn_info);
     return drv->bdrv_snapshot_create(bs, sn_info);      if (bs->file)
           return bdrv_snapshot_create(bs->file, sn_info);
       return -ENOTSUP;
 }  }
   
 int bdrv_snapshot_goto(BlockDriverState *bs,  int bdrv_snapshot_goto(BlockDriverState *bs,
                        const char *snapshot_id)                         const char *snapshot_id)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
       int ret, open_ret;
   
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_snapshot_goto)      if (drv->bdrv_snapshot_goto)
         return -ENOTSUP;          return drv->bdrv_snapshot_goto(bs, snapshot_id);
     return drv->bdrv_snapshot_goto(bs, snapshot_id);  
       if (bs->file) {
           drv->bdrv_close(bs);
           ret = bdrv_snapshot_goto(bs->file, snapshot_id);
           open_ret = drv->bdrv_open(bs, bs->open_flags);
           if (open_ret < 0) {
               bdrv_delete(bs->file);
               bs->drv = NULL;
               return open_ret;
           }
           return ret;
       }
   
       return -ENOTSUP;
 }  }
   
 int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)  int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
Line 1481  int bdrv_snapshot_delete(BlockDriverStat Line 1925  int bdrv_snapshot_delete(BlockDriverStat
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_snapshot_delete)      if (drv->bdrv_snapshot_delete)
         return -ENOTSUP;          return drv->bdrv_snapshot_delete(bs, snapshot_id);
     return drv->bdrv_snapshot_delete(bs, snapshot_id);      if (bs->file)
           return bdrv_snapshot_delete(bs->file, snapshot_id);
       return -ENOTSUP;
 }  }
   
 int bdrv_snapshot_list(BlockDriverState *bs,  int bdrv_snapshot_list(BlockDriverState *bs,
Line 1492  int bdrv_snapshot_list(BlockDriverState  Line 1938  int bdrv_snapshot_list(BlockDriverState 
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_snapshot_list)      if (drv->bdrv_snapshot_list)
         return -ENOTSUP;          return drv->bdrv_snapshot_list(bs, psn_info);
     return drv->bdrv_snapshot_list(bs, psn_info);      if (bs->file)
           return bdrv_snapshot_list(bs->file, psn_info);
       return -ENOTSUP;
   }
   
   int bdrv_snapshot_load_tmp(BlockDriverState *bs,
           const char *snapshot_name)
   {
       BlockDriver *drv = bs->drv;
       if (!drv) {
           return -ENOMEDIUM;
       }
       if (!bs->read_only) {
           return -EINVAL;
       }
       if (drv->bdrv_snapshot_load_tmp) {
           return drv->bdrv_snapshot_load_tmp(bs, snapshot_name);
       }
       return -ENOTSUP;
 }  }
   
 #define NB_SUFFIXES 4  #define NB_SUFFIXES 4
Line 1581  BlockDriverAIOCB *bdrv_aio_readv(BlockDr Line 2045  BlockDriverAIOCB *bdrv_aio_readv(BlockDr
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
     BlockDriverAIOCB *ret;      BlockDriverAIOCB *ret;
   
       trace_bdrv_aio_readv(bs, sector_num, nb_sectors, opaque);
   
     if (!drv)      if (!drv)
         return NULL;          return NULL;
     if (bdrv_check_request(bs, sector_num, nb_sectors))      if (bdrv_check_request(bs, sector_num, nb_sectors))
Line 1598  BlockDriverAIOCB *bdrv_aio_readv(BlockDr Line 2064  BlockDriverAIOCB *bdrv_aio_readv(BlockDr
     return ret;      return ret;
 }  }
   
   typedef struct BlockCompleteData {
       BlockDriverCompletionFunc *cb;
       void *opaque;
       BlockDriverState *bs;
       int64_t sector_num;
       int nb_sectors;
   } BlockCompleteData;
   
   static void block_complete_cb(void *opaque, int ret)
   {
       BlockCompleteData *b = opaque;
   
       if (b->bs->dirty_bitmap) {
           set_dirty_bitmap(b->bs, b->sector_num, b->nb_sectors, 1);
       }
       b->cb(b->opaque, ret);
       qemu_free(b);
   }
   
   static BlockCompleteData *blk_dirty_cb_alloc(BlockDriverState *bs,
                                                int64_t sector_num,
                                                int nb_sectors,
                                                BlockDriverCompletionFunc *cb,
                                                void *opaque)
   {
       BlockCompleteData *blkdata = qemu_mallocz(sizeof(BlockCompleteData));
   
       blkdata->bs = bs;
       blkdata->cb = cb;
       blkdata->opaque = opaque;
       blkdata->sector_num = sector_num;
       blkdata->nb_sectors = nb_sectors;
   
       return blkdata;
   }
   
 BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,  BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
                                   QEMUIOVector *qiov, 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;
       BlockCompleteData *blk_cb_data;
   
       trace_bdrv_aio_writev(bs, sector_num, nb_sectors, opaque);
   
     if (!drv)      if (!drv)
         return NULL;          return NULL;
Line 1613  BlockDriverAIOCB *bdrv_aio_writev(BlockD Line 2118  BlockDriverAIOCB *bdrv_aio_writev(BlockD
         return NULL;          return NULL;
   
     if (bs->dirty_bitmap) {      if (bs->dirty_bitmap) {
         set_dirty_bitmap(bs, sector_num, nb_sectors, 1);          blk_cb_data = blk_dirty_cb_alloc(bs, sector_num, nb_sectors, cb,
                                            opaque);
           cb = &block_complete_cb;
           opaque = blk_cb_data;
     }      }
   
     ret = drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors,      ret = drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors,
                                cb, opaque);                                 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 * BDRV_SECTOR_SIZE;          bs->wr_bytes += (unsigned) nb_sectors * BDRV_SECTOR_SIZE;
         bs->wr_ops ++;          bs->wr_ops ++;
           if (bs->wr_highest_sector < sector_num + nb_sectors - 1) {
               bs->wr_highest_sector = sector_num + nb_sectors - 1;
           }
     }      }
   
     return ret;      return ret;
Line 1659  static void multiwrite_cb(void *opaque,  Line 2170  static void multiwrite_cb(void *opaque, 
 {  {
     MultiwriteCB *mcb = opaque;      MultiwriteCB *mcb = opaque;
   
       trace_multiwrite_cb(mcb, ret);
   
     if (ret < 0 && !mcb->error) {      if (ret < 0 && !mcb->error) {
         mcb->error = ret;          mcb->error = ret;
     }      }
Line 1799  int bdrv_aio_multiwrite(BlockDriverState Line 2312  int bdrv_aio_multiwrite(BlockDriverState
     // Check for mergable requests      // Check for mergable requests
     num_reqs = multiwrite_merge(bs, reqs, num_reqs, mcb);      num_reqs = multiwrite_merge(bs, reqs, num_reqs, mcb);
   
       trace_bdrv_aio_multiwrite(mcb, mcb->num_callbacks, num_reqs);
   
     /*      /*
      * Run the aio requests. As soon as one request can't be submitted       * Run the aio requests. As soon as one request can't be submitted
      * successfully, fail all requests that are not yet submitted (we must       * successfully, fail all requests that are not yet submitted (we must
Line 1820  int bdrv_aio_multiwrite(BlockDriverState Line 2335  int bdrv_aio_multiwrite(BlockDriverState
      */       */
     mcb->num_requests = 1;      mcb->num_requests = 1;
   
       // Run the aio requests
     for (i = 0; i < num_reqs; i++) {      for (i = 0; i < num_reqs; i++) {
         mcb->num_requests++;          mcb->num_requests++;
         acb = bdrv_aio_writev(bs, reqs[i].sector, reqs[i].qiov,          acb = bdrv_aio_writev(bs, reqs[i].sector, reqs[i].qiov,
Line 1830  int bdrv_aio_multiwrite(BlockDriverState Line 2346  int bdrv_aio_multiwrite(BlockDriverState
             // submitted yet. Otherwise we'll wait for the submitted AIOs to              // submitted yet. Otherwise we'll wait for the submitted AIOs to
             // complete and report the error in the callback.              // complete and report the error in the callback.
             if (i == 0) {              if (i == 0) {
                   trace_bdrv_aio_multiwrite_earlyfail(mcb);
                 goto fail;                  goto fail;
             } else {              } else {
                   trace_bdrv_aio_multiwrite_latefail(mcb, i);
                 multiwrite_cb(mcb, -EIO);                  multiwrite_cb(mcb, -EIO);
                 break;                  break;
             }              }
Line 1856  BlockDriverAIOCB *bdrv_aio_flush(BlockDr Line 2374  BlockDriverAIOCB *bdrv_aio_flush(BlockDr
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
   
       if (bs->open_flags & BDRV_O_NO_FLUSH) {
           return bdrv_aio_noop_em(bs, cb, opaque);
       }
   
     if (!drv)      if (!drv)
         return NULL;          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);      return drv->bdrv_aio_flush(bs, cb, opaque);
 }  }
   
Line 1887  typedef struct BlockDriverAIOCBSync { Line 2404  typedef struct BlockDriverAIOCBSync {
   
 static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)  static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)
 {  {
     BlockDriverAIOCBSync *acb = (BlockDriverAIOCBSync *)blockacb;      BlockDriverAIOCBSync *acb =
           container_of(blockacb, BlockDriverAIOCBSync, common);
     qemu_bh_delete(acb->bh);      qemu_bh_delete(acb->bh);
     acb->bh = NULL;      acb->bh = NULL;
     qemu_aio_release(acb);      qemu_aio_release(acb);
Line 1975  static BlockDriverAIOCB *bdrv_aio_flush_ Line 2493  static BlockDriverAIOCB *bdrv_aio_flush_
     return &acb->common;      return &acb->common;
 }  }
   
   static BlockDriverAIOCB *bdrv_aio_noop_em(BlockDriverState *bs,
           BlockDriverCompletionFunc *cb, void *opaque)
   {
       BlockDriverAIOCBSync *acb;
   
       acb = qemu_aio_get(&bdrv_em_aio_pool, bs, cb, opaque);
       acb->is_write = 1; /* don't bounce in the completion handler */
       acb->qiov = NULL;
       acb->bounce = NULL;
       acb->ret = 0;
   
       if (!acb->bh) {
           acb->bh = qemu_bh_new(bdrv_aio_bh_cb, acb);
       }
   
       qemu_bh_schedule(acb->bh);
       return &acb->common;
   }
   
 /**************************************************************/  /**************************************************************/
 /* sync block device emulation */  /* sync block device emulation */
   
Line 1997  static int bdrv_read_em(BlockDriverState Line 2534  static int bdrv_read_em(BlockDriverState
   
     async_ret = NOT_DONE;      async_ret = NOT_DONE;
     iov.iov_base = (void *)buf;      iov.iov_base = (void *)buf;
     iov.iov_len = nb_sectors * 512;      iov.iov_len = nb_sectors * BDRV_SECTOR_SIZE;
     qemu_iovec_init_external(&qiov, &iov, 1);      qemu_iovec_init_external(&qiov, &iov, 1);
     acb = bdrv_aio_readv(bs, sector_num, &qiov, nb_sectors,      acb = bdrv_aio_readv(bs, sector_num, &qiov, nb_sectors,
         bdrv_rw_em_cb, &async_ret);          bdrv_rw_em_cb, &async_ret);
Line 2028  static int bdrv_write_em(BlockDriverStat Line 2565  static int bdrv_write_em(BlockDriverStat
   
     async_ret = NOT_DONE;      async_ret = NOT_DONE;
     iov.iov_base = (void *)buf;      iov.iov_base = (void *)buf;
     iov.iov_len = nb_sectors * 512;      iov.iov_len = nb_sectors * BDRV_SECTOR_SIZE;
     qemu_iovec_init_external(&qiov, &iov, 1);      qemu_iovec_init_external(&qiov, &iov, 1);
     acb = bdrv_aio_writev(bs, sector_num, &qiov, nb_sectors,      acb = bdrv_aio_writev(bs, sector_num, &qiov, nb_sectors,
         bdrv_rw_em_cb, &async_ret);          bdrv_rw_em_cb, &async_ret);
Line 2095  int bdrv_is_inserted(BlockDriverState *b Line 2632  int bdrv_is_inserted(BlockDriverState *b
     if (!drv)      if (!drv)
         return 0;          return 0;
     if (!drv->bdrv_is_inserted)      if (!drv->bdrv_is_inserted)
         return 1;          return !bs->tray_open;
     ret = drv->bdrv_is_inserted(bs);      ret = drv->bdrv_is_inserted(bs);
     return ret;      return ret;
 }  }
Line 2137  int bdrv_eject(BlockDriverState *bs, int Line 2674  int bdrv_eject(BlockDriverState *bs, int
         ret = drv->bdrv_eject(bs, eject_flag);          ret = drv->bdrv_eject(bs, eject_flag);
     }      }
     if (ret == -ENOTSUP) {      if (ret == -ENOTSUP) {
         if (eject_flag)  
             bdrv_close(bs);  
         ret = 0;          ret = 0;
     }      }
       if (ret >= 0) {
           bs->tray_open = eject_flag;
       }
   
     return ret;      return ret;
 }  }
Line 2197  void bdrv_set_dirty_tracking(BlockDriver Line 2735  void bdrv_set_dirty_tracking(BlockDriver
 {  {
     int64_t bitmap_size;      int64_t bitmap_size;
   
       bs->dirty_count = 0;
     if (enable) {      if (enable) {
         if (!bs->dirty_bitmap) {          if (!bs->dirty_bitmap) {
             bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS) +              bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS) +
Line 2219  int bdrv_get_dirty(BlockDriverState *bs, Line 2758  int bdrv_get_dirty(BlockDriverState *bs,
   
     if (bs->dirty_bitmap &&      if (bs->dirty_bitmap &&
         (sector << BDRV_SECTOR_BITS) < bdrv_getlength(bs)) {          (sector << BDRV_SECTOR_BITS) < bdrv_getlength(bs)) {
         return bs->dirty_bitmap[chunk / (sizeof(unsigned long) * 8)] &          return !!(bs->dirty_bitmap[chunk / (sizeof(unsigned long) * 8)] &
             (1 << (chunk % (sizeof(unsigned long) * 8)));              (1UL << (chunk % (sizeof(unsigned long) * 8))));
     } else {      } else {
         return 0;          return 0;
     }      }
Line 2231  void bdrv_reset_dirty(BlockDriverState * Line 2770  void bdrv_reset_dirty(BlockDriverState *
 {  {
     set_dirty_bitmap(bs, cur_sector, nr_sectors, 0);      set_dirty_bitmap(bs, cur_sector, nr_sectors, 0);
 }  }
   
   int64_t bdrv_get_dirty_count(BlockDriverState *bs)
   {
       return bs->dirty_count;
   }
   
   void bdrv_set_in_use(BlockDriverState *bs, int in_use)
   {
       assert(bs->in_use != in_use);
       bs->in_use = in_use;
   }
   
   int bdrv_in_use(BlockDriverState *bs)
   {
       return bs->in_use;
   }
   
   int bdrv_img_create(const char *filename, const char *fmt,
                       const char *base_filename, const char *base_fmt,
                       char *options, uint64_t img_size, int flags)
   {
       QEMUOptionParameter *param = NULL, *create_options = NULL;
       QEMUOptionParameter *backing_fmt, *backing_file;
       BlockDriverState *bs = NULL;
       BlockDriver *drv, *proto_drv;
       BlockDriver *backing_drv = NULL;
       int ret = 0;
   
       /* Find driver and parse its options */
       drv = bdrv_find_format(fmt);
       if (!drv) {
           error_report("Unknown file format '%s'", fmt);
           ret = -EINVAL;
           goto out;
       }
   
       proto_drv = bdrv_find_protocol(filename);
       if (!proto_drv) {
           error_report("Unknown protocol '%s'", filename);
           ret = -EINVAL;
           goto out;
       }
   
       create_options = append_option_parameters(create_options,
                                                 drv->create_options);
       create_options = append_option_parameters(create_options,
                                                 proto_drv->create_options);
   
       /* Create parameter list with default values */
       param = parse_option_parameters("", create_options, param);
   
       set_option_parameter_int(param, BLOCK_OPT_SIZE, img_size);
   
       /* Parse -o options */
       if (options) {
           param = parse_option_parameters(options, create_options, param);
           if (param == NULL) {
               error_report("Invalid options for file format '%s'.", fmt);
               ret = -EINVAL;
               goto out;
           }
       }
   
       if (base_filename) {
           if (set_option_parameter(param, BLOCK_OPT_BACKING_FILE,
                                    base_filename)) {
               error_report("Backing file not supported for file format '%s'",
                            fmt);
               ret = -EINVAL;
               goto out;
           }
       }
   
       if (base_fmt) {
           if (set_option_parameter(param, BLOCK_OPT_BACKING_FMT, base_fmt)) {
               error_report("Backing file format not supported for file "
                            "format '%s'", fmt);
               ret = -EINVAL;
               goto out;
           }
       }
   
       backing_file = get_option_parameter(param, BLOCK_OPT_BACKING_FILE);
       if (backing_file && backing_file->value.s) {
           if (!strcmp(filename, backing_file->value.s)) {
               error_report("Error: Trying to create an image with the "
                            "same filename as the backing file");
               ret = -EINVAL;
               goto out;
           }
       }
   
       backing_fmt = get_option_parameter(param, BLOCK_OPT_BACKING_FMT);
       if (backing_fmt && backing_fmt->value.s) {
           backing_drv = bdrv_find_format(backing_fmt->value.s);
           if (!backing_drv) {
               error_report("Unknown backing file format '%s'",
                            backing_fmt->value.s);
               ret = -EINVAL;
               goto out;
           }
       }
   
       // The size for the image must always be specified, with one exception:
       // If we are using a backing file, we can obtain the size from there
       if (get_option_parameter(param, BLOCK_OPT_SIZE)->value.n == -1) {
           if (backing_file && backing_file->value.s) {
               uint64_t size;
               char buf[32];
   
               bs = bdrv_new("");
   
               ret = bdrv_open(bs, backing_file->value.s, flags, backing_drv);
               if (ret < 0) {
                   error_report("Could not open '%s'", backing_file->value.s);
                   goto out;
               }
               bdrv_get_geometry(bs, &size);
               size *= 512;
   
               snprintf(buf, sizeof(buf), "%" PRId64, size);
               set_option_parameter(param, BLOCK_OPT_SIZE, buf);
           } else {
               error_report("Image creation needs a size parameter");
               ret = -EINVAL;
               goto out;
           }
       }
   
       printf("Formatting '%s', fmt=%s ", filename, fmt);
       print_option_parameters(param);
       puts("");
   
       ret = bdrv_create(drv, filename, param);
   
       if (ret < 0) {
           if (ret == -ENOTSUP) {
               error_report("Formatting or formatting option not supported for "
                            "file format '%s'", fmt);
           } else if (ret == -EFBIG) {
               error_report("The image size is too large for file format '%s'",
                            fmt);
           } else {
               error_report("%s: error while creating %s: %s", filename, fmt,
                            strerror(-ret));
           }
       }
   
   out:
       free_option_parameters(create_options);
       free_option_parameters(param);
   
       if (bs) {
           bdrv_delete(bs);
       }
   
       return ret;
   }

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


unix.superglobalmegacorp.com