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

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 76eb7b972e2b162af6633b66e12388a33d44d43c..c12206de49fa5722e721f2cd7ee068f0787bdb50 100644 (file)
--- 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 78d6e254855e77599f06b30c803f6390f14c5c16..2f8a314795353ba7173975198e446b50baf40703 100644 (file)
--- 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);