Diff for /qemu/block.c between versions 1.1.1.5 and 1.1.1.9

version 1.1.1.5, 2018/04/24 16:44:58 version 1.1.1.9, 2018/04/24 17:01:52
Line 1 Line 1
 /*  /*
  * QEMU System Emulator block driver   * QEMU System Emulator block driver
  *    *
  * Copyright (c) 2003 Fabrice Bellard   * Copyright (c) 2003 Fabrice Bellard
  *    *
  * Permission is hereby granted, free of charge, to any person obtaining a copy   * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal   * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights   * in the Software without restriction, including without limitation the rights
Line 21 Line 21
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.   * THE SOFTWARE.
  */   */
 #include "vl.h"  #include "config-host.h"
   #ifdef _BSD
   /* include native header before sys-queue.h */
   #include <sys/queue.h>
   #endif
   
   #include "qemu-common.h"
   #include "console.h"
 #include "block_int.h"  #include "block_int.h"
   
 #ifdef _BSD  #ifdef _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>  
 #include <sys/disk.h>  #include <sys/disk.h>
 #endif  #endif
   
Line 48  static BlockDriverAIOCB *bdrv_aio_write_ Line 54  static BlockDriverAIOCB *bdrv_aio_write_
         int64_t sector_num, const uint8_t *buf, int nb_sectors,          int64_t sector_num, const uint8_t *buf, int nb_sectors,
         BlockDriverCompletionFunc *cb, void *opaque);          BlockDriverCompletionFunc *cb, void *opaque);
 static void bdrv_aio_cancel_em(BlockDriverAIOCB *acb);  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,
                          const uint8_t *buf, int nb_sectors);                           const uint8_t *buf, int nb_sectors);
   
 static BlockDriverState *bdrv_first;  BlockDriverState *bdrv_first;
   
 static BlockDriver *first_drv;  static BlockDriver *first_drv;
   
 int path_is_absolute(const char *path)  int path_is_absolute(const char *path)
