mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-03 16:42:37 +00:00
Remove phyp driver
The phyp driver was added in 2009 and does not appear to have had any real feature change since 2011. There's virtually no evidence online of users actually using it. IMO it's time to kill it. This was discussed a bit in April 2016: https://www.redhat.com/archives/libvir-list/2016-April/msg01060.html Final discussion is here: https://www.redhat.com/archives/libvir-list/2019-December/msg01162.html Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
6a64be6c78
commit
f854e051b9
|
|
@ -456,7 +456,6 @@ dnl
|
|||
LIBVIRT_DRIVER_ARG_QEMU
|
||||
LIBVIRT_DRIVER_ARG_OPENVZ
|
||||
LIBVIRT_DRIVER_ARG_VMWARE
|
||||
LIBVIRT_DRIVER_ARG_PHYP
|
||||
LIBVIRT_DRIVER_ARG_LIBXL
|
||||
LIBVIRT_DRIVER_ARG_VBOX
|
||||
LIBVIRT_DRIVER_ARG_LXC
|
||||
|
|
@ -473,7 +472,6 @@ LIBVIRT_DRIVER_ARG_INTERFACE
|
|||
LIBVIRT_DRIVER_CHECK_QEMU
|
||||
LIBVIRT_DRIVER_CHECK_OPENVZ
|
||||
LIBVIRT_DRIVER_CHECK_VMWARE
|
||||
LIBVIRT_DRIVER_CHECK_PHYP
|
||||
LIBVIRT_DRIVER_CHECK_LIBXL
|
||||
LIBVIRT_DRIVER_CHECK_VBOX
|
||||
LIBVIRT_DRIVER_CHECK_LXC
|
||||
|
|
@ -953,7 +951,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE
|
|||
LIBVIRT_DRIVER_RESULT_VBOX
|
||||
LIBVIRT_DRIVER_RESULT_LIBXL
|
||||
LIBVIRT_DRIVER_RESULT_LXC
|
||||
LIBVIRT_DRIVER_RESULT_PHYP
|
||||
LIBVIRT_DRIVER_RESULT_ESX
|
||||
LIBVIRT_DRIVER_RESULT_HYPERV
|
||||
LIBVIRT_DRIVER_RESULT_VZ
|
||||
|
|
|
|||
|
|
@ -365,10 +365,6 @@
|
|||
<td>openvz</td>
|
||||
<td>OPENVZ</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>phyp</td>
|
||||
<td>PHYP</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>qemu</td>
|
||||
<td>QEMU</td>
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@
|
|||
daemon through the <a href="remote.html">remote</a> driver via an
|
||||
<a href="internals/rpc.html">RPC</a>. Some hypervisors do support
|
||||
client-side connections and responses, such as Test, OpenVZ, VMware,
|
||||
Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Virtuozzo.
|
||||
VirtualBox (vbox), ESX, Hyper-V, Xen, and Virtuozzo.
|
||||
The libvirtd daemon service is started on the host at system boot
|
||||
time and can also be restarted at any time by a properly privileged
|
||||
user, such as root. The libvirtd daemon uses the same libvirt API
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ credentials=defgrp</pre>
|
|||
<li><code>libvirt</code> - used for connections to a libvirtd
|
||||
server, which is configured with SASL auth</li>
|
||||
<li><code>ssh</code> - used for connections to a Phyp server
|
||||
over SSH</li>
|
||||
over SSH, but the Phyp driver has been removed</li>
|
||||
<li><code>esx</code> - used for connections to an ESX or
|
||||
VirtualCenter server</li>
|
||||
</ol>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
<li><strong><a href="drvvmware.html">VMware Workstation/Player</a></strong></li>
|
||||
<li><strong><a href="drvxen.html">Xen</a></strong></li>
|
||||
<li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li>
|
||||
<li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li>
|
||||
<li><strong><a href="drvvirtuozzo.html">Virtuozzo</a></strong></li>
|
||||
<li><strong><a href="drvbhyve.html">Bhyve</a></strong> - The BSD Hypervisor</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<body>
|
||||
<h1>IBM PowerVM hypervisor driver (phyp)</h1>
|
||||
<ul id="toc"></ul>
|
||||
<p>
|
||||
The IBM PowerVM driver can manage both HMC and IVM PowerVM
|
||||
guests. VIOS connections are tunneled through HMC.
|
||||
</p>
|
||||
|
||||
|
||||
<h2><a id="project">Project Links</a></h2>
|
||||
<ul>
|
||||
<li>
|
||||
The <a href="http://www-03.ibm.com/systems/power/software/virtualization/index.html">IBM
|
||||
PowerVM</a> hypervisor
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
<h2><a id="uri">Connections to the PowerVM driver</a></h2>
|
||||
<p>
|
||||
Some example remote connection URIs for the driver are:
|
||||
</p>
|
||||
<pre>
|
||||
phyp://user@hmc/system (HMC connection)
|
||||
phyp://user@ivm/system (IVM connection)
|
||||
</pre>
|
||||
<p>
|
||||
<strong>Note</strong>: In contrast to other drivers, the
|
||||
PowerVM (or phyp) driver is a client-side-only driver,
|
||||
internally using ssh to connect to the specified hmc or ivm
|
||||
server. Therefore, the <a href="remote.html">remote transport
|
||||
mechanism</a> provided by the remote driver and libvirtd will
|
||||
not work, and you cannot use URIs like
|
||||
<code>phyp+ssh://example.com</code>.
|
||||
</p>
|
||||
|
||||
|
||||
<h3><a id="uriformat">URI Format</a></h3>
|
||||
<p>
|
||||
URIs have this general form (<code>[...]</code> marks an
|
||||
optional part, <code>{...|...}</code> marks a mandatory choice).
|
||||
</p>
|
||||
<pre>
|
||||
phyp://[username@]{hmc|ivm}/managed_system
|
||||
</pre>
|
||||
|
||||
</body></html>
|
||||
|
|
@ -408,8 +408,7 @@
|
|||
<element name='os_type'>
|
||||
<choice>
|
||||
<value>xen</value> <!-- Xen 3.0 pv -->
|
||||
<value>linux</value> <!-- same as 'xen' - meant to be legacy,
|
||||
but is also used by phyp driver -->
|
||||
<value>linux</value> <!-- same as 'xen' - meant to be legacy -->
|
||||
<value>hvm</value> <!-- unmodified OS -->
|
||||
<value>exe</value> <!-- For container based virt -->
|
||||
<value>uml</value> <!-- user mode linux; NOT USED ANYMORE -->
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@
|
|||
<value>vmware</value>
|
||||
<value>hyperv</value>
|
||||
<value>vbox</value>
|
||||
<value>phyp</value>
|
||||
<value>phyp</value> <!-- NOT USED ANYMORE -->
|
||||
<value>vz</value>
|
||||
<value>bhyve</value>
|
||||
</choice>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ typedef enum {
|
|||
VIR_FROM_ONE = 27, /* The OpenNebula driver no longer exists.
|
||||
Retained for ABI/API compat only */
|
||||
VIR_FROM_ESX = 28, /* Error from ESX driver */
|
||||
VIR_FROM_PHYP = 29, /* Error from IBM power hypervisor */
|
||||
VIR_FROM_PHYP = 29, /* Error from the phyp driver, unused since 6.0.0 */
|
||||
|
||||
VIR_FROM_SECRET = 30, /* Error from secret storage */
|
||||
VIR_FROM_CPU = 31, /* Error from CPU driver */
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@
|
|||
# Then the hypervisor drivers that run outside libvirtd, in libvirt.so
|
||||
%define with_openvz 0%{!?_without_openvz:1}
|
||||
%define with_vmware 0%{!?_without_vmware:1}
|
||||
%define with_phyp 0%{!?_without_phyp:1}
|
||||
%define with_esx 0%{!?_without_esx:1}
|
||||
%define with_hyperv 0%{!?_without_hyperv:1}
|
||||
|
||||
|
|
@ -136,7 +135,6 @@
|
|||
%if 0%{?rhel}
|
||||
%define with_openvz 0
|
||||
%define with_vbox 0
|
||||
%define with_phyp 0
|
||||
%define with_vmware 0
|
||||
%define with_libxl 0
|
||||
%define with_hyperv 0
|
||||
|
|
@ -366,7 +364,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0
|
|||
%if %{with_fuse}
|
||||
BuildRequires: fuse-devel >= 2.8.6
|
||||
%endif
|
||||
%if %{with_phyp} || %{with_libssh2}
|
||||
%if %{with_libssh2}
|
||||
BuildRequires: libssh2-devel >= 1.3.0
|
||||
%endif
|
||||
|
||||
|
|
@ -1036,12 +1034,6 @@ exit 1
|
|||
%define arg_libxl --without-libxl
|
||||
%endif
|
||||
|
||||
%if %{with_phyp}
|
||||
%define arg_phyp --with-phyp
|
||||
%else
|
||||
%define arg_phyp --without-phyp
|
||||
%endif
|
||||
|
||||
%if %{with_esx}
|
||||
%define arg_esx --with-esx
|
||||
%else
|
||||
|
|
@ -1164,7 +1156,6 @@ cd %{_vpath_builddir}
|
|||
--with-sasl \
|
||||
--with-polkit \
|
||||
--with-libvirtd \
|
||||
%{?arg_phyp} \
|
||||
%{?arg_esx} \
|
||||
%{?arg_hyperv} \
|
||||
%{?arg_vmware} \
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
dnl The Phyp driver
|
||||
dnl
|
||||
dnl Copyright (C) 2016 Red Hat, Inc.
|
||||
dnl
|
||||
dnl This library is free software; you can redistribute it and/or
|
||||
dnl modify it under the terms of the GNU Lesser General Public
|
||||
dnl License as published by the Free Software Foundation; either
|
||||
dnl version 2.1 of the License, or (at your option) any later version.
|
||||
dnl
|
||||
dnl This library is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
dnl Lesser General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU Lesser General Public
|
||||
dnl License along with this library. If not, see
|
||||
dnl <http://www.gnu.org/licenses/>.
|
||||
dnl
|
||||
|
||||
AC_DEFUN([LIBVIRT_DRIVER_ARG_PHYP], [
|
||||
LIBVIRT_ARG_WITH_FEATURE([PHYP], [PHYP], [check])
|
||||
])
|
||||
|
||||
AC_DEFUN([LIBVIRT_DRIVER_CHECK_PHYP], [
|
||||
AC_REQUIRE([LIBVIRT_CHECK_SSH2])
|
||||
|
||||
if test "$with_phyp" != "no"; then
|
||||
if test "$with_ssh2" = "no" ; then
|
||||
if test "$with_phyp" = "check"; then
|
||||
with_phyp=no
|
||||
else
|
||||
AC_MSG_ERROR([libssh2 is required for Phyp driver])
|
||||
fi
|
||||
else
|
||||
with_phyp=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$with_phyp" = "yes"; then
|
||||
AC_DEFINE_UNQUOTED([WITH_PHYP], 1, [whether IBM HMC / IVM driver is enabled])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"])
|
||||
])
|
||||
|
||||
AC_DEFUN([LIBVIRT_DRIVER_RESULT_PHYP], [
|
||||
LIBVIRT_RESULT([PHYP], [$with_phyp])
|
||||
])
|
||||
|
|
@ -19,7 +19,6 @@
|
|||
# The mingw build is client only. Set up defaults for hypervisor drivers
|
||||
# that talk via a native remote protocol, and for which prereq mingw
|
||||
# libraries exist.
|
||||
%define with_phyp 0%{!?_without_phyp:1}
|
||||
%define with_esx 0%{!?_without_esx:1}
|
||||
# missing libwsman, so can't build hyper-v
|
||||
%define with_hyperv 0%{!?_without_hyperv:0}
|
||||
|
|
@ -28,7 +27,6 @@
|
|||
|
||||
# RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi)
|
||||
%if 0%{?rhel}
|
||||
%define with_phyp 0
|
||||
%define with_xenapi 0
|
||||
%define with_hyperv 0
|
||||
%endif
|
||||
|
|
@ -140,10 +138,6 @@ echo "This RPM requires Fedora >= %{min_fedora}"
|
|||
exit 1
|
||||
%endif
|
||||
|
||||
%if ! %{with_phyp}
|
||||
%define _without_phyp --without-phyp
|
||||
%endif
|
||||
|
||||
%if ! %{with_esx}
|
||||
%define _without_esx --without-esx
|
||||
%endif
|
||||
|
|
@ -176,7 +170,6 @@ autoreconf -if
|
|||
--without-sasl \
|
||||
--without-polkit \
|
||||
--without-libvirtd \
|
||||
%{?_without_phyp} \
|
||||
%{?_without_esx} \
|
||||
%{?_without_hyperv} \
|
||||
--without-vmware \
|
||||
|
|
|
|||
|
|
@ -137,7 +137,6 @@
|
|||
@SRCDIR@/src/openvz/openvz_conf.c
|
||||
@SRCDIR@/src/openvz/openvz_driver.c
|
||||
@SRCDIR@/src/openvz/openvz_util.c
|
||||
@SRCDIR@/src/phyp/phyp_driver.c
|
||||
@SRCDIR@/src/qemu/qemu_agent.c
|
||||
@SRCDIR@/src/qemu/qemu_alias.c
|
||||
@SRCDIR@/src/qemu/qemu_backup.c
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ include logging/Makefile.inc.am
|
|||
include locking/Makefile.inc.am
|
||||
include admin/Makefile.inc.am
|
||||
include rpc/Makefile.inc.am
|
||||
include phyp/Makefile.inc.am
|
||||
include test/Makefile.inc.am
|
||||
include esx/Makefile.inc.am
|
||||
include hyperv/Makefile.inc.am
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ Then there are the hypervisor implementations:
|
|||
* hyperv/ - Microsoft Hyper-V support using WinRM
|
||||
* lxc/ - Linux Native Containers
|
||||
* openvz/ - OpenVZ containers using cli tools
|
||||
* phyp/ - IBM Power Hypervisor using CLI tools over SSH
|
||||
* qemu/ - QEMU / KVM using qemu CLI/monitor
|
||||
* remote/ - Generic libvirt native RPC client
|
||||
* test/ - A "mock" driver for testing
|
||||
|
|
@ -41,7 +40,7 @@ Then there are the hypervisor implementations:
|
|||
|
||||
Finally some secondary drivers that are shared for several HVs.
|
||||
Currently these are used by LXC, OpenVZ, QEMU and Xen drivers.
|
||||
The ESX, Hyper-V, Power Hypervisor, Remote, Test & VirtualBox drivers all
|
||||
The ESX, Hyper-V, Remote, Test & VirtualBox drivers all
|
||||
implement the secondary drivers directly
|
||||
|
||||
* cpu/ - CPU feature management
|
||||
|
|
|
|||
|
|
@ -72,9 +72,6 @@
|
|||
#ifdef WITH_VMWARE
|
||||
# include "vmware/vmware_driver.h"
|
||||
#endif
|
||||
#ifdef WITH_PHYP
|
||||
# include "phyp/phyp_driver.h"
|
||||
#endif
|
||||
#ifdef WITH_ESX
|
||||
# include "esx/esx_driver.h"
|
||||
#endif
|
||||
|
|
@ -290,10 +287,6 @@ virGlobalInit(void)
|
|||
if (vmwareRegister() == -1)
|
||||
goto error;
|
||||
#endif
|
||||
#ifdef WITH_PHYP
|
||||
if (phypRegister() == -1)
|
||||
goto error;
|
||||
#endif
|
||||
#ifdef WITH_ESX
|
||||
if (esxRegister() == -1)
|
||||
goto error;
|
||||
|
|
@ -959,9 +952,6 @@ virConnectOpenInternal(const char *name,
|
|||
if (STREQ(virConnectDriverTab[i]->hypervisorDriver->name, "remote") &&
|
||||
ret->uri != NULL &&
|
||||
(
|
||||
#ifndef WITH_PHYP
|
||||
STRCASEEQ(ret->uri->scheme, "phyp") ||
|
||||
#endif
|
||||
#ifndef WITH_ESX
|
||||
STRCASEEQ(ret->uri->scheme, "vpx") ||
|
||||
STRCASEEQ(ret->uri->scheme, "esx") ||
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
# vim: filetype=automake
|
||||
|
||||
PHYP_DRIVER_SOURCES = \
|
||||
phyp/phyp_driver.c \
|
||||
phyp/phyp_driver.h \
|
||||
$(NULL)
|
||||
|
||||
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(PHYP_DRIVER_SOURCES))
|
||||
EXTRA_DIST += $(PHYP_DRIVER_SOURCES)
|
||||
|
||||
if WITH_PHYP
|
||||
noinst_LTLIBRARIES += libvirt_driver_phyp.la
|
||||
libvirt_la_BUILT_LIBADD += libvirt_driver_phyp.la
|
||||
libvirt_driver_phyp_la_LIBADD = $(SSH2_LIBS)
|
||||
libvirt_driver_phyp_la_CFLAGS = \
|
||||
$(SSH2_CFLAGS) \
|
||||
-I$(srcdir)/conf \
|
||||
$(AM_CFLAGS) \
|
||||
$(NULL)
|
||||
libvirt_driver_phyp_la_SOURCES = $(PHYP_DRIVER_SOURCES)
|
||||
endif WITH_PHYP
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,24 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 2010, 2013 Red Hat, Inc.
|
||||
* Copyright IBM Corp. 2009
|
||||
*
|
||||
* phyp_driver.c: ssh layer to access Power Hypervisors
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library. If not, see
|
||||
* <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
int phypRegister(void);
|
||||
|
|
@ -522,9 +522,6 @@ virshShowVersion(vshControl *ctl G_GNUC_UNUSED)
|
|||
#ifdef WITH_VMWARE
|
||||
vshPrint(ctl, " VMware");
|
||||
#endif
|
||||
#ifdef WITH_PHYP
|
||||
vshPrint(ctl, " PHYP");
|
||||
#endif
|
||||
#ifdef WITH_VBOX
|
||||
vshPrint(ctl, " VirtualBox");
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user