1.1 --- a/tools/libxl/libxl.h	Mon Aug 16 15:31:04 2010 +0100
     1.2 +++ b/tools/libxl/libxl.h	Mon Aug 16 15:31:04 2010 +0100
     1.3 @@ -145,6 +145,37 @@ typedef char **libxl_string_list;
     1.4  
     1.5  typedef char **libxl_key_value_list;
     1.6  
     1.7 +typedef enum {
     1.8 +    XENFV = 1,
     1.9 +    XENPV,
    1.10 +} libxl_qemu_machine_type;
    1.11 +
    1.12 +typedef enum {
    1.13 +    LIBXL_CONSTYPE_SERIAL,
    1.14 +    LIBXL_CONSTYPE_PV,
    1.15 +} libxl_console_constype;
    1.16 +
    1.17 +typedef enum {
    1.18 +    LIBXL_CONSBACK_XENCONSOLED,
    1.19 +    LIBXL_CONSBACK_IOEMU,
    1.20 +} libxl_console_consback;
    1.21 +
    1.22 +typedef enum {
    1.23 +    PHYSTYPE_QCOW = 1,
    1.24 +    PHYSTYPE_QCOW2,
    1.25 +    PHYSTYPE_VHD,
    1.26 +    PHYSTYPE_AIO,
    1.27 +    PHYSTYPE_FILE,
    1.28 +    PHYSTYPE_PHY,
    1.29 +} libxl_disk_phystype;
    1.30 +
    1.31 +typedef enum {
    1.32 +    NICTYPE_IOEMU = 1,
    1.33 +    NICTYPE_VIF,
    1.34 +} libxl_nic_type;
    1.35 +
    1.36 +#define LIBXL_PCI_FUNC_ALL (~0U)
    1.37 +
    1.38  typedef struct {
    1.39      libxl_uuid uuid;
    1.40      uint32_t domid;
    1.41 @@ -285,11 +316,6 @@ typedef struct {
    1.42      int (*suspend_callback)(void *, int);
    1.43  } libxl_domain_suspend_info;
    1.44  
    1.45 -typedef enum {
    1.46 -    XENFV = 1,
    1.47 -    XENPV,
    1.48 -} libxl_qemu_machine_type;
    1.49 -
    1.50  typedef struct {
    1.51      int domid;
    1.52      libxl_uuid uuid; /* this is use only with stubdom, and must be different from the domain uuid */
    1.53 @@ -343,16 +369,6 @@ typedef struct {
    1.54      int devid;
    1.55  } libxl_device_vkb;
    1.56  
    1.57 -typedef enum {
    1.58 -    LIBXL_CONSTYPE_SERIAL,
    1.59 -    LIBXL_CONSTYPE_PV,
    1.60 -} libxl_console_constype;
    1.61 -
    1.62 -typedef enum {
    1.63 -    LIBXL_CONSBACK_XENCONSOLED,
    1.64 -    LIBXL_CONSBACK_IOEMU,
    1.65 -} libxl_console_consback;
    1.66 -
    1.67  typedef struct {
    1.68      uint32_t backend_domid;
    1.69      uint32_t domid;
    1.70 @@ -362,15 +378,6 @@ typedef struct {
    1.71      char *output;
    1.72  } libxl_device_console;
    1.73  
    1.74 -typedef enum {
    1.75 -    PHYSTYPE_QCOW = 1,
    1.76 -    PHYSTYPE_QCOW2,
    1.77 -    PHYSTYPE_VHD,
    1.78 -    PHYSTYPE_AIO,
    1.79 -    PHYSTYPE_FILE,
    1.80 -    PHYSTYPE_PHY,
    1.81 -} libxl_disk_phystype;
    1.82 -
    1.83  typedef struct {
    1.84      uint32_t backend_domid;
    1.85      uint32_t domid;
    1.86 @@ -382,11 +389,6 @@ typedef struct {
    1.87      int is_cdrom;
    1.88  } libxl_device_disk;
    1.89  
    1.90 -typedef enum {
    1.91 -    NICTYPE_IOEMU = 1,
    1.92 -    NICTYPE_VIF,
    1.93 -} libxl_nic_type;
    1.94 -
    1.95  typedef struct {
    1.96      uint32_t backend_domid;
    1.97      uint32_t domid;
    1.98 @@ -431,7 +433,6 @@ typedef struct {
    1.99      };
   1.100      unsigned int domain;
   1.101      unsigned int vdevfn;
   1.102 -#define LIBXL_PCI_FUNC_ALL (~0U)
   1.103      unsigned int vfunc_mask;
   1.104      bool msitranslate;
   1.105      bool power_mgmt;