From nobody Mon May 12 17:57:24 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
ARC-Seal: i=1; a=rsa-sha256; t=1734553389; cv=none;
	d=zohomail.com; s=zohoarc;
	b=Wku2qITkJLj8zlTeRYG1ci0ywnbFTBXhKK23OdLP7i4iQp3hqm8QBXufIZ1/s/b+bV4/9S53gtk5q/czpVZnmQkxrFKtIzye3vtyKvZ8aDQlSMUicphbTT7rVyENKJI1xtzXg3PkV7LMBITim7YtNjDWeci5XK+BjFgi0M5rCDI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1734553389;
 h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To;
	bh=5Fw4UfehpOa8iFRLVWhmcIQODsFvtfteM0UFvIctdBs=;
	b=dWoIwK0zU2lqUUXM/8AIwWrymSYxsukaClGPebmEE0k7Y8qykXMzKNZH3PdEEDga9p2n35s215KswUqTq/OLLmZNge3sBFBbDZXzyxlILa/DFeEMpkW5K/BLlAW8ExBb3Xn+RWDcuoIvgwhSdT7uwtw1CnVe0OHzfy1GWqpyDqY=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1734553389692528.0417657264272;
 Wed, 18 Dec 2024 12:23:09 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces@nongnu.org>)
	id 1tO0Xk-0001XA-Cu; Wed, 18 Dec 2024 15:21:16 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <phil@philjordan.eu>)
 id 1tO0Xi-0001VS-Kb
 for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:14 -0500
Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <phil@philjordan.eu>)
 id 1tO0Xf-0000M1-R5
 for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:14 -0500
Received: by mail-wr1-x429.google.com with SMTP id
 ffacd0b85a97d-38637614567so42248f8f.3
 for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 12:21:11 -0800 (PST)
