From 3535bd753d4b711ca731f3fb07e7dc428ca2dffe Mon Sep 17 00:00:00 2001 From: phamt Date: Fri, 15 Feb 2013 18:15:01 +0000 Subject: [PATCH] Updated rmigrate man page for z/VM. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15187 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-client/pods/man1/chhypervisor.1.pod | 8 ++--- xCAT-client/pods/man1/chvm.1.pod | 29 ++++++++-------- xCAT-client/pods/man1/lsvm.1.pod | 2 +- xCAT-client/pods/man1/rinv.1.pod | 6 ++-- xCAT-client/pods/man1/rmigrate.1.pod | 42 ++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 23 deletions(-) diff --git a/xCAT-client/pods/man1/chhypervisor.1.pod b/xCAT-client/pods/man1/chhypervisor.1.pod index c04f552cb..5c7802dd6 100644 --- a/xCAT-client/pods/man1/chhypervisor.1.pod +++ b/xCAT-client/pods/man1/chhypervisor.1.pod @@ -254,9 +254,9 @@ To deactivate the host 'host1', enter: =item 1. To add a disk to a disk pool defined in the EXTENT CONTROL, enter: - + chhypervisor pokdev61 --adddisk2pool 4 DM1234 DM1234 POOL1 - + =item 2. To add a zFCP device to a device pool defined in xCAT, enter: @@ -266,12 +266,12 @@ To add a zFCP device to a device pool defined in xCAT, enter: To remove a region from a group in the EXTENT CONTROL, enter: chhypervisor pokdev61 --removediskfrompool 2 DM1234 POOL1 - + =item 4. To remove a zFCP device from a device pool defined in xCAT, enter: chhypervisor pokdev61 --removezfcpfrompool zfcp1 4012345600000000 500501234567C890 - + =item 5. To execute a SMAPI function (Image_Query_DM), enter: diff --git a/xCAT-client/pods/man1/chvm.1.pod b/xCAT-client/pods/man1/chvm.1.pod index 57ebfb6b6..a47894985 100644 --- a/xCAT-client/pods/man1/chvm.1.pod +++ b/xCAT-client/pods/man1/chvm.1.pod @@ -467,51 +467,51 @@ Output is similar to: 1. To adds a 3390 (ECKD) disk to a virtual machine's directory entry: - chvm gpok3 --add3390 POOL1 0101 2G MR + chvm gpok3 --add3390 POOL1 0101 2G MR Output is similar to: - gpok3: Adding disk 0101 to LNX3... Done + gpok3: Adding disk 0101 to LNX3... Done 2. To add a network adapter to a virtual machine's directory entry: - chvm gpok3 --addnic 0600 QDIO 3 + chvm gpok3 --addnic 0600 QDIO 3 Output is similar to: - gpok3: Adding NIC 0900 to LNX3... Done + gpok3: Adding NIC 0900 to LNX3... Done 3. To connects a given network adapter to a GuestLAN: - chvm gpok3 --connectnic2guestlan 0600 GLAN1 LN1OWNR + chvm gpok3 --connectnic2guestlan 0600 GLAN1 LN1OWNR Output is similar to: - gpok3: Connecting NIC 0600 to GuestLan GLAN1 on LN1OWNR... Done + gpok3: Connecting NIC 0600 to GuestLan GLAN1 on LN1OWNR... Done -4. To connects a given network adapter to a VSwitch: +4. To connects a given network adapter to a vSwitch: - chvm gpok3 --connectnic2vswitch 0600 VSW1 + chvm gpok3 --connectnic2vswitch 0600 VSW1 Output is similar to: - gpok3: Connecting NIC 0600 to vSwitch VSW1 on LNX3... Done + gpok3: Connecting NIC 0600 to vSwitch VSW1 on LNX3... Done 5. To removes a minidisk from a virtual machine's directory entry: - chvm gpok3 --removedisk 0101 + chvm gpok3 --removedisk 0101 Output is similar to: - gpok3: Removing disk 0101 on LNX3... Done + gpok3: Removing disk 0101 on LNX3... Done 6. To Removes a network adapter from a virtual machine's directory entry: - chvm gpok3 --removenic 0700 + chvm gpok3 --removenic 0700 Output is similar to: - gpok3: Removing NIC 0700 on LNX3... Done + gpok3: Removing NIC 0700 on LNX3... Done 7. To replaces a virtual machine's directory entry: @@ -519,9 +519,8 @@ Output is similar to: Output is similar to: - gpok3: Replacing user entry of LNX3... Done + gpok3: Replacing user entry of LNX3... Done - =head1 FILES /opt/xcat/bin/chvm diff --git a/xCAT-client/pods/man1/lsvm.1.pod b/xCAT-client/pods/man1/lsvm.1.pod index 6607e3266..8b10080a8 100644 --- a/xCAT-client/pods/man1/lsvm.1.pod +++ b/xCAT-client/pods/man1/lsvm.1.pod @@ -50,8 +50,8 @@ Note: Only the virtual machine which is in power on state can be listed by lsvm Show the directory entry for a given virtual machine. -=head1 OPTIONS +=head1 OPTIONS B<-h> diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod index ceef75b38..5c2aa63d6 100644 --- a/xCAT-client/pods/man1/rinv.1.pod +++ b/xCAT-client/pods/man1/rinv.1.pod @@ -48,7 +48,7 @@ B I [B<--ssi>] B I [B<--smapilevel>] -B I [B<--wwpn>] +B I [B<--wwpns> I] B I [B<--zfcppool> I I] @@ -174,9 +174,9 @@ Obtain the SSI and system status. Obtain the SMAPI level installed on the z/VM system. -=item B<--wwpn> +=item B<--wwpns> I -Query all FCPs on a z/VM system and return a list of WWPNs. +Query a given FCP device channel on a z/VM system and return a list of WWPNs. =item B<--zfcppool> I I diff --git a/xCAT-client/pods/man1/rmigrate.1.pod b/xCAT-client/pods/man1/rmigrate.1.pod index 3ea120285..3469caa03 100644 --- a/xCAT-client/pods/man1/rmigrate.1.pod +++ b/xCAT-client/pods/man1/rmigrate.1.pod @@ -6,10 +6,44 @@ B - Execute migration of a guest VM between hosts/hypervisors B I I +=head2 For zVM: + +B I [BI] [BI] [BI] [BI] [BI] [BI] + =head1 B B requests that a guest VM be moved from the current entity hosting it to another. It requests a live migration be done, if possible. +=head2 For zVM: + +B migrates a VM from one z/VM member to another in an SSI cluster (only in z/VM 6.2). + +=head1 OPTIONS + +=head2 zVM specific: + +=over 4 + +=item B +The name of the destination z/VM system to which the specified virtual machine will be relocated. + +=item B +It can be: (MOVE) initiate a VMRELOCATE MOVE of the VM, (TEST) determine if VM is eligible to be relocated, or (CANCEL) stop the relocation of VM. + +=item B +It can be: (ARCHITECTURE) attempt relocation even though hardware architecture facilities or CP features are not available on destination system, (DOMAIN) attempt relocation even though VM would be moved outside of its domain, or (STORAGE) relocation should proceed even if CP determines that there are insufficient storage resources on destination system. + +=item B +It can be: (YES) VMRELOCATE command will do one early pass through virtual machine storage and then go directly to the quiesce stage, or (NO) specifies immediate processing. + +=item B +The maximum wait time for relocation to complete. + +=item B +The maximum quiesce time a VM may be stopped during a relocation attempt. + +=back + =head1 B B table - @@ -19,3 +53,11 @@ This is used to determine the current host to migrate from. =head1 B B I I + +=head2 zVM specific: + +=over 4 + +B I destination=I + +=back