vhost-user-fs: add the "bootindex" property
PATCH v2 1/1 vhost-user-fs: add the "bootindex" property
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
---
Notes:
v2:
- drop "hw/s390x/vhost-user-fs-ccw.c" hunk [Christian, Cornelia]
- document the same in the commit message
- remove fw_cfg kernel boot reference from the commit message (somewhat similar use case, but a comparison or even a hint doesn't necessarily belong in the commit message)
- pick up Dave's ACK
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(+)
include/hw/virtio/vhost-user-fs.h +1 -0
@@ -39,6 +39,7 @@ struct VHostUserFS {VhostUserState vhost_user;VirtQueue **req_vqs;VirtQueue *hiprio_vq; +int32_t bootindex;/*< public >*/ };
hw/virtio/vhost-user-fs-pci.c +2 -0
@@ -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 = {
hw/virtio/vhost-user-fs.c +10 -0
@@ -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, };
Signature · 1 line
2.19.1.3.g30247aa5d201
Quoted 37 lines · Laszlo Ersek
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.htmlExample OpenFirmware device path for the "vhost-user-fs-pci" device in the "bootorder"
fw_cfgfile:/pci@i0cf8/pci-bridge@1,6/pci1af4,105a@0/filesystem@0
Cc "Dr. David Alan Gilbert" <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Ján Tomko <[email protected]>Cc Stefan Hajnoczi <[email protected]>Signed-off-by Laszlo Ersek <[email protected]>---
Notes:
v2:
- drop "hw/s390x/vhost-user-fs-ccw.c" hunk [Christian, Cornelia]- document the same in the commit message
- remove
fw_cfgkernel boot reference from the commit message (somewhat similar use case, but a comparison or even a hint doesn't necessarily belong in the commit message)
Quoted 6 lines
- pick up Dave's ACK
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(+)
Quoted 38 lines · Stefan Hajnoczi
Quoted 37 lines · Laszlo Ersek
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.htmlExample OpenFirmware device path for the "vhost-user-fs-pci" device in the "bootorder"
fw_cfgfile:/pci@i0cf8/pci-bridge@1,6/pci1af4,105a@0/filesystem@0
Cc "Dr. David Alan Gilbert" <[email protected]>Cc "Michael S. Tsirkin" <[email protected]>Cc Ján Tomko <[email protected]>Cc Stefan Hajnoczi <[email protected]>Signed-off-by Laszlo Ersek <[email protected]>---
Notes:
v2:
- drop "hw/s390x/vhost-user-fs-ccw.c" hunk [Christian, Cornelia]- document the same in the commit message
- remove
fw_cfgkernel boot reference from the commit message (somewhat similar use case, but a comparison or even a hint doesn't necessarily belong in the commit message)
Quoted 9 lines
Quoted 6 lines
- pick up Dave's ACK
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(+)Acked-by Stefan Hajnoczi <[email protected]>
Thanks!
Laszlo