Diff for /qemu/block.h between versions and

version, 2018/04/24 16:56:47 version, 2018/04/24 17:34:49
Line 3 Line 3
 #include "qemu-aio.h"  #include "qemu-aio.h"
 #include "qemu-common.h"  #include "qemu-common.h"
   #include "qemu-option.h"
   #include "qobject.h"
 /* block.c */  /* block.c */
 typedef struct BlockDriver BlockDriver;  typedef struct BlockDriver BlockDriver;
 extern BlockDriver bdrv_raw;  
 extern BlockDriver bdrv_host_device;  
 extern BlockDriver bdrv_cow;  
 extern BlockDriver bdrv_qcow;  
 extern BlockDriver bdrv_vmdk;  
 extern BlockDriver bdrv_cloop;  
 extern BlockDriver bdrv_dmg;  
 extern BlockDriver bdrv_bochs;  
 extern BlockDriver bdrv_vpc;  
 extern BlockDriver bdrv_vvfat;  
 extern BlockDriver bdrv_qcow2;  
 extern BlockDriver bdrv_parallels;  
 extern BlockDriver bdrv_nbd;  
 typedef struct BlockDriverInfo {  typedef struct BlockDriverInfo {
     /* in bytes, 0 if irrelevant */      /* in bytes, 0 if irrelevant */
     int cluster_size;      int cluster_size;
Line 50  typedef struct QEMUSnapshotInfo { Line 38  typedef struct QEMUSnapshotInfo {
                                      bdrv_file_open()) */                                       bdrv_file_open()) */
 #define BDRV_O_NOCACHE     0x0020 /* do not use the host page cache */  #define BDRV_O_NOCACHE     0x0020 /* do not use the host page cache */
 #define BDRV_O_CACHE_WB    0x0040 /* use write-back caching */  #define BDRV_O_CACHE_WB    0x0040 /* use write-back caching */
 #define BDRV_O_CACHE_DEF   0x0080 /* use default caching */  #define BDRV_O_NATIVE_AIO  0x0080 /* use native AIO instead of the thread pool */
 void bdrv_info(void);  #define BDRV_SECTOR_BITS   9
 void bdrv_info_stats(void);  #define BDRV_SECTOR_SIZE   (1 << BDRV_SECTOR_BITS)
   void bdrv_info_print(Monitor *mon, const QObject *data);
   void bdrv_info(Monitor *mon, QObject **ret_data);
   void bdrv_stats_print(Monitor *mon, const QObject *data);
   void bdrv_info_stats(Monitor *mon, QObject **ret_data);
 void bdrv_init(void);  void bdrv_init(void);
   void bdrv_init_with_whitelist(void);
 BlockDriver *bdrv_find_format(const char *format_name);  BlockDriver *bdrv_find_format(const char *format_name);
 int bdrv_create(BlockDriver *drv,  BlockDriver *bdrv_find_whitelisted_format(const char *format_name);
                 const char *filename, int64_t size_in_sectors,  int bdrv_create(BlockDriver *drv, const char* filename,
                 const char *backing_file, int flags);      QEMUOptionParameter *options);
   int bdrv_create2(BlockDriver *drv,
                    const char *filename, int64_t size_in_sectors,
                    const char *backing_file, const char *backing_format,
                    int flags);
 BlockDriverState *bdrv_new(const char *device_name);  BlockDriverState *bdrv_new(const char *device_name);
 void bdrv_delete(BlockDriverState *bs);  void bdrv_delete(BlockDriverState *bs);
 int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags);  int bdrv_file_open(BlockDriverState **pbs, const char *filename, int flags);
Line 69  int bdrv_open(BlockDriverState *bs, cons Line 68  int bdrv_open(BlockDriverState *bs, cons
 int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,  int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
                BlockDriver *drv);                 BlockDriver *drv);
 void bdrv_close(BlockDriverState *bs);  void bdrv_close(BlockDriverState *bs);
   int bdrv_check(BlockDriverState *bs);
 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);
 int bdrv_write(BlockDriverState *bs, int64_t sector_num,  int bdrv_write(BlockDriverState *bs, int64_t sector_num,
Line 82  int64_t bdrv_getlength(BlockDriverState  Line 82  int64_t bdrv_getlength(BlockDriverState 
 void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);  void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);
 void bdrv_guess_geometry(BlockDriverState *bs, int *pcyls, int *pheads, int *psecs);  void bdrv_guess_geometry(BlockDriverState *bs, int *pcyls, int *pheads, int *psecs);
 int bdrv_commit(BlockDriverState *bs);  int bdrv_commit(BlockDriverState *bs);
   void bdrv_register(BlockDriver *bdrv);
 /* async block I/O */  /* async block I/O */
 typedef struct BlockDriverAIOCB BlockDriverAIOCB;  typedef struct BlockDriverAIOCB BlockDriverAIOCB;
 typedef void BlockDriverCompletionFunc(void *opaque, int ret);  typedef void BlockDriverCompletionFunc(void *opaque, int ret);
   typedef void BlockDriverDirtyHandler(BlockDriverState *bs, int64_t sector,
                                        int sector_num);
 BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,  BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,
                                  QEMUIOVector *iov, int nb_sectors,                                   QEMUIOVector *iov, int nb_sectors,
                                  BlockDriverCompletionFunc *cb, void *opaque);                                   BlockDriverCompletionFunc *cb, void *opaque);
 BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,  BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
                                   QEMUIOVector *iov, int nb_sectors,                                    QEMUIOVector *iov, int nb_sectors,
                                   BlockDriverCompletionFunc *cb, void *opaque);                                    BlockDriverCompletionFunc *cb, void *opaque);
   BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs,
 BlockDriverAIOCB *bdrv_aio_read(BlockDriverState *bs, int64_t sector_num,                                   BlockDriverCompletionFunc *cb, void *opaque);
                                 uint8_t *buf, int nb_sectors,  
                                 BlockDriverCompletionFunc *cb, void *opaque);  
 BlockDriverAIOCB *bdrv_aio_write(BlockDriverState *bs, int64_t sector_num,  
                                  const uint8_t *buf, int nb_sectors,  
                                  BlockDriverCompletionFunc *cb, void *opaque);  
 void bdrv_aio_cancel(BlockDriverAIOCB *acb);  void bdrv_aio_cancel(BlockDriverAIOCB *acb);
   typedef struct BlockRequest {
       /* Fields to be filled by multiwrite caller */
       int64_t sector;
       int nb_sectors;
       QEMUIOVector *qiov;
       BlockDriverCompletionFunc *cb;
       void *opaque;
       /* Filled by multiwrite implementation */
       int error;
   } BlockRequest;
   int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs,
       int num_reqs);
   /* sg packet commands */
   int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf);
   BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
           unsigned long int req, void *buf,
           BlockDriverCompletionFunc *cb, void *opaque);
 /* Ensure contents are flushed to disk.  */  /* Ensure contents are flushed to disk.  */
 void bdrv_flush(BlockDriverState *bs);  void bdrv_flush(BlockDriverState *bs);
 void bdrv_flush_all(void);  void bdrv_flush_all(void);
