Diff for /qemu/block.c between versions 1.1.1.6 and 1.1.1.12

version 1.1.1.6, 2018/04/24 16:47:23 version 1.1.1.12, 2018/04/24 17:16:37
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 "config-host.h"
   #ifdef _BSD
   /* include native header before sys-queue.h */
   #include <sys/queue.h>
   #endif
   
 #include "qemu-common.h"  #include "qemu-common.h"
 #ifndef QEMU_IMG  
 #include "console.h"  #include "console.h"
 #endif  
 #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
   
 #define SECTOR_BITS 9  #define SECTOR_BITS 9
 #define SECTOR_SIZE (1 << SECTOR_BITS)  #define SECTOR_SIZE (1 << SECTOR_BITS)
   
   static AIOPool vectored_aio_pool;
   
 typedef struct BlockDriverAIOCBSync {  typedef struct BlockDriverAIOCBSync {
     BlockDriverAIOCB common;      BlockDriverAIOCB common;
     QEMUBH *bh;      QEMUBH *bh;
Line 57  static int bdrv_write_em(BlockDriverStat Line 62  static int bdrv_write_em(BlockDriverStat
                          const uint8_t *buf, int nb_sectors);                           const uint8_t *buf, int nb_sectors);
   
 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 137  static void bdrv_register(BlockDriver *b Line 143  static void bdrv_register(BlockDriver *b
         bdrv->bdrv_read = bdrv_read_em;          bdrv->bdrv_read = bdrv_read_em;
         bdrv->bdrv_write = bdrv_write_em;          bdrv->bdrv_write = bdrv_write_em;
     }      }
       aio_pool_init(&bdrv->aio_pool, bdrv->aiocb_size, bdrv->bdrv_aio_cancel);
     bdrv->next = first_drv;      bdrv->next = first_drv;
     first_drv = bdrv;      first_drv = bdrv;
 }  }
