External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-04 05:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

node_device: Enclose Linux specific code in ifdef __linux__

Browse Source 
Our CI started to enable udev backend on FreeBSD. And while there
is udev on FreeBSD some parts of our code are highly Linux
specific, e.g. translating SCSI device type to string (from an
integer obtained from the sysfs). Obviously, this doesn't work
anywhere else. This is the reason why we need to include
scsi/scsi.h header file (which actually comes from the Linux
kernel source tree but for some reason glibc started to
distribute it, followed by musl).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
This commit is contained in:
Michal Privoznik 2023-07-11 16:13:15 +02:00
parent 3bf02acdc5
commit ded44a0406
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_device/node_device_udev.c
View File

@ -22,7 +22,9 @@
#include <gio/gio.h> #include <gio/gio.h>
#include <libudev.h> #include <libudev.h>
#include <pciaccess.h> #include <pciaccess.h>
#include <scsi/scsi.h> #ifdef __linux__
# include <scsi/scsi.h>
#endif
#include "node_device_conf.h" #include "node_device_conf.h"
#include "node_device_event.h" #include "node_device_event.h"
@ -678,6 +680,8 @@ udevGetSCSIType(virNodeDeviceDef *def G_GNUC_UNUSED,
*typestring = NULL; *typestring = NULL;
#ifdef __linux__
/* These values are Linux specific. */
switch (type) { switch (type) {
case TYPE_DISK: case TYPE_DISK:
*typestring = g_strdup("disk"); *typestring = g_strdup("disk");
@ -714,6 +718,10 @@ udevGetSCSIType(virNodeDeviceDef *def G_GNUC_UNUSED,
foundtype = 0; foundtype = 0;
break; break;
} }
#else
/* Implement me. */
foundtype = 0;
#endif
if (*typestring == NULL) { if (*typestring == NULL) {
if (foundtype == 1) { if (foundtype == 1) {