Rename uuid.{c,h} to viruuid.{c,h}

daemon/libvirtd.c

@@ -44,7 +44,7 @@
 #include "libvirtd-config.h"
 
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "remote_driver.h"
 #include "viralloc.h"
 #include "virconf.h"
@@ -53,7 +53,6 @@
 #include "remote.h"
 #include "remote_driver.h"
 #include "virhook.h"
-#include "uuid.h"
 #include "viraudit.h"
 #include "locking/lock_manager.h"
 

daemon/remote.c

@@ -37,7 +37,7 @@
 #include "virlog.h"
 #include "virutil.h"
 #include "stream.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "libvirt/libvirt-qemu.h"
 #include "vircommand.h"
 #include "intprops.h"

src/Makefile.am

@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =							\
-		util/uuid.c util/uuid.h				\
 		util/viralloc.c util/viralloc.h			\
 		util/virarch.h util/virarch.c			\
 		util/viratomic.h util/viratomic.c		\
@@ -116,6 +115,7 @@ UTIL_SOURCES =							\
 		util/virusb.c util/virusb.h			\
 		util/viruri.h util/viruri.c			\
 		util/virutil.c util/virutil.h			\
+		util/viruuid.c util/viruuid.h			\
 		$(NULL)
 
 EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \

src/conf/capabilities.c

@@ -29,7 +29,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "cpu_conf.h"
 #include "virterror_internal.h"
 

src/conf/device_conf.c

@@ -25,7 +25,7 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "device_conf.h"

src/conf/domain_audit.c

@@ -28,7 +28,7 @@
 
 #include "domain_audit.h"
 #include "viraudit.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virlog.h"
 #include "viralloc.h"
 

src/conf/domain_conf.c

@@ -37,7 +37,7 @@
 #include "viralloc.h"
 #include "verify.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "virlog.h"

src/conf/interface_conf.c

@@ -29,7 +29,7 @@
 
 #include "viralloc.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 

src/conf/network_conf.c

@@ -39,7 +39,7 @@
 #include "netdev_vlan_conf.h"
 #include "viralloc.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "c-ctype.h"

src/conf/node_device_conf.c

@@ -35,7 +35,7 @@
 #include "xml.h"
 #include "virutil.h"
 #include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virpci.h"
 #include "virrandom.h"
 

src/conf/nwfilter_conf.c

@@ -38,7 +38,7 @@
 
 #include "internal.h"
 
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"

src/conf/secret_conf.c

@@ -31,7 +31,7 @@
 #include "virterror_internal.h"
 #include "virutil.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECRET
 

src/conf/snapshot_conf.c

@@ -43,7 +43,7 @@
 #include "snapshot_conf.h"
 #include "virstoragefile.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "xml.h"

src/conf/storage_conf.c

@@ -39,7 +39,7 @@
 #include "virstoragefile.h"
 
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "virutil.h"
 #include "viralloc.h"

src/conf/storage_encryption_conf.c

@@ -34,7 +34,7 @@
 #include "virutil.h"
 #include "xml.h"
 #include "virterror_internal.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

src/datatypes.c

@@ -26,7 +26,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

src/esx/esx_device_monitor.c

@@ -28,7 +28,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_private.h"
 #include "esx_device_monitor.h"
 #include "esx_vi.h"

src/esx/esx_driver.c

@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "virtypedparam.h"
 #include "esx_driver.h"

src/esx/esx_interface_driver.c

@@ -28,7 +28,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "interface_conf.h"
 #include "virsocketaddr.h"
 #include "esx_private.h"

src/esx/esx_network_driver.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "network_conf.h"
 #include "esx_private.h"
 #include "esx_network_driver.h"

src/esx/esx_nwfilter_driver.c

@@ -28,7 +28,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_private.h"
 #include "esx_nwfilter_driver.h"
 #include "esx_vi.h"

src/esx/esx_secret_driver.c

