VirtualBox

Ticket #18783: virtualbox_6.0.y.patch

File virtualbox_6.0.y.patch, 2.6 KB (added by Andy Lavr, 5 years ago)

Patch VirtualBox 6.0.10 for Linux kernel 5.3.y

  • r0drv/linux/mp-r0drv-linux.c

    diff -ruN ./virtualbox-6.0.10.orig/r0drv/linux/mp-r0drv-linux.c ./virtualbox-6.0.10/r0drv/linux/mp-r0drv-linux.c
    old new  
    283283    if (RTCpuSetCount(&OnlineSet) > 1)
    284284    {
    285285        /* Fire the function on all other CPUs without waiting for completion. */
    286 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
    287         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */);
    288 # else
    289         int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */);
    290 # endif
    291         Assert(!rc); NOREF(rc);
     286        NOREF(smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */));
    292287    }
    293288#endif
    294289
     
    326321{
    327322#ifdef CONFIG_SMP
    328323    IPRT_LINUX_SAVE_EFL_AC();
    329     int rc;
    330324    RTMPARGS Args;
    331325
    332326    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
     
    337331    Args.cHits = 0;
    338332
    339333    RTThreadPreemptDisable(&PreemptState);
    340 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
    341     rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
    342 # else /* older kernels */
    343     rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
    344 # endif /* older kernels */
     334
     335    NOREF(smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */));
     336
    345337    RTThreadPreemptRestore(&PreemptState);
    346338
    347     Assert(rc == 0); NOREF(rc);
    348339    IPRT_LINUX_RESTORE_EFL_AC();
    349340#else
    350341    RT_NOREF(pfnWorker, pvUser1, pvUser2);
  • vboxnetflt/linux/VBoxNetFlt-linux.c

    diff -ruN ./virtualbox-6.0.10.orig/vboxnetflt/linux/VBoxNetFlt-linux.c ./virtualbox-6.0.10/vboxnetflt/linux/VBoxNetFlt-linux.c
    old new  
    21072107    struct in_device *in_dev;
    21082108    struct inet6_dev *in6_dev;
    21092109
     2110    const struct in_ifaddr *ifa;
     2111
    21102112    if (ulEventType != NETDEV_REGISTER)
    21112113        return NOTIFY_OK;
    21122114
     
    21232125#endif
    21242126    if (in_dev != NULL)
    21252127    {
    2126         for_ifa(in_dev) {
     2128        rcu_read_lock();
     2129        in_dev_for_each_ifa_rcu(ifa, in_dev) {
    21272130            if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address))
    21282131                return NOTIFY_OK;
    21292132
     
    21372140
    21382141            pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort,
    21392142                /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address);
    2140         } endfor_ifa(in_dev);
     2143        }
     2144     rcu_read_unlock();
    21412145    }
    21422146
    21432147    /*

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy