[PATCH 1/3] bhyve: fix virtio-9p src/dst order
For the virtio-9p bhyve command line argument, the proper order is mount_tag=/path/to/host/dir, not the opposite. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 7606840f45..acf3a5a433 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -607,8 +607,8 @@ bhyveBuildFSArgStr(const virDomainDef *def G_GNUC_UNUSED, virCommandAddArgFormat(cmd, "%d:%d,virtio-9p,%s=%s%s", fs->info.addr.pci.slot, fs->info.addr.pci.function, - fs->src->path, fs->dst, + fs->src->path, virBufferCurrentContent(¶ms)); return 0; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args index 193895574d..bfcd88e366 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args @@ -7,4 +7,4 @@ -s 0:0,hostbridge \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ --s 4:0,virtio-9p,/shared/dir=shared_dir,ro bhyve +-s 4:0,virtio-9p,shared_dir=/shared/dir,ro bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args index 0d27954432..e890f7400b 100644 --- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args @@ -7,4 +7,4 @@ -s 0:0,hostbridge \ -s 2:0,ahci,hd:/tmp/freebsd.img \ -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \ --s 4:0,virtio-9p,/shared/dir=shared_dir bhyve +-s 4:0,virtio-9p,shared_dir=/shared/dir bhyve -- 2.28.0
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- docs/drvbhyve.html.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 49d4aa5878..228e8b2bd5 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -482,6 +482,27 @@ to the guest, with <code>ich7</code> being the only supported model now, and the <code>audio</code> element specifies how the guest device is mapped to the host sound device.</p> +<h3><a id="fs-9p">Virtio-9p filesystem</a></h3> + +<p>As of <a href="https://svnweb.freebsd.org/changeset/base/366413">FreeBSD changeset r366413</a> +bhyve supports sharing arbitrary directory tree between the guest and the host. +It's supported in libvirt <span class="since">since 6.9.0</span>.</p> + +<pre> +... + <filesystem> + <source dir='/shared/dir'/> + <target dir='shared_dir'/> + </filesystem> +... +</pre> + +<p>This share could be made read only by adding the <code><readonly/></code> sub-element.</p> + +<p>In the Linux guest, this could be mounted using:</p> + +<pre>mount -t 9p shared_dir /mnt/shared_dir</pre> + <h3><a id="wired">Wiring guest memory</a></h3> <p><span class="since">Since 4.4.0</span>, it's possible to specify that guest memory should -- 2.28.0
On 10/10/20 6:13 AM, Roman Bogorodskiy wrote:
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- docs/drvbhyve.html.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- NEWS.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e708f06e9e..bc35458f38 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -25,6 +25,10 @@ v6.9.0 (unreleased) ``virConnectGetVersion()``, and ``virDomainGetAutostart()`` APIs have been implemented in the Hyper-V driver. + * bhyve: implement virtio-9p filesystem support + + Implement virito-9p shared filesystem using the ``<filesystem/>`` element. + * **Improvements** * **Bug fixes** -- 2.28.0
On 10/10/20 6:13 AM, Roman Bogorodskiy wrote:
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- NEWS.rst | 4 ++++ 1 file changed, 4 insertions(+)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
On 10/10/20 6:13 AM, Roman Bogorodskiy wrote:
For the virtio-9p bhyve command line argument, the proper order is mount_tag=/path/to/host/dir, not the opposite.
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Ooops, sorry for not spotting this during review. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
Michal Privoznik wrote:
On 10/10/20 6:13 AM, Roman Bogorodskiy wrote:
For the virtio-9p bhyve command line argument, the proper order is mount_tag=/path/to/host/dir, not the opposite.
Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com> --- src/bhyve/bhyve_command.c | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Ooops, sorry for not spotting this during review.
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Michal
My fault, apparently I didn't test the final version where I've already replaced my hardcoded test paths with the actual data from XML. Thanks Roman Bogorodskiy
participants (2)
-
Michal Privoznik -
Roman Bogorodskiy