qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Phil Dennis-Jordan <phil@philjordan.eu>, qemu-devel@nongnu.org
Cc: agraf@csgraf.de, peter.maydell@linaro.org, pbonzini@redhat.com,
	mst@redhat.com, stefanha@redhat.com, kwolf@redhat.com,
	hreitz@redhat.com, berrange@redhat.com, eduardo@habkost.net,
	marcel.apfelbaum@gmail.com, marcandre.lureau@redhat.com,
	eblake@redhat.com, armbru@redhat.com, qemu-block@nongnu.org,
	qemu-arm@nongnu.org, Alexander Graf <graf@amazon.com>,
	Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: Re: [PATCH v17 11/11] hw/vmapple/vmapple: Add vmapple machine type
Date: Mon, 3 Mar 2025 20:23:34 +0100	[thread overview]
Message-ID: <1f53a845-1680-41c5-82c2-606492098b80@linaro.org> (raw)
In-Reply-To: <2a4229cf-c789-41ed-ab46-0f0fd9efd19a@linaro.org>

On 3/3/25 19:20, Philippe Mathieu-Daudé wrote:
> On 12/1/25 22:00, Phil Dennis-Jordan wrote:
>> From: Alexander Graf <graf@amazon.com>
>>
>> Apple defines a new "vmapple" machine type as part of its proprietary
>> macOS Virtualization.Framework vmm. This machine type is similar to the
>> virt one, but with subtle differences in base devices, a few special
>> vmapple device additions and a vastly different boot chain.
>>
>> This patch reimplements this machine type in QEMU. To use it, you
>> have to have a readily installed version of macOS for VMApple,
>> run on macOS with -accel hvf, pass the Virtualization.Framework
>> boot rom (AVPBooter) in via -bios, pass the aux and root volume as pflash
>> and pass aux and root volume as virtio drives. In addition, you also
>> need to find the machine UUID and pass that as -M vmapple,uuid= 
>> parameter:
>>
>> $ qemu-system-aarch64 -accel hvf -M vmapple,uuid=0x1234 -m 4G \
>>      -bios /System/Library/Frameworks/Virtualization.framework/ 
>> Versions/A/Resources/AVPBooter.vmapple2.bin
>>      -drive file=aux,if=pflash,format=raw \
>>      -drive file=root,if=pflash,format=raw \
>>      -drive file=aux,if=none,id=aux,format=raw \
>>      -device vmapple-virtio-blk-pci,variant=aux,drive=aux \
>>      -drive file=root,if=none,id=root,format=raw \
>>      -device vmapple-virtio-blk-pci,variant=root,drive=root
>>
>> With all these in place, you should be able to see macOS booting
>> successfully.
>>
>> Known issues:
>>   - Currently only macOS 12 guests are supported. The boot process for
>>     13+ will need further investigation and adjustment.
>>
>> Signed-off-by: Alexander Graf <graf@amazon.com>
>> Co-authored-by: Phil Dennis-Jordan <phil@philjordan.eu>
>> Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
>> Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
>> ---
> 
> 
>>   MAINTAINERS                 |   1 +
>>   contrib/vmapple/uuid.sh     |   9 +
>>   docs/system/arm/vmapple.rst |  63 ++++
>>   docs/system/target-arm.rst  |   1 +
>>   hw/vmapple/Kconfig          |  20 ++
>>   hw/vmapple/meson.build      |   1 +
>>   hw/vmapple/vmapple.c        | 618 ++++++++++++++++++++++++++++++++++++
>>   7 files changed, 713 insertions(+)
>>   create mode 100755 contrib/vmapple/uuid.sh
>>   create mode 100644 docs/system/arm/vmapple.rst
>>   create mode 100644 hw/vmapple/vmapple.c
>>
>> diff --git a/MAINTAINERS b/MAINTAINERS
>> index e220744abf..3a3d9e19f4 100644
>> --- a/MAINTAINERS
>> +++ b/MAINTAINERS
>> @@ -2791,6 +2791,7 @@ M: Phil Dennis-Jordan <phil@philjordan.eu>
>>   S: Maintained
>>   F: hw/vmapple/*
>>   F: include/hw/vmapple/*
>> +F: docs/system/arm/vmapple.rst
>>   Subsystems
>>   ----------
>> diff --git a/contrib/vmapple/uuid.sh b/contrib/vmapple/uuid.sh
>> new file mode 100755
>> index 0000000000..956e8c3afe
>> --- /dev/null
>> +++ b/contrib/vmapple/uuid.sh
>> @@ -0,0 +1,9 @@
>> +#!/bin/sh
>> +# Used for converting a guest provisioned using Virtualization.framework
>> +# for use with the QEMU 'vmapple' aarch64 machine type.
>> +#
>> +# Extracts the Machine UUID from Virtualization.framework VM JSON file.
>> +# (as produced by 'macosvm', passed as command line argument)
>> +
>> +plutil -extract machineId raw "$1" | base64 -d | plutil -extract ECID 
>> raw -
>> +
>> diff --git a/docs/system/arm/vmapple.rst b/docs/system/arm/vmapple.rst
>> new file mode 100644
>> index 0000000000..5090a8997c
>> --- /dev/null
>> +++ b/docs/system/arm/vmapple.rst
>> @@ -0,0 +1,63 @@
> 
> Alex, Phil, we now mandate a SPDX tag. Due to the license used in
> vmapple.c in this patch, are you OK with me squashing here:
> 
> -- >8 --
> diff --git a/docs/system/arm/vmapple.rst b/docs/system/arm/vmapple.rst
> index 5090a8997c3..c5b1bcf45ea 100644
> --- a/docs/system/arm/vmapple.rst
> +++ b/docs/system/arm/vmapple.rst
> @@ -0,0 +1,2 @@
> +.. SPDX-License-Identifier: GPL-2.0-or-later
> +
> diff --git a/contrib/vmapple/uuid.sh b/contrib/vmapple/uuid.sh
> index 956e8c3afed..f5637221d23 100755
> --- a/contrib/vmapple/uuid.sh
> +++ b/contrib/vmapple/uuid.sh
> @@ -1,0 +2 @@
> +#
> @@ -6,0 +8,2 @@
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> ---
> 
> ?
> 
>> +VMApple machine emulation
>> +========================================================================================
>> +
>> +VMApple is the device model that the macOS built-in hypervisor called 
>> "Virtualization.framework"
>> +exposes to Apple Silicon macOS guests. The "vmapple" machine model in 
>> QEMU implements the same
>> +device model, but does not use any code from Virtualization.Framework.
>> +
>> +Prerequisites
>> +-------------
>> +
>> +To run the vmapple machine model, you need to
>> +
>> + * Run on Apple Silicon
>> + * Run on macOS 12.0 or above
>> + * Have an already installed copy of a Virtualization.Framework macOS 
>> 12 virtual
>> +   machine. Note that newer versions than 12.x are currently NOT 
>> supported on
>> +   the guest side. I will assume that you installed it using the
>> +   `macosvm <https://github.com/s-u/macosvm>` CLI.

I'm also squashing here:

-- >8 --
diff --git a/docs/system/arm/vmapple.rst b/docs/system/arm/vmapple.rst
index c5b1bcf45e..35c329ea5a 100644
--- a/docs/system/arm/vmapple.rst
+++ b/docs/system/arm/vmapple.rst
@@ -19,3 +19,3 @@ To run the vmapple machine model, you need to
     the guest side. I will assume that you installed it using the
-   `macosvm <https://github.com/s-u/macosvm>` CLI.
+   `macosvm <https://github.com/s-u/macosvm>`__ CLI.

---

to avoid when building the documentation:

docs/system/arm/vmapple.rst:17:'any' reference target not found: 
https://github.com/s-u/macosvm
ninja: build stopped: subcommand failed.


  reply	other threads:[~2025-03-03 19:24 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-12 21:00 [PATCH v17 00/11] New vmapple machine type and xhci fixes Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 01/11] hw/usb/hcd-xhci-pci: Use modulo to select MSI vector as per spec Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 02/11] hw/usb/hcd-xhci-pci: Use event ring 0 if mapping unsupported Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 03/11] hw: Add vmapple subdir Phil Dennis-Jordan
2025-03-03 17:52   ` Philippe Mathieu-Daudé
2025-01-12 21:00 ` [PATCH v17 04/11] hw/misc/pvpanic: Add MMIO interface Phil Dennis-Jordan
2025-03-03 17:54   ` Philippe Mathieu-Daudé
2025-03-03 20:30     ` Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 05/11] hw/vmapple/aes: Introduce aes engine Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 06/11] hw/vmapple/bdif: Introduce vmapple backdoor interface Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 07/11] hw/vmapple/cfg: Introduce vmapple cfg region Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 08/11] hw/vmapple/virtio-blk: Add support for apple virtio-blk Phil Dennis-Jordan
2025-01-15 12:36   ` Akihiko Odaki
2025-01-12 21:00 ` [PATCH v17 09/11] hw/usb/hcd-xhci-pci: Adds property for disabling mapping in IRQ mode Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 10/11] hw/intc: Remove TCG dependency on ARM_GICV3 Phil Dennis-Jordan
2025-01-12 21:00 ` [PATCH v17 11/11] hw/vmapple/vmapple: Add vmapple machine type Phil Dennis-Jordan
2025-03-03 18:20   ` Philippe Mathieu-Daudé
2025-03-03 19:23     ` Philippe Mathieu-Daudé [this message]
2025-03-03 20:36     ` Phil Dennis-Jordan
2025-03-03 22:11       ` Philippe Mathieu-Daudé
2025-03-05  1:20         ` Philippe Mathieu-Daudé
2025-03-03 21:51   ` Philippe Mathieu-Daudé
2025-01-13 17:31 ` [PATCH v17 00/11] New vmapple machine type and xhci fixes Philippe Mathieu-Daudé
2025-01-14 13:47   ` Phil Dennis-Jordan
2025-01-15 13:05 ` Michael Tokarev
2025-01-15 13:56   ` Phil Dennis-Jordan
2025-01-15 15:08 ` Michael S. Tsirkin
2025-01-15 15:33   ` Phil Dennis-Jordan
2025-01-15 15:40     ` Michael S. Tsirkin
2025-03-03 17:26       ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1f53a845-1680-41c5-82c2-606492098b80@linaro.org \
    --to=philmd@linaro.org \
    --cc=agraf@csgraf.de \
    --cc=akihiko.odaki@daynix.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eblake@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=graf@amazon.com \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=phil@philjordan.eu \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).