diff options
| author | Ed Tanous <ed@tanous.net> | 2024-02-10 00:50:26 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2024-04-30 02:12:43 +0300 |
| commit | 36c0f2a35e670a4b798b7b42fd18455085e9d9c0 (patch) | |
| tree | 103f5e30be4b2e8118e8bfc0e82caaa4f2bad9a5 /src | |
| parent | 95c6307a9b2c02f74b5f5c677d6983f996332ee6 (diff) | |
| download | bmcweb-36c0f2a35e670a4b798b7b42fd18455085e9d9c0.tar.xz | |
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 <ed@tanous.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webserver_run.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/webserver_run.cpp b/src/webserver_run.cpp index f02ead96b9..81a78cc5b3 100644 --- a/src/webserver_run.cpp +++ b/src/webserver_run.cpp @@ -13,7 +13,6 @@ #include "kvm_websocket.hpp" #include "logging.hpp" #include "login_routes.hpp" -#include "nbd_proxy.hpp" #include "obmc_console.hpp" #include "openbmc_dbus_rest.hpp" #include "redfish.hpp" |