From 91c7bf659bc8c8b87f1a6b5470109e51724f11f8 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 4 Sep 2009 14:03:45 +0200 Subject: [PATCH] PHYP driver cleanups * libvirt.spec.in: activate phyp and fix the BuildDep to libssh2-devel * src/phyp/phyp_driver.c: fix a debug macro to use the normal logging API --- libvirt.spec.in | 6 ++---- src/phyp/phyp_driver.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 76eb7b972e..c12206de49 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -12,6 +12,7 @@ %define with_libvirtd 0%{!?_without_libvirtd:1} %define with_uml 0%{!?_without_uml:1} %define with_one 0%{!?_without_one:1} +%define with_phyp 0%{!?_without_phyp:1} %define with_network 0%{!?_without_network:1} %define with_storage_fs 0%{!?_without_storage_fs:1} %define with_storage_lvm 0%{!?_without_storage_lvm:1} @@ -24,9 +25,6 @@ %define with_capng 0%{!?_without_capng:0} %define with_netcf 0%{!?_without_netcf:0} -# default to off -%define with_phyp 0%{!?_without_phyp:0} - # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i586 i686 x86_64 ia64 %define with_xen 0 @@ -196,7 +194,7 @@ BuildRequires: numactl-devel BuildRequires: libcap-ng-devel >= 0.5.0 %endif %if %{with_phyp} -BuildRequires: libssh-devel >= 0.3.1 +BuildRequires: libssh2-devel %endif %if %{with_netcf} BuildRequires: netcf-devel diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 78d6e25485..2f8a314795 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -56,9 +56,7 @@ #define VIR_FROM_THIS VIR_FROM_PHYP -#ifdef ENABLE_DEBUG -#define PHYP_CMD_DEBUG fprintf(stdout,"%s:%d - COMMAND:%s\n",__FUNCTION__,__LINE__,cmd); -#endif +#define PHYP_CMD_DEBUG VIR_DEBUG("COMMAND:%s\n",cmd); static int escape_specialcharacters(char *src, char *dst, size_t dstlen); -- GitLab