[libvirt] [PATCH 3/8] parallels: move parallelsParseError to parallels_utils.h

[Daniel Veillard]

On Tue, Dec 11, 2012 at 02:59:44PM +0400, Dmitry Guryanov wrote:
> This macro will be used in another file in the next
> patch, so move it to common header file.
> 
> Signed-off-by: Dmitry Guryanov <dguryanov at parallels.com>
> ---
>  po/POTFILES.in                   |    1 +
>  src/parallels/parallels_driver.c |    4 ----
>  src/parallels/parallels_utils.h  |    4 ++++
>  3 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 586aa2b..50cdc4e 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -77,6 +77,7 @@ src/openvz/openvz_driver.c
>  src/openvz/openvz_util.c
>  src/parallels/parallels_driver.c
>  src/parallels/parallels_utils.c
> +src/parallels/parallels_utils.h
>  src/parallels/parallels_storage.c
>  src/phyp/phyp_driver.c
>  src/qemu/qemu_agent.c
> diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
> index f29b6ca..5d89503 100644
> --- a/src/parallels/parallels_driver.c
> +++ b/src/parallels/parallels_driver.c
> @@ -69,10 +69,6 @@
>                         _("no domain with matching uuid '%s'"), uuidstr); \
>      } while (0)
>  
> -#define parallelsParseError()                                                  \
> -    virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__,    \
> -                     __FUNCTION__, __LINE__, _("Can't parse prlctl output"))
> -
>  #define IS_CT(def)  (STREQ_NULLABLE(def->os.type, "exe"))
>  
>  static int parallelsClose(virConnectPtr conn);
> diff --git a/src/parallels/parallels_utils.h b/src/parallels/parallels_utils.h
> index e4b3f8b..8b0bdf6 100644
> --- a/src/parallels/parallels_utils.h
> +++ b/src/parallels/parallels_utils.h
> @@ -30,6 +30,10 @@
>  # include "conf/domain_event.h"
>  # include "json.h"
>  
> +# define parallelsParseError()                                                 \
> +    virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__,    \
> +                     __FUNCTION__, __LINE__, _("Can't parse prlctl output"))
> +
>  struct _parallelsConn {
>      virMutex lock;
>      virDomainObjList domains;

ACK,

Daniel

-- 
Daniel Veillard      | Open Source and Standards, Red Hat
veillard at redhat.com  | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
http://veillard.com/ | virtualization library  http://libvirt.org/