[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/10] vhost-user-fs: add the "bootindex" property
From: |
Michael S. Tsirkin |
Subject: |
[PULL 02/10] vhost-user-fs: add the "bootindex" property |
Date: |
Sun, 17 Jan 2021 06:46:20 -0500 |
From: Laszlo Ersek <lersek@redhat.com>
virtio-fs qualifies as a bootable device minimally under OVMF, but
currently the necessary "bootindex" property is missing. Add the property.
Expose the property only in the PCI device, for now. There is no boot
support for virtiofs on s390x (ccw) for the time being [1] [2], so leave
the CCW device unchanged. Add the property to the base device still,
because adding the alias to the CCW device later will be easier this way
[3].
[1] https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01745.html
[2] https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01870.html
[3] https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01751.html
Example OpenFirmware device path for the "vhost-user-fs-pci" device in the
"bootorder" fw_cfg file:
/pci@i0cf8/pci-bridge@1,6/pci1af4,105a@0/filesystem@0
Cc: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Ján Tomko <jtomko@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: virtio-fs@redhat.com
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20210112131603.12686-1-lersek@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/virtio/vhost-user-fs.h | 1 +
hw/virtio/vhost-user-fs-pci.c | 2 ++
hw/virtio/vhost-user-fs.c | 10 ++++++++++
3 files changed, 13 insertions(+)
diff --git a/include/hw/virtio/vhost-user-fs.h
b/include/hw/virtio/vhost-user-fs.h
index 6985752771..0d62834c25 100644
--- a/include/hw/virtio/vhost-user-fs.h
+++ b/include/hw/virtio/vhost-user-fs.h
@@ -39,6 +39,7 @@ struct VHostUserFS {
VhostUserState vhost_user;
VirtQueue **req_vqs;
VirtQueue *hiprio_vq;
+ int32_t bootindex;
/*< public >*/
};
diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c
index 8bb389bd28..2ed8492b3f 100644
--- a/hw/virtio/vhost-user-fs-pci.c
+++ b/hw/virtio/vhost-user-fs-pci.c
@@ -68,6 +68,8 @@ static void vhost_user_fs_pci_instance_init(Object *obj)
virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
TYPE_VHOST_USER_FS);
+ object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev),
+ "bootindex");
}
static const VirtioPCIDeviceTypeInfo vhost_user_fs_pci_info = {
diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c
index ed036ad9c1..ac4fc34b36 100644
--- a/hw/virtio/vhost-user-fs.c
+++ b/hw/virtio/vhost-user-fs.c
@@ -22,6 +22,7 @@
#include "qemu/error-report.h"
#include "hw/virtio/vhost-user-fs.h"
#include "monitor/monitor.h"
+#include "sysemu/sysemu.h"
static void vuf_get_config(VirtIODevice *vdev, uint8_t *config)
{
@@ -279,6 +280,14 @@ static Property vuf_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static void vuf_instance_init(Object *obj)
+{
+ VHostUserFS *fs = VHOST_USER_FS(obj);
+
+ device_add_bootindex_property(obj, &fs->bootindex, "bootindex",
+ "/filesystem@0", DEVICE(obj));
+}
+
static void vuf_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -300,6 +309,7 @@ static const TypeInfo vuf_info = {
.name = TYPE_VHOST_USER_FS,
.parent = TYPE_VIRTIO_DEVICE,
.instance_size = sizeof(VHostUserFS),
+ .instance_init = vuf_instance_init,
.class_init = vuf_class_init,
};
--
MST
- [PULL 00/10] pc,pci,virtio: fixes, features, Michael S. Tsirkin, 2021/01/17
- [PULL 01/10] pci/shpc: don't push attention button when ejecting powered-off device, Michael S. Tsirkin, 2021/01/17
- [PULL 02/10] vhost-user-fs: add the "bootindex" property,
Michael S. Tsirkin <=
- [PULL 03/10] acpi: Allow DSDT acpi table changes, Michael S. Tsirkin, 2021/01/17
- [PULL 04/10] acpi: Fix unmatched expected DSDT.pxb file, Michael S. Tsirkin, 2021/01/17
- [PULL 05/10] acpi: Add addr offset in build_crs, Michael S. Tsirkin, 2021/01/17
- [PULL 06/10] acpi/gpex: Inform os to keep firmware resource map, Michael S. Tsirkin, 2021/01/17
- [PULL 07/10] acpi/gpex: Exclude pxb's resources from PCI0, Michael S. Tsirkin, 2021/01/17
- [PULL 08/10] Kconfig: Compile PXB for ARM_VIRT, Michael S. Tsirkin, 2021/01/17
- [PULL 09/10] acpi: Enable pxb unit-test for ARM virt machine, Michael S. Tsirkin, 2021/01/17
- [PULL 10/10] acpi: Update _DSM method in expected files, Michael S. Tsirkin, 2021/01/17
- Re: [PULL 00/10] pc,pci,virtio: fixes, features, Peter Maydell, 2021/01/18