# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1281969064 -3600
# Node ID 39f50a3b7716e8f645e1f701ebbd824e5f2252fa
# Parent 3f268693fb81300f2dcb961969e07d389e0756c4
libxl: move various enum and #defines above datastructure definitions.
These are left behind when the datastructures move to _lixl_types.hg
in a following patch and moving them first makes that pure code motion
patch more obviously correct.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
committer: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
tools/libxl/libxl.h | 61 ++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff -r 3f268693fb81 -r 39f50a3b7716 tools/libxl/libxl.h
--- a/tools/libxl/libxl.h Mon Aug 16 15:31:04 2010 +0100
+++ b/tools/libxl/libxl.h Mon Aug 16 15:31:04 2010 +0100
@@ -144,6 +144,37 @@ typedef char **libxl_string_list;
typedef char **libxl_string_list;
typedef char **libxl_key_value_list;
+
+typedef enum {
+ XENFV = 1,
+ XENPV,
+} libxl_qemu_machine_type;
+
+typedef enum {
+ LIBXL_CONSTYPE_SERIAL,
+ LIBXL_CONSTYPE_PV,
+} libxl_console_constype;
+
+typedef enum {
+ LIBXL_CONSBACK_XENCONSOLED,
+ LIBXL_CONSBACK_IOEMU,
+} libxl_console_consback;
+
+typedef enum {
+ PHYSTYPE_QCOW = 1,
+ PHYSTYPE_QCOW2,
+ PHYSTYPE_VHD,
+ PHYSTYPE_AIO,
+ PHYSTYPE_FILE,
+ PHYSTYPE_PHY,
+} libxl_disk_phystype;
+
+typedef enum {
+ NICTYPE_IOEMU = 1,
+ NICTYPE_VIF,
+} libxl_nic_type;
+
+#define LIBXL_PCI_FUNC_ALL (~0U)
typedef struct {
libxl_uuid uuid;
@@ -285,11 +316,6 @@ typedef struct {
int (*suspend_callback)(void *, int);
} libxl_domain_suspend_info;
-typedef enum {
- XENFV = 1,
- XENPV,
-} libxl_qemu_machine_type;
-
typedef struct {
int domid;
libxl_uuid uuid; /* this is use only with stubdom, and must be different
from the domain uuid */
@@ -343,16 +369,6 @@ typedef struct {
int devid;
} libxl_device_vkb;
-typedef enum {
- LIBXL_CONSTYPE_SERIAL,
- LIBXL_CONSTYPE_PV,
-} libxl_console_constype;
-
-typedef enum {
- LIBXL_CONSBACK_XENCONSOLED,
- LIBXL_CONSBACK_IOEMU,
-} libxl_console_consback;
-
typedef struct {
uint32_t backend_domid;
uint32_t domid;
@@ -361,15 +377,6 @@ typedef struct {
libxl_domain_build_state *build_state;
char *output;
} libxl_device_console;
-
-typedef enum {
- PHYSTYPE_QCOW = 1,
- PHYSTYPE_QCOW2,
- PHYSTYPE_VHD,
- PHYSTYPE_AIO,
- PHYSTYPE_FILE,
- PHYSTYPE_PHY,
-} libxl_disk_phystype;
typedef struct {
uint32_t backend_domid;
@@ -381,11 +388,6 @@ typedef struct {
int readwrite;
int is_cdrom;
} libxl_device_disk;
-
-typedef enum {
- NICTYPE_IOEMU = 1,
- NICTYPE_VIF,
-} libxl_nic_type;
typedef struct {
uint32_t backend_domid;
@@ -431,7 +433,6 @@ typedef struct {
};
unsigned int domain;
unsigned int vdevfn;
-#define LIBXL_PCI_FUNC_ALL (~0U)
unsigned int vfunc_mask;
bool msitranslate;
bool power_mgmt;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home