2010/4/5 Eric Blake <eblake(a)redhat.com>:
On 04/04/2010 11:36 AM, Matthias Bolte wrote:
> ---
> src/openvz/openvz_conf.c | 83 +++++++-------
> src/openvz/openvz_conf.h | 9 +-
> src/openvz/openvz_driver.c | 266 ++++++++++++++++++++++----------------------
> 3 files changed, 177 insertions(+), 181 deletions(-)
>
> @@ -288,18 +286,18 @@ openvzReadNetworkConf(virConnectPtr conn,
> p += 4;
> len = next - p;
> if (len != 17) { //should be 17
> - openvzError(conn, VIR_ERR_INTERNAL_ERROR,
> - "%s", _("Wrong length MAC
address"));
> + openvzError( VIR_ERR_INTERNAL_ERROR, "%s",
> + _("Wrong length MAC address"));
Wonky spacing.
> +++ b/src/openvz/openvz_conf.h
> @@ -33,10 +33,8 @@
> # include "domain_conf.h"
> # include "threads.h"
>
> -enum { OPENVZ_WARN, OPENVZ_ERR };
Worth mentioning in the commit log that these were unused?
> -
> -# define openvzError(conn, code, ...) \
> - virReportErrorHelper(conn, VIR_FROM_OPENVZ, code, __FILE__, \
> +# define openvzError(code, ...) \
> + virReportErrorHelper(NULL, VIR_FROM_OPENVZ, code, __FILE__, \
> __FUNCTION__, __LINE__, __VA_ARGS__)
ACK, and the rest of the patch is mechanical fallout, once you fix the nits.
Thanks, I folded in both changes and pushed.
Matthias