Changeset 66509 in vbox

Timestamp:

Apr 11, 2017 11:19:10 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions

additions/linux/drm: Remove unnecessary check from accel_init

accel_init gets called exactly once per instance, so there is no need
to check of vbva_info has already been allocated.

While at it also switch to kcalloc.

Signed-off-by: Hans de Goede <hdegoede@…>.

File:

• trunk/src/VBox/Additions/linux/drm/vbox_main.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -243 +243 @@
 {
     unsigned i;
+
+    vbox->vbva_info = kcalloc(vbox->num_crtcs, sizeof(*vbox->vbva_info),
+                              GFP_KERNEL);
     if (!vbox->vbva_info)
-    {
-        vbox->vbva_info = kzalloc(  sizeof(struct VBVABUFFERCONTEXT)
-                                  * vbox->num_crtcs,
-                                  GFP_KERNEL);
-        if (!vbox->vbva_info)
-            return -ENOMEM;
-    }
+        return -ENOMEM;
+
     /* Take a command buffer for each screen from the end of usable VRAM. */
     vbox->available_vram_size -= vbox->num_crtcs * VBVA_MIN_BUFFER_SIZE;