Merge pull request #55929 from sabrinajess/CNV23823

CNV-23823: QEMU and VirtIO updates

Author: apinnick

_topic_maps/_topic_map.yml

@@ -3566,14 +3566,10 @@ Topics:
     File: virt-automating-windows-sysprep
   - Name: Triggering virtual machine failover by resolving a failed node
     File: virt-triggering-vm-failover-resolving-failed-node
-  - Name: Installing the QEMU guest agent on virtual machines
+  - Name: Installing the QEMU guest agent and VirtIO drivers
     File: virt-installing-qemu-guest-agent
   - Name: Viewing the QEMU guest agent information for virtual machines
     File: virt-viewing-qemu-guest-agent-web
-  - Name: Installing VirtIO driver on an existing Windows virtual machine
-    File: virt-installing-virtio-drivers-on-existing-windows-vm
-  - Name: Installing VirtIO driver on a new Windows virtual machine
-    File: virt-installing-virtio-drivers-on-new-windows-vm
   - Name: Using virtual Trusted Platform Module devices
     File: virt-using-vtpm-devices
   - Name: Managing virtual machines with OpenShift Pipelines

modules/virt-about-virtio-drivers.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virt-installing-virtio-drivers-on-new-windows-vm.adoc
-// * virt/virtual_machines/virt-installing-virtio-drivers-on-existing-windows-vm.adoc
 
 //This file contains UI elements and/or package names that need to be updated.
 

modules/virt-adding-virtio-drivers-vm-yaml.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virt-installing-virtio-drivers-on-new-windows-vm.adoc
-// * virt/virtual_machines/virt-installing-virtio-drivers-on-existing-windows-vm.adoc
 
 //This file contains UI elements and/or package names that need to be updated.
 

modules/virt-installing-qemu-guest-agent-on-linux-vm.adoc

@@ -7,10 +7,7 @@
 [id="virt-installing-qemu-guest-agent-on-linux-vm_{context}"]
 = Installing QEMU guest agent on a Linux virtual machine
 
-The `qemu-guest-agent` is widely available and available by default in Red Hat
-virtual machines. Install the agent and start the service.
-
-To check if your virtual machine (VM) has the QEMU guest agent installed and running, verify that `AgentConnected` is listed in the VM spec.
+The `qemu-guest-agent` is widely available and available by default in {op-system-base-full} virtual machines (VMs). Install the agent and start the service.
 
 [NOTE]
 ====
@@ -36,3 +33,12 @@ $ yum install -y qemu-guest-agent
 ----
 $ systemctl enable --now qemu-guest-agent
 ----
+
+.Verification
+. Run the following command to verify that `AgentConnected` is listed in the VM spec:
+
++
+[source,terminal]
+----
+$ oc get vm <vm_name>
+----

modules/virt-installing-qemu-guest-agent-on-windows-vm.adoc

@@ -3,17 +3,32 @@
 // * virt/virtual_machines/virtual_disks/virt-managing-vm-snapshots.adoc
 // * virt/virtual_machines/virt-installing-qemu-guest-agent.adoc
 
+:_content-type: PROCEDURE
 [id="installing-qemu-guest-agent-on-windows-vm_{context}"]
 = Installing QEMU guest agent on a Windows virtual machine
 
 For Windows virtual machines, the QEMU guest agent is included in the
 VirtIO drivers. Install the drivers on an existing or a new Windows installation.
 
-To check if your virtual machine (VM) has the QEMU guest agent installed and running, verify that `AgentConnected` is listed in the VM spec.
-
 [NOTE]
 ====
 To create snapshots of an online (Running state) VM with the highest integrity, install the QEMU guest agent.
 
 The QEMU guest agent takes a consistent snapshot by attempting to quiesce the VM’s file system as much as possible, depending on the system workload. This ensures that in-flight I/O is written to the disk before the snapshot is taken. If the guest agent is not present, quiescing is not possible and a best-effort snapshot is taken. The conditions under which the snapshot was taken are reflected in the snapshot indications that are displayed in the web console or CLI.
 ====
+
+.Procedure
+
+. In the Windows Guest Operating System (OS), use the *File Explorer* to navigate to the `guest-agent` directory in the `virtio-win` CD drive.
+
+. Run the `qemu-ga-x86_64.msi` installer.
+
+
+.Verification
+. Run the following command to verify that the output contains the `QEMU Guest Agent`:
+
++
+[source,terminal]
+----
+$ net start
+----

modules/virt-installing-virtio-drivers-existing-windows.adoc

@@ -2,7 +2,6 @@
 //
 // * virt/virtual_machines/virtual_disks/virt-managing-vm-snapshots.adoc
 // * virt/virtual_machines/virt-installing-qemu-guest-agent.adoc
