From: Christian Borntraeger <borntraeger@de.ibm.com> To: Laszlo Ersek <lersek@redhat.com>, qemu devel list <qemu-devel@nongnu.org> Cc: virtio-fs@redhat.com, "Michael S. Tsirkin" <mst@redhat.com>, Cornelia Huck <cohuck@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, qemu-s390x@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com> Subject: Re: [PATCH] vhost-user-fs: add the "bootindex" property Date: Mon, 11 Jan 2021 10:46:06 +0100 [thread overview] Message-ID: <f296274e-3c4b-bb90-ca4a-273c3bd97f7f@de.ibm.com> (raw) In-Reply-To: <20210104132401.5100-1-lersek@redhat.com> On 04.01.21 14:24, Laszlo Ersek wrote: > virtio-fs qualifies as a bootable device minimally under OVMF, but > currently the necessary "bootindex" property is missing (fw_cfg kernel > boot notwithstanding). > > Add the property. For completeness, add it to the CCW device as well; > other virtio-ccw devices seem to have "bootindex" properties too. Currently we do not have boot support for virtiofs on s390x (ccw) Not sure if it is better if we should add the property now or whenever boot support is implemented. As of today we do have bootindex for block and net. Maybe it is better to defer bootindex for virtio-fs-ccw until we can boot from it? In that way management software can detect if this is bootable or not? > > 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: Christian Borntraeger <borntraeger@de.ibm.com> > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Halil Pasic <pasic@linux.ibm.com> > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Cc: qemu-s390x@nongnu.org > Cc: virtio-fs@redhat.com > Signed-off-by: Laszlo Ersek <lersek@redhat.com> > --- > include/hw/virtio/vhost-user-fs.h | 1 + > hw/s390x/vhost-user-fs-ccw.c | 2 ++ > hw/virtio/vhost-user-fs-pci.c | 2 ++ > hw/virtio/vhost-user-fs.c | 10 ++++++++++ > 4 files changed, 15 insertions(+) > > diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h > index 698575277101..0d62834c2510 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/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c > index 6c6f26929301..474e97e937b8 100644 > --- a/hw/s390x/vhost-user-fs-ccw.c > +++ b/hw/s390x/vhost-user-fs-ccw.c > @@ -47,6 +47,8 @@ static void vhost_user_fs_ccw_instance_init(Object *obj) > ccw_dev->force_revision_1 = true; > 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 void vhost_user_fs_ccw_class_init(ObjectClass *klass, void *data) > diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c > index 8bb389bd282a..2ed8492b3fa3 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 ed036ad9c13f..ac4fc34b36a2 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, > }; > >
WARNING: multiple messages have this Message-ID (diff)
From: Christian Borntraeger <borntraeger@de.ibm.com> To: Laszlo Ersek <lersek@redhat.com>, qemu devel list <qemu-devel@nongnu.org> Cc: virtio-fs@redhat.com, "Michael S. Tsirkin" <mst@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, qemu-s390x@nongnu.org Subject: Re: [Virtio-fs] [PATCH] vhost-user-fs: add the "bootindex" property Date: Mon, 11 Jan 2021 10:46:06 +0100 [thread overview] Message-ID: <f296274e-3c4b-bb90-ca4a-273c3bd97f7f@de.ibm.com> (raw) In-Reply-To: <20210104132401.5100-1-lersek@redhat.com> On 04.01.21 14:24, Laszlo Ersek wrote: > virtio-fs qualifies as a bootable device minimally under OVMF, but > currently the necessary "bootindex" property is missing (fw_cfg kernel > boot notwithstanding). > > Add the property. For completeness, add it to the CCW device as well; > other virtio-ccw devices seem to have "bootindex" properties too. Currently we do not have boot support for virtiofs on s390x (ccw) Not sure if it is better if we should add the property now or whenever boot support is implemented. As of today we do have bootindex for block and net. Maybe it is better to defer bootindex for virtio-fs-ccw until we can boot from it? In that way management software can detect if this is bootable or not? > > 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: Christian Borntraeger <borntraeger@de.ibm.com> > Cc: Cornelia Huck <cohuck@redhat.com> > Cc: Halil Pasic <pasic@linux.ibm.com> > Cc: Stefan Hajnoczi <stefanha@redhat.com> > Cc: qemu-s390x@nongnu.org > Cc: virtio-fs@redhat.com > Signed-off-by: Laszlo Ersek <lersek@redhat.com> > --- > include/hw/virtio/vhost-user-fs.h | 1 + > hw/s390x/vhost-user-fs-ccw.c | 2 ++ > hw/virtio/vhost-user-fs-pci.c | 2 ++ > hw/virtio/vhost-user-fs.c | 10 ++++++++++ > 4 files changed, 15 insertions(+) > > diff --git a/include/hw/virtio/vhost-user-fs.h b/include/hw/virtio/vhost-user-fs.h > index 698575277101..0d62834c2510 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/s390x/vhost-user-fs-ccw.c b/hw/s390x/vhost-user-fs-ccw.c > index 6c6f26929301..474e97e937b8 100644 > --- a/hw/s390x/vhost-user-fs-ccw.c > +++ b/hw/s390x/vhost-user-fs-ccw.c > @@ -47,6 +47,8 @@ static void vhost_user_fs_ccw_instance_init(Object *obj) > ccw_dev->force_revision_1 = true; > 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 void vhost_user_fs_ccw_class_init(ObjectClass *klass, void *data) > diff --git a/hw/virtio/vhost-user-fs-pci.c b/hw/virtio/vhost-user-fs-pci.c > index 8bb389bd282a..2ed8492b3fa3 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 ed036ad9c13f..ac4fc34b36a2 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, > }; > >
next prev parent reply other threads:[~2021-01-11 9:47 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-04 13:24 [PATCH] vhost-user-fs: add the "bootindex" property Laszlo Ersek 2021-01-04 13:24 ` [Virtio-fs] " Laszlo Ersek 2021-01-11 8:50 ` Laszlo Ersek 2021-01-11 8:50 ` [Virtio-fs] " Laszlo Ersek 2021-01-11 9:46 ` Christian Borntraeger [this message] 2021-01-11 9:46 ` Christian Borntraeger 2021-01-11 10:05 ` Laszlo Ersek 2021-01-11 10:05 ` [Virtio-fs] " Laszlo Ersek 2021-01-11 10:07 ` Christian Borntraeger 2021-01-11 10:07 ` [Virtio-fs] " Christian Borntraeger 2021-01-11 16:16 ` Laszlo Ersek 2021-01-11 16:16 ` [Virtio-fs] " Laszlo Ersek 2021-01-11 16:22 ` Cornelia Huck 2021-01-11 16:22 ` [Virtio-fs] " Cornelia Huck 2021-01-11 16:32 ` Laszlo Ersek 2021-01-11 16:32 ` [Virtio-fs] " Laszlo Ersek 2021-01-11 17:38 ` Dr. David Alan Gilbert 2021-01-11 17:38 ` [Virtio-fs] " Dr. David Alan Gilbert
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=f296274e-3c4b-bb90-ca4a-273c3bd97f7f@de.ibm.com \ --to=borntraeger@de.ibm.com \ --cc=cohuck@redhat.com \ --cc=dgilbert@redhat.com \ --cc=lersek@redhat.com \ --cc=mst@redhat.com \ --cc=pasic@linux.ibm.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=stefanha@redhat.com \ --cc=virtio-fs@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.