diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-30 09:24:22 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2020-06-30 09:24:22 -0500 |
| commit | d176dfce22f5ead7a6018edb69757bc8840cc008 (patch) | |
| tree | aa15398098e0f20a9fb643441ec8443b2ffd6328 /0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch | |
| parent | 61b5e2fd06a4be7134afb1cd363002e015123f7f (diff) | |
| download | kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.tar.gz kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.tar.xz kernel-d176dfce22f5ead7a6018edb69757bc8840cc008.zip | |
kernel-5.8.0-0.rc3.20200630git7c30b859a947.1
* Tue Jun 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.20200630git7c30b859a947.1]
- 7c30b859a947 rebase
- Updated changelog for the release based on v5.8-rc3 (Fedora Kernel Team)
Resolves: rhbz#
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch')
| -rw-r--r-- | 0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch b/0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch index 2128d4912..3362eaddf 100644 --- a/0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch +++ b/0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch @@ -19,7 +19,7 @@ index aee5eff229f2..15b3cb618c6e 100644 @@ -661,6 +661,48 @@ static int vbg_reset_host_capabilities(struct vbg_dev *gdev) return vbg_status_code_to_errno(rc); } - + +/** + * Set guest capabilities on the host. + * Must be called with gdev->session_mutex hold. @@ -87,12 +87,12 @@ index aee5eff229f2..15b3cb618c6e 100644 - /* Ignore allocation failure, we must do session cleanup. */ - } + int ret = 0; - + mutex_lock(&gdev->session_mutex); - + @@ -709,23 +736,10 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev, goto out; - + vbg_track_bit_usage(&gdev->set_guest_caps_tracker, changed, previous); - or_mask = gdev->set_guest_caps_tracker.mask; - @@ -110,7 +110,7 @@ index aee5eff229f2..15b3cb618c6e 100644 - gdev->guest_caps_host = U32_MAX; - if (session_termination) - goto out; - + + ret = vbg_set_host_capabilities(gdev, session, session_termination); + /* Roll back on failure, unless it's session termination time. */ + if (ret < 0 && !session_termination) { @@ -118,13 +118,13 @@ index aee5eff229f2..15b3cb618c6e 100644 session->set_guest_caps); session->set_guest_caps = previous; @@ -733,7 +747,6 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev, - + out: mutex_unlock(&gdev->session_mutex); - vbg_req_free(req, sizeof(*req)); - + return ret; } -- -2.25.4 +2.26.2 |