From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 3 of 9] libxl: move various enum and #defines
	above datastructure definitions
Date: Fri, 13 Aug 2010 14:50:06 +0100
Message-ID: <06e63fc8240a8d590208.1281707406@localhost.localdomain>
References: <patchbomb.1281707403@localhost.localdomain>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1281707403@localhost.localdomain>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Ian Campbell <ian.campbell@citrix.com>
# Date 1281706573 -3600
# Node ID 06e63fc8240a8d5902087947e016b7f69ab53071
# Parent  bee7f853a66535787786e99f5eba951717cea0ac
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@citrix.com>

diff -r bee7f853a665 -r 06e63fc8240a tools/libxl/libxl.h
--- a/tools/libxl/libxl.h	Fri Aug 13 14:36:13 2010 +0100
+++ b/tools/libxl/libxl.h	Fri Aug 13 14:36:13 2010 +0100
@@ -29,6 +29,32 @@ 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 {
+    CONSTYPE_XENCONSOLED,
+    CONSTYPE_IOEMU,
+} libxl_console_constype;
+
+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;
@@ -170,11 +196,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 */
@@ -228,11 +249,6 @@ typedef struct {
     int devid;
 } libxl_device_vkb;
 
-typedef enum {
-    CONSTYPE_XENCONSOLED,
-    CONSTYPE_IOEMU,
-} libxl_console_constype;
-
 typedef struct {
     uint32_t backend_domid;
     uint32_t domid;
@@ -240,15 +256,6 @@ typedef struct {
     libxl_console_constype constype;
     libxl_domain_build_state *build_state;
 } 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;
@@ -260,11 +267,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;
@@ -310,7 +312,6 @@ typedef struct {
     };
     unsigned int domain;
     unsigned int vdevfn;
-#define LIBXL_PCI_FUNC_ALL (~0U)
     unsigned int vfunc_mask;
     bool msitranslate;
     bool power_mgmt;