Line 147  BlockDriverState *bdrv_new(const char *d Line 154  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 191  void get_tmp_filename(char *filename, in Line 196  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 305  int bdrv_file_open(BlockDriverState **pb Line 314  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 331  int bdrv_open2(BlockDriverState *bs, con Line 339  int bdrv_open2(BlockDriverState *bs, con
     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 364  int bdrv_open2(BlockDriverState *bs, con Line 384  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 | (flags & BDRV_O_DIRECT);          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 405  int bdrv_open2(BlockDriverState *bs, con Line 424  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 448  void bdrv_close(BlockDriverState *bs) Line 465  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 496  int bdrv_commit(BlockDriverState *bs) Line 520  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 < 0)
           return -EIO;
   
       if ((offset > len) || (len - offset < size))
           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)
Line 504  int bdrv_read(BlockDriverState *bs, int6 Line 564  int bdrv_read(BlockDriverState *bs, int6
   
     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 545  int bdrv_write(BlockDriverState *bs, int Line 599  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 {              }
             bs->wr_bytes += (unsigned) len;              count += ret;
             bs->wr_ops ++;              buf += ret;
             return 0;          } while (count != len);
         }          bs->wr_bytes += (unsigned) len;
     } else {          bs->wr_ops ++;
         return drv->bdrv_write(bs, sector_num, buf, nb_sectors);          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,
Line 668  int bdrv_pread(BlockDriverState *bs, int Line 723  int bdrv_pread(BlockDriverState *bs, int
   
     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);
Line 683  int bdrv_pwrite(BlockDriverState *bs, in Line 741  int bdrv_pwrite(BlockDriverState *bs, in
   
     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 728  void bdrv_get_geometry(BlockDriverState  Line 789  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,
Line 806  int bdrv_is_encrypted(BlockDriverState * Line 973  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 818  int bdrv_set_key(BlockDriverState *bs, c Line 994  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 851  BlockDriverState *bdrv_find(const char * Line 1029  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 873  void bdrv_flush(BlockDriverState *bs) Line 1051  void bdrv_flush(BlockDriverState *bs)
         bdrv_flush(bs->backing_hd);          bdrv_flush(bs->backing_hd);
 }  }
   
 #ifndef QEMU_IMG  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 905  void bdrv_info(void) Line 1119  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 925  void bdrv_info_stats (void) Line 1138  void bdrv_info_stats (void)
                      " wr_bytes=%" PRIu64                       " wr_bytes=%" PRIu64
                      " rd_operations=%" PRIu64                       " rd_operations=%" PRIu64
                      " wr_operations=%" PRIu64                       " wr_operations=%" PRIu64
                      "\n",                       "\n",
                      bs->device_name,                       bs->device_name,
                      bs->rd_bytes, bs->wr_bytes,                       bs->rd_bytes, bs->wr_bytes,
                      bs->rd_ops, bs->wr_ops);                       bs->rd_ops, bs->wr_ops);
     }      }
 }  }
 #endif  
   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,  void bdrv_get_backing_filename(BlockDriverState *bs,
                                char *filename, int filename_size)                                 char *filename, int filename_size)
Line 951  int bdrv_write_compressed(BlockDriverSta Line 1173  int bdrv_write_compressed(BlockDriverSta
         return -ENOMEDIUM;          return -ENOMEDIUM;
     if (!drv->bdrv_write_compressed)      if (!drv->bdrv_write_compressed)
         return -ENOTSUP;          return -ENOTSUP;
       if (bdrv_check_request(bs, sector_num, nb_sectors))
           return -EIO;
     return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);      return drv->bdrv_write_compressed(bs, sector_num, buf, nb_sectors);
 }  }
   
Line 965  int bdrv_get_info(BlockDriverState *bs,  Line 1189  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 */
   
Line 1088  char *bdrv_snapshot_dump(char *buf, int  Line 1332  char *bdrv_snapshot_dump(char *buf, int 
 /**************************************************************/  /**************************************************************/
 /* async I/Os */  /* async I/Os */
   
   typedef struct VectorTranslationAIOCB {
       BlockDriverAIOCB common;
       QEMUIOVector *iov;
       uint8_t *bounce;
       int is_write;
       BlockDriverAIOCB *aiocb;
   } VectorTranslationAIOCB;
   
   static void bdrv_aio_cancel_vector(BlockDriverAIOCB *_acb)
   {
       VectorTranslationAIOCB *acb
           = container_of(_acb, VectorTranslationAIOCB, common);
   
       bdrv_aio_cancel(acb->aiocb);
   }
   
   static void bdrv_aio_rw_vector_cb(void *opaque, int ret)
   {
       VectorTranslationAIOCB *s = (VectorTranslationAIOCB *)opaque;
   
       if (!s->is_write) {
           qemu_iovec_from_buffer(s->iov, s->bounce, s->iov->size);
       }
       qemu_vfree(s->bounce);
       s->common.cb(s->common.opaque, ret);
       qemu_aio_release(s);
   }
   
   static BlockDriverAIOCB *bdrv_aio_rw_vector(BlockDriverState *bs,
                                               int64_t sector_num,
                                               QEMUIOVector *iov,
                                               int nb_sectors,
                                               BlockDriverCompletionFunc *cb,
                                               void *opaque,
                                               int is_write)
   
   {
       VectorTranslationAIOCB *s = qemu_aio_get_pool(&vectored_aio_pool, bs,
                                                     cb, opaque);
   
       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);
       }
       if (!s->aiocb) {
           qemu_vfree(s->bounce);
           qemu_aio_release(s);
           return NULL;
       }
       return &s->common;
   }
   
   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)
Line 1097  BlockDriverAIOCB *bdrv_aio_read(BlockDri Line 1422  BlockDriverAIOCB *bdrv_aio_read(BlockDri
   
     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);  
         sector_num++;  
         nb_sectors--;  
         buf += 512;  
     }  
   
     ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);      ret = drv->bdrv_aio_read(bs, sector_num, buf, nb_sectors, cb, opaque);
   
Line 1128  BlockDriverAIOCB *bdrv_aio_write(BlockDr Line 1447  BlockDriverAIOCB *bdrv_aio_write(BlockDr
         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);      ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);
   
Line 1145  BlockDriverAIOCB *bdrv_aio_write(BlockDr Line 1463  BlockDriverAIOCB *bdrv_aio_write(BlockDr
   
 void bdrv_aio_cancel(BlockDriverAIOCB *acb)  void bdrv_aio_cancel(BlockDriverAIOCB *acb)
 {  {
     BlockDriver *drv = acb->bs->drv;      acb->pool->cancel(acb);
   
     drv->bdrv_aio_cancel(acb);  
 }  }
   
   
 /**************************************************************/  /**************************************************************/
 /* async block device emulation */  /* async block device emulation */
   
 #ifdef QEMU_IMG  
 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 1224  static void bdrv_aio_cancel_em(BlockDriv Line 1515  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_IMG */  
   
 /**************************************************************/  /**************************************************************/
 /* sync block device emulation */  /* sync block device emulation */
Line 1243  static int bdrv_read_em(BlockDriverState Line 1533  static int bdrv_read_em(BlockDriverState
     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 1264  static int bdrv_write_em(BlockDriverStat Line 1552  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;
 }  }
   
 void bdrv_init(void)  void bdrv_init(void)
 {  {
       aio_pool_init(&vectored_aio_pool, sizeof(VectorTranslationAIOCB),
                     bdrv_aio_cancel_vector);
   
     bdrv_register(&bdrv_raw);      bdrv_register(&bdrv_raw);
     bdrv_register(&bdrv_host_device);      bdrv_register(&bdrv_host_device);
 #ifndef _WIN32  #ifndef _WIN32
Line 1294  void bdrv_init(void) Line 1581  void bdrv_init(void)
     bdrv_register(&bdrv_vvfat);      bdrv_register(&bdrv_vvfat);
     bdrv_register(&bdrv_qcow2);      bdrv_register(&bdrv_qcow2);
     bdrv_register(&bdrv_parallels);      bdrv_register(&bdrv_parallels);
       bdrv_register(&bdrv_nbd);
 }  }
   
 void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,  void aio_pool_init(AIOPool *pool, int aiocb_size,
                    void *opaque)                     void (*cancel)(BlockDriverAIOCB *acb))
   {
       pool->aiocb_size = aiocb_size;
       pool->cancel = cancel;
       pool->free_aiocb = NULL;
   }
   
   void *qemu_aio_get_pool(AIOPool *pool, BlockDriverState *bs,
                           BlockDriverCompletionFunc *cb, void *opaque)
 {  {
     BlockDriver *drv;  
     BlockDriverAIOCB *acb;      BlockDriverAIOCB *acb;
   
     drv = bs->drv;      if (pool->free_aiocb) {
     if (drv->free_aiocb) {          acb = pool->free_aiocb;
         acb = drv->free_aiocb;          pool->free_aiocb = acb->next;
         drv->free_aiocb = acb->next;  
     } else {      } else {
         acb = qemu_mallocz(drv->aiocb_size);          acb = qemu_mallocz(pool->aiocb_size);
         if (!acb)          acb->pool = pool;
             return NULL;  
     }      }
     acb->bs = bs;      acb->bs = bs;
     acb->cb = cb;      acb->cb = cb;
Line 1317  void *qemu_aio_get(BlockDriverState *bs, Line 1610  void *qemu_aio_get(BlockDriverState *bs,
     return acb;      return acb;
 }  }
   
   void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,
                      void *opaque)
   {
       return qemu_aio_get_pool(&bs->drv->aio_pool, bs, cb, opaque);
   }
   
 void qemu_aio_release(void *p)  void qemu_aio_release(void *p)
 {  {
     BlockDriverAIOCB *acb = p;      BlockDriverAIOCB *acb = (BlockDriverAIOCB *)p;
     BlockDriver *drv = acb->bs->drv;      AIOPool *pool = acb->pool;
     acb->next = drv->free_aiocb;      acb->next = pool->free_aiocb;
     drv->free_aiocb = acb;      pool->free_aiocb = acb;
 }  }
   
 /**************************************************************/  /**************************************************************/

Removed from v.1.1.1.6  
changed lines
  Added in v.1.1.1.12


unix.superglobalmegacorp.com