virt: vbox: Rename guest_caps struct members to set_guest_caps

Rename guest_caps[_tracker] struct members to set_guest_caps[_tracker]
this is a preparation patch for adding support for the
VBGL_IOCTL_GUEST_CAPS_ACQUIRE ioctl.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20200709120858.63928-4-hdegoede@redhat.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Hans de Goede and committed by

Greg Kroah-Hartman 6 years ago fd01cc59 2d41d2ab

+15 -14

2 changed files

expand all

drivers

virt

vboxguest

vboxguest_core.c

vboxguest_core.h

+10 -10

drivers/virt/vboxguest/vboxguest_core.c

··· 699 699 mutex_lock(&gdev->session_mutex); 700 700 701 701 /* Apply the changes to the session mask. */ 702 - previous = session->guest_caps; 703 - session->guest_caps |= or_mask; 704 - session->guest_caps &= ~not_mask; 702 + previous = session->set_guest_caps; 703 + session->set_guest_caps |= or_mask; 704 + session->set_guest_caps &= ~not_mask; 705 705 706 706 /* If anything actually changed, update the global usage counters. */ 707 - changed = previous ^ session->guest_caps; 707 + changed = previous ^ session->set_guest_caps; 708 708 if (!changed) 709 709 goto out; 710 710 711 - vbg_track_bit_usage(&gdev->guest_caps_tracker, changed, previous); 712 - or_mask = gdev->guest_caps_tracker.mask; 711 + vbg_track_bit_usage(&gdev->set_guest_caps_tracker, changed, previous); 712 + or_mask = gdev->set_guest_caps_tracker.mask; 713 713 714 714 if (gdev->guest_caps_host == or_mask || !req) 715 715 goto out; ··· 726 726 if (session_termination) 727 727 goto out; 728 728 729 - vbg_track_bit_usage(&gdev->guest_caps_tracker, changed, 730 - session->guest_caps); 731 - session->guest_caps = previous; 729 + vbg_track_bit_usage(&gdev->set_guest_caps_tracker, changed, 730 + session->set_guest_caps); 731 + session->set_guest_caps = previous; 732 732 } 733 733 734 734 out: ··· 1452 1452 if (ret) 1453 1453 return ret; 1454 1454 1455 - caps->u.out.session_caps = session->guest_caps; 1455 + caps->u.out.session_caps = session->set_guest_caps; 1456 1456 caps->u.out.global_caps = gdev->guest_caps_host; 1457 1457 1458 1458 return 0;

+5 -4

drivers/virt/vboxguest/vboxguest_core.h

··· 118 118 u32 event_filter_host; 119 119 120 120 /** 121 - * Usage counters for guest capabilities. Indexed by capability bit 121 + * Usage counters for guest capabilities requested through 122 + * vbg_set_session_capabilities(). Indexed by capability bit 122 123 * number, one count per session using a capability. 123 124 * Protected by session_mutex. 124 125 */ 125 - struct vbg_bit_usage_tracker guest_caps_tracker; 126 + struct vbg_bit_usage_tracker set_guest_caps_tracker; 126 127 /** 127 128 * The guest capabilities last reported to the host (or UINT32_MAX). 128 129 * Protected by session_mutex. ··· 165 164 */ 166 165 u32 event_filter; 167 166 /** 168 - * Guest capabilities for this session. 167 + * Guest capabilities set through vbg_set_session_capabilities(). 169 168 * A capability claimed by any guest session will be reported to the 170 169 * host. Protected by vbg_gdev.session_mutex. 171 170 */ 172 - u32 guest_caps; 171 + u32 set_guest_caps; 173 172 /** VMMDEV_REQUESTOR_* flags */ 174 173 u32 requestor; 175 174 /** Set on CANCEL_ALL_WAITEVENTS, protected by vbg_devevent_spinlock. */

Configure Feed

Configure Feed