From nobody Sun Feb  8 23:03:51 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1641322494; cv=none;
	d=zohomail.com; s=zohoarc;
	b=Pg/wKemuR/SI/c4GafHTlSe/BwzwIWfJ6H2wOO/E3ceC2SQqXS/Bwc81jFRudaex9kXJLhddTUAUcXtI66WZixgeaiPeaEONm4P0J0L/4wI8vQrTssh3paLBxKtQuVhoB5NrB1ljCscBYbjG+SbLtauIwy660K0gEIPVnNnv5Nk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1641322494;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=hlk+slglLJFyhGpqCvLzgOrcgaYl6RVRYXmdvaue9PY=;
	b=c1vQX+fh/VoodYXH4EZvkdiHL613Yc/gntDupgmhSEyFbFVwolMgiviWg5YIr6nRKDSMBQ9XyphgQPv1la7EJFnrHBpO8UsKotKbuaRQ8JQcTuWUvsMrGpK3MnqKLsuONrHrl9QNZn1d2UtPxJnHOND8xf5fzUeL6BRLZPIf+Ck=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<abologna@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1641322494123747.2085707030859;
 Tue, 4 Jan 2022 10:54:54 -0800 (PST)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-456-vXginS_mNzGKV1RwvhzVkQ-1; Tue, 04 Jan 2022 13:54:51 -0500
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC3DC81EE63;
	Tue,  4 Jan 2022 18:54:46 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 52F158E5F3;
	Tue,  4 Jan 2022 18:54:46 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 24DDB4A7CA;
	Tue,  4 Jan 2022 18:54:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
	[10.5.11.23])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 204Isilh013206 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 4 Jan 2022 13:54:44 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id DEB5934D41; Tue,  4 Jan 2022 18:54:44 +0000 (UTC)
Received: from kinshicho.usersys.redhat.com (unknown [10.40.193.201])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B310429A0;
	Tue,  4 Jan 2022 18:54:32 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1641322493;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=hlk+slglLJFyhGpqCvLzgOrcgaYl6RVRYXmdvaue9PY=;
	b=WNakyxit5PavF/4Ayy/a+/dUoXyWmVnKb+zgXdpDA3Hcjxx5Z4ljEa82OmBbPRTxsbEyVj
	koWh5onOOHR5gmqeOqsVFAfMCT7isPDhpB91VM37aeRGtPkF71PcDej7Wp5jEU/TZ1iDuA
	hnDdrkFDMHdADXZa0CaVEfKzfa5bR18=
X-MC-Unique: vXginS_mNzGKV1RwvhzVkQ-1
From: Andrea Bolognani <abologna@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 12/17] tests: Add HVF test cases
Date: Tue,  4 Jan 2022 19:52:51 +0100
Message-Id: <20220104185256.339072-13-abologna@redhat.com>
In-Reply-To: <20220104185256.339072-1-abologna@redhat.com>
References: <20220104185256.339072-1-abologna@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-loop: libvir-list@redhat.com
Cc: r.bolshakov@yadro.com
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://listman.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1641322494760100001
Content-Type: text/plain; charset="utf-8"

We need to use a hardcoded list of capabilities because we don't
yet have proper replies files obtained from QEMU running on actual
macOS machines.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .../hvf-aarch64-virt-headless.args            | 48 +++++++++
 .../hvf-aarch64-virt-headless.xml             | 45 +++++++++
 .../hvf-x86_64-q35-headless.args              | 47 +++++++++
 .../hvf-x86_64-q35-headless.xml               | 44 +++++++++
 tests/qemuxml2argvtest.c                      | 18 ++++
 .../hvf-aarch64-virt-headless.xml             | 94 ++++++++++++++++++
 .../hvf-x86_64-q35-headless.xml               | 97 +++++++++++++++++++
 tests/qemuxml2xmltest.c                       | 18 ++++
 8 files changed, 411 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
 create mode 100644 tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml
 create mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
 create mode 100644 tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml
 create mode 100644 tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml
 create mode 100644 tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml

diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/=
qemuxml2argvdata/hvf-aarch64-virt-headless.args
new file mode 100644
index 0000000000..0f1eed66c2
--- /dev/null
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@@ -0,0 +1,48 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-aarch64 \
+-name guest=3Dtest,debug-threads=3Don \
+-S \
+-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test=
/master-key.aes \
+-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \
+-accel hvf \
+-drive file=3D/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=3Dpfla=
sh,format=3Draw,unit=3D0,readonly=3Don \
+-drive file=3D/var/lib/libvirt/qemu/nvram/test_VARS.fd,if=3Dpflash,format=
=3Draw,unit=3D1 \
+-m 4096 \
+-realtime mlock=3Doff \
+-smp 2,sockets=3D2,cores=3D1,threads=3D1 \
+-uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-test/monitor.so=
ck,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc,driftfix=3Dslew \
+-no-shutdown \
+-boot strict=3Don \
+-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
+-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
+-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
+-device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
+-device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x1.0x5 \
+-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \
+-drive file=3D/var/lib/libvirt/images/test.qcow2,format=3Dqcow2,if=3Dnone,=
id=3Ddrive-virtio-disk0 \
+-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-virtio-disk0,i=
d=3Dvirtio-disk0,bootindex=3D1 \
+-netdev user,id=3Dhostnet0 \
+-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6=
,bus=3Dpci.1,addr=3D0x0 \
+-chardev pty,id=3Dcharserial0 \
+-serial chardev:charserial0 \
+-chardev socket,id=3Dcharchannel0,path=3D/tmp/channel/domain--1-test/org.q=
emu.guest_agent.0,server=3Don,wait=3Doff \
+-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel=
0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
+-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \
+-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml b/tests/q=
emuxml2argvdata/hvf-aarch64-virt-headless.xml
new file mode 100644
index 0000000000..ef13820e17
--- /dev/null
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.xml
@@ -0,0 +1,45 @@
+<domain type=3D'hvf'>
+  <name>test</name>
+  <uuid>1b826c23-8767-47ad-a6b5-c83a88277f71</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <loader readonly=3D'yes' type=3D'pflash'>/usr/share/edk2/aarch64/QEMU_=
EFI-silent-pflash.raw</loader>
+    <nvram>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <clock offset=3D'utc'>
+    <timer name=3D'rtc' tickpolicy=3D'catchup'/>
+    <timer name=3D'pit' tickpolicy=3D'delay'/>
+    <timer name=3D'hpet' present=3D'no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/test.qcow2'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+    </disk>
+    <controller type=3D'usb' model=3D'none'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:9a:e6:c6'/>
+      <model type=3D'virtio'/>
+    </interface>
+    <console type=3D'pty'/>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+    </channel>
+    <memballoon model=3D'virtio'/>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/urandom</backend>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args b/tests/qe=
muxml2argvdata/hvf-x86_64-q35-headless.args
new file mode 100644
index 0000000000..b3358e3d59
--- /dev/null
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
@@ -0,0 +1,47 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/tmp/lib/domain--1-test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+XDG_DATA_HOME=3D/tmp/lib/domain--1-test/.local/share \
+XDG_CACHE_HOME=3D/tmp/lib/domain--1-test/.cache \
+XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-x86_64 \
+-name guest=3Dtest,debug-threads=3Don \
+-S \
+-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test=
/master-key.aes \
+-machine q35,usb=3Doff,dump-guest-core=3Doff \
+-accel hvf \
+-m 4096 \
+-realtime mlock=3Doff \
+-smp 2,sockets=3D2,cores=3D1,threads=3D1 \
+-uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-test/monitor.so=
ck,server=3Don,wait=3Doff \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc,driftfix=3Dslew \
+-no-hpet \
+-no-shutdown \
+-boot strict=3Don \
+-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
+-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
+-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
+-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr=
=3D0x1.0x3 \
+-device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=
=3D0x1.0x4 \
+-device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=
=3D0x1.0x5 \
+-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \
+-drive file=3D/var/lib/libvirt/images/test.qcow2,format=3Dqcow2,if=3Dnone,=
id=3Ddrive-virtio-disk0 \
+-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-virtio-disk0,i=
d=3Dvirtio-disk0,bootindex=3D1 \
+-netdev user,id=3Dhostnet0 \
+-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6=
,bus=3Dpci.1,addr=3D0x0 \
+-chardev pty,id=3Dcharserial0 \
+-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \
+-chardev socket,id=3Dcharchannel0,path=3D/tmp/channel/domain--1-test/org.q=
emu.guest_agent.0,server=3Don,wait=3Doff \
+-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel=
0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \
+-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
+-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \
+-msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml b/tests/qem=
uxml2argvdata/hvf-x86_64-q35-headless.xml
new file mode 100644
index 0000000000..cad560e9ca
--- /dev/null
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.xml
@@ -0,0 +1,44 @@
+<domain type=3D'hvf'>
+  <name>test</name>
+  <uuid>1b826c23-8767-47ad-a6b5-c83a88277f71</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+  </features>
+  <clock offset=3D'utc'>
+    <timer name=3D'rtc' tickpolicy=3D'catchup'/>
+    <timer name=3D'pit' tickpolicy=3D'delay'/>
+    <timer name=3D'hpet' present=3D'no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/test.qcow2'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+    </disk>
+    <controller type=3D'usb' model=3D'none'/>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:9a:e6:c6'/>
+      <model type=3D'virtio'/>
+    </interface>
+    <console type=3D'pty'/>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+    </channel>
+    <memballoon model=3D'virtio'/>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/urandom</backend>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6c67b36d5c..57435e770e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3500,6 +3500,24 @@ mymain(void)
=20
     DO_TEST_CAPS_LATEST("devices-acpi-index");
