diff --git a/docs/en/docs/Virtualization/best-practices.md b/docs/en/docs/Virtualization/best-practices.md index a3debf11f144805f152f838b11e6afa3422bcf2f..0f29dbd6b383cac3e3657ab4a2f4eda942e271d7 100644 --- a/docs/en/docs/Virtualization/best-practices.md +++ b/docs/en/docs/Virtualization/best-practices.md @@ -224,7 +224,7 @@ Modify the /boot/efi/EFI/openEuler/grub.cfg configuration file of the VM, add ar ``` >![](./public_sys-resources/icon-note.gif) **Note:** ->PV-qspinlock is supported only when the operating systems of the host machine and VM are both openEuler-20.09 or later and the VM kernel compilation option CONFIG_PARAVIRT_SPINLOCKS is set to y (default value for openEuler). +>PV-qspinlock is supported only when the operating systems of the host machine and VM are both openEuler-21.03 or later and the VM kernel compilation option CONFIG_PARAVIRT_SPINLOCKS is set to y (default value for openEuler). ### Guest-Idle-Haltpoll @@ -524,7 +524,7 @@ During startup, the previous component measures (calculates the hash value) the **Installing the swtpm and libtpms Software** swtpm provides a TPM emulator (TPM 1.2 and TPM 2.0) that can be integrated into a virtualization environment. So far, it has been integrated into QEMU and serves as a prototype system in RunC. swtpm uses libtpms to provide TPM1.2 and TPM2.0 simulation functions. -Currently, openEuler20.09 provides the libtpms and swtpm sources. You can run the yum command to install them. +Currently, openEuler 21.03 provides the libtpms and swtpm sources. You can run the yum command to install them. ``` # yum install libtpms swtpm swtpm-devel swtpm-tools @@ -566,7 +566,7 @@ Currently, openEuler20.09 provides the libtpms and swtpm sources. You can run th ``` >![](public_sys-resources/icon-note.gif) **NOTE:** - > Currently, openEuler20.09 AArch64 version does not support ACPI feature in VM trusted boot process. Therefore, do not configure the ACPI feature for VMs. Otherwise, the vTPM device cannot be identified after the VM is started. + > Currently, openEuler21.03 AArch64 version does not support ACPI feature in VM trusted boot process. Therefore, do not configure the ACPI feature for VMs. Otherwise, the vTPM device cannot be identified after the VM is started. 2. Create the VM. @@ -586,10 +586,10 @@ Currently, openEuler20.09 provides the libtpms and swtpm sources. You can run th **Confirming that the Measure Boot Is Successfully Enabled** -The vBIOS determines whether to enable the measure boot function. Currently, the vBIOS in openEuler20.09 has the measure boot capability. If the host machine uses the edk2 component of another version, check whether the edk2 component supports the measure boot function. +The vBIOS determines whether to enable the measure boot function. Currently, the vBIOS in openEuler21.03 has the measure boot capability. If the host machine uses the edk2 component of another version, check whether the edk2 component supports the measure boot function. Log in to the VM as user root and check whether the TPM driver, tpm2-tss protocol stack, and tpm2-tools are installed on the VM. -By default, the tpm driver (tpm_tis.ko), tpm2-tss protocol stack, and tpm2-tools are installed in openEuler20.09. If another OS is used, run the following command to check whether the driver and related tools are installed: +By default, the tpm driver (tpm_tis.ko), tpm2-tss protocol stack, and tpm2-tools are installed in openEuler 21.03. If another OS is used, run the following command to check whether the driver and related tools are installed: ``` diff --git a/docs/en/docs/Virtualization/vm-configuration.md b/docs/en/docs/Virtualization/vm-configuration.md index e42e9ad02c921e04dec6a15df3af9f24b8736777..a96e55b6880bcccf1b0118b1a47f04e96aca2b30 100644 --- a/docs/en/docs/Virtualization/vm-configuration.md +++ b/docs/en/docs/Virtualization/vm-configuration.md @@ -277,7 +277,7 @@ In this example, two I/O threads, one block disk device and one CD, are configur - + @@ -777,7 +777,7 @@ An XML configuration file of AArch64 VM, which contains basic elements. The foll - + diff --git "a/docs/zh/docs/Administration/\344\275\277\347\224\250LVM\347\256\241\347\220\206\347\241\254\347\233\230.md" "b/docs/zh/docs/Administration/\344\275\277\347\224\250LVM\347\256\241\347\220\206\347\241\254\347\233\230.md" index 08be596ebd0403fabd21c2642755cad5e8c22ec0..e8f7b0f66283ea81b15f7db3711d0dce1a1eb0fb 100644 --- "a/docs/zh/docs/Administration/\344\275\277\347\224\250LVM\347\256\241\347\220\206\347\241\254\347\233\230.md" +++ "b/docs/zh/docs/Administration/\344\275\277\347\224\250LVM\347\256\241\347\220\206\347\241\254\347\233\230.md" @@ -274,7 +274,7 @@ vgextend [option] vgname pvname ... - vgname：要扩展容量的卷组名称。 - pvname：要加入到卷组中的物理卷名称。 -示例：将卷组vg1中添加物理卷/dev/sdb。 +示例：向卷组vg1中添加物理卷/dev/sdb。 ``` # vgextend vg1 /dev/sdb diff --git "a/docs/zh/docs/Virtualization/\345\256\211\350\243\205\350\231\232\346\213\237\345\214\226.md" "b/docs/zh/docs/Virtualization/\345\256\211\350\243\205\350\231\232\346\213\237\345\214\226.md" index aac70608ca9f506e05b62141b201a350900cfbe2..a41731e8ed39f7f101ea9617bec7b7b297a8808c 100644 --- "a/docs/zh/docs/Virtualization/\345\256\211\350\243\205\350\231\232\346\213\237\345\214\226.md" +++ "b/docs/zh/docs/Virtualization/\345\256\211\350\243\205\350\231\232\346\213\237\345\214\226.md" @@ -29,7 +29,7 @@ #### 前提条件 -- 已经配置yum源。配置方式请参见《openEuler 20.09 管理员指南》。 +- 已经配置yum源。配置方式请参见《管理员指南》。 - 安装操作需要root用户权限。 #### 安装步骤 diff --git "a/docs/zh/docs/Virtualization/\346\234\200\344\275\263\345\256\236\350\267\265.md" "b/docs/zh/docs/Virtualization/\346\234\200\344\275\263\345\256\236\350\267\265.md" index b9cae3f2169252537b587265b3e24ceffe386473..b308b357baeffb7f0bd730bc38f8f2a45b11c7cf 100644 --- "a/docs/zh/docs/Virtualization/\346\234\200\344\275\263\345\256\236\350\267\265.md" +++ "b/docs/zh/docs/Virtualization/\346\234\200\344\275\263\345\256\236\350\267\265.md" @@ -223,7 +223,7 @@ PV-qspinlock主要是针对虚拟化CPU超分场景自旋锁的优化，允许hy ``` >![](./public_sys-resources/icon-note.gif) **说明：** ->PV-qspinlock仅限于宿主机和虚拟机操作系统均为openEuler-20.09及以上版本支持，且虚拟机内核编译选项需要配置CONFIG_PARAVIRT_SPINLOCKS=y（openEuler默认配置）。 +>PV-qspinlock仅限于宿主机和虚拟机操作系统均为openEuler-21.03及以上版本支持，且虚拟机内核编译选项需要配置CONFIG_PARAVIRT_SPINLOCKS=y（openEuler默认配置）。 ### Guest-Idle-Haltpoll @@ -521,7 +521,7 @@ CRTM是度量启动的根，是系统启动的首个组件，没有其它代码 **一、安装swtpm和libtpms软件** swtpm提供了一个可集成到虚拟化环境中的TPM仿真器（TPM1.2和TPM2.0）。到目前为止，他已经集成到了QEMU中，同时也作为RunC中的原型系统。swtpm是利用libtpms来提供TPM1.2和TPM2.0的模拟功能。 -目前openEuler20.09版本中提供了libtpms和swtpm的源，可以直接使用yum命令安装。 +目前openEuler 21.03版本中提供了libtpms和swtpm的源，可以直接使用yum命令安装。 ``` # yum install libtpms swtpm swtpm-devel swtpm-tools @@ -563,7 +563,7 @@ swtpm提供了一个可集成到虚拟化环境中的TPM仿真器（TPM1.2和TPM ``` >![](public_sys-resources/icon-note.gif) **说明：** - >目前，openEuler 20.09 版本 AArch64 架构上的虚拟机可信启动不支持 ACPI 特性，所以虚拟机请勿配置ACPI特性，否则启动虚拟机后无法识别vTPM设备。 + >目前，openEuler 21.03 版本 AArch64 架构上的虚拟机可信启动不支持 ACPI 特性，所以虚拟机请勿配置ACPI特性，否则启动虚拟机后无法识别vTPM设备。 2. 创建虚拟机。 @@ -583,10 +583,10 @@ swtpm提供了一个可集成到虚拟化环境中的TPM仿真器（TPM1.2和TPM **三、确认度量启动使能成功** -度量启动功能使能与否由vBIOS决定，目前openEuler20.09版本中的vBIOS已经具备了度量启动的能力。若宿主机采用其他版本的edk2组件，请确认其是否支持度量启动功能。 +度量启动功能使能与否由vBIOS决定，目前openEuler 21.03版本中的vBIOS已经具备了度量启动的能力。若宿主机采用其他版本的edk2组件，请确认其是否支持度量启动功能。 使用root用户登陆虚拟机，确认虚拟机中是否安装了tpm驱动，tpm2-tss协议栈及tpm2-tools工具。 -openEuler20.09版本中默认安装了tpm驱动(tpm_tis.ko)，tpm2-tss协议栈和tpm2-tools工具。若使用其他操作系统，可以使用如下命令检查是否安装了驱动和相关工具。 +openEuler 21.03版本中默认安装了tpm驱动(tpm_tis.ko)，tpm2-tss协议栈和tpm2-tools工具。若使用其他操作系统，可以使用如下命令检查是否安装了驱动和相关工具。 ``` diff --git "a/docs/zh/docs/Virtualization/\347\256\241\347\220\206\350\231\232\346\213\237\346\234\272.md" "b/docs/zh/docs/Virtualization/\347\256\241\347\220\206\350\231\232\346\213\237\346\234\272.md" index af14e672076f11f073211f43f5580e5960b9e117..299dce566decd55ec8783f24aa14bf4ec7f58fed 100644 --- "a/docs/zh/docs/Virtualization/\347\256\241\347\220\206\350\231\232\346\213\237\346\234\272.md" +++ "b/docs/zh/docs/Virtualization/\347\256\241\347\220\206\350\231\232\346\213\237\346\234\272.md" @@ -461,7 +461,7 @@ Libvirt组件提供了一组查询虚拟机状态信息的命令，包括虚拟 Target Source --------------------------------------------------------------------- sda /home/openeuler/vm/openEuler_aarch64.qcow2 - sdb /home/openeuler/vm/openEuler-20.09-aarch64-dvd.iso + sdb /home/openeuler/vm/openEuler-21.03-aarch64-dvd.iso ``` - 使用virsh domiflist查询虚拟机网卡信息，从查询结果可知，虚拟机有1张网卡，对应的后端是vnet0在主机br0网桥上，MAC地址为00:05:fe:d4:f1:cc。 diff --git "a/docs/zh/docs/Virtualization/\350\231\232\346\213\237\346\234\272\351\205\215\347\275\256.md" "b/docs/zh/docs/Virtualization/\350\231\232\346\213\237\346\234\272\351\205\215\347\275\256.md" index 1401fe742aca88af9ec278889fa83d5ab79ef945..2ec0e3a742ed86f405809ac04790f5df4da81513 100644 --- "a/docs/zh/docs/Virtualization/\350\231\232\346\213\237\346\234\272\351\205\215\347\275\256.md" +++ "b/docs/zh/docs/Virtualization/\350\231\232\346\213\237\346\234\272\351\205\215\347\275\256.md" @@ -285,7 +285,7 @@ XML配置文件使用disk元素配置存储设备，disk常见的属性如[表1] - + @@ -785,7 +785,7 @@ x86\_64架构支持BIOS和UEFI两种启动方式，如果不配置loader，则 - +