security/snort2pfcd: Update to 2.0

[joneum]

Summary

• Update to 2.0

PR: 219396
Submitted by: Samee Shahzada (maintainer)
Approved by: xxx (mentor)
#Differential Revision: https://reviews.freebsd.org/Dxxxxx

Test Plan

security/snort2pfcd % portlint -AC
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 1 warning found.

poudriere testport:

10amd64
10i386
11amd64
11i386
12.0-CURRENT r318899 amd64
12.0-CURRENT r318400 i386

head/security/snort2pfcd/Makefile

  * - setup various driver entry points
  * - invoke the vmbus hv main init routine
  * - get the irq resource
  * - invoke the vmbus to add the vmbus root device
  * - setup the vmbus root device
  * - retrieve the channel offers
  */
 static int
-vmbus_bus_init(void)
+vmbus_doattach(struct vmbus_softc *sc)
 {
-        struct vmbus_softc *sc = vmbus_get_softc();
         int ret;
 
         if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
                 return (0);
         sc->vmbus_flags |= VMBUS_FLAG_ATTACHED;
 
         /*
          * Create context for "post message" Hypercalls
#ifndef EARLY_AP_STARTUP
         /* 
          * If the system has already booted and thread
          * scheduling is possible indicated by the global
          * cold set to zero, we just call the driver
          * initialization directly.
          */
         if (!cold)
 #endif
-                vmbus_bus_init();
+                vmbus_doattach(vmbus_sc);
 
         bus_generic_probe(dev);
         return (0);
 }
 
 static void
 vmbus_sysinit(void *arg __unused)
 {
-        if (vm_guest != VM_GUEST_HV || vmbus_get_softc() == NULL)
+        struct vmbus_softc *sc = vmbus_get_softc();
+
+        if (vm_guest != VM_GUEST_HV || sc == NULL)
                 return;
 
 #ifndef EARLY_AP_STARTUP
         /* 
          * If the system has already booted and thread
          * scheduling is possible, as indicated by the
          * global cold set to zero, we just call the driver
          * initialization directly.
          */
         if (!cold) 
 #endif
-                vmbus_bus_init();
+                vmbus_doattach(sc);
 }
 
 static int
 vmbus_detach(device_t dev)
 {
         struct vmbus_softc *sc = device_get_softc(dev);
 
         hv_vmbus_release_unattached_channels();

head/security/snort2pfcd/distinfo

  * - setup various driver entry points
  * - invoke the vmbus hv main init routine
  * - get the irq resource
  * - invoke the vmbus to add the vmbus root device
  * - setup the vmbus root device
  * - retrieve the channel offers
  */
 static int
-vmbus_bus_init(void)
+vmbus_doattach(struct vmbus_softc *sc)
 {
-        struct vmbus_softc *sc = vmbus_get_softc();
         int ret;
 
         if (sc->vmbus_flags & VMBUS_FLAG_ATTACHED)
                 return (0);
         sc->vmbus_flags |= VMBUS_FLAG_ATTACHED;
 
         /*
          * Create context for "post message" Hypercalls
#ifndef EARLY_AP_STARTUP
         /* 
          * If the system has already booted and thread
          * scheduling is possible indicated by the global
          * cold set to zero, we just call the driver
          * initialization directly.
          */
         if (!cold)
 #endif
-                vmbus_bus_init();
+                vmbus_doattach(vmbus_sc);
 
         bus_generic_probe(dev);
         return (0);
 }
 
 static void
 vmbus_sysinit(void *arg __unused)
 {
-        if (vm_guest != VM_GUEST_HV || vmbus_get_softc() == NULL)
+        struct vmbus_softc *sc = vmbus_get_softc();
+
+        if (vm_guest != VM_GUEST_HV || sc == NULL)
                 return;
 
 #ifndef EARLY_AP_STARTUP
         /* 
          * If the system has already booted and thread
          * scheduling is possible, as indicated by the
          * global cold set to zero, we just call the driver
          * initialization directly.
          */
         if (!cold) 
 #endif
-                vmbus_bus_init();
+                vmbus_doattach(sc);
 }
 
 static int
 vmbus_detach(device_t dev)
 {
         struct vmbus_softc *sc = device_get_softc(dev);
 
         hv_vmbus_release_unattached_channels();