From c319a494d05fbb0205eca9ccf1a4be9885e941e4 Mon Sep 17 00:00:00 2001
From: Alex Brown <alexandermichaelbrown@outlook.com>
Date: Tue, 6 Aug 2024 12:40:19 +1000
Subject: [PATCH] examples/virtio-snd: fix VCPU for Microkit 1.4.0

Signed-off-by: Alex Brown <alexandermichaelbrown@outlook.com>
---
 examples/virtio-snd/board/odroidc4/virtio-snd.system     | 9 ++++++---
 .../virtio-snd/board/qemu_virt_aarch64/virtio-snd.system | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/examples/virtio-snd/board/odroidc4/virtio-snd.system b/examples/virtio-snd/board/odroidc4/virtio-snd.system
index 77d8301dd..b95dcac75 100644
--- a/examples/virtio-snd/board/odroidc4/virtio-snd.system
+++ b/examples/virtio-snd/board/odroidc4/virtio-snd.system
@@ -60,7 +60,8 @@
         <map mr="snd_c0_pcm_req" vaddr="0x4_400_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_req" />
         <map mr="snd_c0_pcm_res" vaddr="0x4_600_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_res" />
 
-        <virtual_machine name="client_linux_1" id="0" priority="90">
+        <virtual_machine name="client_linux_1" priority="90">
+            <vcpu id="0" />
             <map mr="client_vm_ram_1" vaddr="0x20000000" perms="rwx" />
             <map mr="gic_vcpu" vaddr="0xffc02000" perms="rw" cached="false" />
         </virtual_machine>
@@ -83,7 +84,8 @@
         <map mr="snd_c1_pcm_req" vaddr="0x4_400_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_req" />
         <map mr="snd_c1_pcm_res" vaddr="0x4_600_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_res" />
 
-        <virtual_machine name="client_linux_2" id="0" priority="90">
+        <virtual_machine name="client_linux_2" priority="90">
+            <vcpu id="0" />
             <map mr="client_vm_ram_2" vaddr="0x20000000" perms="rwx" />
             <map mr="gic_vcpu" vaddr="0xffc02000" perms="rw" cached="false" />
         </virtual_machine>
@@ -123,7 +125,8 @@
         <setvar symbol="sound_data_paddr" region_paddr="snd_data" />
         <map mr="snd_shared" vaddr="0x12_000_000" perms="rw" cached="false" setvar_vaddr="sound_shared_state" />
 
-        <virtual_machine name="snd_linux" id="0" priority="110">
+        <virtual_machine name="snd_linux" priority="110">
+            <vcpu id="0" />
             <map mr="snd_driver_vm_ram" vaddr="0x20000000" perms="rwx" />
             <map mr="gic_vcpu" vaddr="0xffc02000" perms="rw" cached="false" />
             <map mr="bus1" vaddr="0xff600000" perms="rw" cached="false" />
diff --git a/examples/virtio-snd/board/qemu_virt_aarch64/virtio-snd.system b/examples/virtio-snd/board/qemu_virt_aarch64/virtio-snd.system
index 8e4d79421..4fe1750bd 100644
--- a/examples/virtio-snd/board/qemu_virt_aarch64/virtio-snd.system
+++ b/examples/virtio-snd/board/qemu_virt_aarch64/virtio-snd.system
@@ -54,7 +54,8 @@
         <map mr="snd_c0_pcm_req" vaddr="0x4_400_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_req" />
         <map mr="snd_c0_pcm_res" vaddr="0x4_600_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_res" />
 
-        <virtual_machine name="client_linux_1" id="0" priority="90">
+        <virtual_machine name="client_linux_1" priority="90">
+            <vcpu id="0" />
             <map mr="client_vm_ram_1" vaddr="0x40000000" perms="rwx" />
             <map mr="gic_vcpu" vaddr="0x8010000" perms="rw" cached="false" />
         </virtual_machine>
@@ -77,7 +78,8 @@
         <map mr="snd_c1_pcm_req" vaddr="0x4_400_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_req" />
         <map mr="snd_c1_pcm_res" vaddr="0x4_600_000" perms="rw" cached="true" setvar_vaddr="sound_pcm_res" />
 
-        <virtual_machine name="client_linux_2" id="0" priority="90">
+        <virtual_machine name="client_linux_2" priority="90">
+            <vcpu id="0" />
             <map mr="client_vm_ram_2" vaddr="0x40000000" perms="rwx" />
             <map mr="gic_vcpu" vaddr="0x8010000" perms="rw" cached="false" />
         </virtual_machine>
@@ -118,7 +120,8 @@
         <setvar symbol="sound_data_paddr" region_paddr="snd_data" />
         <map mr="snd_shared" vaddr="0x12_000_000" perms="rw" cached="false" setvar_vaddr="sound_shared_state" />
 
-        <virtual_machine name="snd_linux" id="0" priority="110">
+        <virtual_machine name="snd_linux" priority="110">
+            <vcpu id="0" />
             <map mr="snd_driver_vm_ram" vaddr="0x40000000" perms="rwx" />
             <map mr="gic_vcpu" vaddr="0x8010000" perms="rw" cached="false" />