Received: from localhost.localdomain (h082218084190.host.wavenet.at.
 [82.218.84.190]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-388c80120c7sm14842267f8f.13.2024.12.18.12.21.08
 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
 Wed, 18 Dec 2024 12:21:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=philjordan-eu.20230601.gappssmtp.com; s=20230601; t=1734553270;
 x=1735158070;
 darn=nongnu.org;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:from:to:cc:subject:date
 :message-id:reply-to;
 bh=5Fw4UfehpOa8iFRLVWhmcIQODsFvtfteM0UFvIctdBs=;
 b=2jlAwxFfEfXLOms60APhwNGAbTJir4VeWXlxZpVBfa3ZCjTsisAe5IioRLfpVnQ9MA
 YnxuAi08pgy3bYS8D266Bk/laKf4FBmFByDbX/VLJjzfoYhRKADqZsAjiG5ona5hKEKx
 E6ry14zLqW8+JtW5lUo11/WNiZ29e94ENTQlxphn1GuBFq3hNG13J+cBk34ue/Xu3fns
 UwKaHJnDxQJ6bI8uxUcQrIiose6KiRzhc6OqyLbgPcKhjbpanJAretEGEL63s7OXTpBP
 7F/wn8gGdjhArWp1gpPB6TMCD+ODXxE7xjJIaj3mhvzMwai3SjFAuUMrG76MceLkWFeC
 WeoA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1734553270; x=1735158070;
 h=content-transfer-encoding:mime-version:references:in-reply-to
 :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=5Fw4UfehpOa8iFRLVWhmcIQODsFvtfteM0UFvIctdBs=;
 b=aGyYyf4bF6BxPxGeeH5rN8yPw6qTHkvPHare1KK5X6pI/mBtBwC89M5mZGO3RsX0Zx
 iw153PNU4eVCflGDYUlOFYd0oZvA9QTIYrn2p85j/skl8XhTMzntP0/zM2B0/hDFIEnf
 tn8b/uUG5YTgXzXREYPC/4Ddq03taU8L8IQo13ee/5txpCXO1JpLvAYkaoco9FhkXnk7
 58bA3gw+7Jwcq2zASBwV9s2lhww0lFI5KV5b7S8PGsoWjF2x1Gxb+bjgb1eS8QwGHpar
 fUaPT1M9/fkQ34zPkJMwDz2+G9kOa+mIK8P6j5swgsNwjAgmzL0XTP7Pe2kGHsb5p+Cg
 1pCw==
X-Gm-Message-State: AOJu0Yzs97ayHIxmgctN/6ioc/Z3Vxo1ZIW8QGm2EgUiMSn45bizQBvf
 5yytkzhwmM5+1uQ0elqCDhDvVPyECMnuz0CjbPhXqvWlm2ZdEpfjhROLO8d4/X6L7YVw5ZowapW
 65w==
X-Gm-Gg: ASbGncvGVVXt3S7zjtipIQp0VEo+4iM0JMJ/q+mPwtXjulAuRpzeB6zBLWk6o/3sbZ8
 IpIBLYmcGXzxkkbW7N49PiqVeIRttQ38ftIfEO1HDj63EzztS09J5JrwVYpOH9xRovM6HRYDRXZ
 /34HYR15g8U8/iTkZ2/Rg59n0Kbd0b7+afn1JJpP8NF7euFwW7Hl0AY13/uKpmcju0kA5SyRdEy
 ZtSB0HTVZCCJPUkiwAytrq6kUQOymrnT+J2ucK6jZmXCsh/pU3UfyeLjzVar1spfSCztWpqVziP
 3KOMaqPzwiHj90fAGfoCeR2T+PoCARxY
X-Google-Smtp-Source: 
 AGHT+IH/pTn3AH7GkWXM1gO/KDHm8pt1JK6GjRtOtECiwfyn4qVcSXXqX3J/UFHZoPgYB9JiduZwfQ==
X-Received: by 2002:a5d:64ab:0:b0:386:3803:bbd5 with SMTP id
 ffacd0b85a97d-388e4d8e6f3mr3801276f8f.45.1734553270367;
 Wed, 18 Dec 2024 12:21:10 -0800 (PST)
From: Phil Dennis-Jordan <phil@philjordan.eu>
To: qemu-devel@nongnu.org
Cc: agraf@csgraf.de, phil@philjordan.eu, peter.maydell@linaro.org,
 pbonzini@redhat.com, rad@semihalf.com, quic_llindhol@quicinc.com,
 stefanha@redhat.com, mst@redhat.com, slp@redhat.com,
 richard.henderson@linaro.org, eduardo@habkost.net,
 marcel.apfelbaum@gmail.com, gaosong@loongson.cn, jiaxun.yang@flygoat.com,
 chenhuacai@kernel.org, kwolf@redhat.com, hreitz@redhat.com,
 philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com,
 alistair.francis@wdc.com, bmeng.cn@gmail.com, liwei1518@gmail.com,
 dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
 jcmvbkbc@gmail.com, marcandre.lureau@redhat.com, berrange@redhat.com,
 akihiko.odaki@daynix.com, qemu-arm@nongnu.org, qemu-block@nongnu.org,
 qemu-riscv@nongnu.org, balaton@eik.bme.hu, Alexander Graf <graf@amazon.com>
Subject: [PATCH v15 11/15] hw/vmapple/bdif: Introduce vmapple backdoor
 interface
Date: Wed, 18 Dec 2024 21:20:32 +0100
Message-Id: <20241218202036.80064-12-phil@philjordan.eu>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20241218202036.80064-1-phil@philjordan.eu>
References: <20241218202036.80064-1-phil@philjordan.eu>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
 as permitted sender) client-ip=209.51.188.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Received-SPF: neutral client-ip=2a00:1450:4864:20::429;
 envelope-from=phil@philjordan.eu; helo=mail-wr1-x429.google.com
X-Spam_score_int: -10
X-Spam_score: -1.1
X-Spam_bar: -
X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_NEUTRAL=0.779 autolearn=no autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @philjordan-eu.20230601.gappssmtp.com)
X-ZM-MESSAGEID: 1734553390625116600

From: Alexander Graf <graf@amazon.com>

The VMApple machine exposes AUX and ROOT block devices (as well as USB OTG
emulation) via virtio-pci as well as a special, simple backdoor platform
device.

This patch implements this backdoor platform device to the best of my
understanding. I left out any USB OTG parts; they're only needed for
guest recovery and I don't understand the protocol yet.

Signed-off-by: Alexander Graf <graf@amazon.com>
Signed-off-by: Phil Dennis-Jordan <phil@philjordan.eu>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Tested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---