@@ -27,7 +27,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_private.h"
 #include "esx_secret_driver.h"
 #include "esx_vi.h"

src/esx/esx_storage_backend_iscsi.c

@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"
 #include "esx_storage_backend_iscsi.h"

src/esx/esx_storage_backend_vmfs.c

@@ -34,7 +34,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"
 #include "esx_storage_backend_vmfs.h"

src/esx/esx_storage_driver.c

@@ -25,7 +25,7 @@
 
 #include <config.h>
 
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "storage_conf.h"
 #include "esx_private.h"

src/esx/esx_util.c

@@ -31,7 +31,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "esx_private.h"
 #include "esx_util.h"

src/esx/esx_vi.c

@@ -30,7 +30,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "xml.h"
 #include "esx_vi.h"

src/esx/esx_vi_methods.c

@@ -26,7 +26,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "esx_vi_methods.h"
 #include "esx_util.h"
 

src/hyperv/hyperv_device_monitor.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_device_monitor.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV

src/hyperv/hyperv_driver.c

@@ -30,7 +30,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_driver.h"
 #include "hyperv_interface_driver.h"
 #include "hyperv_network_driver.h"

src/hyperv/hyperv_interface_driver.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_interface_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV

src/hyperv/hyperv_network_driver.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_network_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV

src/hyperv/hyperv_nwfilter_driver.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_nwfilter_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV

src/hyperv/hyperv_secret_driver.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_secret_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV

src/hyperv/hyperv_storage_driver.c

@@ -29,7 +29,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_storage_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_HYPERV

src/hyperv/hyperv_util.c

@@ -27,7 +27,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "hyperv_private.h"
 #include "hyperv_util.h"
 

src/hyperv/hyperv_wmi.c

@@ -30,7 +30,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "hyperv_private.h"
 #include "hyperv_wmi.h"

src/libvirt.c

@@ -50,7 +50,7 @@
 #include "datatypes.h"
 #include "driver.h"
 
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "configmake.h"
 #include "intprops.h"

src/libxl/libxl_conf.c

@@ -37,7 +37,7 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "capabilities.h"
 #include "libxl_driver.h"
 #include "libxl_conf.h"

src/libxl/libxl_driver.c

@@ -37,7 +37,7 @@
 #include "datatypes.h"
 #include "virfile.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vircommand.h"
 #include "libxl.h"
 #include "libxl_driver.h"

src/locking/domain_lock.c

@@ -23,7 +23,7 @@
 
 #include "domain_lock.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 

src/locking/lock_daemon.c

@@ -44,7 +44,7 @@
 #include "rpc/virnetserver.h"
 #include "virrandom.h"
 #include "virhash.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 #include "locking/lock_daemon_dispatch.h"
 #include "locking/lock_protocol.h"

src/locking/lock_driver_lockd.c

@@ -25,7 +25,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virfile.h"
 #include "virterror_internal.h"

src/locking/lock_driver_nop.c

@@ -24,7 +24,7 @@
 #include "lock_driver_nop.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 
 static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED,

src/locking/lock_manager.c

@@ -27,7 +27,7 @@
 #include "virlog.h"
 #include "virutil.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 
 #if HAVE_DLFCN_H
 # include <dlfcn.h>

src/lxc/lxc_conf.c

@@ -32,7 +32,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "configmake.h"
 #include "lxc_container.h"
 #include "virnodesuspend.h"

src/lxc/lxc_container.c

@@ -59,7 +59,7 @@
 #include "virutil.h"
 #include "viralloc.h"
 #include "virnetdevveth.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 #include "virusb.h"
 #include "vircommand.h"

src/lxc/lxc_driver.c

@@ -50,7 +50,7 @@
 #include "virnetdevbridge.h"
 #include "virnetdevveth.h"
 #include "nodeinfo.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virstatslinux.h"
 #include "virhook.h"
 #include "virfile.h"

src/network/bridge_driver.c

