External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-16 22:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/openvz_conf.c src/libvirt.c: cleanup, avoid some warnings,

Browse Source 
and reuse the existing uuid generation function.
Daniel
This commit is contained in:
Daniel Veillard 2007-07-17 14:40:26 +00:00
parent b55718444f
commit 36e975dd4f
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jul 17 16:39:18 CEST 2007 Daniel Veillard <veillard@redhat.com>
* src/openvz_conf.c src/libvirt.c: cleanup, avoid some warnings,
and reuse the existing uuid generation function.
Tue Jul 17 15:24:27 CEST 2007 Daniel Veillard <veillard@redhat.com>
* configure.in src/Makefile.am src/driver.h src/libvirt.c:

3
src/libvirt.c
View File

@ -30,6 +30,9 @@
#include "xen_unified.h"
#include "remote_internal.h"
#include "qemu_driver.h"
#ifdef WITH_OPENVZ
#include "openvz_driver.h"
#endif
/*
* TODO:

24
src/openvz_conf.c
View File

@ -331,6 +331,7 @@ char *openvzLocateConfDir(void)
/* Richard Steven's classic readline() function */
static
int openvz_readline(int fd, char *ptr, int maxlen)
{
int n, rc;
@ -355,27 +356,6 @@ int openvz_readline(int fd, char *ptr, int maxlen)
return n;
}
void openvzGenerateUUID(unsigned char *uuid)
{
unsigned int i;
int fd;
/* seed rand() with kernel entrophy */
fd = open("/dev/urandom", O_RDONLY);
if(fd != -1) {
read(fd, &i, sizeof(int));
srand(i);
close(fd);
}
else {
srand((int) time(NULL));
}
for (i = 0 ; i < VIR_UUID_BUFLEN ; i++) {
uuid[i] = (unsigned char)(1 + (int) (256.0 * (rand() / (RAND_MAX + 1.0))));
}
}
int openvzGetVPSUUID(int vpsid, char *uuidbuf)
{
char conf_file[PATH_MAX];
@ -437,7 +417,7 @@ int openvzSetUUID(int vpsid)
return -1;
if(uuid[0] == (int)NULL) {
openvzGenerateUUID(new_uuid);
virUUIDGenerate(new_uuid);
bzero(uuid, (VIR_UUID_BUFLEN * 2) + 1);
for(i = 0; i < VIR_UUID_BUFLEN; i ++)
sprintf(uuid + (i * 2), "%02x", (unsigned char)new_uuid[i]);