1 files changed, 11 insertions, 26 deletions

diff --git a/tools/libxen/include/xen_vbd.h b/tools/libxen/include/xen_vbd.h
index 2b9d8b05eb..880449f3c1 100644
--- a/tools/libxen/include/xen_vbd.h
+++ b/tools/libxen/include/xen_vbd.h
@@ -20,7 +20,6 @@
 #define XEN_VBD_H
 
 #include "xen_common.h"
-#include "xen_driver_type.h"
 #include "xen_vbd_decl.h"
 #include "xen_vbd_mode.h"
 #include "xen_vdi_decl.h"
@@ -28,8 +27,8 @@
 
 
 /*
- * The VBD class. 
- *  
+ * The VBD class.
+ * 
  * A virtual block device.
  */
 
@@ -70,8 +69,8 @@ typedef struct xen_vbd_record
     struct xen_vdi_record_opt *vdi;
     char *device;
     char *image;
+    bool bootable;
     enum xen_vbd_mode mode;
-    enum xen_driver_type driver;
     double io_read_kbs;
     double io_write_kbs;
 } xen_vbd_record;
@@ -212,17 +211,17 @@ xen_vbd_get_device(xen_session *session, char **result, xen_vbd vbd);
 
 
 /**
- * Get the mode field of the given VBD.
+ * Get the bootable field of the given VBD.
  */
 extern bool
-xen_vbd_get_mode(xen_session *session, enum xen_vbd_mode *result, xen_vbd vbd);
+xen_vbd_get_bootable(xen_session *session, bool *result, xen_vbd vbd);
 
 
 /**
- * Get the driver field of the given VBD.
+ * Get the mode field of the given VBD.
  */
 extern bool
-xen_vbd_get_driver(xen_session *session, enum xen_driver_type *result, xen_vbd vbd);
+xen_vbd_get_mode(xen_session *session, enum xen_vbd_mode *result, xen_vbd vbd);
 
 
 /**
@@ -240,20 +239,6 @@ xen_vbd_get_io_write_kbs(xen_session *session, double *result, xen_vbd vbd);
 
 
 /**
- * Set the VM field of the given VBD.
- */
-extern bool
-xen_vbd_set_vm(xen_session *session, xen_vbd vbd, xen_vm vm);
-
-
-/**
- * Set the VDI field of the given VBD.
- */
-extern bool
-xen_vbd_set_vdi(xen_session *session, xen_vbd vbd, xen_vdi vdi);
-
-
-/**
  * Set the device field of the given VBD.
  */
 extern bool
@@ -261,17 +246,17 @@ xen_vbd_set_device(xen_session *session, xen_vbd vbd, char *device);
 
 
 /**
- * Set the mode field of the given VBD.
+ * Set the bootable field of the given VBD.
  */
 extern bool
-xen_vbd_set_mode(xen_session *session, xen_vbd vbd, enum xen_vbd_mode mode);
+xen_vbd_set_bootable(xen_session *session, xen_vbd vbd, bool bootable);
 
 
 /**
- * Set the driver field of the given VBD.
+ * Set the mode field of the given VBD.
  */
 extern bool
-xen_vbd_set_driver(xen_session *session, xen_vbd vbd, enum xen_driver_type driver);
+xen_vbd_set_mode(xen_session *session, xen_vbd vbd, enum xen_vbd_mode mode);
 
 
 /**