=20
+    DO_TEST("hvf-x86_64-q35-headless",
+            QEMU_CAPS_HVF,
+            QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
+            QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+            QEMU_CAPS_DEVICE_VIRTIO_NET,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
+            QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST("hvf-aarch64-virt-headless",
+            QEMU_CAPS_HVF,
+            QEMU_CAPS_OBJECT_GPEX,
+            QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
+            QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+            QEMU_CAPS_DEVICE_VIRTIO_NET,
+            QEMU_CAPS_DEVICE_PL011,
+            QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM);
+
     if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL)
         virFileDeleteTree(fakerootdir);
=20
diff --git a/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml b/tests=
/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml
new file mode 100644
index 0000000000..b5193a02b4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hvf-aarch64-virt-headless.xml
@@ -0,0 +1,94 @@
+<domain type=3D'hvf'>
+  <name>test</name>
+  <uuid>1b826c23-8767-47ad-a6b5-c83a88277f71</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'aarch64' machine=3D'virt'>hvm</type>
+    <loader readonly=3D'yes' type=3D'pflash'>/usr/share/edk2/aarch64/QEMU_=
EFI-silent-pflash.raw</loader>
+    <nvram>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <gic version=3D'2'/>
+  </features>
+  <clock offset=3D'utc'>
+    <timer name=3D'rtc' tickpolicy=3D'catchup'/>
+    <timer name=3D'pit' tickpolicy=3D'delay'/>
+    <timer name=3D'hpet' present=3D'no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/test.qcow2'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:9a:e6:c6'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'system-serial' port=3D'0'>
+        <model name=3D'pl011'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/urandom</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml b/tests/q=
emuxml2xmloutdata/hvf-x86_64-q35-headless.xml
new file mode 100644
index 0000000000..fd2b376b9b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml
@@ -0,0 +1,97 @@
+<domain type=3D'hvf'>
+  <name>test</name>
+  <uuid>1b826c23-8767-47ad-a6b5-c83a88277f71</uuid>
+  <memory unit=3D'KiB'>4194304</memory>
+  <currentMemory unit=3D'KiB'>4194304</currentMemory>
+  <vcpu placement=3D'static'>2</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'q35'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+  </features>
+  <clock offset=3D'utc'>
+    <timer name=3D'rtc' tickpolicy=3D'catchup'/>
+    <timer name=3D'pit' tickpolicy=3D'delay'/>
+    <timer name=3D'hpet' present=3D'no'/>
+  </clock>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <disk type=3D'file' device=3D'disk'>
+      <driver name=3D'qemu' type=3D'qcow2'/>
+      <source file=3D'/var/lib/libvirt/images/test.qcow2'/>
+      <target dev=3D'vda' bus=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'sata' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x1f' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pcie-root'/>
+    <controller type=3D'virtio-serial' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'1' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'1' port=3D'0x8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0' multifunction=3D'on'/>
+    </controller>
+    <controller type=3D'pci' index=3D'2' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'2' port=3D'0x9'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
+    <controller type=3D'pci' index=3D'3' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'3' port=3D'0xa'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'pci' index=3D'4' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'4' port=3D'0xb'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x3'/>
+    </controller>
+    <controller type=3D'pci' index=3D'5' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'5' port=3D'0xc'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x4'/>
+    </controller>
+    <controller type=3D'pci' index=3D'6' model=3D'pcie-root-port'>
+      <model name=3D'pcie-root-port'/>
+      <target chassis=3D'6' port=3D'0xd'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x5'/>
+    </controller>
+    <interface type=3D'user'>
+      <mac address=3D'52:54:00:9a:e6:c6'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </interface>
+    <serial type=3D'pty'>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
+    </serial>
+    <console type=3D'pty'>
+      <target type=3D'serial' port=3D'0'/>
+    </console>
+    <channel type=3D'unix'>
+      <target type=3D'virtio' name=3D'org.qemu.guest_agent.0'/>
+      <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D'1=
'/>
+    </channel>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </memballoon>
+    <rng model=3D'virtio'>
+      <backend model=3D'random'>/dev/urandom</backend>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
+    </rng>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c11d415e98..322f91636c 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1451,6 +1451,24 @@ mymain(void)
=20
     DO_TEST_CAPS_LATEST("devices-acpi-index");
=20
+    DO_TEST("hvf-x86_64-q35-headless",
+            QEMU_CAPS_HVF,
+            QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
+            QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+            QEMU_CAPS_DEVICE_VIRTIO_NET,
+            QEMU_CAPS_DEVICE_ISA_SERIAL,
+            QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM);
+    DO_TEST("hvf-aarch64-virt-headless",
+            QEMU_CAPS_KVM,
+            QEMU_CAPS_OBJECT_GPEX,
+            QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
+            QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
+            QEMU_CAPS_DEVICE_VIRTIO_NET,
+            QEMU_CAPS_DEVICE_PL011,
+            QEMU_CAPS_DEVICE_VIRTIO_RNG,
+            QEMU_CAPS_OBJECT_RNG_RANDOM);
+
  cleanup:
     if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL)
         virFileDeleteTree(fakerootdir);
--=20
2.31.1