From patchwork Thu Jul 23 14:01:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 499411 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0411A1402DE for ; Fri, 24 Jul 2015 00:03:45 +1000 (AEST) Received: from localhost ([::1]:41499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIH67-0003En-4U for incoming@patchwork.ozlabs.org; Thu, 23 Jul 2015 10:03:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIH4H-0008Ik-Na for qemu-devel@nongnu.org; Thu, 23 Jul 2015 10:01:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZIH4A-0004bU-Fl for qemu-devel@nongnu.org; Thu, 23 Jul 2015 10:01:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZIH4A-0004bI-9G for qemu-devel@nongnu.org; Thu, 23 Jul 2015 10:01:42 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id DF9C2387DB6 for ; Thu, 23 Jul 2015 14:01:41 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-26.ams2.redhat.com [10.36.116.26]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6NE1dX1008664 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 23 Jul 2015 10:01:41 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A3097305D0E7; Thu, 23 Jul 2015 16:01:38 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 23 Jul 2015 16:01:34 +0200 Message-Id: <1437660098-4584-4-git-send-email-armbru@redhat.com> In-Reply-To: <1437660098-4584-1-git-send-email-armbru@redhat.com> References: <1437660098-4584-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, dgilbert@redhat.com, lersek@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PATCH v2 3/7] qga: Clean up unnecessarily dirty casts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qga_vss_fsfreeze() casts error_set_win32() from void (*)(Error **, int, ErrorClass, const char *, ...) to void (*)(void **, int, int, const char *, ...) The result is later called. Since the two types are not compatible, the call is undefined behavior. It works in practice anyway. However, there's no real need for trickery here. Clean it up as follows: * Declare struct Error, and fix the first parameter. * Switch to error_setg_win32(). This gets rid of the troublesome ErrorClass parameter. Requires converting error_setg_win32() from macro to function, but that's trivially easy, because this is the only user of error_set_win32(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/error.h | 9 ++------- qga/vss-win32.c | 5 ++--- qga/vss-win32/requester.cpp | 2 +- qga/vss-win32/requester.h | 11 ++++++----- util/error.c | 5 ++--- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index 34af4e1..692e013 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -44,8 +44,8 @@ void error_set_errno(Error **errp, int os_error, ErrorClass err_class, * printf-style human message, followed by a g_win32_error_message() string if * @win32_err is not zero. */ -void error_set_win32(Error **errp, int win32_err, ErrorClass err_class, - const char *fmt, ...) GCC_FMT_ATTR(4, 5); +void error_setg_win32(Error **errp, int win32_err, const char *fmt, ...) + GCC_FMT_ATTR(3, 4); #endif /** @@ -56,11 +56,6 @@ void error_setg(Error **errp, const char *fmt, ...) #define error_setg_errno(errp, os_error, fmt, ...) \ error_set_errno(errp, os_error, ERROR_CLASS_GENERIC_ERROR, \ fmt, ## __VA_ARGS__) -#ifdef _WIN32 -#define error_setg_win32(errp, win32_err, fmt, ...) \ - error_set_win32(errp, win32_err, ERROR_CLASS_GENERIC_ERROR, \ - fmt, ## __VA_ARGS__) -#endif /** * Helper for open() errors diff --git a/qga/vss-win32.c b/qga/vss-win32.c index 0e40957..e1f5398 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -150,9 +150,8 @@ void qga_vss_fsfreeze(int *nr_volume, Error **errp, bool freeze) const char *func_name = freeze ? "requester_freeze" : "requester_thaw"; QGAVSSRequesterFunc func; ErrorSet errset = { - .error_set = (ErrorSetFunc)error_set_win32, - .errp = (void **)errp, - .err_class = ERROR_CLASS_GENERIC_ERROR + .error_setg_win32 = error_setg_win32, + .errp = errp, }; func = (QGAVSSRequesterFunc)GetProcAddress(provider_lib, func_name); diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index 922e74d..b130fee 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -24,7 +24,7 @@ #define VSS_TIMEOUT_EVENT_MSEC 10 #define err_set(e, err, fmt, ...) \ - ((e)->error_set((e)->errp, err, (e)->err_class, fmt, ## __VA_ARGS__)) + ((e)->error_setg_win32((e)->errp, err, fmt, ## __VA_ARGS__)) #define err_is_set(e) ((e)->errp && *(e)->errp) diff --git a/qga/vss-win32/requester.h b/qga/vss-win32/requester.h index 374f9b8..0a8d048 100644 --- a/qga/vss-win32/requester.h +++ b/qga/vss-win32/requester.h @@ -20,13 +20,14 @@ extern "C" { #endif +struct Error; + /* Callback to set Error; used to avoid linking glib to the DLL */ -typedef void (*ErrorSetFunc)(void **errp, int win32_err, int err_class, - const char *fmt, ...) GCC_FMT_ATTR(4, 5); +typedef void (*ErrorSetFunc)(struct Error **errp, int win32_err, + const char *fmt, ...) GCC_FMT_ATTR(3, 4); typedef struct ErrorSet { - ErrorSetFunc error_set; - void **errp; - int err_class; + ErrorSetFunc error_setg_win32; + struct Error **errp; } ErrorSet; STDAPI requester_init(void); diff --git a/util/error.c b/util/error.c index 8f12f67..9620f2a 100644 --- a/util/error.c +++ b/util/error.c @@ -96,8 +96,7 @@ void error_setg_file_open(Error **errp, int os_errno, const char *filename) #ifdef _WIN32 -void error_set_win32(Error **errp, int win32_err, ErrorClass err_class, - const char *fmt, ...) +void error_setg_win32(Error **errp, int win32_err, const char *fmt, ...) { va_list ap; char *msg1, *msg2; @@ -107,7 +106,7 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class, } va_start(ap, fmt); - error_setv(errp, err_class, fmt, ap); + error_setv(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ap); va_end(ap); if (win32_err != 0) {