[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 4/8] Use libuuid if available.
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCH v6 4/8] Use libuuid if available. |
Date: |
Thu, 11 Sep 2008 16:24:11 +0300 |
User-agent: |
StGIT/0.14.2 |
If libuuid is available use it for UUID generation in case a user asks for it.
Signed-off-by: Gleb Natapov <address@hidden>
---
Makefile.target | 4 ++++
configure | 21 +++++++++++++++++++++
vl.c | 19 +++++++++++++++++++
3 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index e3bceac..a3399d7 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -519,6 +519,10 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
LIBS += $(CONFIG_VNC_TLS_LIBS)
endif
+ifdef CONFIG_UUID
+LIBS += -luuid
+endif
+
# SCSI layer
OBJS+= lsi53c895a.o esp.o
diff --git a/configure b/configure
index f1ee0af..b914ac5 100755
--- a/configure
+++ b/configure
@@ -110,6 +110,7 @@ curses="yes"
aio="yes"
nptl="yes"
mixemu="no"
+uuid="yes"
# OS specific
targetos=`uname -s`
@@ -316,6 +317,8 @@ for opt do
;;
--enable-uname-release=*) uname_release="$optarg"
;;
+ --disable-uuid) uuid="no"
+ ;;
--sparc_cpu=*)
sparc_cpu="$optarg"
case $sparc_cpu in
@@ -785,6 +788,19 @@ EOF
fi
##########################################
+# uuid library
+if test "$uuid" = "yes" ; then
+ uuid=no
+ cat > $TMPC << EOF
+#include <uuid/uuid.h>
+int main(void) { uuid_t u; return 0; }
+EOF
+ if $cc -o $TMPE $TMPC -luuid 2> /dev/null ; then
+ uuid=yes
+ fi
+fi
+
+##########################################
# Sound support libraries probe
audio_drv_probe()
@@ -966,6 +982,7 @@ echo "uname -r $uname_release"
echo "NPTL support $nptl"
echo "vde support $vde"
echo "AIO support $aio"
+echo "UUID support $uuid"
if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -1173,6 +1190,10 @@ if test "$vnc_tls" = "yes" ; then
echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_mak
echo "#define CONFIG_VNC_TLS 1" >> $config_h
fi
+if test "$uuid" = "yes" ; then
+ echo "CONFIG_UUID=yes" >> $config_mak
+ echo "#define CONFIG_UUID 1" >> $config_h
+fi
qemu_version=`head $source_path/VERSION`
echo "VERSION=$qemu_version" >>$config_mak
echo "#define QEMU_VERSION \"$qemu_version\"" >> $config_h
diff --git a/vl.c b/vl.c
index 918b7f5..15d2dec 100644
--- a/vl.c
+++ b/vl.c
@@ -142,6 +142,11 @@ int inet_aton(const char *cp, struct in_addr *ia);
#include "exec-all.h"
+#ifdef CONFIG_UUID
+#include <uuid/uuid.h>
+static int generate_uuid;
+#endif
+
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
#ifdef __sun__
@@ -8801,6 +8806,15 @@ int main(int argc, char **argv)
cursor_hide = 0;
break;
case QEMU_OPTION_uuid:
+ if (strcmp(optarg, "gen") == 0) {
+#ifdef CONFIG_UUID
+ generate_uuid = 1;
+ break;
+#else
+ fprintf(stderr, "UUID generation not supported.\n");
+ exit(1);
+#endif
+ }
if(qemu_uuid_parse(optarg, qemu_uuid) < 0) {
fprintf(stderr, "Fail to parse UUID string."
" Wrong format.\n");
@@ -8906,6 +8920,11 @@ int main(int argc, char **argv)
monitor_device = "stdio";
}
+#if CONFIG_UUID
+ if (generate_uuid)
+ uuid_generate(qemu_uuid);
+#endif
+
#ifndef _WIN32
if (daemonize) {
pid_t pid;
- [Qemu-devel] [PATCH v6 0/8] Add new firmware configuration mechanism, Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 1/8] Key/value based qemu<->guest firmware communication mechanism., Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 2/8] Add -uuid command line option., Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 3/8] Add "info uuid" command to monitor., Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 4/8] Use libuuid if available.,
Gleb Natapov <=
- [Qemu-devel] [PATCH v6 5/8] Add UUID to firmware configuration info., Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 6/8] Pass cpu speed into SM BIOS., Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 7/8] Add common keys to firmware configuration, Gleb Natapov, 2008/09/11
- [Qemu-devel] [PATCH v6 8/8] Add sparc keys to firmware configuration., Gleb Natapov, 2008/09/11
- Re: [Qemu-devel] [PATCH v6 0/8] Add new firmware configuration mechanism, Blue Swirl, 2008/09/11