[libvirt] [PATCH 24/29] Convert HAVE_UDEV to WITH_UDEV

From: "Daniel P. Berrange" <berrange(a)redhat.com&gt; Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com&gt; --- configure.ac | 4 ++-- src/Makefile.am | 2 +- src/node_device/node_device_driver.c | 4 ++-- src/node_device/node_device_driver.h | 2 +- src/storage/storage_backend_scsi.c | 4 ++-- src/util/storage_file.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index e68c338..e1c8635 100644 --- a/configure.ac +++ b/configure.ac @@ -2251,11 +2251,11 @@ if test "x$with_udev" = "xyes" || test "x$with_udev" = "xcheck"; then ]) fi if test "x$with_udev" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_UDEV], 1, + AC_DEFINE_UNQUOTED([WITH_UDEV], 1, [use UDEV for host device enumeration]) fi fi -AM_CONDITIONAL([HAVE_UDEV], [test "x$with_udev" = "xyes"]) +AM_CONDITIONAL([WITH_UDEV], [test "x$with_udev" = "xyes"]) AC_SUBST([UDEV_CFLAGS]) AC_SUBST([UDEV_LIBS]) AC_SUBST([PCIACCESS_CFLAGS]) diff --git a/src/Makefile.am b/src/Makefile.am index 7c5db89..026aaea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1154,7 +1154,7 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) endif -if HAVE_UDEV +if WITH_UDEV libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) $(PCIACCESS_CFLAGS) libvirt_driver_nodedev_la_LIBADD += $(UDEV_LIBS) $(PCIACCESS_LIBS) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 4c62707..6759815 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -681,7 +681,7 @@ out: } int nodedevRegister(void) { -#if defined(HAVE_HAL) && defined(HAVE_UDEV) +#if defined(HAVE_HAL) && defined(WITH_UDEV) /* Register only one of these two - they conflict */ if (udevNodeRegister() == -1) return halNodeRegister(); @@ -690,7 +690,7 @@ int nodedevRegister(void) { # ifdef HAVE_HAL return halNodeRegister(); # endif -# ifdef HAVE_UDEV +# ifdef WITH_UDEV return udevNodeRegister(); # endif #endif diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index b34e1af..d1dc134 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -42,7 +42,7 @@ # ifdef HAVE_HAL int halNodeRegister(void); # endif -# ifdef HAVE_UDEV +# ifdef WITH_UDEV int udevNodeRegister(void); # endif diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index 9689fb0..b3a36c8 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -166,7 +166,7 @@ static char * virStorageBackendSCSISerial(const char *dev) { char *serial = NULL; -#ifdef HAVE_UDEV +#ifdef WITH_UDEV virCommandPtr cmd = virCommandNewArgList( "/lib/udev/scsi_id", "--replace-whitespace", @@ -191,7 +191,7 @@ virStorageBackendSCSISerial(const char *dev) virReportOOMError(); } -#ifdef HAVE_UDEV +#ifdef WITH_UDEV cleanup: virCommandFree(cmd); #endif diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 2399e50..d2cb7db 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -1129,7 +1129,7 @@ const char *virStorageFileGetLVMKey(const char *path) } #endif -#ifdef HAVE_UDEV +#ifdef WITH_UDEV const char *virStorageFileGetSCSIKey(const char *path) { char *key = NULL; -- 1.7.11.4