mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
* src/openvz_conf.c src/libvirt.c: cleanup, avoid some warnings,
and reuse the existing uuid generation function. Daniel
This commit is contained in:
parent
b55718444f
commit
36e975dd4f
@ -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>
|
Tue Jul 17 15:24:27 CEST 2007 Daniel Veillard <veillard@redhat.com>
|
||||||
|
|
||||||
* configure.in src/Makefile.am src/driver.h src/libvirt.c:
|
* configure.in src/Makefile.am src/driver.h src/libvirt.c:
|
||||||
|
@ -30,6 +30,9 @@
|
|||||||
#include "xen_unified.h"
|
#include "xen_unified.h"
|
||||||
#include "remote_internal.h"
|
#include "remote_internal.h"
|
||||||
#include "qemu_driver.h"
|
#include "qemu_driver.h"
|
||||||
|
#ifdef WITH_OPENVZ
|
||||||
|
#include "openvz_driver.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TODO:
|
* TODO:
|
||||||
|
@ -331,6 +331,7 @@ char *openvzLocateConfDir(void)
|
|||||||
|
|
||||||
/* Richard Steven's classic readline() function */
|
/* Richard Steven's classic readline() function */
|
||||||
|
|
||||||
|
static
|
||||||
int openvz_readline(int fd, char *ptr, int maxlen)
|
int openvz_readline(int fd, char *ptr, int maxlen)
|
||||||
{
|
{
|
||||||
int n, rc;
|
int n, rc;
|
||||||
@ -355,27 +356,6 @@ int openvz_readline(int fd, char *ptr, int maxlen)
|
|||||||
return n;
|
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)
|
int openvzGetVPSUUID(int vpsid, char *uuidbuf)
|
||||||
{
|
{
|
||||||
char conf_file[PATH_MAX];
|
char conf_file[PATH_MAX];
|
||||||
@ -437,7 +417,7 @@ int openvzSetUUID(int vpsid)
|
|||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if(uuid[0] == (int)NULL) {
|
if(uuid[0] == (int)NULL) {
|
||||||
openvzGenerateUUID(new_uuid);
|
virUUIDGenerate(new_uuid);
|
||||||
bzero(uuid, (VIR_UUID_BUFLEN * 2) + 1);
|
bzero(uuid, (VIR_UUID_BUFLEN * 2) + 1);
|
||||||
for(i = 0; i < VIR_UUID_BUFLEN; i ++)
|
for(i = 0; i < VIR_UUID_BUFLEN; i ++)
|
||||||
sprintf(uuid + (i * 2), "%02x", (unsigned char)new_uuid[i]);
|
sprintf(uuid + (i * 2), "%02x", (unsigned char)new_uuid[i]);
|
||||||
|
Loading…
Reference in New Issue
Block a user