summaryrefslogtreecommitdiffstats
path: root/0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch')
-rw-r--r--0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch b/0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
index e288e6e9b..e92eac034 100644
--- a/0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
+++ b/0001-virt-vbox-Rename-guest_caps-struct-members-to-set_gu.patch
@@ -21,7 +21,7 @@ index 18ebd7a6af98..aee5eff229f2 100644
+++ b/drivers/virt/vboxguest/vboxguest_core.c
@@ -699,17 +699,17 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev,
mutex_lock(&gdev->session_mutex);
-
+
/* Apply the changes to the session mask. */
- previous = session->guest_caps;
- session->guest_caps |= or_mask;
@@ -29,24 +29,24 @@ index 18ebd7a6af98..aee5eff229f2 100644
+ previous = session->set_guest_caps;
+ session->set_guest_caps |= or_mask;
+ session->set_guest_caps &= ~not_mask;
-
+
/* If anything actually changed, update the global usage counters. */
- changed = previous ^ session->guest_caps;
+ changed = previous ^ session->set_guest_caps;
if (!changed)
goto out;
-
+
- vbg_track_bit_usage(&gdev->guest_caps_tracker, changed, previous);
- or_mask = gdev->guest_caps_tracker.mask;
+ vbg_track_bit_usage(&gdev->set_guest_caps_tracker, changed, previous);
+ or_mask = gdev->set_guest_caps_tracker.mask;
-
+
if (gdev->guest_caps_host == or_mask || !req)
goto out;
@@ -726,9 +726,9 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev,
if (session_termination)
goto out;
-
+
- vbg_track_bit_usage(&gdev->guest_caps_tracker, changed,
- session->guest_caps);
- session->guest_caps = previous;
@@ -54,16 +54,16 @@ index 18ebd7a6af98..aee5eff229f2 100644
+ session->set_guest_caps);
+ session->set_guest_caps = previous;
}
-
+
out:
@@ -1452,7 +1452,7 @@ static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev,
if (ret)
return ret;
-
+
- caps->u.out.session_caps = session->guest_caps;
+ caps->u.out.session_caps = session->set_guest_caps;
caps->u.out.global_caps = gdev->guest_caps_host;
-
+
return 0;
diff --git a/drivers/virt/vboxguest/vboxguest_core.h b/drivers/virt/vboxguest/vboxguest_core.h
index 77c3a9c8255d..dc745a033164 100644
@@ -71,7 +71,7 @@ index 77c3a9c8255d..dc745a033164 100644
+++ b/drivers/virt/vboxguest/vboxguest_core.h
@@ -118,11 +118,12 @@ struct vbg_dev {
u32 event_filter_host;
-
+
/**
- * Usage counters for guest capabilities. Indexed by capability bit
+ * Usage counters for guest capabilities requested through
@@ -99,5 +99,5 @@ index 77c3a9c8255d..dc745a033164 100644
u32 requestor;
/** Set on CANCEL_ALL_WAITEVENTS, protected by vbg_devevent_spinlock. */
--
-2.25.4
+2.26.2