v4:

 * Moved most header code to .c, rest to vmapple.h
 * Better compliance with coding, naming, and formatting conventions.

v8:

 * Replaced uses of cpu_physical_memory_read with dma_memory_read.
 * Replaced an instance of g_free with g_autofree.

v9:

 * Replaced uses of cpu_physical_memory_write with dma_memory_write.

v15:

 * Constified the property table.

 hw/vmapple/Kconfig           |   3 +
 hw/vmapple/bdif.c            | 275 +++++++++++++++++++++++++++++++++++
 hw/vmapple/meson.build       |   1 +
 hw/vmapple/trace-events      |   5 +
 include/hw/vmapple/vmapple.h |   2 +
 5 files changed, 286 insertions(+)
 create mode 100644 hw/vmapple/bdif.c

diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig
index a73504d5999..68f88876eb9 100644
--- a/hw/vmapple/Kconfig
+++ b/hw/vmapple/Kconfig
@@ -1,3 +1,6 @@
 config VMAPPLE_AES
     bool
=20
+config VMAPPLE_BDIF
+    bool
+
diff --git a/hw/vmapple/bdif.c b/hw/vmapple/bdif.c
new file mode 100644
index 00000000000..412116c2768
--- /dev/null
+++ b/hw/vmapple/bdif.c
@@ -0,0 +1,275 @@
+/*
+ * VMApple Backdoor Interface
+ *
+ * Copyright =C2=A9 2023 Amazon.com, Inc. or its affiliates. All Rights Re=
served.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or late=
r.
+ * See the COPYING file in the top-level directory.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/units.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "trace.h"
+#include "hw/vmapple/vmapple.h"
+#include "hw/sysbus.h"
+#include "hw/block/block.h"
+#include "qapi/error.h"
+#include "sysemu/block-backend.h"
+#include "sysemu/dma.h"
+
+OBJECT_DECLARE_SIMPLE_TYPE(VMAppleBdifState, VMAPPLE_BDIF)
+
+struct VMAppleBdifState {
+    SysBusDevice parent_obj;
+
+    BlockBackend *aux;
+    BlockBackend *root;
+    MemoryRegion mmio;
+};
+
+#define VMAPPLE_BDIF_SIZE   0x00200000
+
+#define REG_DEVID_MASK      0xffff0000
+#define DEVID_ROOT          0x00000000
+#define DEVID_AUX           0x00010000
+#define DEVID_USB           0x00100000
+
+#define REG_STATUS          0x0
+#define REG_STATUS_ACTIVE     BIT(0)
+#define REG_CFG             0x4
+#define REG_CFG_ACTIVE        BIT(1)
+#define REG_UNK1            0x8
+#define REG_BUSY            0x10
+#define REG_BUSY_READY        BIT(0)
+#define REG_UNK2            0x400
+#define REG_CMD             0x408
+#define REG_NEXT_DEVICE     0x420
+#define REG_UNK3            0x434
+
+typedef struct VblkSector {
+    uint32_t pad;
+    uint32_t pad2;
+    uint32_t sector;
+    uint32_t pad3;
+} VblkSector;
+
+typedef struct VblkReqCmd {
+    uint64_t addr;
+    uint32_t len;
+    uint32_t flags;
+} VblkReqCmd;
+
+typedef struct VblkReq {
+    VblkReqCmd sector;
+    VblkReqCmd data;
+    VblkReqCmd retval;
+} VblkReq;
+
+#define VBLK_DATA_FLAGS_READ  0x00030001
+#define VBLK_DATA_FLAGS_WRITE 0x00010001
+
+#define VBLK_RET_SUCCESS  0
+#define VBLK_RET_FAILED   1
+
+static uint64_t bdif_read(void *opaque, hwaddr offset, unsigned size)
+{
+    uint64_t ret =3D -1;
+    uint64_t devid =3D offset & REG_DEVID_MASK;
+
+    switch (offset & ~REG_DEVID_MASK) {
+    case REG_STATUS:
+        ret =3D REG_STATUS_ACTIVE;
+        break;
+    case REG_CFG:
+        ret =3D REG_CFG_ACTIVE;
+        break;
+    case REG_UNK1:
+        ret =3D 0x420;
+        break;
+    case REG_BUSY:
+        ret =3D REG_BUSY_READY;
+        break;
+    case REG_UNK2:
+        ret =3D 0x1;
+        break;
+    case REG_UNK3:
+        ret =3D 0x0;
+        break;
+    case REG_NEXT_DEVICE:
+        switch (devid) {
+        case DEVID_ROOT:
+            ret =3D 0x8000000;
+            break;
+        case DEVID_AUX:
+            ret =3D 0x10000;
+            break;
+        }
+        break;
+    }
+
+    trace_bdif_read(offset, size, ret);
+    return ret;
+}
+
+static void le2cpu_sector(VblkSector *sector)
+{
+    sector->sector =3D le32_to_cpu(sector->sector);
+}
+
+static void le2cpu_reqcmd(VblkReqCmd *cmd)
+{
+    cmd->addr =3D le64_to_cpu(cmd->addr);
+    cmd->len =3D le32_to_cpu(cmd->len);
+    cmd->flags =3D le32_to_cpu(cmd->flags);
+}
+
+static void le2cpu_req(VblkReq *req)
+{
+    le2cpu_reqcmd(&req->sector);
+    le2cpu_reqcmd(&req->data);
+    le2cpu_reqcmd(&req->retval);
+}
+
+static void vblk_cmd(uint64_t devid, BlockBackend *blk, uint64_t gp_addr,
+                     uint64_t static_off)
+{
+    VblkReq req;
+    VblkSector sector;
+    uint64_t off =3D 0;
+    g_autofree char *buf =3D NULL;
+    uint8_t ret =3D VBLK_RET_FAILED;
+    int r;
+    MemTxResult dma_result;
+
+    dma_result =3D dma_memory_read(&address_space_memory, gp_addr,
+                                 &req, sizeof(req), MEMTXATTRS_UNSPECIFIED=
);
+    if (dma_result !=3D MEMTX_OK) {
+        goto out;
+    }
+
+    le2cpu_req(&req);
+
+    if (req.sector.len !=3D sizeof(sector)) {
+        goto out;
+    }
+
+    /* Read the vblk command */
+    dma_result =3D dma_memory_read(&address_space_memory, req.sector.addr,
+                                 &sector, sizeof(sector),
+                                 MEMTXATTRS_UNSPECIFIED);
+    if (dma_result !=3D MEMTX_OK) {
+        goto out;
+    }
+    le2cpu_sector(&sector);
+
+    off =3D sector.sector * 512ULL + static_off;
+
+    /* Sanity check that we're not allocating bogus sizes */
+    if (req.data.len > 128 * MiB) {
+        goto out;
+    }
+
+    buf =3D g_malloc0(req.data.len);
+    switch (req.data.flags) {
+    case VBLK_DATA_FLAGS_READ:
+        r =3D blk_pread(blk, off, req.data.len, buf, 0);
+        trace_bdif_vblk_read(devid =3D=3D DEVID_AUX ? "aux" : "root",
+                             req.data.addr, off, req.data.len, r);
+        if (r < 0) {
+            goto out;
+        }
+        dma_result =3D dma_memory_write(&address_space_memory, req.data.ad=
dr, buf,
+                                      req.data.len, MEMTXATTRS_UNSPECIFIED=
);
+        if (dma_result =3D=3D MEMTX_OK) {
+            ret =3D VBLK_RET_SUCCESS;
+        }
+        break;
+    case VBLK_DATA_FLAGS_WRITE:
+        /* Not needed, iBoot only reads */
+        break;
+    default:
+        break;
+    }
+
+out:
+    dma_memory_write(&address_space_memory, req.retval.addr, &ret, 1,
+                     MEMTXATTRS_UNSPECIFIED);
+}
+
+static void bdif_write(void *opaque, hwaddr offset,
+                       uint64_t value, unsigned size)
+{
+    VMAppleBdifState *s =3D opaque;
+    uint64_t devid =3D (offset & REG_DEVID_MASK);
+
+    trace_bdif_write(offset, size, value);
+
+    switch (offset & ~REG_DEVID_MASK) {
+    case REG_CMD:
+        switch (devid) {
+        case DEVID_ROOT:
+            vblk_cmd(devid, s->root, value, 0x0);
+            break;
+        case DEVID_AUX:
+            vblk_cmd(devid, s->aux, value, 0x0);
+            break;
+        }
+        break;
+    }
+}
+
+static const MemoryRegionOps bdif_ops =3D {
+    .read =3D bdif_read,
+    .write =3D bdif_write,
+    .endianness =3D DEVICE_NATIVE_ENDIAN,
+    .valid =3D {
+        .min_access_size =3D 1,
+        .max_access_size =3D 8,
+    },
+    .impl =3D {
+        .min_access_size =3D 1,
+        .max_access_size =3D 8,
+    },
+};
+
+static void bdif_init(Object *obj)
+{
+    VMAppleBdifState *s =3D VMAPPLE_BDIF(obj);
+
+    memory_region_init_io(&s->mmio, obj, &bdif_ops, obj,
+                         "VMApple Backdoor Interface", VMAPPLE_BDIF_SIZE);
+    sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio);
+}
+
+static const Property bdif_properties[] =3D {
+    DEFINE_PROP_DRIVE("aux", VMAppleBdifState, aux),
+    DEFINE_PROP_DRIVE("root", VMAppleBdifState, root),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void bdif_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc =3D DEVICE_CLASS(klass);
+
+    dc->desc =3D "VMApple Backdoor Interface";
+    device_class_set_props(dc, bdif_properties);
+}
+
+static const TypeInfo bdif_info =3D {
+    .name          =3D TYPE_VMAPPLE_BDIF,
+    .parent        =3D TYPE_SYS_BUS_DEVICE,
+    .instance_size =3D sizeof(VMAppleBdifState),
+    .instance_init =3D bdif_init,
+    .class_init    =3D bdif_class_init,
+};
+
+static void bdif_register_types(void)
+{
+    type_register_static(&bdif_info);
+}
+
+type_init(bdif_register_types)
diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build
index bcd4dcb28d2..d4624713deb 100644
--- a/hw/vmapple/meson.build
+++ b/hw/vmapple/meson.build
@@ -1 +1,2 @@
 system_ss.add(when: 'CONFIG_VMAPPLE_AES',  if_true: files('aes.c'))
