From c5faf316a91b3c7d72c59af0723a6bcba5b98ef0 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 4 May 2016 13:53:33 -0400 Subject: [PATCH] Enable lsvm for kvm hypervisor (#1022) * Enable lsvm for kvm hypervisor * Remove commented line --- .../guides/admin-guides/references/man1/lsvm.1.rst | 13 ++++++++++--- xCAT-client/pods/man1/lsvm.1.pod | 10 +++++++--- xCAT-server/lib/xcat/plugins/kvm.pm | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst index b2da686c5..cae3ee788 100644 --- a/docs/source/guides/admin-guides/references/man1/lsvm.1.rst +++ b/docs/source/guides/admin-guides/references/man1/lsvm.1.rst @@ -11,7 +11,7 @@ NAME **** -\ **lsvm**\ - Lists partition profile information for HMC-, DFM-, IVM-, KVM-, Vmware- and zVM-managed nodes. For Power 775, it lists the LPARs' I/O slots information and CEC configuration. +\ **lsvm**\ - Lists partition profile information for HMC-, DFM-, IVM-, KVM-, VMware- and zVM-managed nodes. For Power 775, it lists the LPARs' I/O slots information and CEC configuration. ******** @@ -36,6 +36,13 @@ For PPC (using Direct FSP Management): \ **lsvm**\ \ *noderange*\ +For KVM and VMware +================== + + +\ **lsvm**\ \ *noderange*\ + + For zVM: ======== @@ -72,11 +79,11 @@ More information about this part, refer to the section Using the \*vm commands t XCAT_Power_775_Hardware_Management -For KVM and Vmware +For KVM and VMware ================== -The virtual machines that defined in the hypervisor \ *noderange*\ will be displayed. \ *noderange*\ only can be hypervisor. The type of the hypervisor should be set: hypervisor.type before running the lsvm. +The virtual machines that defined in the hypervisor \ *noderange*\ will be displayed. \ *noderange*\ only can be hypervisor. Note: Only the virtual machine which is in power on state can be listed by lsvm command. diff --git a/xCAT-client/pods/man1/lsvm.1.pod b/xCAT-client/pods/man1/lsvm.1.pod index b42cc097d..a9843bb8b 100644 --- a/xCAT-client/pods/man1/lsvm.1.pod +++ b/xCAT-client/pods/man1/lsvm.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Lists partition profile information for HMC-, DFM-, IVM-, KVM-, Vmware- and zVM-managed nodes. For Power 775, it lists the LPARs' I/O slots information and CEC configuration. +B - Lists partition profile information for HMC-, DFM-, IVM-, KVM-, VMware- and zVM-managed nodes. For Power 775, it lists the LPARs' I/O slots information and CEC configuration. =head1 SYNOPSIS @@ -18,6 +18,10 @@ B [B<-l>| B<--long>] B<--p775> I B I +=head2 For KVM and VMware + +B I + =head2 For zVM: B I @@ -44,9 +48,9 @@ The Memory Interleaving Mode has 3 valid options: More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM in the doc below. XCAT_Power_775_Hardware_Management -=head2 For KVM and Vmware +=head2 For KVM and VMware -The virtual machines that defined in the hypervisor I will be displayed. I only can be hypervisor. The type of the hypervisor should be set: hypervisor.type before running the lsvm. +The virtual machines that defined in the hypervisor I will be displayed. I can only be hypervisor. Note: Only the virtual machine which is in power on state can be listed by lsvm command. diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm index dd881b5d2..d3804e4f8 100755 --- a/xCAT-server/lib/xcat/plugins/kvm.pm +++ b/xCAT-server/lib/xcat/plugins/kvm.pm @@ -79,7 +79,7 @@ sub handled_commands { #rvitals => 'nodehm:mgt', #rinv => 'nodehm:mgt', getrvidparms => 'nodehm:mgt', - lsvm => 'hypervisor:type', + lsvm => 'nodehm:mgt=ipmi', rbeacon => 'nodehm:mgt', revacuate => 'hypervisor:type', vmstatenotify => 'hypervisor:type',