Line 127  int bdrv_get_type_hint(BlockDriverState  Line 146  int bdrv_get_type_hint(BlockDriverState 
 int bdrv_get_translation_hint(BlockDriverState *bs);  int bdrv_get_translation_hint(BlockDriverState *bs);
 int bdrv_is_removable(BlockDriverState *bs);  int bdrv_is_removable(BlockDriverState *bs);
 int bdrv_is_read_only(BlockDriverState *bs);  int bdrv_is_read_only(BlockDriverState *bs);
   int bdrv_set_read_only(BlockDriverState *bs, int read_only);
 int bdrv_is_sg(BlockDriverState *bs);  int bdrv_is_sg(BlockDriverState *bs);
   int bdrv_enable_write_cache(BlockDriverState *bs);
 int bdrv_is_inserted(BlockDriverState *bs);  int bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);  int bdrv_media_changed(BlockDriverState *bs);
 int bdrv_is_locked(BlockDriverState *bs);  int bdrv_is_locked(BlockDriverState *bs);
 void bdrv_set_locked(BlockDriverState *bs, int locked);  void bdrv_set_locked(BlockDriverState *bs, int locked);
 void bdrv_eject(BlockDriverState *bs, int eject_flag);  int bdrv_eject(BlockDriverState *bs, int eject_flag);
 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);
 void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size);  void bdrv_get_format(BlockDriverState *bs, char *buf, int buf_size);
Line 161  int bdrv_snapshot_delete(BlockDriverStat Line 182  int bdrv_snapshot_delete(BlockDriverStat
 int bdrv_snapshot_list(BlockDriverState *bs,  int bdrv_snapshot_list(BlockDriverState *bs,
                        QEMUSnapshotInfo **psn_info);                         QEMUSnapshotInfo **psn_info);
 char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn);  char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn);
 int bdrv_ioctl(BlockDriverState *bs, unsigned long int req, void *buf);  
 char *get_human_readable_size(char *buf, int buf_size, int64_t size);  char *get_human_readable_size(char *buf, int buf_size, int64_t size);
 int path_is_absolute(const char *path);  int path_is_absolute(const char *path);
Line 169  void path_combine(char *dest, int dest_s Line 189  void path_combine(char *dest, int dest_s
                   const char *base_path,                    const char *base_path,
                   const char *filename);                    const char *filename);
   int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf,
                         int64_t pos, int size);
   int bdrv_load_vmstate(BlockDriverState *bs, uint8_t *buf,
                         int64_t pos, int size);
   void bdrv_set_dirty_tracking(BlockDriverState *bs, int enable);
   int bdrv_get_dirty(BlockDriverState *bs, int64_t sector);
   void bdrv_reset_dirty(BlockDriverState *bs, int64_t cur_sector,
                         int nr_sectors);
 #endif  #endif

Removed from v.  
changed lines
  Added in v.