diff options
| author | Cole Robinson <crobinso@redhat.com> | 2019-07-12 15:58:22 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2019-07-12 16:01:21 -0400 |
| commit | 0c223ab21f0cff216b4a1ab2070a43f0e943d308 (patch) | |
| tree | 8a87cc7d433ddad3fe494a20c860b622fd32a896 /tests | |
| parent | e5980863ddc41220f984f95bfeddf74407d19c72 (diff) | |
| download | virt-manager-0c223ab21f0cff216b4a1ab2070a43f0e943d308.tar.gz | |
guest: Don't set default uefi if firmware= is set
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml | 55 | ||||
| -rw-r--r-- | tests/clitest.py | 1 |
2 files changed, 56 insertions, 0 deletions
diff --git a/tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml b/tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml new file mode 100644 index 00000000..b062e805 --- /dev/null +++ b/tests/cli-test-xml/compare/virt-install-aarch64-firmware-no-override.xml @@ -0,0 +1,55 @@ +<domain type="kvm"> + <name>vm1</name> + <uuid>00000000-1111-2222-3333-444444444444</uuid> + <memory>65536</memory> + <currentMemory>65536</currentMemory> + <vcpu>1</vcpu> + <os firmware="efi"> + <type arch="aarch64" machine="virt">hvm</type> + <boot dev="network"/> + </os> + <cpu mode="host-passthrough"/> + <clock offset="utc"/> + <on_reboot>destroy</on_reboot> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type="usb" index="0" model="qemu-xhci" ports="15"/> + <interface type="bridge"> + <source bridge="testsuitebr0"/> + <mac address="00:11:22:33:44:55"/> + <model type="virtio"/> + </interface> + <console type="pty"/> + <channel type="unix"> + <source mode="bind"/> + <target type="virtio" name="org.qemu.guest_agent.0"/> + </channel> + </devices> +</domain> +<domain type="kvm"> + <name>vm1</name> + <uuid>00000000-1111-2222-3333-444444444444</uuid> + <memory>65536</memory> + <currentMemory>65536</currentMemory> + <vcpu>1</vcpu> + <os firmware="efi"> + <type arch="aarch64" machine="virt">hvm</type> + <boot dev="network"/> + </os> + <cpu mode="host-passthrough"/> + <clock offset="utc"/> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type="usb" index="0" model="qemu-xhci" ports="15"/> + <interface type="bridge"> + <source bridge="testsuitebr0"/> + <mac address="00:11:22:33:44:55"/> + <model type="virtio"/> + </interface> + <console type="pty"/> + <channel type="unix"> + <source mode="bind"/> + <target type="virtio" name="org.qemu.guest_agent.0"/> + </channel> + </devices> +</domain> diff --git a/tests/clitest.py b/tests/clitest.py index 7ef324bc..a309f937 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -990,6 +990,7 @@ c.add_compare("--arch aarch64 --boot kernel=/f19-arm.kernel,initrd=/f19-arm.init c.add_compare("--arch aarch64 --cdrom %(EXISTIMG2)s --boot loader=CODE.fd,nvram.template=VARS.fd --disk %(EXISTIMG1)s --cpu none --events on_crash=preserve,on_reboot=destroy,on_poweroff=restart", "aarch64-cdrom") c.add_compare("--connect %(URI-KVM-AARCH64)s --disk %(EXISTIMG1)s --import --os-variant fedora21 --panic default", "aarch64-kvm-import") # the --panic is a no-op c.add_compare("--connect %(URI-KVM-AARCH64)s --disk size=1 --os-variant fedora22 --features gic_version=host --network network=default,address.type=pci --controller type=scsi,model=virtio-scsi,address.type=pci", "aarch64-kvm-gic") +c.add_compare("--connect %(URI-KVM-AARCH64)s --arch aarch64 --disk none --pxe --boot firmware=efi", "aarch64-firmware-no-override") # Simple headless guests for various architectures |