Line 121  void path_combine(char *dest, int dest_s Line 128  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_read) {
         /* add AIO emulation layer */          /* add AIO emulation layer */
Line 144  BlockDriverState *bdrv_new(const char *d Line 151  BlockDriverState *bdrv_new(const char *d
     BlockDriverState **pbs, *bs;      BlockDriverState **pbs, *bs;
   
     bs = qemu_mallocz(sizeof(BlockDriverState));      bs = qemu_mallocz(sizeof(BlockDriverState));
     if(!bs)  
         return NULL;  
     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 */          /* insert at the end */
Line 167  BlockDriver *bdrv_find_format(const char Line 172  BlockDriver *bdrv_find_format(const char
     return NULL;      return NULL;
 }  }
   
 int bdrv_create(BlockDriver *drv,   int bdrv_create(BlockDriver *drv,
                 const char *filename, int64_t size_in_sectors,                  const char *filename, int64_t size_in_sectors,
                 const char *backing_file, int flags)                  const char *backing_file, int flags)
 {  {
Line 180  int bdrv_create(BlockDriver *drv,  Line 185  int bdrv_create(BlockDriver *drv, 
 void get_tmp_filename(char *filename, int size)  void get_tmp_filename(char *filename, int size)
 {  {
     char temp_dir[MAX_PATH];      char temp_dir[MAX_PATH];
       
     GetTempPath(MAX_PATH, temp_dir);      GetTempPath(MAX_PATH, temp_dir);
     GetTempFileName(temp_dir, "qem", 0, filename);      GetTempFileName(temp_dir, "qem", 0, filename);
 }  }
Line 188  void get_tmp_filename(char *filename, in Line 193  void get_tmp_filename(char *filename, in
 void get_tmp_filename(char *filename, int size)  void get_tmp_filename(char *filename, int size)
 {  {
     int fd;      int fd;
       const char *tmpdir;
     /* XXX: race condition possible */      /* XXX: race condition possible */
     pstrcpy(filename, size, "/tmp/vl.XXXXXX");      tmpdir = getenv("TMPDIR");
       if (!tmpdir)
           tmpdir = "/tmp";
       snprintf(filename, size, "%s/vl.XXXXXX", tmpdir);
     fd = mkstemp(filename);      fd = mkstemp(filename);
     close(fd);      close(fd);
 }  }
Line 202  static int is_windows_drive_prefix(const Line 211  static int is_windows_drive_prefix(const
              (filename[0] >= 'A' && filename[0] <= 'Z')) &&               (filename[0] >= 'A' && filename[0] <= 'Z')) &&
             filename[1] == ':');              filename[1] == ':');
 }  }
       
 static int is_windows_drive(const char *filename)  static 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')
         return 1;          return 1;
     if (strstart(filename, "\\\\.\\", NULL) ||      if (strstart(filename, "\\\\.\\", NULL) ||
Line 236  static BlockDriver *find_protocol(const  Line 245  static BlockDriver *find_protocol(const 
     memcpy(protocol, filename, len);      memcpy(protocol, filename, len);
     protocol[len] = '\0';      protocol[len] = '\0';
     for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) {      for(drv1 = first_drv; drv1 != NULL; drv1 = drv1->next) {
         if (drv1->protocol_name &&           if (drv1->protocol_name &&
             !strcmp(drv1->protocol_name, protocol))              !strcmp(drv1->protocol_name, protocol))
             return drv1;              return drv1;
     }      }
Line 251  static BlockDriver *find_image_format(co Line 260  static BlockDriver *find_image_format(co
     BlockDriver *drv1, *drv;      BlockDriver *drv1, *drv;
     uint8_t buf[2048];      uint8_t buf[2048];
     BlockDriverState *bs;      BlockDriverState *bs;
       
     /* detect host devices. By convention, /dev/cdrom[N] is always      /* detect host devices. By convention, /dev/cdrom[N] is always
        recognized as a host CDROM */         recognized as a host CDROM */
     if (strstart(filename, "/dev/cdrom", NULL))      if (strstart(filename, "/dev/cdrom", NULL))
Line 262  static BlockDriver *find_image_format(co Line 271  static BlockDriver *find_image_format(co
 #else  #else
     {      {
         struct stat st;          struct stat st;
         if (stat(filename, &st) >= 0 &&           if (stat(filename, &st) >= 0 &&
             (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) {              (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode))) {
             return &bdrv_host_device;              return &bdrv_host_device;
         }          }
     }      }
 #endif  #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 == &bdrv_vvfat)
Line 302  int bdrv_file_open(BlockDriverState **pb Line 311  int bdrv_file_open(BlockDriverState **pb
     int ret;      int ret;
   
     bs = bdrv_new("");      bs = bdrv_new("");
     if (!bs)  
         return -ENOMEM;  
     ret = bdrv_open2(bs, filename, flags | BDRV_O_FILE, NULL);      ret = bdrv_open2(bs, filename, flags | BDRV_O_FILE, NULL);
     if (ret < 0) {      if (ret < 0) {
         bdrv_delete(bs);          bdrv_delete(bs);
         return ret;          return ret;
     }      }
       bs->growable = 1;
     *pbs = bs;      *pbs = bs;
     return 0;      return 0;
 }  }
Line 322  int bdrv_open2(BlockDriverState *bs, con Line 330  int bdrv_open2(BlockDriverState *bs, con
                BlockDriver *drv)                 BlockDriver *drv)
 {  {
     int ret, open_flags;      int ret, open_flags;
     char tmp_filename[1024];      char tmp_filename[PATH_MAX];
     char backing_filename[1024];      char backing_filename[PATH_MAX];
       
     bs->read_only = 0;      bs->read_only = 0;
     bs->is_temporary = 0;      bs->is_temporary = 0;
     bs->encrypted = 0;      bs->encrypted = 0;
       bs->valid_key = 0;
   
     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;
   
         /* 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("");
         if (!bs1) {          ret = bdrv_open(bs1, filename, 0);
             return -ENOMEM;          if (ret < 0) {
         }  
         if (bdrv_open(bs1, filename, 0) < 0) {  
             bdrv_delete(bs1);              bdrv_delete(bs1);
             return -1;              return ret;
         }          }
         total_size = bdrv_getlength(bs1) >> SECTOR_BITS;          total_size = bdrv_getlength(bs1) >> SECTOR_BITS;
   
           if (bs1->drv && bs1->drv->protocol_name)
               is_protocol = 1;
   
         bdrv_delete(bs1);          bdrv_delete(bs1);
           
         get_tmp_filename(tmp_filename, sizeof(tmp_filename));          get_tmp_filename(tmp_filename, sizeof(tmp_filename));
         realpath(filename, backing_filename);  
         if (bdrv_create(&bdrv_qcow2, tmp_filename,           /* Real path is meaningless for protocols */
                         total_size, backing_filename, 0) < 0) {          if (is_protocol)
             return -1;              snprintf(backing_filename, sizeof(backing_filename),
                        "%s", filename);
           else
               realpath(filename, backing_filename);
   
           ret = bdrv_create(&bdrv_qcow2, tmp_filename,
                             total_size, backing_filename, 0);
           if (ret < 0) {
               return ret;
         }          }
         filename = tmp_filename;          filename = tmp_filename;
         bs->is_temporary = 1;          bs->is_temporary = 1;
Line 361  int bdrv_open2(BlockDriverState *bs, con Line 381  int bdrv_open2(BlockDriverState *bs, con
     pstrcpy(bs->filename, sizeof(bs->filename), filename);      pstrcpy(bs->filename, sizeof(bs->filename), filename);
     if (flags & BDRV_O_FILE) {      if (flags & BDRV_O_FILE) {
         drv = find_protocol(filename);          drv = find_protocol(filename);
         if (!drv)      } else if (!drv) {
             return -ENOENT;          drv = find_image_format(filename);
     } else {      }
         if (!drv) {      if (!drv) {
             drv = find_image_format(filename);          ret = -ENOENT;
             if (!drv)          goto unlink_and_fail;
                 return -1;  
         }  
     }      }
     bs->drv = drv;      bs->drv = drv;
     bs->opaque = qemu_mallocz(drv->instance_size);      bs->opaque = qemu_mallocz(drv->instance_size);
     if (bs->opaque == NULL && drv->instance_size > 0)  
         return -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 */
     if (!(flags & BDRV_O_FILE))      if (!(flags & BDRV_O_FILE))
         open_flags = BDRV_O_RDWR;          open_flags = BDRV_O_RDWR | (flags & BDRV_O_CACHE_MASK);
     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);      ret = drv->bdrv_open(bs, filename, open_flags);
     if (ret == -EACCES && !(flags & BDRV_O_FILE)) {      if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) {
         ret = drv->bdrv_open(bs, filename, BDRV_O_RDONLY);          ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR);
         bs->read_only = 1;          bs->read_only = 1;
     }      }
     if (ret < 0) {      if (ret < 0) {
         qemu_free(bs->opaque);          qemu_free(bs->opaque);
         bs->opaque = NULL;          bs->opaque = NULL;
         bs->drv = NULL;          bs->drv = NULL;
       unlink_and_fail:
           if (bs->is_temporary)
               unlink(filename);
         return ret;          return ret;
     }      }
     if (drv->bdrv_getlength) {      if (drv->bdrv_getlength) {
Line 402  int bdrv_open2(BlockDriverState *bs, con Line 421  int bdrv_open2(BlockDriverState *bs, con
     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 */
         bs->backing_hd = bdrv_new("");          bs->backing_hd = bdrv_new("");
         if (!bs->backing_hd) {  
         fail:  
             bdrv_close(bs);  
             return -ENOMEM;  
         }  
         path_combine(backing_filename, sizeof(backing_filename),          path_combine(backing_filename, sizeof(backing_filename),
                      filename, bs->backing_file);                       filename, bs->backing_file);
         if (bdrv_open(bs->backing_hd, backing_filename, 0) < 0)          ret = bdrv_open(bs->backing_hd, backing_filename, open_flags);
             goto fail;          if (ret < 0) {
               bdrv_close(bs);
               return ret;
           }
     }      }
   
     /* call the change callback */      /* call the change callback */
Line 445  void bdrv_close(BlockDriverState *bs) Line 462  void bdrv_close(BlockDriverState *bs)
   
 void bdrv_delete(BlockDriverState *bs)  void bdrv_delete(BlockDriverState *bs)
 {  {
     /* XXX: remove the driver list */      BlockDriverState **pbs;
   
       pbs = &bdrv_first;
       while (*pbs != bs && *pbs != NULL)
           pbs = &(*pbs)->next;
       if (*pbs == bs)
           *pbs = bs->next;
   
     bdrv_close(bs);      bdrv_close(bs);
     qemu_free(bs);      qemu_free(bs);
 }  }
Line 493  int bdrv_commit(BlockDriverState *bs) Line 517  int bdrv_commit(BlockDriverState *bs)
     return 0;      return 0;
 }  }
   
   static int bdrv_check_byte_request(BlockDriverState *bs, int64_t offset,
                                      size_t size)
   {
       int64_t len;
   
       if (!bdrv_is_inserted(bs))
           return -ENOMEDIUM;
   
       if (bs->growable)
           return 0;
   
       len = bdrv_getlength(bs);
   
       if ((offset + size) > len)
           return -EIO;
   
       return 0;
   }
   
   static int bdrv_check_request(BlockDriverState *bs, int64_t sector_num,
                                 int nb_sectors)
   {
       int64_t offset;
   
       /* 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 */
 int bdrv_read(BlockDriverState *bs, int64_t sector_num,   int bdrv_read(BlockDriverState *bs, int64_t sector_num,
               uint8_t *buf, int nb_sectors)                uint8_t *buf, int nb_sectors)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
   
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
       if (bdrv_check_request(bs, sector_num, nb_sectors))
           return -EIO;
   
     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {  
             memcpy(buf, bs->boot_sector_data, 512);  
         sector_num++;  
         nb_sectors--;  
         buf += 512;  
         if (nb_sectors == 0)  
             return 0;  
     }  
     if (drv->bdrv_pread) {      if (drv->bdrv_pread) {
         int ret, len;          int ret, len;
         len = nb_sectors * 512;          len = nb_sectors * 512;
Line 518  int bdrv_read(BlockDriverState *bs, int6 Line 569  int bdrv_read(BlockDriverState *bs, int6
             return ret;              return ret;
         else if (ret != len)          else if (ret != len)
             return -EINVAL;              return -EINVAL;
         else          else {
               bs->rd_bytes += (unsigned) len;
               bs->rd_ops ++;
             return 0;              return 0;
           }
     } else {      } else {
         return drv->bdrv_read(bs, sector_num, buf, nb_sectors);          return drv->bdrv_read(bs, sector_num, buf, nb_sectors);
     }      }
 }  }
   
 /* Return < 0 if error. Important errors are:   /* Return < 0 if error. Important errors are:
   -EIO         generic I/O error (may happen for all errors)    -EIO         generic I/O error (may happen for all errors)
   -ENOMEDIUM   No media inserted.    -ENOMEDIUM   No media inserted.
   -EINVAL      Invalid sector number or nb_sectors    -EINVAL      Invalid sector number or nb_sectors
   -EACCES      Trying to write a read-only device    -EACCES      Trying to write a read-only device
 */  */
 int bdrv_write(BlockDriverState *bs, int64_t sector_num,   int bdrv_write(BlockDriverState *bs, int64_t sector_num,
                const uint8_t *buf, int nb_sectors)                 const uint8_t *buf, int nb_sectors)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
Line 539  int bdrv_write(BlockDriverState *bs, int Line 593  int bdrv_write(BlockDriverState *bs, int
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (bs->read_only)      if (bs->read_only)
         return -EACCES;          return -EACCES;
     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {      if (bdrv_check_request(bs, sector_num, nb_sectors))
         memcpy(bs->boot_sector_data, buf, 512);             return -EIO;
     }  
     if (drv->bdrv_pwrite) {      if (drv->bdrv_pwrite) {
         int ret, len;          int ret, len, count = 0;
         len = nb_sectors * 512;          len = nb_sectors * 512;
         ret = drv->bdrv_pwrite(bs, sector_num * 512, buf, len);          do {
         if (ret < 0)              ret = drv->bdrv_pwrite(bs, sector_num * 512, buf, len - count);
             return ret;              if (ret < 0) {
         else if (ret != len)                  printf("bdrv_write ret=%d\n", ret);
             return -EIO;                  return ret;
         else              }
             return 0;              count += ret;
     } else {              buf += ret;
         return drv->bdrv_write(bs, sector_num, buf, nb_sectors);          } while (count != len);
           bs->wr_bytes += (unsigned) len;
           bs->wr_ops ++;
           return 0;
     }      }
       return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
 }  }
   
 static int bdrv_pread_em(BlockDriverState *bs, int64_t offset,   static int bdrv_pread_em(BlockDriverState *bs, int64_t offset,
                          uint8_t *buf, int count1)                           uint8_t *buf, int count1)
 {  {
     uint8_t tmp_buf[SECTOR_SIZE];      uint8_t tmp_buf[SECTOR_SIZE];
Line 601  static int bdrv_pread_em(BlockDriverStat Line 659  static int bdrv_pread_em(BlockDriverStat
     return count1;      return count1;
 }  }
   
 static int bdrv_pwrite_em(BlockDriverState *bs, int64_t offset,   static int bdrv_pwrite_em(BlockDriverState *bs, int64_t offset,
                           const uint8_t *buf, int count1)                            const uint8_t *buf, int count1)
 {  {
     uint8_t tmp_buf[SECTOR_SIZE];      uint8_t tmp_buf[SECTOR_SIZE];
Line 650  static int bdrv_pwrite_em(BlockDriverSta Line 708  static int bdrv_pwrite_em(BlockDriverSta
 }  }
   
 /**  /**
  * Read with byte offsets (needed only for file protocols)    * Read with byte offsets (needed only for file protocols)
  */   */
 int bdrv_pread(BlockDriverState *bs, int64_t offset,   int bdrv_pread(BlockDriverState *bs, int64_t offset,
                void *buf1, int count1)                 void *buf1, int count1)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
   
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
       if (bdrv_check_byte_request(bs, offset, count1))
           return -EIO;
   
     if (!drv->bdrv_pread)      if (!drv->bdrv_pread)
         return bdrv_pread_em(bs, offset, buf1, count1);          return bdrv_pread_em(bs, offset, buf1, count1);
     return drv->bdrv_pread(bs, offset, buf1, count1);      return drv->bdrv_pread(bs, offset, buf1, count1);
 }  }
   
 /**   /**
  * Write with byte offsets (needed only for file protocols)    * Write with byte offsets (needed only for file protocols)
  */   */
 int bdrv_pwrite(BlockDriverState *bs, int64_t offset,   int bdrv_pwrite(BlockDriverState *bs, int64_t offset,
                 const void *buf1, int count1)                  const void *buf1, int count1)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
   
     if (!drv)      if (!drv)
         return -ENOMEDIUM;          return -ENOMEDIUM;
       if (bdrv_check_byte_request(bs, offset, count1))
           return -EIO;
   
     if (!drv->bdrv_pwrite)      if (!drv->bdrv_pwrite)
         return bdrv_pwrite_em(bs, offset, buf1, count1);          return bdrv_pwrite_em(bs, offset, buf1, count1);
     return drv->bdrv_pwrite(bs, offset, buf1, count1);      return drv->bdrv_pwrite(bs, offset, buf1, count1);
Line 708  int64_t bdrv_getlength(BlockDriverState  Line 772  int64_t bdrv_getlength(BlockDriverState 
 }  }
   
 /* return 0 as number of sectors if no device present or error */  /* return 0 as number of sectors if no device present or error */
 void bdrv_get_geometry(BlockDriverState *bs, int64_t *nb_sectors_ptr)  void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr)
 {  {
     int64_t length;      int64_t length;
     length = bdrv_getlength(bs);      length = bdrv_getlength(bs);
Line 719  void bdrv_get_geometry(BlockDriverState  Line 783  void bdrv_get_geometry(BlockDriverState 
     *nb_sectors_ptr = length;      *nb_sectors_ptr = length;
 }  }
   
 /* force a given boot sector. */  struct partition {
 void bdrv_set_boot_sector(BlockDriverState *bs, const uint8_t *data, int size)          uint8_t boot_ind;           /* 0x80 - active */
           uint8_t head;               /* starting head */
           uint8_t sector;             /* starting sector */
           uint8_t cyl;                /* starting cylinder */
           uint8_t sys_ind;            /* What partition type */
           uint8_t end_head;           /* end head */
           uint8_t end_sector;         /* end sector */
           uint8_t end_cyl;            /* end cylinder */
           uint32_t start_sect;        /* starting sector counting from 0 */
           uint32_t nr_sects;          /* nr of sectors in partition */
   } __attribute__((packed));
   
   /* try to guess the disk logical geometry from the MSDOS partition table. Return 0 if OK, -1 if could not guess */
   static int guess_disk_lchs(BlockDriverState *bs,
                              int *pcylinders, int *pheads, int *psectors)
   {
       uint8_t buf[512];
       int ret, i, heads, sectors, cylinders;
       struct partition *p;
       uint32_t nr_sects;
       uint64_t nb_sectors;
   
       bdrv_get_geometry(bs, &nb_sectors);
   
       ret = bdrv_read(bs, 0, buf, 1);
       if (ret < 0)
           return -1;
       /* test msdos magic */
       if (buf[510] != 0x55 || buf[511] != 0xaa)
           return -1;
       for(i = 0; i < 4; i++) {
           p = ((struct partition *)(buf + 0x1be)) + i;
           nr_sects = le32_to_cpu(p->nr_sects);
           if (nr_sects && p->end_head) {
               /* We make the assumption that the partition terminates on
                  a cylinder boundary */
               heads = p->end_head + 1;
               sectors = p->end_sector & 63;
               if (sectors == 0)
                   continue;
               cylinders = nb_sectors / (heads * sectors);
               if (cylinders < 1 || cylinders > 16383)
                   continue;
               *pheads = heads;
               *psectors = sectors;
               *pcylinders = cylinders;
   #if 0
               printf("guessed geometry: LCHS=%d %d %d\n",
                      cylinders, heads, sectors);
   #endif
               return 0;
           }
       }
       return -1;
   }
   
   void bdrv_guess_geometry(BlockDriverState *bs, int *pcyls, int *pheads, int *psecs)
 {  {
     bs->boot_sector_enabled = 1;      int translation, lba_detected = 0;
     if (size > 512)      int cylinders, heads, secs;
         size = 512;      uint64_t nb_sectors;
     memcpy(bs->boot_sector_data, data, size);  
     memset(bs->boot_sector_data + size, 0, 512 - size);      /* if a geometry hint is available, use it */
       bdrv_get_geometry(bs, &nb_sectors);
       bdrv_get_geometry_hint(bs, &cylinders, &heads, &secs);
       translation = bdrv_get_translation_hint(bs);
       if (cylinders != 0) {
           *pcyls = cylinders;
           *pheads = heads;
           *psecs = secs;
       } else {
           if (guess_disk_lchs(bs, &cylinders, &heads, &secs) == 0) {
               if (heads > 16) {
                   /* if heads > 16, it means that a BIOS LBA
                      translation was active, so the default
                      hardware geometry is OK */
                   lba_detected = 1;
                   goto default_geometry;
               } else {
                   *pcyls = cylinders;
                   *pheads = heads;
                   *psecs = secs;
                   /* disable any translation to be in sync with
                      the logical geometry */
                   if (translation == BIOS_ATA_TRANSLATION_AUTO) {
                       bdrv_set_translation_hint(bs,
                                                 BIOS_ATA_TRANSLATION_NONE);
                   }
               }
           } else {
           default_geometry:
               /* if no geometry, use a standard physical disk geometry */
               cylinders = nb_sectors / (16 * 63);
   
               if (cylinders > 16383)
                   cylinders = 16383;
               else if (cylinders < 2)
                   cylinders = 2;
               *pcyls = cylinders;
               *pheads = 16;
               *psecs = 63;
               if ((lba_detected == 1) && (translation == BIOS_ATA_TRANSLATION_AUTO)) {
                   if ((*pcyls * *pheads) <= 131072) {
                       bdrv_set_translation_hint(bs,
                                                 BIOS_ATA_TRANSLATION_LARGE);
                   } else {
                       bdrv_set_translation_hint(bs,
                                                 BIOS_ATA_TRANSLATION_LBA);
                   }
               }
           }
           bdrv_set_geometry_hint(bs, *pcyls, *pheads, *psecs);
       }
 }  }
   
 void bdrv_set_geometry_hint(BlockDriverState *bs,   void bdrv_set_geometry_hint(BlockDriverState *bs,
                             int cyls, int heads, int secs)                              int cyls, int heads, int secs)
 {  {
     bs->cyls = cyls;      bs->cyls = cyls;
Line 749  void bdrv_set_translation_hint(BlockDriv Line 919  void bdrv_set_translation_hint(BlockDriv
     bs->translation = translation;      bs->translation = translation;
 }  }
   
 void bdrv_get_geometry_hint(BlockDriverState *bs,   void bdrv_get_geometry_hint(BlockDriverState *bs,
                             int *pcyls, int *pheads, int *psecs)                              int *pcyls, int *pheads, int *psecs)
 {  {
     *pcyls = bs->cyls;      *pcyls = bs->cyls;
Line 777  int bdrv_is_read_only(BlockDriverState * Line 947  int bdrv_is_read_only(BlockDriverState *
     return bs->read_only;      return bs->read_only;
 }  }
   
   int bdrv_is_sg(BlockDriverState *bs)
   {
       return bs->sg;
   }
   
 /* 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)
 {  {
     bs->change_cb = change_cb;      bs->change_cb = change_cb;
Line 792  int bdrv_is_encrypted(BlockDriverState * Line 967  int bdrv_is_encrypted(BlockDriverState *
     return bs->encrypted;      return bs->encrypted;
 }  }
   
   int bdrv_key_required(BlockDriverState *bs)
   {
       BlockDriverState *backing_hd = bs->backing_hd;
   
       if (backing_hd && backing_hd->encrypted && !backing_hd->valid_key)
           return 1;
       return (bs->encrypted && !bs->valid_key);
   }
   
 int bdrv_set_key(BlockDriverState *bs, const char *key)  int bdrv_set_key(BlockDriverState *bs, const char *key)
 {  {
     int ret;      int ret;
Line 804  int bdrv_set_key(BlockDriverState *bs, c Line 988  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;
     return bs->drv->bdrv_set_key(bs, key);      ret = bs->drv->bdrv_set_key(bs, key);
       bs->valid_key = (ret == 0);
       return ret;
 }  }
   
 void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size)  void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size)
Line 816  void bdrv_get_format(BlockDriverState *b Line 1002  void bdrv_get_format(BlockDriverState *b
     }      }
 }  }
   
 void bdrv_iterate_format(void (*it)(void *opaque, const char *name),   void bdrv_iterate_format(void (*it)(void *opaque, const char *name),
                          void *opaque)                           void *opaque)
 {  {
     BlockDriver *drv;      BlockDriver *drv;
Line 837  BlockDriverState *bdrv_find(const char * Line 1023  BlockDriverState *bdrv_find(const char *
     return NULL;      return NULL;
 }  }
   
 void bdrv_iterate(void (*it)(void *opaque, const char *name), 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) {      for (bs = bdrv_first; bs != NULL; bs = bs->next) {
         it(opaque, bs->device_name);          it(opaque, bs);
     }      }
 }  }
   
Line 859  void bdrv_flush(BlockDriverState *bs) Line 1045  void bdrv_flush(BlockDriverState *bs)
         bdrv_flush(bs->backing_hd);          bdrv_flush(bs->backing_hd);
 }  }
   
   void bdrv_flush_all(void)
   {
       BlockDriverState *bs;
   
       for (bs = bdrv_first; bs != NULL; bs = bs->next)
           if (bs->drv && !bdrv_is_read_only(bs) && 
               (!bdrv_is_removable(bs) || bdrv_is_inserted(bs)))
               bdrv_flush(bs);
   }
   
   /*
    * Returns true iff the specified sector is present in the disk image. Drivers
    * not implementing the functionality are assumed to not support backing files,
    * hence all their sectors are reported as allocated.
    *
    * 'pnum' is set to the number of sectors (including and immediately following
    * the specified sector) that are known to be in the same
    * allocated/unallocated state.
    *
    * 'nb_sectors' is the max value 'pnum' should be set to.
    */
   int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
           int *pnum)
   {
       int64_t n;
       if (!bs->drv->bdrv_is_allocated) {
           if (sector_num >= bs->total_sectors) {
               *pnum = 0;
               return 0;
           }
           n = bs->total_sectors - sector_num;
           *pnum = (n < nb_sectors) ? (n) : (nb_sectors);
           return 1;
       }
       return bs->drv->bdrv_is_allocated(bs, sector_num, nb_sectors, pnum);
   }
   
 void bdrv_info(void)  void bdrv_info(void)
 {  {
     BlockDriverState *bs;      BlockDriverState *bs;
Line 890  void bdrv_info(void) Line 1113  void bdrv_info(void)
             }              }
             term_printf(" ro=%d", bs->read_only);              term_printf(" ro=%d", bs->read_only);
             term_printf(" drv=%s", bs->drv->format_name);              term_printf(" drv=%s", bs->drv->format_name);
             if (bs->encrypted)              term_printf(" encrypted=%d", bdrv_is_encrypted(bs));
                 term_printf(" encrypted");  
         } else {          } else {
             term_printf(" [not inserted]");              term_printf(" [not inserted]");
         }          }
Line 899  void bdrv_info(void) Line 1121  void bdrv_info(void)
     }      }
 }  }
   
 void bdrv_get_backing_filename(BlockDriverState *bs,   /* The "info blockstats" command. */
   void bdrv_info_stats (void)
   {
       BlockDriverState *bs;
   
       for (bs = bdrv_first; bs != NULL; bs = bs->next) {
           term_printf ("%s:"
                        " rd_bytes=%" PRIu64
                        " wr_bytes=%" PRIu64
                        " rd_operations=%" PRIu64
                        " wr_operations=%" PRIu64
                        "\n",
                        bs->device_name,
                        bs->rd_bytes, bs->wr_bytes,
                        bs->rd_ops, bs->wr_ops);
       }
   }
   
   const char *bdrv_get_encrypted_filename(BlockDriverState *bs)
   {
       if (bs->backing_hd && bs->backing_hd->encrypted)
           return bs->backing_file;
       else if (bs->encrypted)
           return bs->filename;
       else
           return NULL;
   }
   
   void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size)                                 char *filename, int filename_size)
 {  {
     if (!bs->backing_hd) {      if (!bs->backing_hd) {
Line 909  void bdrv_get_backing_filename(BlockDriv Line 1159  void bdrv_get_backing_filename(BlockDriv
     }      }
 }  }
   
 int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,   int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num,
                           const uint8_t *buf, int nb_sectors)                            const uint8_t *buf, int nb_sectors)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
Line 919  int bdrv_write_compressed(BlockDriverSta Line 1169  int bdrv_write_compressed(BlockDriverSta
         return -ENOTSUP;          return -ENOTSUP;
     return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);      return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
 }  }
       
 int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)  int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
Line 931  int bdrv_get_info(BlockDriverState *bs,  Line 1181  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)
   {
       BlockDriver *drv = bs->drv;
       if (!drv)
           return -ENOMEDIUM;
       if (!drv->bdrv_put_buffer)
           return -ENOTSUP;
       return drv->bdrv_put_buffer(bs, buf, pos, size);
   }
   
   int bdrv_get_buffer(BlockDriverState *bs, uint8_t *buf, int64_t pos, int size)
   {
       BlockDriver *drv = bs->drv;
       if (!drv)
           return -ENOMEDIUM;
       if (!drv->bdrv_get_buffer)
           return -ENOTSUP;
       return drv->bdrv_get_buffer(bs, buf, pos, size);
   }
   
 /**************************************************************/  /**************************************************************/
 /* handling of snapshots */  /* handling of snapshots */
   
 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;
Line 945  int bdrv_snapshot_create(BlockDriverStat Line 1215  int bdrv_snapshot_create(BlockDriverStat
     return drv->bdrv_snapshot_create(bs, sn_info);      return drv->bdrv_snapshot_create(bs, sn_info);
 }  }
   
 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;
Line 966  int bdrv_snapshot_delete(BlockDriverStat Line 1236  int bdrv_snapshot_delete(BlockDriverStat
     return drv->bdrv_snapshot_delete(bs, snapshot_id);      return drv->bdrv_snapshot_delete(bs, snapshot_id);
 }  }
   
 int bdrv_snapshot_list(BlockDriverState *bs,   int bdrv_snapshot_list(BlockDriverState *bs,
                        QEMUSnapshotInfo **psn_info)                         QEMUSnapshotInfo **psn_info)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
Line 991  char *get_human_readable_size(char *buf, Line 1261  char *get_human_readable_size(char *buf,
         base = 1024;          base = 1024;
         for(i = 0; i < NB_SUFFIXES; i++) {          for(i = 0; i < NB_SUFFIXES; i++) {
             if (size < (10 * base)) {              if (size < (10 * base)) {
                 snprintf(buf, buf_size, "%0.1f%c",                   snprintf(buf, buf_size, "%0.1f%c",
                          (double)size / base,                           (double)size / base,
                          suffixes[i]);                           suffixes[i]);
                 break;                  break;
             } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {              } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {
                 snprintf(buf, buf_size, "%" PRId64 "%c",                   snprintf(buf, buf_size, "%" PRId64 "%c",
                          ((size + (base >> 1)) / base),                           ((size + (base >> 1)) / base),
                          suffixes[i]);                           suffixes[i]);
                 break;                  break;
Line 1019  char *bdrv_snapshot_dump(char *buf, int  Line 1289  char *bdrv_snapshot_dump(char *buf, int 
     int64_t secs;      int64_t secs;
   
     if (!sn) {      if (!sn) {
         snprintf(buf, buf_size,           snprintf(buf, buf_size,
                  "%-10s%-20s%7s%20s%15s",                    "%-10s%-20s%7s%20s%15s",
                  "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");                   "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");
     } else {      } else {
         ti = sn->date_sec;          ti = sn->date_sec;
Line 1038  char *bdrv_snapshot_dump(char *buf, int  Line 1308  char *bdrv_snapshot_dump(char *buf, int 
                  "%02d:%02d:%02d.%03d",                   "%02d:%02d:%02d.%03d",
                  (int)(secs / 3600),                   (int)(secs / 3600),
                  (int)((secs / 60) % 60),                   (int)((secs / 60) % 60),
                  (int)(secs % 60),                    (int)(secs % 60),
                  (int)((sn->vm_clock_nsec / 1000000) % 1000));                   (int)((sn->vm_clock_nsec / 1000000) % 1000));
         snprintf(buf, buf_size,          snprintf(buf, buf_size,
                  "%-10s%-20s%7s%20s%15s",                    "%-10s%-20s%7s%20s%15s",
                  sn->id_str, sn->name,                   sn->id_str, sn->name,
                  get_human_readable_size(buf1, sizeof(buf1), sn->vm_state_size),                   get_human_readable_size(buf1, sizeof(buf1), sn->vm_state_size),
                  date_buf,                   date_buf,
Line 1054  char *bdrv_snapshot_dump(char *buf, int  Line 1324  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_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(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,
                                    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, 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,  BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num,
                                 uint8_t *buf, int nb_sectors,                                  uint8_t *buf, int nb_sectors,
                                 BlockDriverCompletionFunc *cb, void *opaque)                                  BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
       BlockDriverAIOCB *ret;
   
     if (!drv)      if (!drv)
         return NULL;          return NULL;
           if (bdrv_check_request(bs, sector_num, nb_sectors))
     /* XXX: we assume that nb_sectors == 0 is suppored by the async read */          return NULL;
     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {  
         memcpy(buf, bs->boot_sector_data, 512);      ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);
         sector_num++;  
         nb_sectors--;      if (ret) {
         buf += 512;          /* Update stats even though technically transfer has not happened. */
           bs->rd_bytes += (unsigned) nb_sectors * SECTOR_SIZE;
           bs->rd_ops ++;
     }      }
   
     return drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);      return ret;
 }  }
   
 BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num,  BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num,
Line 1079  BlockDriverAIOCB *bdrv_aio_write(BlockDr Line 1421  BlockDriverAIOCB *bdrv_aio_write(BlockDr
                                  BlockDriverCompletionFunc *cb, void *opaque)                                   BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     BlockDriver *drv = bs->drv;      BlockDriver *drv = bs->drv;
       BlockDriverAIOCB *ret;
   
     if (!drv)      if (!drv)
         return NULL;          return NULL;
     if (bs->read_only)      if (bs->read_only)
         return NULL;          return NULL;
     if (sector_num == 0 && bs->boot_sector_enabled && nb_sectors > 0) {      if (bdrv_check_request(bs, sector_num, nb_sectors))
         memcpy(bs->boot_sector_data, buf, 512);             return NULL;
   
       ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);
   
       if (ret) {
           /* Update stats even though technically transfer has not happened. */
           bs->wr_bytes += (unsigned) nb_sectors * SECTOR_SIZE;
           bs->wr_ops ++;
     }      }
   
     return drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);      return ret;
 }  }
   
 void bdrv_aio_cancel(BlockDriverAIOCB *acb)  void bdrv_aio_cancel(BlockDriverAIOCB *acb)
 {  {
     BlockDriver *drv = acb->bs->drv;      BlockDriver *drv = acb->bs->drv;
   
       if (acb->cb == bdrv_aio_rw_vector_cb) {
           VectorTranslationState *s = acb->opaque;
           acb = s->aiocb;
       }
   
     drv->bdrv_aio_cancel(acb);      drv->bdrv_aio_cancel(acb);
 }  }
   
Line 1102  void bdrv_aio_cancel(BlockDriverAIOCB *a Line 1457  void bdrv_aio_cancel(BlockDriverAIOCB *a
 /**************************************************************/  /**************************************************************/
 /* async block device emulation */  /* async block device emulation */
   
 #ifdef QEMU_TOOL  
 static BlockDriverAIOCB *bdrv_aio_read_em(BlockDriverState *bs,  
         int64_t sector_num, uint8_t *buf, int nb_sectors,  
         BlockDriverCompletionFunc *cb, void *opaque)  
 {  
     int ret;  
     ret = bdrv_read(bs, sector_num, buf, nb_sectors);  
     cb(opaque, ret);  
     return NULL;  
 }  
   
 static BlockDriverAIOCB *bdrv_aio_write_em(BlockDriverState *bs,  
         int64_t sector_num, const uint8_t *buf, int nb_sectors,  
         BlockDriverCompletionFunc *cb, void *opaque)  
 {  
     int ret;  
     ret = bdrv_write(bs, sector_num, buf, nb_sectors);  
     cb(opaque, ret);  
     return NULL;  
 }  
   
 static void bdrv_aio_cancel_em(BlockDriverAIOCB *acb)  
 {  
 }  
 #else  
 static void bdrv_aio_bh_cb(void *opaque)  static void bdrv_aio_bh_cb(void *opaque)
 {  {
     BlockDriverAIOCBSync *acb = opaque;      BlockDriverAIOCBSync *acb = opaque;
Line 1172  static void bdrv_aio_cancel_em(BlockDriv Line 1502  static void bdrv_aio_cancel_em(BlockDriv
     qemu_bh_cancel(acb->bh);      qemu_bh_cancel(acb->bh);
     qemu_aio_release(acb);      qemu_aio_release(acb);
 }  }
 #endif /* !QEMU_TOOL */  
   
 /**************************************************************/  /**************************************************************/
 /* sync block device emulation */  /* sync block device emulation */
Line 1184  static void bdrv_rw_em_cb(void *opaque,  Line 1513  static void bdrv_rw_em_cb(void *opaque, 
   
 #define NOT_DONE 0x7fffffff  #define NOT_DONE 0x7fffffff
   
 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)
 {  {
     int async_ret;      int async_ret;
     BlockDriverAIOCB *acb;      BlockDriverAIOCB *acb;
   
     async_ret = NOT_DONE;      async_ret = NOT_DONE;
     qemu_aio_wait_start();      acb = bdrv_aio_read(bs, sector_num, buf, nb_sectors,
     acb = bdrv_aio_read(bs, sector_num, buf, nb_sectors,   
                         bdrv_rw_em_cb, &async_ret);                          bdrv_rw_em_cb, &async_ret);
     if (acb == NULL) {      if (acb == NULL)
         qemu_aio_wait_end();  
         return -1;          return -1;
     }  
     while (async_ret == NOT_DONE) {      while (async_ret == NOT_DONE) {
         qemu_aio_wait();          qemu_aio_wait();
     }      }
     qemu_aio_wait_end();  
     return async_ret;      return async_ret;
 }  }
   
Line 1212  static int bdrv_write_em(BlockDriverStat Line 1539  static int bdrv_write_em(BlockDriverStat
     BlockDriverAIOCB *acb;      BlockDriverAIOCB *acb;
   
     async_ret = NOT_DONE;      async_ret = NOT_DONE;
     qemu_aio_wait_start();      acb = bdrv_aio_write(bs, sector_num, buf, nb_sectors,
     acb = bdrv_aio_write(bs, sector_num, buf, nb_sectors,   
                          bdrv_rw_em_cb, &async_ret);                           bdrv_rw_em_cb, &async_ret);
     if (acb == NULL) {      if (acb == NULL)
         qemu_aio_wait_end();  
         return -1;          return -1;
     }  
     while (async_ret == NOT_DONE) {      while (async_ret == NOT_DONE) {
         qemu_aio_wait();          qemu_aio_wait();
     }      }
     qemu_aio_wait_end();  
     return async_ret;      return async_ret;
 }  }
   
Line 1241  void bdrv_init(void) Line 1564  void bdrv_init(void)
     bdrv_register(&bdrv_vpc);      bdrv_register(&bdrv_vpc);
     bdrv_register(&bdrv_vvfat);      bdrv_register(&bdrv_vvfat);
     bdrv_register(&bdrv_qcow2);      bdrv_register(&bdrv_qcow2);
       bdrv_register(&bdrv_parallels);
       bdrv_register(&bdrv_nbd);
 }  }
   
 void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,  void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,
Line 1255  void *qemu_aio_get(BlockDriverState *bs, Line 1580  void *qemu_aio_get(BlockDriverState *bs,
         drv->free_aiocb = acb->next;          drv->free_aiocb = acb->next;
     } else {      } else {
         acb = qemu_mallocz(drv->aiocb_size);          acb = qemu_mallocz(drv->aiocb_size);
         if (!acb)  
             return NULL;  
     }      }
     acb->bs = bs;      acb->bs = bs;
     acb->cb = cb;      acb->cb = cb;
Line 1292  int bdrv_is_inserted(BlockDriverState *b Line 1615  int bdrv_is_inserted(BlockDriverState *b
   
 /**  /**
  * Return TRUE if the media changed since the last call to this   * Return TRUE if the media changed since the last call to this
  * function. It is currently only used for floppy disks    * function. It is currently only used for floppy disks
  */   */
 int bdrv_media_changed(BlockDriverState *bs)  int bdrv_media_changed(BlockDriverState *bs)
 {  {
Line 1346  void bdrv_set_locked(BlockDriverState *b Line 1669  void bdrv_set_locked(BlockDriverState *b
         drv->bdrv_set_locked(bs, locked);          drv->bdrv_set_locked(bs, locked);
     }      }
 }  }
   
   /* needed for generic scsi interface */
   
   int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
   {
       BlockDriver *drv = bs->drv;
   
       if (drv && drv->bdrv_ioctl)
           return drv->bdrv_ioctl(bs, req, buf);
       return -ENOTSUP;
   }

Removed from v.1.1.1.5  
changed lines
  Added in v.1.1.1.9


unix.superglobalmegacorp.com