From 36c0f2a35e670a4b798b7b42fd18455085e9d9c0 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Fri, 9 Feb 2024 13:50:26 -0800 Subject: Consolidate Vm implementations As much as the two vm implementations SEEM different, the differences largely lie in how we're getting the nbd proxy socket. One is relying on launching a process (nbd-proxy), the other is getting the fd from dbus. Given [1] exists and is in process, we need to have a plan for getting these two VM implementations into one, once that patchset is complete. This commit: Splits the vm-websocket option into vm-websocket-provider, providing two options, nbd-proxy, and virtual-media (the names of the respective apps). To accomplish this, it moves the contents of nbd-proxy into include/vm-websocket, so we can compare the similarities and start consolidating. The longer term intent is that the nbd-proxy option will be completely removed, and the code deleted. This has the additional advantage that we will no longer require the boost::process dependency, as all info will be available on dbus. As part of this, the nbd proxy websocket is also registered at /vm/0/0, to be backward compatible with the old interfaces. Tested: Code compiles. Need some help here. [1] https://gerrit.openbmc.org/c/openbmc/jsnbd/+/49944 Change-Id: Iedbca169ea40d45a8775f843792b874a248bb594 Signed-off-by: Ed Tanous --- meson_options.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meson_options.txt') diff --git a/meson_options.txt b/meson_options.txt index d10d1b3dde..8a497ed8cc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,7 +24,7 @@ option( 'vm-websocket', type: 'feature', value: 'enabled', - description: '''Enable the Virtual Media WebSocket. Path is /vm/0/0 to + description: '''Enable the Virtual Media WebSocket. Path is /vm/0/0 and /nbd/ to open the websocket. See https://github.com/openbmc/jsnbd/blob/master/README.''' ) @@ -37,7 +37,8 @@ option( # opportunity to upstream their backend implementation #option( # 'vm-nbdproxy', -# type: 'feature', value: 'disabled', +# type: 'feature', +# value: 'disabled', # description: 'Enable the Virtual Media WebSocket.' #) -- cgit v1.2.3