Diff for /qemu/blockdev.h between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2018/04/24 18:23:17 version 1.1.1.4, 2018/04/24 19:33:45
Line 11 Line 11
 #define BLOCKDEV_H  #define BLOCKDEV_H
   
 #include "block.h"  #include "block.h"
   #include "error.h"
 #include "qemu-queue.h"  #include "qemu-queue.h"
   
 void blockdev_mark_auto_del(BlockDriverState *bs);  void blockdev_mark_auto_del(BlockDriverState *bs);
 void blockdev_auto_del(BlockDriverState *bs);  void blockdev_auto_del(BlockDriverState *bs);
   
   #define BLOCK_SERIAL_STRLEN 20
   
 typedef enum {  typedef enum {
       IF_DEFAULT = -1,            /* for use with drive_add() only */
     IF_NONE,      IF_NONE,
     IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,      IF_IDE, IF_SCSI, IF_FLOPPY, IF_PFLASH, IF_MTD, IF_SD, IF_VIRTIO, IF_XEN,
     IF_COUNT      IF_COUNT
 } BlockInterfaceType;  } BlockInterfaceType;
   
 #define BLOCK_SERIAL_STRLEN 20  struct DriveInfo {
   
 typedef struct DriveInfo {  
     BlockDriverState *bdrv;      BlockDriverState *bdrv;
     char *id;      char *id;
     const char *devaddr;      const char *devaddr;
Line 32  typedef struct DriveInfo { Line 34  typedef struct DriveInfo {
     int bus;      int bus;
     int unit;      int unit;
     int auto_del;               /* see blockdev_mark_auto_del() */      int auto_del;               /* see blockdev_mark_auto_del() */
       int media_cd;
     QemuOpts *opts;      QemuOpts *opts;
     char serial[BLOCK_SERIAL_STRLEN + 1];      char serial[BLOCK_SERIAL_STRLEN + 1];
     QTAILQ_ENTRY(DriveInfo) next;      QTAILQ_ENTRY(DriveInfo) next;
 } DriveInfo;      int refcount;
   };
 #define MAX_IDE_DEVS    2  
 #define MAX_SCSI_DEVS   7  
   
 extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);  DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);
 extern int drive_get_max_bus(BlockInterfaceType type);  DriveInfo *drive_get_by_index(BlockInterfaceType type, int index);
 extern void drive_uninit(DriveInfo *dinfo);  int drive_get_max_bus(BlockInterfaceType type);
 extern DriveInfo *drive_get_by_blockdev(BlockDriverState *bs);  DriveInfo *drive_get_next(BlockInterfaceType type);
   void drive_get_ref(DriveInfo *dinfo);
 extern QemuOpts *drive_add(const char *file, const char *fmt, ...);  void drive_put_ref(DriveInfo *dinfo);
 extern DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi,  DriveInfo *drive_get_by_blockdev(BlockDriverState *bs);
                              int *fatal_error);  
   QemuOpts *drive_def(const char *optstr);
   QemuOpts *drive_add(BlockInterfaceType type, int index, const char *file,
                       const char *optstr);
   DriveInfo *drive_init(QemuOpts *arg, int default_to_scsi);
   
 /* device-hotplug */  /* device-hotplug */
   
 DriveInfo *add_init_drive(const char *opts);  DriveInfo *add_init_drive(const char *opts);
   
   void qmp_change_blockdev(const char *device, const char *filename,
                            bool has_format, const char *format, Error **errp);
 void do_commit(Monitor *mon, const QDict *qdict);  void do_commit(Monitor *mon, const QDict *qdict);
 int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data);  int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
 int do_block_set_passwd(Monitor *mon, const QDict *qdict, QObject **ret_data);  
 int do_change_block(Monitor *mon, const char *device,  
                     const char *filename, const char *fmt);  
   
 #endif  #endif

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.4


unix.superglobalmegacorp.com