@@ -55,7 +55,7 @@
 #include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viriptables.h"
 #include "virlog.h"
 #include "virdnsmasq.h"

src/node_device/node_device_hal.c

@@ -34,7 +34,7 @@
 #include "driver.h"
 #include "datatypes.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virpci.h"
 #include "virlog.h"
 #include "node_device_driver.h"

src/node_device/node_device_udev.c

@@ -34,7 +34,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "virbuffer.h"
 #include "virpci.h"

src/openvz/openvz_conf.c

@@ -45,7 +45,7 @@
 #include "virterror_internal.h"
 #include "openvz_conf.h"
 #include "openvz_util.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virutil.h"

src/phyp/phyp_driver.c

@@ -52,7 +52,7 @@
 #include "driver.h"
 #include "libvirt/libvirt.h"
 #include "virterror_internal.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "domain_conf.h"
 #include "storage_conf.h"
 #include "nodeinfo.h"

src/qemu/qemu_command.c

@@ -34,7 +34,7 @@
 #include "virarch.h"
 #include "virutil.h"
 #include "virfile.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "c-ctype.h"
 #include "domain_nwfilter.h"
 #include "domain_audit.h"

src/qemu/qemu_conf.c

@@ -39,7 +39,7 @@
 #include "qemu_command.h"
 #include "qemu_capabilities.h"
 #include "qemu_bridge_filter.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "virconf.h"
 #include "virutil.h"

src/qemu/qemu_domain.c

@@ -32,7 +32,7 @@
 #include "virterror_internal.h"
 #include "c-ctype.h"
 #include "cpu/cpu.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 #include "domain_event.h"
 #include "virtime.h"

src/qemu/qemu_driver.c

@@ -67,7 +67,7 @@
 #include "virstatslinux.h"
 #include "capabilities.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "node_device_conf.h"

src/qemu/qemu_migration.c

@@ -43,7 +43,7 @@
 #include "virfile.h"
 #include "datatypes.h"
 #include "fdstream.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virtime.h"
 #include "locking/domain_lock.h"
 #include "rpc/virnetsocket.h"

src/qemu/qemu_process.c

@@ -64,7 +64,7 @@
 #include "domain_nwfilter.h"
 #include "locking/domain_lock.h"
 #include "network/bridge_driver.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virprocess.h"
 #include "virtime.h"
 #include "virnetdevtap.h"

src/secret/secret_driver.c

@@ -38,7 +38,7 @@
 #include "secret_driver.h"
 #include "virthread.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virterror_internal.h"
 #include "virfile.h"
 #include "configmake.h"

src/security/security_apparmor.c

@@ -42,7 +42,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virpci.h"
 #include "virusb.h"
 #include "virfile.h"

src/security/virt-aa-helper.c

@@ -49,7 +49,7 @@
 #include "security_apparmor.h"
 #include "domain_conf.h"
 #include "xml.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virusb.h"
 #include "virpci.h"
 #include "virfile.h"

src/storage/storage_backend.c

@@ -51,7 +51,7 @@
 #include "viralloc.h"
 #include "internal.h"
 #include "secret_conf.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virstoragefile.h"
 #include "storage_backend.h"
 #include "virlog.h"

src/storage/storage_backend_rbd.c

@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "base64.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "rados/librados.h"
 #include "rbd/librbd.h"
 

src/test/test_driver.c

@@ -37,7 +37,7 @@
 #include "test_driver.h"
 #include "virbuffer.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "capabilities.h"
 #include "viralloc.h"
 #include "network_conf.h"

src/uml/uml_conf.c

@@ -35,7 +35,7 @@
 #include <arpa/inet.h>
 
 #include "uml_conf.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virbuffer.h"
 #include "virconf.h"
 #include "virutil.h"

src/uml/uml_driver.c

@@ -52,7 +52,7 @@
 #include "virstatslinux.h"
 #include "capabilities.h"
 #include "viralloc.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"
 #include "datatypes.h"