-// * virt/virtual_machines/virt-installing-virtio-drivers-on-existing-windows-vm.adoc
 
 :_content-type: PROCEDURE
 [id="virt-installing-virtio-drivers-existing-windows_{context}"]

modules/virt-installing-virtio-drivers-installing-windows.adoc

@@ -8,7 +8,7 @@
 [id="virt-installing-virtio-drivers-installing-windows_{context}"]
 = Installing VirtIO drivers during Windows installation
 
-Install the VirtIO drivers from the attached SATA CD driver during Windows installation.
+Install the `virtio` drivers during or after Windows installation.
 
 [NOTE]
 ====
@@ -17,15 +17,22 @@ installation method might differ between versions of Windows. See the
 documentation for the version of Windows that you are installing.
 ====
 
+.Prerequisites
+
+* A storage device containing the `virtio` drivers must be attached to the VM.
+
 .Procedure
 
-. Start the virtual machine and connect to a graphical console.
-. Begin the Windows installation process.
-. Select the *Advanced* installation.
-. The storage destination will not be recognized until the driver is loaded.
-Click `Load driver`.
-. The drivers are attached as a SATA CD drive. Click *OK* and browse the CD drive
- for the storage driver to load. The drivers are arranged hierarchically
-according to their driver type, operating system, and CPU architecture.
-. Repeat the previous two steps for all required drivers.
-. Complete the Windows installation.
+. In the Windows Guest OS, use the `File Explorer` to navigate to the `virtio-win` CD drive.
+. Double-click to run the appropriate installer for your VM:
+.. For a 64-bit vCPU, use the `virtio-win-gt-x64` installer. 32-bit vCPUs are no longer supported.
+. Optional: During the *Custom Setup* step of the installer, select the device drivers you want to install. The recommended driver set is selected by default.
+. After the installation is complete, select *Finish*.
+. Reboot the VM.
+
+.Verification
+
+. Open the system disk on the PC. This is typically `C:`.
+. Navigate to *Program Files*  -> *Virtio-Win*.
+
+If the *Virtio-Win* directory is present and contains a sub-directory for each driver, the installation was successful.

modules/virt-removing-virtio-disk-from-vm.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virt-installing-virtio-drivers-on-new-windows-vm.adoc
-// * virt/virtual_machines/virt-installing-virtio-drivers-on-existing-windows-vm.adoc
 
 //This file contains UI elements and/or package names that need to be updated.
 

modules/virt-supported-virtio-drivers.adoc

@@ -1,7 +1,6 @@
 // Module included in the following assemblies:
 //
 // * virt/virtual_machines/virt-installing-virtio-drivers-on-new-windows-vm.adoc
-// * virt/virtual_machines/virt-installing-virtio-drivers-on-existing-windows-vm.adoc
 
 [id="virt-supported-virtio-drivers_{context}"]
 = Supported VirtIO drivers for Microsoft Windows virtual machines

virt/virtual_machines/virt-installing-qemu-guest-agent.adoc

@@ -1,13 +1,15 @@
 :_content-type: ASSEMBLY
 [id="virt-installing-qemu-guest-agent"]
-= Installing the QEMU guest agent on virtual machines
+= Installing the QEMU guest agent and VirtIO drivers
 include::_attributes/common-attributes.adoc[]
 :context: virt-installing-qemu-guest-agent
 
 toc::[]
 
 The xref:../../virt/virtual_machines/virt-viewing-qemu-guest-agent-web.adoc#virt-viewing-qemu-guest-agent-web[QEMU guest agent] is a daemon that runs on the virtual machine and passes information to the host about the virtual machine, users, file systems, and secondary networks.
 
+== Installing the QEMU guest agent
+
 include::modules/virt-installing-qemu-guest-agent-on-linux-vm.adoc[leveloffset=+1]
 
 // apinnick: Commenting out because there is not enough information here and the UI has changed.
@@ -20,6 +22,14 @@ include::modules/virt-installing-qemu-guest-agent-on-linux-vm.adoc[leveloffset=+
 
 include::modules/virt-installing-qemu-guest-agent-on-windows-vm.adoc[leveloffset=+1]
 
+== Installing VirtIO drivers
+
+include::modules/virt-supported-virtio-drivers.adoc[leveloffset=+2]
+
+include::modules/virt-about-virtio-drivers.adoc[leveloffset=+2]
+
 include::modules/virt-installing-virtio-drivers-existing-windows.adoc[leveloffset=+2]
 
 include::modules/virt-installing-virtio-drivers-installing-windows.adoc[leveloffset=+2]
+
+include::modules/virt-adding-virtio-drivers-vm-yaml.adoc[leveloffset=+2]