From nobody Mon May 12 21:10:41 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=1734553505; cv=none;
d=zohomail.com; s=zohoarc;
b=XFhWm0BtJQLTEk1Svb0eb3MF1bstd8uoKZaUPyAN+PN+6mduYyOaINA83+TdJqbHyo8QXA0FIqdlJgkwk49WH2TFIza4U8OpnUuADgOr3AvS+FJ/dvC2i4+VPURI/vKaVnyoUSqSFozVMwWXqhi53GznxkO4msghLc18e8b542U=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1734553505;
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=wRpyFiCQW73oP3HCBh+RKCpqOBvFZvQ+nxhkLxinTW8=;
b=mu7equgq/rfVluyLt9C/0zC5rOmhvSKJHaZ/LOq/FogNe6SB5zm1EBDcDJXJ+O9yv0XflAApEo2rAD4TV5dq4T8PLWevM1Vm9wg08C8jroDUFDT+ZFuZqVeXthhZ3TE0RymhdiwRfVsULvOKyoZJ8VTmuL3tY+2/e23B/c2VzN8=
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 1734553505104192.44545946433288;
Wed, 18 Dec 2024 12:25:05 -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 1tO0Xq-0001cG-88; Wed, 18 Dec 2024 15:21:22 -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 1tO0Xm-0001Xv-Ak
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:18 -0500
Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331])
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 1tO0Xj-0000Nm-Jo
for qemu-devel@nongnu.org; Wed, 18 Dec 2024 15:21:18 -0500
Received: by mail-wm1-x331.google.com with SMTP id
5b1f17b1804b1-43623f0c574so362945e9.2
for <qemu-devel@nongnu.org>; Wed, 18 Dec 2024 12:21:15 -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.12
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Wed, 18 Dec 2024 12:21:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=philjordan-eu.20230601.gappssmtp.com; s=20230601; t=1734553274;
x=1735158074;
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=wRpyFiCQW73oP3HCBh+RKCpqOBvFZvQ+nxhkLxinTW8=;
b=2uDdtFhALa6mc9uPJG+4Jzmhu2DXjCdKM7VRuVMny1SAv3yu/gW2Gl0SsArQl/JHkv
x4V2s0pdY/AZMq+t+0U51vhdZW0BwozHZwR+6Xfieg8xYiP6LCjhfzxrVMaoHDV3LpRI
vyUdrSEpGMIS7lcDbNXfrJ7kINspY0QljTStwIMPNWQlEAnBHZCaspHUWC4PmSR8F/no
/98J8pGW6ZUTQOD2AUTrz706RvFbtdiyMLBXHgq4/CzJ50mvB4C9/Nm6uXElhJltyZvW
82+BxT9XffH9xtUqf1WN3yAmQ+AfXif34H8yp3bx0l9o/nBPeQSsTWwirBG6d25DO4EF
vroA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1734553274; x=1735158074;
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=wRpyFiCQW73oP3HCBh+RKCpqOBvFZvQ+nxhkLxinTW8=;
b=fStDmS/zs2Eqw3r+gUmQNIVyqmqfz51aCovfDfJR1AldB7uhL06xa6Sjmk+/bQgxvp
wZYPra25ctqxRjaFkxLUPJo9YmVUHFGW2QQGP+5pqwYKV9AEh5ZwqL5drXuScwlLgEa5
z20WFJk3V8T25JF6Cpkt6iL4m+KzpuRtJMSmUNYYiwlOB8W6kdzveiQSEy/NQP5BU5s6
74aPTrCT+irLaoIaMOKFWI1kwwV6KJU1Qy3yHo6EintlS7JFFM8hMig0vqKHsOfyFVWI
0uB/Wo1WocALobkd5eHh+V6LyNRP9IdD65Ajt18jEvhlWMfu6u9OwVhD0l8U4dZXrWhB
Ywpg==
X-Gm-Message-State: AOJu0Yzz4SEwVgI74rmcvksDljITmu04Te29eORRpnFdjQyfxTMi0SnM
fGnsr6UqVaJTi94lnYv4XaoblpqRiz7MeG57q0HYYb7vfft2AlJNR64zVpk/Q0YrAOuJmZl+AQH
clg==
X-Gm-Gg: ASbGncuvz/bSkAC5wxp2/e13A5+Byo9XDsXmMGWpqtIuddtZCcBNMF0vIgbkp/lyBmO
TNw5NCu65VZlgXF2vxXJ1ISrH9Y4UMqAjfSjzP7f2eGOyv5Ej5ulnh9WJXM0kpbgFajBc5JE6s8
bW+uICJ2YiwEdJjyUP5FnCimcD8wJYwDwGu1Mi46Mk7kVhiBgiVmfznHGpvKgERlAtCqhYhCB9I
FWOf0NFc4yDVjkm/g/TJTulO1UeHz2jC6c1vfcvcfV0uz8iGrmts8xl11Eq0i6VJjWdXNY2ayCl
prUGOTeqFXB/c834BNEEU+vA8KMt3xga
X-Google-Smtp-Source:
AGHT+IEypGWcRIKswGmgWRDNW66iD6GwxfRRmSYQGEUNiCXOie/PKSEL71cdET46HJeTdnrHtUKVig==
X-Received: by 2002:a05:600c:1d0e:b0:434:f623:9fe3 with SMTP id
5b1f17b1804b1-43655376cf4mr41658515e9.16.1734553274111;
Wed, 18 Dec 2024 12:21:14 -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 13/15] hw/vmapple/virtio-blk: Add support for apple
virtio-blk
Date: Wed, 18 Dec 2024 21:20:34 +0100
Message-Id: <20241218202036.80064-14-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::331;
envelope-from=phil@philjordan.eu; helo=mail-wm1-x331.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: 1734553507064116600
From: Alexander Graf <graf@amazon.com>
Apple has its own virtio-blk PCI device ID where it deviates from the
official virtio-pci spec slightly: It puts a new "apple type"
field at a static offset in config space and introduces a new barrier
command.
This patch first creates a mechanism for virtio-blk downstream classes to
handle unknown commands. It then creates such a downstream class and a new
vmapple-virtio-blk-pci class which support the additional apple type config
identifier as well as the barrier command.
The 'aux' or 'root' device type are selected using the 'variant' property.
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:
* Use recommended object type declaration pattern.
* Correctly log unimplemented code paths.
* Most header code moved to .c, type name #defines moved to vmapple.h
v5:
* Corrected handling of potentially unaligned writes to virtio config area.
* Simplified passing through device variant type to subobject.
v9:
* Correctly specify class_size for VMAppleVirtIOBlkClass
v10:
* Folded v9 patch 16/16 into this one, changing the device type design to
provide a single device type with a variant property instead of 2 differ=
ent
subtypes for aux and root volumes.
* Tidied up error reporting for the variant property.
v15:
* Constified the property table.
hw/block/virtio-blk.c | 19 ++-
hw/core/qdev-properties-system.c | 8 ++
hw/vmapple/Kconfig | 3 +
hw/vmapple/meson.build | 1 +
hw/vmapple/virtio-blk.c | 205 ++++++++++++++++++++++++++++
include/hw/pci/pci_ids.h | 1 +
include/hw/qdev-properties-system.h | 5 +
include/hw/virtio/virtio-blk.h | 12 +-
include/hw/vmapple/vmapple.h | 2 +
qapi/virtio.json | 14 ++
10 files changed, 265 insertions(+), 5 deletions(-)
create mode 100644 hw/vmapple/virtio-blk.c
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 9ca60fbc070..89a5697cf9b 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -50,12 +50,12 @@ static void virtio_blk_init_request(VirtIOBlock *s, Vir=
tQueue *vq,
req->mr_next =3D NULL;
}
=20
-static void virtio_blk_free_request(VirtIOBlockReq *req)
+void virtio_blk_free_request(VirtIOBlockReq *req)
{
g_free(req);
}
=20
-static void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char sta=
tus)
+void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status)
{
VirtIOBlock *s =3D req->dev;
VirtIODevice *vdev =3D VIRTIO_DEVICE(s);
@@ -966,8 +966,18 @@ static int virtio_blk_handle_request(VirtIOBlockReq *r=
eq, MultiReqBuffer *mrb)
break;
}
default:
- virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP);
- virtio_blk_free_request(req);
+ {
+ /*
+ * Give subclasses a chance to handle unknown requests. This way t=
he
+ * class lookup is not in the hot path.
+ */
+ VirtIOBlkClass *vbk =3D VIRTIO_BLK_GET_CLASS(s);
+ if (!vbk->handle_unknown_request ||
+ !vbk->handle_unknown_request(req, mrb, type)) {
+ virtio_blk_req_complete(req, VIRTIO_BLK_S_UNSUPP);
+ virtio_blk_free_request(req);
+ }
+ }
}
return 0;
}
@@ -2044,6 +2054,7 @@ static const TypeInfo virtio_blk_info =3D {
.instance_size =3D sizeof(VirtIOBlock),
.instance_init =3D virtio_blk_instance_init,
.class_init =3D virtio_blk_class_init,
+ .class_size =3D sizeof(VirtIOBlkClass),
};
=20
static void virtio_register_types(void)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-sys=
tem.c
index 22ea1ed3583..32abfc20b31 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -1283,3 +1283,11 @@ const PropertyInfo qdev_prop_iothread_vq_mapping_lis=
t =3D {
.set =3D set_iothread_vq_mapping_list,
.release =3D release_iothread_vq_mapping_list,
};
+
+const PropertyInfo qdev_prop_vmapple_virtio_blk_variant =3D {
+ .name =3D "VMAppleVirtioBlkVariant",
+ .enum_table =3D &VMAppleVirtioBlkVariant_lookup,
+ .get =3D qdev_propinfo_get_enum,
+ .set =3D qdev_propinfo_set_enum,
+ .set_default_value =3D qdev_propinfo_set_default_value_enum,
+};
diff --git a/hw/vmapple/Kconfig b/hw/vmapple/Kconfig
index 8bbeb9a9237..bcd1be63e3c 100644
--- a/hw/vmapple/Kconfig
+++ b/hw/vmapple/Kconfig
@@ -7,3 +7,6 @@ config VMAPPLE_BDIF
config VMAPPLE_CFG
bool
=20
+config VMAPPLE_VIRTIO_BLK
+ bool
+
diff --git a/hw/vmapple/meson.build b/hw/vmapple/meson.build
index 64b78693a31..bf17cf906c9 100644
--- a/hw/vmapple/meson.build
+++ b/hw/vmapple/meson.build
@@ -1,3 +1,4 @@
system_ss.add(when: 'CONFIG_VMAPPLE_AES', if_true: files('aes.c'))
system_ss.add(when: 'CONFIG_VMAPPLE_BDIF', if_true: files('bdif.c'))
system_ss.add(when: 'CONFIG_VMAPPLE_CFG', if_true: files('cfg.c'))
+system_ss.add(when: 'CONFIG_VMAPPLE_VIRTIO_BLK', if_true: files('virtio-b=
lk.c'))
diff --git a/hw/vmapple/virtio-blk.c b/hw/vmapple/virtio-blk.c
new file mode 100644
index 00000000000..d5d6a7b39dd
--- /dev/null
+++ b/hw/vmapple/virtio-blk.c
@@ -0,0 +1,205 @@
+/*
+ * VMApple specific VirtIO Block implementation
+ *
+ * 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
+ *
+ * VMApple uses almost standard VirtIO Block, but with a few key differenc=
es:
+ *
+ * - Different PCI device/vendor ID
+ * - An additional "type" identifier to differentiate AUX and Root volumes
+ * - An additional BARRIER command
+ */
+
+#include "qemu/osdep.h"
+#include "hw/vmapple/vmapple.h"
+#include "hw/virtio/virtio-blk.h"
+#include "hw/virtio/virtio-pci.h"
+#include "qemu/bswap.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "qapi/error.h"
+
+#define TYPE_VMAPPLE_VIRTIO_BLK "vmapple-virtio-blk"
+OBJECT_DECLARE_TYPE(VMAppleVirtIOBlk, VMAppleVirtIOBlkClass, VMAPPLE_VIRTI=
O_BLK)
+
+typedef struct VMAppleVirtIOBlkClass {
+ VirtIOBlkClass parent;
+
+ void (*get_config)(VirtIODevice *vdev, uint8_t *config);
+} VMAppleVirtIOBlkClass;
+
+typedef struct VMAppleVirtIOBlk {
+ VirtIOBlock parent_obj;
+
+ uint32_t apple_type;
+} VMAppleVirtIOBlk;
+
+/*
+ * vmapple-virtio-blk-pci: This extends VirtioPCIProxy.
+ */
+OBJECT_DECLARE_SIMPLE_TYPE(VMAppleVirtIOBlkPCI, VMAPPLE_VIRTIO_BLK_PCI)
+
+#define VIRTIO_BLK_T_APPLE_BARRIER 0x10000
+
+static bool vmapple_virtio_blk_handle_unknown_request(VirtIOBlockReq *req,
+ MultiReqBuffer *mrb,
+ uint32_t type)
+{
+ switch (type) {
+ case VIRTIO_BLK_T_APPLE_BARRIER:
+ qemu_log_mask(LOG_UNIMP, "%s: Barrier requests are currently no-op=
s\n",
+ __func__);
+ virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
+ virtio_blk_free_request(req);
+ return true;
+ default:
+ return false;
+ }
+}
+
+/*
+ * VMApple virtio-blk uses the same config format as normal virtio, with o=
ne
+ * exception: It adds an "apple type" specififer at the same location that
+ * the spec reserves for max_secure_erase_sectors. Let's hook into the
+ * get_config code path here, run it as usual and then patch in the apple =
type.
+ */
+static void vmapple_virtio_blk_get_config(VirtIODevice *vdev, uint8_t *con=
fig)
+{
+ VMAppleVirtIOBlk *dev =3D VMAPPLE_VIRTIO_BLK(vdev);
+ VMAppleVirtIOBlkClass *vvbk =3D VMAPPLE_VIRTIO_BLK_GET_CLASS(dev);
+ struct virtio_blk_config *blkcfg =3D (struct virtio_blk_config *)confi=
g;
+
+ vvbk->get_config(vdev, config);
+
+ g_assert(dev->parent_obj.config_size >=3D endof(struct virtio_blk_conf=
ig, zoned));
+
+ /* Apple abuses the field for max_secure_erase_sectors as type id */
+ stl_he_p(&blkcfg->max_secure_erase_sectors, dev->apple_type);
+}
+
+static void vmapple_virtio_blk_class_init(ObjectClass *klass, void *data)
+{
+ VirtIOBlkClass *vbk =3D VIRTIO_BLK_CLASS(klass);
+ VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_CLASS(klass);
+ VMAppleVirtIOBlkClass *vvbk =3D VMAPPLE_VIRTIO_BLK_CLASS(klass);
+
+ vbk->handle_unknown_request =3D vmapple_virtio_blk_handle_unknown_requ=
est;
+ vvbk->get_config =3D vdc->get_config;
+ vdc->get_config =3D vmapple_virtio_blk_get_config;
+}
+
+static const TypeInfo vmapple_virtio_blk_info =3D {
+ .name =3D TYPE_VMAPPLE_VIRTIO_BLK,
+ .parent =3D TYPE_VIRTIO_BLK,
+ .instance_size =3D sizeof(VMAppleVirtIOBlk),
+ .class_size =3D sizeof(VMAppleVirtIOBlkClass),
+ .class_init =3D vmapple_virtio_blk_class_init,
+};
+
+/* PCI Devices */
+
+struct VMAppleVirtIOBlkPCI {
+ VirtIOPCIProxy parent_obj;
+ VMAppleVirtIOBlk vdev;
+ VMAppleVirtioBlkVariant variant;
+};
+
+
+static const Property vmapple_virtio_blk_pci_properties[] =3D {
+ DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),
+ DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
+ VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
+ DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
+ DEV_NVECTORS_UNSPECIFIED),
+ DEFINE_PROP_VMAPPLE_VIRTIO_BLK_VARIANT("variant", VMAppleVirtIOBlkPCI,=
variant,
+ VM_APPLE_VIRTIO_BLK_VARIANT_UNS=
PECIFIED),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void vmapple_virtio_blk_pci_realize(VirtIOPCIProxy *vpci_dev, Error=
**errp)
+{
+ ERRP_GUARD();
+ VMAppleVirtIOBlkPCI *dev =3D VMAPPLE_VIRTIO_BLK_PCI(vpci_dev);
+ DeviceState *vdev =3D DEVICE(&dev->vdev);
+ VirtIOBlkConf *conf =3D &dev->vdev.parent_obj.conf;
+
+ if (dev->variant =3D=3D VM_APPLE_VIRTIO_BLK_VARIANT_UNSPECIFIED) {
+ error_setg(errp, "vmapple virtio block device variant unspecified"=
);
+ error_append_hint(errp,
+ "Variant property must be set to 'aux' or 'root'=
.\n"
+ "Use a regular virtio-blk-pci device instead whe=
n "
+ "neither is applicaple.\n");
+ return;
+ }
+
+ if (conf->num_queues =3D=3D VIRTIO_BLK_AUTO_NUM_QUEUES) {
+ conf->num_queues =3D virtio_pci_optimal_num_queues(0);
+ }
+
+ if (vpci_dev->nvectors =3D=3D DEV_NVECTORS_UNSPECIFIED) {
+ vpci_dev->nvectors =3D conf->num_queues + 1;
+ }
+
+ /*
+ * We don't support zones, but we need the additional config space siz=
e.
+ * Let's just expose the feature so the rest of the virtio-blk logic
+ * allocates enough space for us. The guest will ignore zones anyway.
+ */
+ virtio_add_feature(&dev->vdev.parent_obj.host_features, VIRTIO_BLK_F_Z=
ONED);
+ /* Propagate the apple type down to the virtio-blk device */
+ dev->vdev.apple_type =3D dev->variant;
+ /* and spawn the virtio-blk device */
+ qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
+
+ /*
+ * The virtio-pci machinery adjusts its vendor/device ID based on whet=
her
+ * we support modern or legacy virtio. Let's patch it back to the Apple
+ * identifiers here.
+ */
+ pci_config_set_vendor_id(vpci_dev->pci_dev.config, PCI_VENDOR_ID_APPLE=
);
+ pci_config_set_device_id(vpci_dev->pci_dev.config,
+ PCI_DEVICE_ID_APPLE_VIRTIO_BLK);
+}
+
+static void vmapple_virtio_blk_pci_class_init(ObjectClass *klass, void *da=
ta)
+{
+ DeviceClass *dc =3D DEVICE_CLASS(klass);
+ VirtioPCIClass *k =3D VIRTIO_PCI_CLASS(klass);
+ PCIDeviceClass *pcidev_k =3D PCI_DEVICE_CLASS(klass);
+
+ set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+ device_class_set_props(dc, vmapple_virtio_blk_pci_properties);
+ k->realize =3D vmapple_virtio_blk_pci_realize;
+ pcidev_k->vendor_id =3D PCI_VENDOR_ID_APPLE;
+ pcidev_k->device_id =3D PCI_DEVICE_ID_APPLE_VIRTIO_BLK;
+ pcidev_k->revision =3D VIRTIO_PCI_ABI_VERSION;
+ pcidev_k->class_id =3D PCI_CLASS_STORAGE_SCSI;
+}
+
+static void vmapple_virtio_blk_pci_instance_init(Object *obj)
+{
+ VMAppleVirtIOBlkPCI *dev =3D VMAPPLE_VIRTIO_BLK_PCI(obj);
+
+ virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
+ TYPE_VMAPPLE_VIRTIO_BLK);
+}
+
+static const VirtioPCIDeviceTypeInfo vmapple_virtio_blk_pci_info =3D {
+ .generic_name =3D TYPE_VMAPPLE_VIRTIO_BLK_PCI,
+ .instance_size =3D sizeof(VMAppleVirtIOBlkPCI),
+ .instance_init =3D vmapple_virtio_blk_pci_instance_init,
+ .class_init =3D vmapple_virtio_blk_pci_class_init,
+};
+
+static void vmapple_virtio_blk_register_types(void)
+{
+ type_register_static(&vmapple_virtio_blk_info);
+ virtio_pci_types_register(&vmapple_virtio_blk_pci_info);
+}
+
+type_init(vmapple_virtio_blk_register_types)
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
index f1a53fea8d6..33e2898be95 100644
--- a/include/hw/pci/pci_ids.h
+++ b/include/hw/pci/pci_ids.h
@@ -191,6 +191,7 @@
#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020
#define PCI_DEVICE_ID_APPLE_U3_AGP 0x004b
#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC 0x0021
+#define PCI_DEVICE_ID_APPLE_VIRTIO_BLK 0x1a00
=20
#define PCI_VENDOR_ID_SUN 0x108e
#define PCI_DEVICE_ID_SUN_EBUS 0x1000
diff --git a/include/hw/qdev-properties-system.h b/include/hw/qdev-properti=
es-system.h
index 7ec37f6316c..3631e309690 100644
--- a/include/hw/qdev-properties-system.h
+++ b/include/hw/qdev-properties-system.h
@@ -30,6 +30,7 @@ extern const PropertyInfo qdev_prop_pcie_link_speed;
extern const PropertyInfo qdev_prop_pcie_link_width;
extern const PropertyInfo qdev_prop_cpus390entitlement;
extern const PropertyInfo qdev_prop_iothread_vq_mapping_list;
+extern const PropertyInfo qdev_prop_vmapple_virtio_blk_variant;
=20
#define DEFINE_PROP_PCI_DEVFN(_n, _s, _f, _d) \
DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_pci_devfn, int32_t)
@@ -97,4 +98,8 @@ extern const PropertyInfo qdev_prop_iothread_vq_mapping_l=
ist;
DEFINE_PROP(_name, _state, _field, qdev_prop_iothread_vq_mapping_list,=
\
IOThreadVirtQueueMappingList *)
=20
+#define DEFINE_PROP_VMAPPLE_VIRTIO_BLK_VARIANT(_n, _s, _f, _d) \
+ DEFINE_PROP_SIGNED(_n, _s, _f, _d, qdev_prop_vmapple_virtio_blk_varian=
t, \
+ VMAppleVirtioBlkVariant)
+
#endif
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index 5c14110c4b1..28d5046ea6c 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -24,7 +24,7 @@
#include "qapi/qapi-types-virtio.h"
=20
#define TYPE_VIRTIO_BLK "virtio-blk-device"
-OBJECT_DECLARE_SIMPLE_TYPE(VirtIOBlock, VIRTIO_BLK)
+OBJECT_DECLARE_TYPE(VirtIOBlock, VirtIOBlkClass, VIRTIO_BLK)
=20
/* This is the last element of the write scatter-gather list */
struct virtio_blk_inhdr
@@ -100,6 +100,16 @@ typedef struct MultiReqBuffer {
bool is_write;
} MultiReqBuffer;
=20
+typedef struct VirtIOBlkClass {
+ /*< private >*/
+ VirtioDeviceClass parent;
+ /*< public >*/
+ bool (*handle_unknown_request)(VirtIOBlockReq *req, MultiReqBuffer *mr=
b,
+ uint32_t type);
+} VirtIOBlkClass;
+
void virtio_blk_handle_vq(VirtIOBlock *s, VirtQueue *vq);
+void virtio_blk_free_request(VirtIOBlockReq *req);
+void virtio_blk_req_complete(VirtIOBlockReq *req, unsigned char status);
=20
#endif
diff --git a/include/hw/vmapple/vmapple.h b/include/hw/vmapple/vmapple.h
index 3bba59f5ec7..9c1ad1bd8c3 100644
--- a/include/hw/vmapple/vmapple.h
+++ b/include/hw/vmapple/vmapple.h
@@ -18,4 +18,6 @@
=20
#define TYPE_VMAPPLE_CFG "vmapple-cfg"
=20
+#define TYPE_VMAPPLE_VIRTIO_BLK_PCI "vmapple-virtio-blk-pci"
+
#endif /* HW_VMAPPLE_VMAPPLE_H */
diff --git a/qapi/virtio.json b/qapi/virtio.json
index 2529c2d8b20..d351d2166ef 100644
--- a/qapi/virtio.json
+++ b/qapi/virtio.json
@@ -992,3 +992,17 @@
##
{ 'enum': 'GranuleMode',
'data': [ '4k', '8k', '16k', '64k', 'host' ] }
+
+##
+# @VMAppleVirtioBlkVariant:
+#
+# @unspecified: The default, not a valid setting.
+#
+# @root: Block device holding the root volume
+#
+# @aux: Block device holding auxiliary data required for boot
+#
+# Since: 9.2
+##
+{ 'enum': 'VMAppleVirtioBlkVariant',
+ 'data': [ 'unspecified', 'root', 'aux' ] }
--=20
2.39.5 (Apple Git-154)