src/util/virnetdevmacvlan.c

@@ -58,7 +58,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
 
 # include "viralloc.h"
 # include "virlog.h"
-# include "uuid.h"
+# include "viruuid.h"
 # include "virfile.h"
 # include "virnetlink.h"
 # include "virnetdev.h"

src/util/virnetdevvportprofile.h

@@ -24,7 +24,7 @@
 # define __VIR_NETDEV_VPORT_PROFILE_H__
 
 # include "internal.h"
-# include "uuid.h"
+# include "viruuid.h"
 # include "virutil.h"
 # include "virmacaddr.h"
 

src/util/viruuid.c

@@ -1,4 +1,6 @@
 /*
+ * viruuid.h: helper APIs for dealing with UUIDs
+ *
  * Copyright (C) 2007-2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -21,7 +23,7 @@
 
 #include <config.h>
 
-#include "uuid.h"
+#include "viruuid.h"
 
 #include <errno.h>
 #include <fcntl.h>

src/util/viruuid.h

@@ -1,4 +1,6 @@
 /*
+ * viruuid.h: helper APIs for dealing with UUIDs
+ *
  * Copyright (C) 2007, 2011, 2012 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or

src/vbox/vbox_tmpl.c

@@ -48,7 +48,7 @@
 #include "domain_event.h"
 #include "storage_conf.h"
 #include "virstoragefile.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "nodeinfo.h"
 #include "virlog.h"

src/vmware/vmware_conf.c

@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "nodeinfo.h"
 #include "virfile.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virterror_internal.h"
 #include "vmx.h"
 

src/vmware/vmware_driver.c

@@ -29,7 +29,7 @@
 #include "virfile.h"
 #include "viralloc.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vircommand.h"
 #include "vmx.h"
 #include "vmware_conf.h"

src/vmx/vmx.c

@@ -30,7 +30,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "vmx.h"
 #include "viruri.h"
 

src/xen/xen_driver.c

@@ -58,7 +58,7 @@
 #include "viralloc.h"
 #include "node_device_conf.h"
 #include "virpci.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "fdstream.h"
 #include "virfile.h"
 #include "viruri.h"

src/xen/xen_inotify.c

@@ -37,7 +37,7 @@
 #include "xen_inotify.h"
 #include "xend_internal.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virfile.h"
 
 #include "xm_internal.h" /* for xenXMDomainConfigParse */

src/xen/xend_internal.c

@@ -38,7 +38,7 @@
 #include "virsexpr.h"
 #include "xen_sxpr.h"
 #include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "xen_driver.h"
 #include "xen_hypervisor.h"
 #include "xs_internal.h" /* To extract VNC port & Serial console TTY */

src/xen/xm_internal.c

@@ -44,7 +44,7 @@
 #include "xen_xm.h"
 #include "virhash.h"
 #include "virbuffer.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"

src/xen/xs_internal.c

@@ -46,7 +46,7 @@
 #include "driver.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "xen_driver.h"
 #include "xs_internal.h"
 #include "xen_hypervisor.h"

src/xenapi/xenapi_driver.c

@@ -32,7 +32,7 @@
 #include "datatypes.h"
 #include "virauth.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "virbuffer.h"
 #include "viruri.h"

src/xenapi/xenapi_utils.c

@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virutil.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "viralloc.h"
 #include "virbuffer.h"
 #include "virlog.h"

src/xenxs/xen_sxpr.c

@@ -31,7 +31,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "verify.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virlog.h"
 #include "count-one-bits.h"
 #include "xenxs_private.h"

src/xenxs/xen_xm.c

@@ -30,7 +30,7 @@
 #include "virconf.h"
 #include "viralloc.h"
 #include "verify.h"
-#include "uuid.h"
+#include "viruuid.h"
 #include "virsexpr.h"
 #include "count-one-bits.h"
 #include "xenxs_private.h"