Skip to content

Commit

Permalink
examples/virtio-snd: fix VCPU for Microkit 1.4.0
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Brown <[email protected]>
  • Loading branch information
alexandermbrown committed Aug 6, 2024
1 parent b34ec40 commit c319a49
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
9 changes: 6 additions & 3 deletions examples/virtio-snd/board/odroidc4/virtio-snd.system
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
9 changes: 6 additions & 3 deletions examples/virtio-snd/board/qemu_virt_aarch64/virtio-snd.system
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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" />

Expand Down

0 comments on commit c319a49

Please sign in to comment.