diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index c6854f155ee9a2366dcce1e9769257b61c6030d8..e405c8038fb4c5d45d78f50a7bcb1c7f7cf1a3dc 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -38,38 +38,13 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_VI__SOAP__REQUEST_HEADER \
- "\n" \
- "" \
- ""
-
-#define ESX_VI__SOAP__REQUEST_FOOTER \
- "" \
- ""
+
#define ESX_VI__SOAP__RESPONSE_XPATH(_type) \
((char *)"/soapenv:Envelope/soapenv:Body/" \
"vim:"_type"Response/vim:returnval")
-#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \
- do { \
- virBufferAddLit(_buffer, "<"); \
- virBufferAdd(_buffer, _element, -1); \
- virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \
- virBufferAdd(_buffer, _type, -1); \
- virBufferAddLit(_buffer, "\">"); \
- } while (0)
-
-#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \
- do { \
- virBufferAddLit(_buffer, ""); \
- virBufferAdd(_buffer, _element, -1); \
- virBufferAddLit(_buffer, ">"); \
- } while (0)
+
#define ESX_VI__TEMPLATE__ALLOC(_type) \
int \
@@ -78,6 +53,8 @@
return esxVI_Alloc((void **)ptrptr, sizeof(esxVI_##_type)); \
}
+
+
#define ESX_VI__TEMPLATE__FREE(_type, _body) \
void \
esxVI_##_type##_Free(esxVI_##_type **ptrptr) \
diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h
index a3d9363ce5b1a447accbc1a96a0bf19c9109bb81..e0d731e79c9bef0ec99be8f7c7c1b186cb2db7ef 100644
--- a/src/esx/esx_vi.h
+++ b/src/esx/esx_vi.h
@@ -40,6 +40,43 @@
+#define ESX_VI__SOAP__REQUEST_HEADER \
+ "\n" \
+ "\n" \
+ "\n"
+
+
+
+#define ESX_VI__SOAP__REQUEST_FOOTER \
+ "\n" \
+ ""
+
+
+
+#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \
+ do { \
+ virBufferAddLit(_buffer, "<"); \
+ virBufferAdd(_buffer, _element, -1); \
+ virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \
+ virBufferAdd(_buffer, _type, -1); \
+ virBufferAddLit(_buffer, "\">"); \
+ } while (0)
+
+
+
+#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \
+ do { \
+ virBufferAddLit(_buffer, ""); \
+ virBufferAdd(_buffer, _element, -1); \
+ virBufferAddLit(_buffer, ">"); \
+ } while (0)
+
+
+
typedef enum _esxVI_APIVersion esxVI_APIVersion;
typedef enum _esxVI_ProductVersion esxVI_ProductVersion;
typedef enum _esxVI_Occurrence esxVI_Occurrence;
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index 5c52167b99eb190144df02188733eb8209ce69df..8f841e3eb6022f323dd74da8c55cb7aee087d81d 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -34,23 +34,6 @@
-#define ESX_VI__SOAP__REQUEST_HEADER \
- "\n" \
- "" \
- ""
-
-
-
-#define ESX_VI__SOAP__REQUEST_FOOTER \
- "" \
- ""
-
-
-
#define ESX_VI__METHOD__CHECK_OUTPUT__None \
/* nothing */
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index ed4674b3b2f257a9297ef703051663984ce553ca..7d2c02cda92a6eb1e870bc25274d45e9fdb4cd77 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -39,26 +39,6 @@
-#define ESV_VI__XML_TAG__OPEN(_buffer, _element, _type) \
- do { \
- virBufferAddLit(_buffer, "<"); \
- virBufferAdd(_buffer, _element, -1); \
- virBufferAddLit(_buffer, " xmlns=\"urn:vim25\" xsi:type=\""); \
- virBufferAdd(_buffer, _type, -1); \
- virBufferAddLit(_buffer, "\">"); \
- } while (0)
-
-
-
-#define ESV_VI__XML_TAG__CLOSE(_buffer, _element) \
- do { \
- virBufferAddLit(_buffer, ""); \
- virBufferAdd(_buffer, _element, -1); \
- virBufferAddLit(_buffer, ">"); \
- } while (0)
-
-
-
#define ESX_VI__TEMPLATE__ALLOC(__type) \
int \
esxVI_##__type##_Alloc(esxVI_##__type **ptrptr) \