+system_ss.add(when: 'CONFIG_VMAPPLE_BDIF', if_true: files('bdif.c'))
diff --git a/hw/vmapple/trace-events b/hw/vmapple/trace-events
index 0d4a73d7d1c..d86f64d50fe 100644
--- a/hw/vmapple/trace-events
+++ b/hw/vmapple/trace-events
@@ -14,3 +14,8 @@ aes_2_read(uint64_t offset, uint64_t res) "offset=3D0x%"P=
RIx64" res=3D0x%"PRIx64
 aes_2_write(uint64_t offset, uint64_t val) "offset=3D0x%"PRIx64" val=3D0x%=
"PRIx64
 aes_dump_data(const char *desc, const char *hex) "%s%s"
=20
+# bdif.c
+bdif_read(uint64_t offset, uint32_t size, uint64_t value) "offset=3D0x%"PR=
Ix64" size=3D0x%x value=3D0x%"PRIx64
+bdif_write(uint64_t offset, uint32_t size, uint64_t value) "offset=3D0x%"P=
RIx64" size=3D0x%x value=3D0x%"PRIx64
+bdif_vblk_read(const char *dev, uint64_t addr, uint64_t offset, uint32_t l=
en, int r) "dev=3D%s addr=3D0x%"PRIx64" off=3D0x%"PRIx64" size=3D0x%x r=3D%=
d"
+
diff --git a/include/hw/vmapple/vmapple.h b/include/hw/vmapple/vmapple.h
index 6762b6c869f..9090e9c5ac8 100644
--- a/include/hw/vmapple/vmapple.h
+++ b/include/hw/vmapple/vmapple.h
@@ -14,4 +14,6 @@
=20
 #define TYPE_APPLE_AES "apple-aes"
=20
+#define TYPE_VMAPPLE_BDIF "vmapple-bdif"
+
 #endif /* HW_VMAPPLE_VMAPPLE_H */
--=20
2.39.5 (Apple Git-154)