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
This commit is contained in:
Daniel Veillard 2009-09-04 14:03:45 +02:00
parent 191053b53d
commit 91c7bf659b
2 changed files with 3 additions and 7 deletions

View File

@ -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

View File

@ -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);