Continuation of previous patch.
* src/esx/esx_device_monitor.c (ESX_ERROR): Use C99 rather than
GNU vararg macro syntax.
* src/esx/esx_driver.c (ESX_ERROR): Likewise.
* src/esx/esx_interface_driver.c (ESX_ERROR): Likewise.
* src/esx/esx_network_driver.c (ESX_ERROR): Likewise.
* src/esx/esx_secret_driver.c (ESX_ERROR): Likewise.
* src/esx/esx_storage_driver.c (ESX_ERROR): Likewise.
* src/esx/esx_util.c (ESX_ERROR): Likewise.
* src/esx/esx_vi.c (ESX_VI_ERROR): Likewise.
* src/esx/esx_vi_methods.c (ESX_VI_ERROR): Likewise.
* src/esx/esx_vi_types.c (ESX_VI_ERROR): Likewise.
* src/esx/esx_vmx.c (ESX_ERROR): Likewise.
---
src/esx/esx_device_monitor.c | 5 +++--
src/esx/esx_driver.c | 5 +++--
src/esx/esx_interface_driver.c | 5 +++--
src/esx/esx_network_driver.c | 5 +++--
src/esx/esx_secret_driver.c | 5 +++--
src/esx/esx_storage_driver.c | 5 +++--
src/esx/esx_util.c | 5 +++--
src/esx/esx_vi.c | 5 +++--
src/esx/esx_vi_methods.c | 5 +++--
src/esx/esx_vi_types.c | 5 +++--
src/esx/esx_vmx.c | 5 +++--
11 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index de67ebb..78de0e0 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -3,6 +3,7 @@
* esx_device_monitor.c: device monitor methods for managing VMware ESX
* host devices
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -37,9 +38,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(conn, code, fmt...) \
+#define ESX_ERROR(conn, code, ...) \
virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index e125a09..2b52884 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -2,6 +2,7 @@
/*
* esx_driver.c: core driver methods for managing VMware ESX hosts
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2009, 2010 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
* Copyright (C) 2009 Maximilian Wilhelm <max@xxxxxxxxxxx>
*
@@ -46,9 +47,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(code, fmt...) \
+#define ESX_ERROR(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
static int esxDomainGetMaxVcpus(virDomainPtr domain);
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 6e9d224..e3739f7 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -3,6 +3,7 @@
* esx_interface_driver.h: interface driver methods for managing VMware ESX
* host interfaces
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -37,9 +38,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(conn, code, fmt...) \
+#define ESX_ERROR(conn, code, ...) \
virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 1eeae44..dacc95b 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -3,6 +3,7 @@
* esx_network_driver.c: network driver methods for managing VMware ESX
* host networks
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -37,9 +38,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(conn, code, fmt...) \
+#define ESX_ERROR(conn, code, ...) \
virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 7b24d0c..07a178f 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -2,6 +2,7 @@
/*
* esx_secret_driver.c: secret driver methods for VMware ESX secret manipulation
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -36,9 +37,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(conn, code, fmt...) \
+#define ESX_ERROR(conn, code, ...) \
virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index d09831a..b920f3b 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -3,6 +3,7 @@
* esx_storage_driver.c: storage driver methods for managing VMware ESX
* host storage
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2010 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -37,9 +38,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(conn, code, fmt...) \
+#define ESX_ERROR(conn, code, ...) \
virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 5da8e97..dcbd86c 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -2,6 +2,7 @@
/*
* esx_util.c: utility methods for the VMware ESX driver
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2009 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
* Copyright (C) 2009 Maximilian Wilhelm <max@xxxxxxxxxxx>
*
@@ -37,9 +38,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(code, fmt...) \
+#define ESX_ERROR(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
/* AI_ADDRCONFIG is missing on some systems. */
#ifndef AI_ADDRCONFIG
diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 9edfcb4..8c8f1bc 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -2,6 +2,7 @@
/*
* esx_vi.c: client for the VMware VI API 2.5 to manage ESX hosts
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2009 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -38,9 +39,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_VI_ERROR(code, fmt...) \
+#define ESX_VI_ERROR(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
#define ESX_VI__SOAP__REQUEST_HEADER \
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \
diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index d3beb07..05c7b42 100644
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -2,6 +2,7 @@
/*
* esx_vi_methods.c: client for the VMware VI API 2.5 to manage ESX hosts
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2009 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -32,9 +33,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_VI_ERROR(code, fmt...) \
+#define ESX_VI_ERROR(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
#define ESX_VI__SOAP__REQUEST_HEADER \
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" \
diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index c32bf33..958b901 100644
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -2,6 +2,7 @@
/*
* esx_vi_types.c: client for the VMware VI API 2.5 to manage ESX hosts
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2009 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -37,9 +38,9 @@
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_VI_ERROR(code, fmt...) \
+#define ESX_VI_ERROR(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
index 2651ccb..ba4c608 100644
--- a/src/esx/esx_vmx.c
+++ b/src/esx/esx_vmx.c
@@ -2,6 +2,7 @@
/*
* esx_vmx.c: VMX related methods for the VMware ESX driver
*
+ * Copyright (C) 2010 Red Hat, Inc.
* Copyright (C) 2009 Matthias Bolte <matthias.bolte@xxxxxxxxxxxxxx>
*
* This library is free software; you can redistribute it and/or
@@ -420,9 +421,9 @@ def->parallels[0]...
#define VIR_FROM_THIS VIR_FROM_ESX
-#define ESX_ERROR(code, fmt...) \
+#define ESX_ERROR(code, ...) \
virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \
- __LINE__, fmt)
+ __LINE__, __VA_ARGS__)
--
1.6.6.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list