2010/4/5 Eric Blake <eblake@xxxxxxxxxx>: > On 04/04/2010 11:36 AM, Matthias Bolte wrote: >> --- >> src/esx/esx_device_monitor.c | 4 ++-- >> src/esx/esx_interface_driver.c | 4 ++-- >> src/esx/esx_network_driver.c | 4 ++-- >> src/esx/esx_secret_driver.c | 4 ++-- >> src/esx/esx_storage_driver.c | 4 ++-- >> 5 files changed, 10 insertions(+), 10 deletions(-) >> >> diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c >> index 1962a11..31724f7 100644 >> --- a/src/esx/esx_device_monitor.c >> +++ b/src/esx/esx_device_monitor.c >> @@ -38,8 +38,8 @@ >> >> #define VIR_FROM_THIS VIR_FROM_ESX >> >> -#define ESX_ERROR(conn, code, ...) \ >> - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ >> +#define ESX_ERROR(code, ...) \ >> + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ >> __LINE__, __VA_ARGS__) >> >> >> diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c >> index fef324d..b2fddbe 100644 >> --- a/src/esx/esx_interface_driver.c >> +++ b/src/esx/esx_interface_driver.c >> @@ -38,8 +38,8 @@ >> >> #define VIR_FROM_THIS VIR_FROM_ESX >> >> -#define ESX_ERROR(conn, code, ...) \ >> - virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ >> +#define ESX_ERROR(code, ...) \ >> + virReportErrorHelper(NULL, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ >> __LINE__, __VA_ARGS__) > > Odd - why define ESX_ERROR in these five files if no callers had to > change? Is this something that should be factored into a .h? > > At any rate, ACK that it brings things in line with > src/esx/esx_driver.c; factoring into a common .h could be separate. > I merged this patch into patch 02/30 by moving the definition of ESX_ERROR into esx_private.h. Matthias -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list