struct virtio_user_dev *dev = virtio_user_get_dev(hw);
/* unmask feature bits defined in vhost user protocol */
- return dev->device_features & VIRTIO_PMD_SUPPORTED_GUEST_FEATURES;
+ return (dev->device_features | dev->frontend_features) &
+ VIRTIO_PMD_SUPPORTED_GUEST_FEATURES;
}
static void
{
struct virtio_user_dev *dev = virtio_user_get_dev(hw);
- dev->features = features & dev->device_features;
+ dev->features = features & (dev->device_features | dev->frontend_features);
}
static int
{
FILE *fp;
char *line = NULL;
- size_t size;
+ size_t size = 0;
char name[11];
bool found = false;
uint32_t num;
break;
}
}
+ free(line);
fclose(fp);
return found ? num : UNNAMED_MAJOR;
}