shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

conf: don't use "class" as name

Browse Source 
Vim treats *.h files as cpp ones with respect to syntax highlighting.
Thus "class" in _virNodeDevCapPCIDev highlighted mistakenly.
This can be fixed by filetype detection code tunables but it
is more convinient to skip this tuning by every project member.

Let's just use "klass" as field name instead of _class or class
and add syntax rule.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Nikolay Shirokovskiy 2019-03-12 11:08:00 +03:00
parent e7e6861489
commit 0eca80e606
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cfg.mk
View File

@ -1075,6 +1075,15 @@ sc_require_attribute_cleanup_initialization:
halt='variable declared with a cleanup macro must be initialized' \ halt='variable declared with a cleanup macro must be initialized' \
$(_sc_search_regexp) $(_sc_search_regexp)
# "class" in headers is not good because by default Vim treats it as a keyword
# Let's prohibit it in source files as well.
sc_prohibit_class:
@prohibit=' +_?class *;' \
in_vc_files='\.[chx]$$' \
halt='use klass instead of class or _class' \
$(_sc_search_regexp)
# We don't use this feature of maint.mk. # We don't use this feature of maint.mk.
prev_version_file = /dev/null prev_version_file = /dev/null

4
src/conf/node_device_conf.c
View File

@ -346,7 +346,7 @@ virNodeDeviceCapUSBInterfaceDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, "<number>%d</number>\n", virBufferAsprintf(buf, "<number>%d</number>\n",
data->usb_if.number); data->usb_if.number);
virBufferAsprintf(buf, "<class>%d</class>\n", virBufferAsprintf(buf, "<class>%d</class>\n",
data->usb_if._class); data->usb_if.klass);
virBufferAsprintf(buf, "<subclass>%d</subclass>\n", virBufferAsprintf(buf, "<subclass>%d</subclass>\n",
data->usb_if.subclass); data->usb_if.subclass);
virBufferAsprintf(buf, "<protocol>%d</protocol>\n", virBufferAsprintf(buf, "<protocol>%d</protocol>\n",
@ -1216,7 +1216,7 @@ virNodeDevCapUSBInterfaceParseXML(xmlXPathContextPtr ctxt,
goto out; goto out;
if (virNodeDevCapsDefParseULong("number(./class[1])", ctxt, if (virNodeDevCapsDefParseULong("number(./class[1])", ctxt,
&usb_if->_class, def, &usb_if->klass, def,
_("no USB interface class supplied for '%s'"), _("no USB interface class supplied for '%s'"),
_("invalid USB interface class supplied for '%s'")) < 0) _("invalid USB interface class supplied for '%s'")) < 0)
goto out; goto out;

4
src/conf/node_device_conf.h
View File

@ -153,7 +153,7 @@ struct _virNodeDevCapPCIDev {
unsigned int function; unsigned int function;
unsigned int product; unsigned int product;
unsigned int vendor; unsigned int vendor;
unsigned int class; unsigned int klass;
char *product_name; char *product_name;
char *vendor_name; char *vendor_name;
virPCIDeviceAddressPtr physical_function; virPCIDeviceAddressPtr physical_function;
@ -186,7 +186,7 @@ typedef struct _virNodeDevCapUSBIf virNodeDevCapUSBIf;
typedef virNodeDevCapUSBIf *virNodeDevCapUSBIfPtr; typedef virNodeDevCapUSBIf *virNodeDevCapUSBIfPtr;
struct _virNodeDevCapUSBIf { struct _virNodeDevCapUSBIf {
unsigned int number; unsigned int number;
unsigned int _class; /* "class" is reserved in C */ unsigned int klass;
unsigned int subclass; unsigned int subclass;
unsigned int protocol; unsigned int protocol;
char *description; char *description;

4
src/node_device/node_device_udev.c
View File

@ -402,7 +402,7 @@ udevProcessPCI(struct udev_device *device,
privileged = driver->privileged; privileged = driver->privileged;
nodeDeviceUnlock(); nodeDeviceUnlock();
if (udevGetUintProperty(device, "PCI_CLASS", &pci_dev->class, 16) < 0) if (udevGetUintProperty(device, "PCI_CLASS", &pci_dev->klass, 16) < 0)
goto cleanup; goto cleanup;
if ((p = strrchr(def->sysfs_path, '/')) == NULL || if ((p = strrchr(def->sysfs_path, '/')) == NULL ||
@ -582,7 +582,7 @@ udevProcessUSBInterface(struct udev_device *device,
return -1; return -1;
if (udevGetUintSysfsAttr(device, "bInterfaceClass", if (udevGetUintSysfsAttr(device, "bInterfaceClass",
&usb_if->_class, 16) < 0) &usb_if->klass, 16) < 0)
return -1; return -1;
if (udevGetUintSysfsAttr(device, "bInterfaceSubClass", if (udevGetUintSysfsAttr(device, "bInterfaceSubClass",

8
tests/virpcimock.c
View File

@ -122,7 +122,7 @@ struct pciDevice {
char *id; char *id;
int vendor; int vendor;
int device; int device;
int class; int klass;
int iommuGroup; int iommuGroup;
struct pciDriver *driver; /* Driver attached. NULL if attached to no driver */ struct pciDriver *driver; /* Driver attached. NULL if attached to no driver */
}; };
@ -404,7 +404,7 @@ pci_device_new_from_stub(const struct pciDevice *data)
ABORT("@tmp overflow"); ABORT("@tmp overflow");
make_file(devpath, "device", tmp, -1); make_file(devpath, "device", tmp, -1);
if (snprintf(tmp, sizeof(tmp), "0x%.4x", dev->class) < 0) if (snprintf(tmp, sizeof(tmp), "0x%.4x", dev->klass) < 0)
ABORT("@tmp overflow"); ABORT("@tmp overflow");
make_file(devpath, "class", tmp, -1); make_file(devpath, "class", tmp, -1);
@ -858,10 +858,10 @@ init_env(void)
MAKE_PCI_DEVICE("0000:00:01.0", 0x8086, 0x0044); MAKE_PCI_DEVICE("0000:00:01.0", 0x8086, 0x0044);
MAKE_PCI_DEVICE("0000:00:02.0", 0x8086, 0x0046); MAKE_PCI_DEVICE("0000:00:02.0", 0x8086, 0x0046);
MAKE_PCI_DEVICE("0000:00:03.0", 0x8086, 0x0048); MAKE_PCI_DEVICE("0000:00:03.0", 0x8086, 0x0048);
MAKE_PCI_DEVICE("0001:00:00.0", 0x1014, 0x03b9, .class = 0x060400); MAKE_PCI_DEVICE("0001:00:00.0", 0x1014, 0x03b9, .klass = 0x060400);
MAKE_PCI_DEVICE("0001:01:00.0", 0x8086, 0x105e, .iommuGroup = 0); MAKE_PCI_DEVICE("0001:01:00.0", 0x8086, 0x105e, .iommuGroup = 0);
MAKE_PCI_DEVICE("0001:01:00.1", 0x8086, 0x105e, .iommuGroup = 0); MAKE_PCI_DEVICE("0001:01:00.1", 0x8086, 0x105e, .iommuGroup = 0);
MAKE_PCI_DEVICE("0005:80:00.0", 0x10b5, 0x8112, .class = 0x060400); MAKE_PCI_DEVICE("0005:80:00.0", 0x10b5, 0x8112, .klass = 0x060400);
MAKE_PCI_DEVICE("0005:90:01.0", 0x1033, 0x0035, .iommuGroup = 1); MAKE_PCI_DEVICE("0005:90:01.0", 0x1033, 0x0035, .iommuGroup = 1);
MAKE_PCI_DEVICE("0005:90:01.1", 0x1033, 0x0035, .iommuGroup = 1); MAKE_PCI_DEVICE("0005:90:01.1", 0x1033, 0x0035, .iommuGroup = 1);
MAKE_PCI_DEVICE("0005:90:01.2", 0x1033, 0x00e0, .iommuGroup = 1); MAKE_PCI_DEVICE("0005:90:01.2", 0x1033, 0x00e0, .iommuGroup = 1);