External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/opennebula/one_conf.c src/opennebula/one_driver.c: fix One

Browse Source 
driver compilation issues, patch by Javier Fontan and remove
  some tabs in format strings
daniel
This commit is contained in:
Daniel Veillard 2009-06-24 16:17:10 +00:00
parent 2fa4a8b991
commit 31bd8cb6d0
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jun 24 18:15:56 CEST 2009 Daniel Veillard <veillard@redhat.com>
* src/opennebula/one_conf.c src/opennebula/one_driver.c: fix One
driver compilation issues, patch by Javier Fontan and remove
some tabs in format strings
Mon Jun 22 12:40:11 EDT 2009 Cole Robinson <crobinso@redhat.com> Mon Jun 22 12:40:11 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/libvirt_private.syms src/storage_conf.c src/storage_conf.h * src/libvirt_private.syms src/storage_conf.c src/storage_conf.h

32
src/opennebula/one_conf.c
View File

@ -172,20 +172,20 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def)
// missing source is only allowed at cdrom and floppy // missing source is only allowed at cdrom and floppy
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) {
virBufferVSprintf(&buf, "DISK=[ type = disk,\n" virBufferVSprintf(&buf, "DISK=[ type = disk,\n"
" source = \"%s\",\n", "\tsource = \"%s\",\n",
def->disks[i]->src); def->disks[i]->src);
} }
else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
virBufferAddLit(&buf, "DISK=[ type = cdrom,\n"); virBufferAddLit(&buf, "DISK=[ type = cdrom,\n");
if (def->disks[i]->src) virBufferVSprintf(&buf, " source = \"%s\",\n",def->disks[i]->src); if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src);
} }
else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
virBufferAddLit(&buf, "DISK=[ type = floppy,\n"); virBufferAddLit(&buf, "DISK=[ type = floppy,\n");
if (def->disks[i]->src) virBufferVSprintf(&buf, " source = \"%s\",\n",def->disks[i]->src); if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src);
} }
virBufferVSprintf(&buf, " target = \"%s\",\n" virBufferVSprintf(&buf, "\ttarget = \"%s\",\n"
" readonly =", "\treadonly =",
def->disks[i]->dst); def->disks[i]->dst);
if (def->disks[i]->readonly) if (def->disks[i]->readonly)
@ -225,18 +225,24 @@ char* xmlOneTemplate(virConnectPtr conn,virDomainDefPtr def)
} }
} }
if (def->graphics != NULL) { for(i=0;i<def->ngraphics;i++) {
if (def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (def->graphics[i] == NULL)
continue;
if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
virBufferAddLit(&buf,"GRAPHICS = [\n type = \"vnc\""); virBufferAddLit(&buf,"GRAPHICS = [\n type = \"vnc\"");
if (def->graphics->data.vnc.listenAddr != NULL) if (def->graphics[i]->data.vnc.listenAddr != NULL)
virBufferVSprintf(&buf,",\n listen = \"%s\"",def->graphics->data.vnc.listenAddr); virBufferVSprintf(&buf,",\n listen = \"%s\"",
def->graphics[i]->data.vnc.listenAddr);
if (def->graphics->data.vnc.autoport == 0) if (def->graphics[i]->data.vnc.autoport == 0)
virBufferVSprintf(&buf,",\n port = \"%d\"",def->graphics->data.vnc.port); virBufferVSprintf(&buf,",\n port = \"%d\"",
def->graphics[i]->data.vnc.port);
if (def->graphics->data.vnc.passwd != NULL) if (def->graphics[i]->data.vnc.passwd != NULL)
virBufferVSprintf(&buf,",\n passwd = \"%s\"",def->graphics->data.vnc.passwd); virBufferVSprintf(&buf,",\n passwd = \"%s\"",
def->graphics[i]->data.vnc.passwd);
virBufferAddLit(&buf," ]\n"); virBufferAddLit(&buf," ]\n");

2
src/opennebula/one_driver.c
View File

@ -749,6 +749,8 @@ static virDriver oneDriver = {
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
NULL, /* domainDumpXML */ NULL, /* domainDumpXML */
NULL, /* domainXMLFromNative */
NULL, /* domainXMLToNative */
oneListDefinedDomains, /* listDefinedDomains */ oneListDefinedDomains, /* listDefinedDomains */
oneNumDefinedDomains, /* numOfDefinedDomains */ oneNumDefinedDomains, /* numOfDefinedDomains */
oneDomainStart, /* domainCreate */ oneDomainStart, /* domainCreate */