drivers: remove direct access to interrupt handle

[dpdk.git] / drivers / bus / vmbus / linux / vmbus_bus.c

diff --git a/drivers/bus/vmbus/linux/vmbus_bus.c b/drivers/bus/vmbus/linux/vmbus_bus.c
index 3c924ee..f502783 100644 (file)
--- a/drivers/bus/vmbus/linux/vmbus_bus.c
+++ b/drivers/bus/vmbus/linux/vmbus_bus.c
@@ -236,13 +236,14 @@ vmbus_scan_one(const char *name)
        char filename[PATH_MAX];
        char dirname[PATH_MAX];
        unsigned long tmp;
+       char *dev_name;
 
        dev = calloc(1, sizeof(*dev));
        if (dev == NULL)
                return -1;
 
        dev->device.bus = &rte_vmbus_bus.bus;
-       dev->device.name = strdup(name);
+       dev->device.name = dev_name = strdup(name);
        if (!dev->device.name)
                goto error;
 
@@ -261,6 +262,7 @@ vmbus_scan_one(const char *name)
 
        /* skip non-network devices */
        if (rte_uuid_compare(dev->class_id, vmbus_nic_uuid) != 0) {
+               free(dev_name);
                free(dev);
                return 0;
        }
@@ -297,6 +299,12 @@ vmbus_scan_one(const char *name)
 
        dev->device.devargs = vmbus_devargs_lookup(dev);
 
+       /* Allocate interrupt handle instance */
+       dev->intr_handle =
+               rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_PRIVATE);
+       if (dev->intr_handle == NULL)
+               goto error;
+
        /* device is valid, add in list (sorted) */
        VMBUS_LOG(DEBUG, "Adding vmbus device %s", name);
 
@@ -312,6 +320,7 @@ vmbus_scan_one(const char *name)
                } else { /* already registered */
                        VMBUS_LOG(NOTICE,
                                "%s already registered", name);
+                       free(dev_name);
                        free(dev);
                }
                return 0;
@@ -322,6 +331,7 @@ vmbus_scan_one(const char *name)
 error:
        VMBUS_LOG(DEBUG, "failed");
 
+       free(dev_name);
        free(dev);
        return -1;
 }