Update to internal 0.57

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

8 files changed, 644 insertions, 0 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch
new file mode 100644
index 000000000..3e3f69d1c
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0001-Revert-Disable-nbd-proxy-from-the-build.patch
@@ -0,0 +1,50 @@
+From 95f002dc969d7d6d64dbf2ee0db7dc1c1c6a9173 Mon Sep 17 00:00:00 2001
+From: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
+Date: Thu, 18 Mar 2021 11:30:28 +0100
+Subject: [PATCH] Revert "Disable nbd proxy from the build"
+
+NBD Proxy has been disabled upstream. Reenable as we use it for Virtual
+Media
+
+This reverts commit efb8062c306474942bc94f15d748b2eb0b58fbb6.
+---
+ meson.build       | 2 +-
+ meson_options.txt | 9 +--------
+ 2 files changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 66a066b..cef0a49 100644
+--- a/meson.build
++++ b/meson.build
+@@ -81,7 +81,7 @@ feature_map = {
+ 'static-hosting'                  : '-DBMCWEB_ENABLE_STATIC_HOSTING',
+ 'insecure-tftp-update'            : '-DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE',
+ 'validate-unsecure-feature'       : '-DBMCWEB_ENABLE_VALIDATION_UNSECURE_FEATURE',
+-#'vm-nbdproxy'                     : '-DBMCWEB_ENABLE_VM_NBDPROXY',
++'vm-nbdproxy'                     : '-DBMCWEB_ENABLE_VM_NBDPROXY',
+ 'vm-websocket'                    : '-DBMCWEB_ENABLE_VM_WEBSOCKET',
+ }
+ 
+diff --git a/meson_options.txt b/meson_options.txt
+index 9611631..7ee3ebb 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -3,14 +3,7 @@ option('yocto-deps', type: 'feature', value: 'disabled', description : 'Use YOCT
+ option('kvm', type : 'feature',value : 'enabled', description : 'Enable the KVM host video WebSocket.  Path is \'/kvm/0\'.  Video is from the BMC\'s \'/dev/video\' device.')
+ option ('tests', type : 'feature', value : 'enabled', description : 'Enable Unit tests for bmcweb')
+ option('vm-websocket', type : 'feature', value : 'enabled', description : '''Enable the Virtual Media WebSocket. Path is \'/vm/0/0\'to open the websocket. See https://github.com/openbmc/jsnbd/blob/master/README.''')
+-
+-# if you use this option and are seeing this comment, please comment here:
+-# https://github.com/openbmc/bmcweb/issues/188 and put forward your intentions
+-# for this code.  At this point, no daemon has been upstreamed that implements
+-# this interface, so for the moment this appears to be dead code;  In leiu of
+-# removing it, it has been disabled to try to give those that use it the
+-# opportunity to upstream their backend implementation
+-#option('vm-nbdproxy', type: 'feature', value : 'disabled', description : 'Enable the Virtual Media WebSocket.')
++option('vm-nbdproxy', type: 'feature', value : 'disabled', description : 'Enable the Virtual Media WebSocket.')
+ option('rest', type : 'feature', value : 'enabled', description : '''Enable Phosphor REST (D-Bus) APIs. Paths directly map Phosphor D-Bus object paths, for example, \'/xyz/openbmc_project/logging/entry/enumerate\'. See https://github.com/openbmc/docs/blob/master/rest-api.md.''')
+ option('redfish', type : 'feature',value : 'enabled', description: 'Enable Redfish APIs.  Paths are under \'/redfish/v1/\'. See https://github.com/openbmc/bmcweb/blob/master/DEVELOPING.md#redfish.')
+ option('host-serial-socket', type : 'feature', value : 'enabled', description : 'Enable host serial console WebSocket. Path is \'/console0\'.  See https://github.com/openbmc/docs/blob/master/console.md.')
+-- 
+2.26.2
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch
new file mode 100644
index 000000000..01c1c858c
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0002-bmcweb-handle-device-or-resource-busy-exception.patch
@@ -0,0 +1,219 @@
+From 76480c6a5b1708113f28aecab32a85984371243c Mon Sep 17 00:00:00 2001
+From: Karol Wachowski <karol.wachowski@intel.com>
+Date: Fri, 10 Jul 2020 09:54:06 +0000
+Subject: [PATCH] bmcweb handle device or resource busy exception
+
+Use async_method_call_timed() for mount/unmount dbus oprations.
+Long mount/unmount times are supported by VirtualMedia service,
+this works because of settable timeout property, available for each block
+device.
+Default dbus calls will timeout when mount/unmount timeout is long enough.
+
+Get mount/unmount timeout property and use it for mount/unmount calls.
+Add handling of device or resource busy exception (EBUSY) that
+can be thrown by VirtualMedia service during Mount/Unmount dbus operations.
+
+Tested: Verified that after mounting non-existing HTTPS resource
+        in proxy mode, VirtualMedia recovers restoring ready state
+        and returns EBUSY during that transition.
+        Verfied that resources can be mounted/unmounted in both legacy
+        and proxy mode.
+Signed-off-by: Karol Wachowski <karol.wachowski@intel.com>
+Change-Id: Ica62c34db0cce24c4c6169fc661edfde49e948d0
+---
+ redfish-core/lib/virtual_media.hpp | 144 ++++++++++++++++++++++-------
+ 1 file changed, 110 insertions(+), 34 deletions(-)
+
+diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
+index 95a8881..188248a 100644
+--- a/redfish-core/lib/virtual_media.hpp
++++ b/redfish-core/lib/virtual_media.hpp
+@@ -24,6 +24,8 @@
+ #include <account_service.hpp>
+ #include <boost/url/url_view.hpp>
+ 
++#include <chrono>
++
+ namespace redfish
+ 
+ {
+@@ -160,6 +162,26 @@ static void vmParseInterfaceObject(const DbusInterfaceType& interface,
+     }
+ }
+ 
++/**
++ * @brief parses Timeout property and converts to microseconds
++ */
++static std::optional<uint64_t>
++    vmParseTimeoutProperty(const std::variant<int>& timeoutProperty)
++{
++    const int* timeoutValue = std::get_if<int>(&timeoutProperty);
++    if (timeoutValue)
++    {
++        constexpr int timeoutMarginSeconds = 10;
++        return std::chrono::duration_cast<std::chrono::microseconds>(
++                   std::chrono::seconds(*timeoutValue + timeoutMarginSeconds))
++            .count();
++    }
++    else
++    {
++        return std::nullopt;
++    }
++}
++
+ /**
+  * @brief Fill template for Virtual Media Item.
+  */
+@@ -856,22 +878,54 @@ class VirtualMediaActionInsertMedia : public Node
+         }
+ 
+         crow::connections::systemBus->async_method_call(
+-            [asyncResp, secretPipe](const boost::system::error_code ec,
+-                                    bool success) {
++            [asyncResp, service, name, imageUrl, rw, unixFd,
++             secretPipe](const boost::system::error_code ec,
++                         const std::variant<int> timeoutProperty) {
+                 if (ec)
+                 {
+                     BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec;
+                     messages::internalError(asyncResp->res);
++                    return;
+                 }
+-                else if (!success)
++
++                auto timeout = vmParseTimeoutProperty(timeoutProperty);
++                if (timeout == std::nullopt)
+                 {
+-                    BMCWEB_LOG_ERROR << "Service responded with error";
+-                    messages::generalError(asyncResp->res);
++                    BMCWEB_LOG_ERROR << "Timeout property is empty.";
++                    messages::internalError(asyncResp->res);
++                    return;
+                 }
++
++                crow::connections::systemBus->async_method_call_timed(
++                    [asyncResp, secretPipe](const boost::system::error_code ec,
++                                            bool success) {
++                        if (ec)
++                        {
++                            BMCWEB_LOG_ERROR << "Bad D-Bus request error: "
++                                             << ec;
++                            if (ec ==
++                                boost::system::errc::device_or_resource_busy)
++                            {
++                                messages::resourceInUse(asyncResp->res);
++                            }
++                            else
++                            {
++                                messages::internalError(asyncResp->res);
++                            }
++                        }
++                        else if (!success)
++                        {
++                            BMCWEB_LOG_ERROR << "Service responded with error";
++                            messages::generalError(asyncResp->res);
++                        }
++                    },
++                    service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name,
++                    "xyz.openbmc_project.VirtualMedia.Legacy", "Mount",
++                    *timeout, imageUrl, rw, unixFd);
+             },
+             service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name,
+-            "xyz.openbmc_project.VirtualMedia.Legacy", "Mount", imageUrl, rw,
+-            unixFd);
++            "org.freedesktop.DBus.Properties", "Get",
++            "xyz.openbmc_project.VirtualMedia.MountPoint", "Timeout");
+     }
+ };
+ 
+@@ -1003,38 +1057,60 @@ class VirtualMediaActionEjectMedia : public Node
+                     const std::string& service, const std::string& name,
+                     bool legacy)
+     {
+-
+-        // Legacy mount requires parameter with image
++        std::string objectPath = "/xyz/openbmc_project/VirtualMedia/";
++        std::string ifaceName = "xyz.openbmc_project.VirtualMedia";
+         if (legacy)
+         {
+-            crow::connections::systemBus->async_method_call(
+-                [asyncResp](const boost::system::error_code ec) {
+-                    if (ec)
+-                    {
+-                        BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec;
+-
+-                        messages::internalError(asyncResp->res);
+-                        return;
+-                    }
+-                },
+-                service, "/xyz/openbmc_project/VirtualMedia/Legacy/" + name,
+-                "xyz.openbmc_project.VirtualMedia.Legacy", "Unmount");
++            objectPath += "Legacy/";
++            ifaceName += ".Legacy";
+         }
+-        else // proxy
++        else
+         {
+-            crow::connections::systemBus->async_method_call(
+-                [asyncResp](const boost::system::error_code ec) {
+-                    if (ec)
+-                    {
+-                        BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec;
+-
+-                        messages::internalError(asyncResp->res);
+-                        return;
+-                    }
+-                },
+-                service, "/xyz/openbmc_project/VirtualMedia/Proxy/" + name,
+-                "xyz.openbmc_project.VirtualMedia.Proxy", "Unmount");
++            objectPath += "Proxy/";
++            ifaceName += ".Proxy";
+         }
++        objectPath += name;
++
++        crow::connections::systemBus->async_method_call(
++            [asyncResp, service, name, objectPath,
++             ifaceName](const boost::system::error_code ec,
++                        const std::variant<int> timeoutProperty) {
++                if (ec)
++                {
++                    BMCWEB_LOG_ERROR << "Bad D-Bus request error: " << ec;
++                    messages::internalError(asyncResp->res);
++                    return;
++                }
++
++                auto timeout = vmParseTimeoutProperty(timeoutProperty);
++                if (timeout == std::nullopt)
++                {
++                    BMCWEB_LOG_ERROR << "Timeout property is empty.";
++                    messages::internalError(asyncResp->res);
++                    return;
++                }
++                crow::connections::systemBus->async_method_call_timed(
++                    [asyncResp](const boost::system::error_code ec) {
++                        if (ec)
++                        {
++                            BMCWEB_LOG_ERROR << "Bad D-Bus request error: "
++                                             << ec;
++                            if (ec ==
++                                boost::system::errc::device_or_resource_busy)
++                            {
++                                messages::resourceInUse(asyncResp->res);
++                            }
++                            else
++                            {
++                                messages::internalError(asyncResp->res);
++                            }
++                            return;
++                        }
++                    },
++                    service, objectPath, ifaceName, "Unmount", *timeout);
++            },
++            service, objectPath, "org.freedesktop.DBus.Properties", "Get",
++            "xyz.openbmc_project.VirtualMedia.MountPoint", "Timeout");
+     }
+ };
+ 
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0003-Add-ConnectedVia-property-to-virtual-media-item-temp.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0003-Add-ConnectedVia-property-to-virtual-media-item-temp.patch
new file mode 100644
index 000000000..41c1c9836
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0003-Add-ConnectedVia-property-to-virtual-media-item-temp.patch
@@ -0,0 +1,28 @@
+From d303bfdd6778c43096401ff78fab70f9041cd4cf Mon Sep 17 00:00:00 2001
+From: Karol Wachowski <karol.wachowski@intel.com>
+Date: Thu, 11 Feb 2021 08:35:41 +0000
+Subject: [PATCH] Add ConnectedVia property to virtual media item template
+
+Tested: Verified that ConnectedVia property is returned and set to
+	"NotConnected" for disconnected media.
+
+Signed-off-by: Karol Wachowski <karol.wachowski@intel.com>
+---
+ redfish-core/lib/virtual_media.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
+index c45fed2..aa7c639 100644
+--- a/redfish-core/lib/virtual_media.hpp
++++ b/redfish-core/lib/virtual_media.hpp
+@@ -193,6 +193,7 @@ static nlohmann::json vmItemTemplate(const std::string& name,
+     item["@odata.id"] =
+         "/redfish/v1/Managers/" + name + "/VirtualMedia/" + resName;
+     item["@odata.type"] = "#VirtualMedia.v1_3_0.VirtualMedia";
++    item["ConnectedVia"] = "NotConnected";
+     item["Name"] = "Virtual Removable Media";
+     item["Id"] = resName;
+     item["WriteProtected"] = true;
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch
new file mode 100644
index 000000000..3a9e67217
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0004-Invalid-status-code-from-InsertMedia-REST-methods.patch
@@ -0,0 +1,185 @@
+From 805641a2d189da9befc05168f51cef76da1ba326 Mon Sep 17 00:00:00 2001
+From: Alicja Rybak <alicja.rybak@intel.com>
+Date: Tue, 20 Apr 2021 16:32:37 +0200
+Subject: [PATCH] Invalid status code from InsertMedia REST methods GET,
+ PUT, DELETE, PATCH in proxy mode
+
+Add handlers for GET, PUT, DELETE, PATCH method and function that
+checks which mode is used and set suitable status code:
+Not allowed for Legacy and Not found for Proxy.
+
+Change-Id: Ib4c0a3e9a2a8853caa74c59239d9fcfed99c5e8b
+Signed-off-by: Alicja Rybak <alicja.rybak@intel.com>
+---
+ redfish-core/lib/virtual_media.hpp | 155 +++++++++++++++++++++++++++++
+ 1 file changed, 155 insertions(+)
+
+diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
+index aa7c639..3e28164 100644
+--- a/redfish-core/lib/virtual_media.hpp
++++ b/redfish-core/lib/virtual_media.hpp
+@@ -548,6 +548,161 @@ class VirtualMediaActionInsertMedia : public Node
+         return true;
+     }
+ 
++    /**
++     * @brief Function checks if insert media request is Legacy or Proxy type
++     *        and sets suitable response code for unsupported REST method.
++     *
++     */
++    void CheckProxyMode(const std::shared_ptr<bmcweb::AsyncResp>& aResp,
++                        const crow::Request& req,
++                        const std::vector<std::string>& params)
++    {
++        if (params.size() != 2)
++        {
++            messages::internalError(aResp->res);
++            return;
++        }
++
++        // take resource name from URL
++        const std::string& resName = params[1];
++
++        if (params[0] != "bmc")
++        {
++            messages::resourceNotFound(aResp->res, "VirtualMedia.Insert",
++                                       resName);
++
++            return;
++        }
++
++        crow::connections::systemBus->async_method_call(
++            [this, aResp{std::move(aResp)}, req,
++             resName](const boost::system::error_code ec,
++                      const GetObjectType& getObjectType) {
++                if (ec)
++                {
++                    BMCWEB_LOG_ERROR << "ObjectMapper::GetObject call failed: "
++                                     << ec;
++                    aResp->res.result(boost::beast::http::status::not_found);
++
++                    return;
++                }
++                std::string service = getObjectType.begin()->first;
++                BMCWEB_LOG_DEBUG << "GetObjectType: " << service;
++
++                crow::connections::systemBus->async_method_call(
++                    [this, service, resName, req,
++                     aResp{aResp}](const boost::system::error_code ec,
++                                   ManagedObjectType& subtree) {
++                        if (ec)
++                        {
++                            BMCWEB_LOG_DEBUG << "DBUS response error";
++
++                            return;
++                        }
++
++                        for (auto& item : subtree)
++                        {
++                            std::string thispath = item.first.filename();
++                            if (thispath.empty())
++                            {
++                                continue;
++                            }
++
++                            if (thispath != resName)
++                            {
++                                continue;
++                            }
++
++                            auto mode = item.first.parent_path();
++                            auto type = mode.parent_path();
++                            if (mode.filename().empty() ||
++                                type.filename().empty())
++                            {
++                                continue;
++                            }
++
++                            if (type.filename() != "VirtualMedia")
++                            {
++                                continue;
++                            }
++
++                            // Check if dbus path is Legacy type
++                            if (mode.filename() == "Legacy")
++                            {
++                                BMCWEB_LOG_DEBUG << "InsertMedia only allowed "
++                                                    "with POST method "
++                                                    "in legacy mode";
++                                aResp->res.result(boost::beast::http::status::
++                                                      method_not_allowed);
++
++                                return;
++                            }
++                            // Check if dbus path is Proxy type
++                            if (mode.filename() == "Proxy")
++                            {
++                                // Not possible in proxy mode
++                                BMCWEB_LOG_DEBUG << "InsertMedia not "
++                                                    "allowed in proxy mode";
++                                aResp->res.result(
++                                    boost::beast::http::status::not_found);
++
++                                return;
++                            }
++                        }
++
++                        BMCWEB_LOG_DEBUG << "Parent item not found";
++                        aResp->res.result(
++                            boost::beast::http::status::not_found);
++                    },
++                    service, "/xyz/openbmc_project/VirtualMedia",
++                    "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
++            },
++            "xyz.openbmc_project.ObjectMapper",
++            "/xyz/openbmc_project/object_mapper",
++            "xyz.openbmc_project.ObjectMapper", "GetObject",
++            "/xyz/openbmc_project/VirtualMedia", std::array<const char*, 0>());
++    }
++
++    /**
++     * @brief Function handles GET method request.
++     */
++    void doGet(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
++               const crow::Request& req,
++               const std::vector<std::string>& params) override
++    {
++        CheckProxyMode(asyncResp, req, params);
++    }
++
++    /**
++     * @brief Function handles PATCH method request.
++     */
++    void doPatch(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
++                 const crow::Request& req,
++                 const std::vector<std::string>& params) override
++    {
++        CheckProxyMode(asyncResp, req, params);
++    }
++
++    /**
++     * @brief Function handles PUT method request.
++     */
++    void doPut(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
++               const crow::Request& req,
++               const std::vector<std::string>& params) override
++    {
++        CheckProxyMode(asyncResp, req, params);
++    }
++
++    /**
++     * @brief Function handles DELETE method request.
++     */
++    void doDelete(const std::shared_ptr<bmcweb::AsyncResp>& asyncResp,
++                  const crow::Request& req,
++                  const std::vector<std::string>& params) override
++    {
++        CheckProxyMode(asyncResp, req, params);
++    }
++
+     /**
+      * @brief Function handles POST method request.
+      *
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0005-Set-Inserted-redfish-property-for-not-inserted-resou.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0005-Set-Inserted-redfish-property-for-not-inserted-resou.patch
new file mode 100644
index 000000000..3d80aeb20
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0005-Set-Inserted-redfish-property-for-not-inserted-resou.patch
@@ -0,0 +1,43 @@
+From 89ca38dbc3433b3b734a20068e599809f3bd7b90 Mon Sep 17 00:00:00 2001
+From: Karol Wachowski <karol.wachowski@intel.com>
+Date: Tue, 23 Feb 2021 15:53:16 +0000
+Subject: [PATCH] Set Inserted redfish property for not inserted resources
+
+Tested: Verified that Inserted property is returned and set to
+	"false" for not inserted media.
+Signed-off-by: Karol Wachowski <karol.wachowski@intel.com>
+---
+ redfish-core/lib/virtual_media.hpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
+index 3e28164..4c475b7 100644
+--- a/redfish-core/lib/virtual_media.hpp
++++ b/redfish-core/lib/virtual_media.hpp
+@@ -96,6 +96,7 @@ static void
+         BMCWEB_LOG_DEBUG << "Value Active not found";
+         return;
+     }
++    aResp->res.jsonValue["Inserted"] = *activeValue;
+ 
+     const std::string* endpointIdValue =
+         std::get_if<std::string>(&endpointIdProperty->second);
+@@ -107,7 +108,6 @@ static void
+             aResp->res.jsonValue["Oem"]["OpenBMC"]["WebSocketEndpoint"] =
+                 *endpointIdValue;
+             aResp->res.jsonValue["TransferProtocolType"] = "OEM";
+-            aResp->res.jsonValue["Inserted"] = *activeValue;
+             if (*activeValue == true)
+             {
+                 aResp->res.jsonValue["ConnectedVia"] = "Applet";
+@@ -138,7 +138,6 @@ static void
+                         }
+ 
+                         aResp->res.jsonValue["Image"] = *imageUrlValue;
+-                        aResp->res.jsonValue["Inserted"] = *activeValue;
+                         aResp->res.jsonValue["TransferProtocolType"] =
+                             getTransferProtocolTypeFromUri(*imageUrlValue);
+ 
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch
new file mode 100644
index 000000000..efce3e72c
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0006-Bmcweb-handle-permission-denied-exception.patch
@@ -0,0 +1,47 @@
+From e7018ea9e3ad1a17e096aec3717a4764c3feac2e Mon Sep 17 00:00:00 2001
+From: Alicja Rybak <alicja.rybak@intel.com>
+Date: Wed, 14 Apr 2021 16:26:59 +0200
+Subject: [PATCH] Bmcweb handle permission denied exception
+
+Add handling of permission denied exception (EPERM) that
+can be thrown by VirtualMedia service during Mount/Unmount dbus operations.
+
+Tested:
+Verified that after mounting/unmounting HTTPS resource twice in a row in legacy mode,
+VirtualMedia returns EPERM, which bmcweb handles as 403 status code.
+
+Change-Id: Ibc18d5ec822c5072605b1fc4651389982002798b
+Signed-off-by: Alicja Rybak <alicja.rybak@intel.com>
+---
+ redfish-core/lib/virtual_media.hpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
+index 4c475b7..8151ac0 100644
+--- a/redfish-core/lib/virtual_media.hpp
++++ b/redfish-core/lib/virtual_media.hpp
+@@ -1073,6 +1073,10 @@ class VirtualMediaActionInsertMedia : public Node
+                             {
+                                 messages::resourceInUse(asyncResp->res);
+                             }
++                            else if (ec == boost::system::errc::permission_denied)
++                            {
++                                messages::accessDenied(asyncResp->res, "VirtualMedia.Insert");
++                            }
+                             else
+                             {
+                                 messages::internalError(asyncResp->res);
+@@ -1267,6 +1271,10 @@ class VirtualMediaActionEjectMedia : public Node
+                             {
+                                 messages::resourceInUse(asyncResp->res);
+                             }
++                            else if (ec == boost::system::errc::permission_denied)
++                            {
++                                messages::accessDenied(asyncResp->res, "VirtualMedia.Eject");
++                            }
+                             else
+                             {
+                                 messages::internalError(asyncResp->res);
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0007-Fix-unmounting-image-in-proxy-mode.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0007-Fix-unmounting-image-in-proxy-mode.patch
new file mode 100644
index 000000000..88fa89465
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0007-Fix-unmounting-image-in-proxy-mode.patch
@@ -0,0 +1,35 @@
+From 6f4b5fc1879f39b0f5fee0838f0ecbc481275d5e Mon Sep 17 00:00:00 2001
+From: Alicja Rybak <alicja.rybak@intel.com>
+Date: Fri, 23 Apr 2021 17:35:52 +0200
+Subject: [PATCH] Fix unmounting image in proxy mode.
+
+Sometimes Slot0 got higher key than Slot1 and erase function for Slot1
+invalidates elements with keys not less than the erased element.
+In that case invalid slot0 will be unmounted.
+Change order of calling close() and erase() functions to
+unmount correct device.
+
+Change-Id: I7a40a4518982f697d3eed635cde6d06978149cf0
+Signed-off-by: Alicja Rybak <alicja.rybak@intel.com>
+---
+ include/nbd_proxy.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp
+index 3b28823..897bcf2 100644
+--- a/include/nbd_proxy.hpp
++++ b/include/nbd_proxy.hpp
+@@ -439,9 +439,9 @@ inline void requestRoutes(App& app)
+                     BMCWEB_LOG_DEBUG << "No session to close";
+                     return;
+                 }
++                session->second->close();
+                 // Remove reference to session in global map
+                 sessions.erase(session);
+-                session->second->close();
+             })
+         .onmessage([](crow::websocket::Connection& conn,
+                       const std::string& data, bool) {
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch
new file mode 100644
index 000000000..c188b2105
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/vm/0008-Fix-VM-NBDPROXY-build-issue-with-AsyncResp.patch
@@ -0,0 +1,37 @@
+From d31d913a8c5dbacf6a36407532cf777852099ced Mon Sep 17 00:00:00 2001
+From: AppaRao Puli <apparao.puli@linux.intel.com>
+Date: Sun, 2 May 2021 11:07:16 +0000
+Subject: [PATCH] Fix VM NBDPROXY build issue with AsyncResp
+
+8d1b46d7 moves bmcweb to using AsyncResp everywhere, and not have
+each individual handler creating its own object.
+
+This commit fixes the build failure when enabling virtual media
+compile flag(BMCWEB_ENABLE_VM_NBDPROXY). This is caused by above
+mentioned recent change.
+
+Tested:
+ - Build is successful with enabled virtual media flag.
+
+Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com>
+Change-Id: I363a41a08fae9dc05b3553695b96ffd26948f696
+---
+ redfish-core/lib/virtual_media.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/redfish-core/lib/virtual_media.hpp b/redfish-core/lib/virtual_media.hpp
+index 685ee5c..99542c4 100644
+--- a/redfish-core/lib/virtual_media.hpp
++++ b/redfish-core/lib/virtual_media.hpp
+@@ -635,7 +635,7 @@ class VirtualMediaActionInsertMedia : public Node
+                                 }
+ 
+                                 bool paramsValid = validateParams(
+-                                    asyncResp->res, imageUrl, inserted,
++                                    asyncResp, imageUrl, inserted,
+                                     transferMethod, transferProtocolType);
+ 
+                                 if (paramsValid == false)
+-- 
+2.17.1
+