Skip to content

Commit

Permalink
vfio/mdev: Fix missing static's on MDEV_TYPE_ATTR's
Browse files Browse the repository at this point in the history 
These should always be prefixed with static, otherwise compilation
will fail on non-modular builds with

ld: samples/vfio-mdev/mbochs.o:(.data+0x2e0): multiple definition of `mdev_type_attr_name'; samples/vfio-mdev/mdpy.o:(.data+0x240): first defined here

Fixes: a5e6e65 ("sample: vfio bochs vbe display (host device for bochs-drm)")
Fixes: d61fc96 ("sample: vfio mdev display - host device")
Signed-off-by: Jason Gunthorpe <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Alex Williamson <[email protected]>
  • Loading branch information
@jgunthorpe @awilliam
jgunthorpe authored and awilliam committed Apr 7, 2021
1 parent 6a2a235 commit 6cbf507
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions samples/vfio-mdev/mbochs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@ static const struct attribute_group mdev_dev_group = {
.attrs = mdev_dev_attrs,
};

const struct attribute_group *mdev_dev_groups[] = {
static const struct attribute_group *mdev_dev_groups[] = {
&mdev_dev_group,
NULL,
};
Expand All @@ -1344,7 +1344,7 @@ name_show(struct kobject *kobj, struct device *dev, char *buf)
{
return sprintf(buf, "%s\n", kobj->name);
}
MDEV_TYPE_ATTR_RO(name);
static MDEV_TYPE_ATTR_RO(name);

static ssize_t
description_show(struct kobject *kobj, struct device *dev, char *buf)
Expand All @@ -1354,7 +1354,7 @@ description_show(struct kobject *kobj, struct device *dev, char *buf)
return sprintf(buf, "virtual display, %d MB video memory\n",
type ? type->mbytes : 0);
}
MDEV_TYPE_ATTR_RO(description);
static MDEV_TYPE_ATTR_RO(description);

static ssize_t
available_instances_show(struct kobject *kobj, struct device *dev, char *buf)
Expand All @@ -1364,14 +1364,14 @@ available_instances_show(struct kobject *kobj, struct device *dev, char *buf)

return sprintf(buf, "%d\n", count);
}
MDEV_TYPE_ATTR_RO(available_instances);
static MDEV_TYPE_ATTR_RO(available_instances);

static ssize_t device_api_show(struct kobject *kobj, struct device *dev,
char *buf)
{
return sprintf(buf, "%s\n", VFIO_DEVICE_API_PCI_STRING);
}
MDEV_TYPE_ATTR_RO(device_api);
static MDEV_TYPE_ATTR_RO(device_api);

static struct attribute *mdev_types_attrs[] = {
&mdev_type_attr_name.attr,
Expand Down
10 changes: 5 additions & 5 deletions samples/vfio-mdev/mdpy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ static const struct attribute_group mdev_dev_group = {
.attrs = mdev_dev_attrs,
};

const struct attribute_group *mdev_dev_groups[] = {
static const struct attribute_group *mdev_dev_groups[] = {
&mdev_dev_group,
NULL,
};
Expand All @@ -668,7 +668,7 @@ name_show(struct kobject *kobj, struct device *dev, char *buf)
{
return sprintf(buf, "%s\n", kobj->name);
}
MDEV_TYPE_ATTR_RO(name);
static MDEV_TYPE_ATTR_RO(name);

static ssize_t
description_show(struct kobject *kobj, struct device *dev, char *buf)
Expand All @@ -679,21 +679,21 @@ description_show(struct kobject *kobj, struct device *dev, char *buf)
type ? type->width : 0,
type ? type->height : 0);
}
MDEV_TYPE_ATTR_RO(description);
static MDEV_TYPE_ATTR_RO(description);

static ssize_t
available_instances_show(struct kobject *kobj, struct device *dev, char *buf)
{
return sprintf(buf, "%d\n", max_devices - mdpy_count);
}
MDEV_TYPE_ATTR_RO(available_instances);
static MDEV_TYPE_ATTR_RO(available_instances);

static ssize_t device_api_show(struct kobject *kobj, struct device *dev,
char *buf)
{
return sprintf(buf, "%s\n", VFIO_DEVICE_API_PCI_STRING);
}
MDEV_TYPE_ATTR_RO(device_api);
static MDEV_TYPE_ATTR_RO(device_api);

static struct attribute *mdev_types_attrs[] = {
&mdev_type_attr_name.attr,
Expand Down

0 comments on commit 6cbf507

Please sign in to comment.