- Devel - libvirt List Archives

[libvirt] [PATCH] storage: Replace storageLog with VIR_ERROR
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/storage/storage_driver.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 50fcbe2..37be77d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -40,11 +40,10 @@ #include "storage_conf.h" #include "memory.h" #include "storage_backend.h" +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_STORAGE -#define storageLog(msg...) fprintf(stderr, msg) - static virStorageDriverStatePtr driverState; static int storageDriverShutdown(void); @@ -70,8 +69,7 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { !virStoragePoolObjIsActive(pool)) { virStorageBackendPtr backend; if ((backend = virStorageBackendForType(pool->def->type)) == NULL) { - storageLog("Missing backend %d", - pool->def->type); + VIR_ERROR("Missing backend %d", pool->def->type); virStoragePoolObjUnlock(pool); continue; } @@ -79,9 +77,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { if (backend->startPool && backend->startPool(NULL, pool) < 0) { virErrorPtr err = virGetLastError(); - storageLog("Failed to autostart storage pool '%s': %s", - pool->def->name, err ? err->message : - "no error message found"); + VIR_ERROR("Failed to autostart storage pool '%s': %s", + pool->def->name, err ? err->message : + "no error message found"); virStoragePoolObjUnlock(pool); continue; } @@ -90,9 +88,9 @@ storageDriverAutostart(virStorageDriverStatePtr driver) { virErrorPtr err = virGetLastError(); if (backend->stopPool) backend->stopPool(NULL, pool); - storageLog("Failed to autostart storage pool '%s': %s", - pool->def->name, err ? err->message : - "no error message found"); + VIR_ERROR("Failed to autostart storage pool '%s': %s", + pool->def->name, err ? err->message : + "no error message found"); virStoragePoolObjUnlock(pool); continue; } @@ -132,7 +130,6 @@ storageDriverStartup(int privileged) { goto error; if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { - storageLog("out of memory in virAsprintf"); VIR_FREE(userdir); goto out_of_memory; } @@ -175,7 +172,7 @@ storageDriverStartup(int privileged) { return 0; out_of_memory: - storageLog("virStorageStartup: out of memory"); + virReportOOMError(NULL); error: VIR_FREE(base); storageDriverUnlock(driverState); @@ -635,7 +632,7 @@ storagePoolUndefine(virStoragePoolPtr obj) { if (unlink(pool->autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { char ebuf[1024]; - storageLog("Failed to delete autostart link '%s': %s", + VIR_ERROR("Failed to delete autostart link '%s': %s", pool->autostartLink, virStrerror(errno, ebuf, sizeof ebuf)); } -- 1.6.3.3

3 4

[libvirt] [PATCH] website: Add a 1em right margin
by Matthias Bolte 04 Feb '10

04 Feb '10

This stops the text and pre-boxes from touching the right border. --- docs/libvirt.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/libvirt.css b/docs/libvirt.css index a4d1ddd..dfc93c6 100644 --- a/docs/libvirt.css +++ b/docs/libvirt.css @@ -30,6 +30,7 @@ h2, h3, h4, h5, h6 { #content { margin-left: 230px; + margin-right: 1em; padding: 0px; padding-bottom: 1em; } -- 1.6.3.3

2 2

[libvirt] [PATCH] opennebula: Remove unnecessary casts
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/opennebula/one_driver.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index ad7faca..c96d24d 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -108,7 +108,7 @@ static int oneIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) static virDomainPtr oneDomainLookupByID(virConnectPtr conn, int id) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainPtr dom = NULL; virDomainObjPtr vm = NULL; @@ -137,7 +137,7 @@ return_point: static virDomainPtr oneDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainPtr dom = NULL; virDomainObjPtr vm = NULL; @@ -165,7 +165,7 @@ return_point: static virDomainPtr oneDomainLookupByName(virConnectPtr conn, const char *name) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainObjPtr vm = NULL; virDomainPtr dom=NULL; @@ -192,7 +192,7 @@ return_point: static int oneListDomains(virConnectPtr conn, int *ids, int nids) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -204,7 +204,7 @@ static int oneListDomains(virConnectPtr conn, int *ids, int nids) static int oneNumDomains(virConnectPtr conn) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -216,7 +216,7 @@ static int oneNumDomains(virConnectPtr conn) static int oneListDefinedDomains(virConnectPtr conn, char **const names, int nnames) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -228,7 +228,7 @@ static int oneListDefinedDomains(virConnectPtr conn, static int oneNumDefinedDomains(virConnectPtr conn) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; int n; oneDriverLock(driver); @@ -240,7 +240,7 @@ static int oneNumDefinedDomains(virConnectPtr conn) static virDomainPtr oneDomainDefine(virConnectPtr conn, const char *xml) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainDefPtr def; virDomainObjPtr vm; virDomainPtr dom=NULL; @@ -272,7 +272,7 @@ return_point: static int oneDomainUndefine(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; int ret=-1; @@ -302,7 +302,7 @@ return_point: static int oneDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; struct timeval tv; virDomainObjPtr vm; oneDriverLock(driver); @@ -377,7 +377,7 @@ static int oneDomainGetInfo(virDomainPtr dom, static char *oneGetOSType(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm = NULL; char *ret = NULL; @@ -403,7 +403,7 @@ cleanup: static int oneDomainStart(virDomainPtr dom) { virConnectPtr conn = dom->conn; - one_driver_t *driver = (one_driver_t *)(conn->privateData); + one_driver_t *driver = conn->privateData; virDomainObjPtr vm; int ret = -1; int oneid; @@ -436,7 +436,7 @@ static virDomainPtr oneDomainCreateAndStart(virConnectPtr conn, const char *xml, unsigned int flags ATTRIBUTE_UNUSED) { - one_driver_t *driver = (one_driver_t *)conn->privateData; + one_driver_t *driver = conn->privateData; virDomainObjPtr vm = NULL; virDomainDefPtr def; virDomainPtr dom = NULL; @@ -486,7 +486,7 @@ return_point: static int oneDomainShutdown(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t*)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -520,7 +520,7 @@ return_point: static int oneDomainDestroy(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t*)dom->conn->privateData; + one_driver_t *driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -556,7 +556,7 @@ return_point: static int oneDomainSuspend(virDomainPtr dom) { - one_driver_t* driver=dom->conn->privateData; + one_driver_t* driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -590,7 +590,7 @@ return_point: static int oneDomainResume(virDomainPtr dom) { - one_driver_t* driver=dom->conn->privateData; + one_driver_t* driver = dom->conn->privateData; virDomainObjPtr vm; int ret=-1; @@ -698,7 +698,7 @@ static int oneGetAutostart(virDomainPtr domain ATTRIBUTE_UNUSED, int *autostart) } static char* oneGetCapabilities(virConnectPtr conn){ - one_driver_t* privconn=conn->privateData; + one_driver_t* privconn = conn->privateData; char *xml; oneDriverLock(privconn); if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) -- 1.6.3.3

2 2

[libvirt] [PATCH] cpu conf: Use virBufferFreeAndReset instead of virBufferContentAndReset and VIR_FREE
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/conf/cpu_conf.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index e7924c1..244d670 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -249,7 +249,6 @@ virCPUDefFormat(virConnectPtr conn, int flags) { virBuffer buf = VIR_BUFFER_INITIALIZER; - char *tmp; if (virCPUDefFormatBuf(conn, &buf, def, indent, flags) < 0) goto cleanup; @@ -262,8 +261,7 @@ virCPUDefFormat(virConnectPtr conn, no_memory: virReportOOMError(conn); cleanup: - tmp = virBufferContentAndReset(&buf); - VIR_FREE(tmp); + virBufferFreeAndReset(&buf); return NULL; } -- 1.6.3.3

2 2

[libvirt] [PATCH] docs: Refer to virReportOOMError in the HACKING file
by Matthias Bolte 04 Feb '10

04 Feb '10

Instead of refering to __virRaiseError(VIR_ERROR_NO_MEMORY). --- HACKING | 22 +++++++++++----------- docs/hacking.html.in | 20 ++++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/HACKING b/HACKING index 3844e50..4bf216c 100644 --- a/HACKING +++ b/HACKING @@ -166,13 +166,13 @@ codebase, because they encourage a number of serious coding bugs and do not enable compile time verification of checks for NULL. Instead of these routines, use the macros from memory.h - - eg to allocate a single object: + - eg to allocate a single object: virDomainPtr domain; if (VIR_ALLOC(domain) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } @@ -182,8 +182,8 @@ routines, use the macros from memory.h int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } - eg to allocate an array of object pointers @@ -192,8 +192,8 @@ routines, use the macros from memory.h int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } - eg to re-allocate the array of domains to be longer @@ -201,8 +201,8 @@ routines, use the macros from memory.h ndomains = 20 if (VIR_REALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } - eg to free the domain @@ -297,7 +297,7 @@ eg typical usage is as follows: if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); - virReportOOMError(...); + virReportOOMError(NULL); return NULL; } @@ -385,7 +385,7 @@ to build: - if a recently commited patch breaks compilation on a platform or for a given driver then it's fine to commit a minimal fix directly without getting the review feedback first - - similary if make check or make syntax-chek breaks, if there is + - similary if make check or make syntax-check breaks, if there is an obvious fix, it's fine to commit immediately The patch should still be sent to the list (or tell what the fix was if trivial) and 'make check syntax-check' should pass too before commiting diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 96f6657..71b4f47 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -192,8 +192,8 @@ virDomainPtr domain; if (VIR_ALLOC(domain) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -204,8 +204,8 @@ int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -216,8 +216,8 @@ int ndomains = 10; if (VIR_ALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -227,8 +227,8 @@ ndomains = 20 if (VIR_REALLOC_N(domains, ndomains) < 0) { - __virRaiseError(VIR_ERROR_NO_MEMORY) - return NULL; + virReportOOMError(NULL); + return NULL; } </pre></li> @@ -314,7 +314,7 @@ if (virBufferError(&buf)) { virBufferFreeAndReset(&buf); - virReportOOMError(...); + virReportOOMError(NULL); return NULL; } @@ -419,7 +419,7 @@ <li>if a recently commited patch breaks compilation on a platform or for a given driver then it's fine to commit a minimal fix directly without getting the review feedback first</li> - <li>if make check or make syntax-chek breaks, if there is + <li>if make check or make syntax-check breaks, if there is an obvious fix, it's fine to commit immediately. The patch should still be sent to the list (or tell what the fix was if trivial) and 'make check syntax-check' should pass too before commiting -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Cleanup preprocessing structure in esxVI_EnsureSession
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/esx/esx_vi.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bc94326..19c85c5 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -1317,16 +1317,18 @@ esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) * you try to call it. Query the session manager for the current session of * this connection instead and re-login if there is no current session for this * connection. + * + * Update: 'ESX 4.0.0 build-171294' doesn't implement this method. */ #define ESX_VI_USE_SESSION_IS_ACTIVE 0 int esxVI_EnsureSession(esxVI_Context *ctx) { - int result = 0; #if ESX_VI_USE_SESSION_IS_ACTIVE esxVI_Boolean active = esxVI_Boolean_Undefined; #else + int result = 0; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *sessionManager = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -1352,6 +1354,8 @@ esxVI_EnsureSession(esxVI_Context *ctx) return -1; } } + + return 0; #else if (esxVI_String_AppendValueToList(&propertyNameList, "currentSession") < 0 || @@ -1388,16 +1392,11 @@ esxVI_EnsureSession(esxVI_Context *ctx) "last login"); goto failure; } -#endif cleanup: -#if ESX_VI_USE_SESSION_IS_ACTIVE - /* nothing */ -#else esxVI_String_Free(&propertyNameList); esxVI_ObjectContent_Free(&sessionManager); esxVI_UserSession_Free(&currentSession); -#endif return result; @@ -1405,8 +1404,7 @@ esxVI_EnsureSession(esxVI_Context *ctx) result = -1; goto cleanup; - - return 0; +#endif } -- 1.6.3.3

2 2

[libvirt] [PATCH] docs: Emphasize that devices have to be inside the <devices> element
by Matthias Bolte 04 Feb '10

04 Feb '10

Also cleanup indentation of domain XML examples. --- docs/drvxen.html.in | 12 +- docs/formatdomain.html.in | 776 +++++++++++++++++++++++++-------------------- 2 files changed, 430 insertions(+), 358 deletions(-) diff --git a/docs/drvxen.html.in b/docs/drvxen.html.in index a6f0e57..4e35afa 100644 --- a/docs/drvxen.html.in +++ b/docs/drvxen.html.in @@ -234,9 +234,9 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ] <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> - <pae/> - <acpi/> - <apic/> + <pae/> + <acpi/> + <apic/> </features> <clock sync="localtime"/> <devices> @@ -288,9 +288,9 @@ vif = [ "mac=00:16:3e:60:36:ba,bridge=virbr0,script=vif-bridge,vifname=vif5.0" ] <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> - <pae/> - <acpi/> - <apic/> + <pae/> + <acpi/> + <apic/> </features> <clock sync="localtime"/> <devices> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ce49f7d..083a80a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -28,11 +28,11 @@ <h3><a name="elementsMetadata">General metadata</a></h3> - <pre> - <domain type='xen' id='3'> - <name>fv0</name> - <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> - ...</pre> +<pre> +<domain type='xen' id='3'> + <name>fv0</name> + <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> + ...</pre> <dl> <dt><code>name</code></dt> @@ -66,14 +66,14 @@ to obtain/find the boot image. </p> - <pre> - ... - <os> - <type>hvm</type> - <loader>/usr/lib/xen/boot/hvmloader</loader> - <boot dev='hd'/> - </os> - ...</pre> +<pre> + ... + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + ...</pre> <dl> <dt><code>type</code></dt> @@ -109,11 +109,11 @@ An example is <code>pygrub</code> with Xen. </p> - <pre> - ... - <bootloader>/usr/bin/pygrub</bootloader> - <bootloader_args>--append single</bootloader_args> - ...</pre> +<pre> + ... + <bootloader>/usr/bin/pygrub</bootloader> + <bootloader_args>--append single</bootloader_args> + ...</pre> <dl> <dt><code>bootloader</code></dt> @@ -139,16 +139,16 @@ is usually available for both para and full virtualized guests. </p> - <pre> - ... - <os> - <type>hvm</type> - <loader>/usr/lib/xen/boot/hvmloader</loader> - <kernel>/root/f8-i386-vmlinuz</kernel> - <initrd>/root/f8-i386-initrd</initrd> - <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline> - </os> - ...</pre> +<pre> + ... + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/root/f8-i386-vmlinuz</kernel> + <initrd>/root/f8-i386-initrd</initrd> + <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline> + </os> + ...</pre> <dl> <dt><code>type</code></dt> @@ -172,15 +172,15 @@ <h3><a name="elementsResources">Basic resources</a></h3> - <pre> - ... - <memory>524288</memory> - <currentMemory>524288</currentMemory> - <memoryBacking> - <hugepages/> - </memoryBacking> - <vcpu>1</vcpu> - ...</pre> +<pre> + ... + <memory>524288</memory> + <currentMemory>524288</currentMemory> + <memoryBacking> + <hugepages/> + </memoryBacking> + <vcpu>1</vcpu> + ...</pre> <dl> <dt><code>memory</code></dt> @@ -209,14 +209,14 @@ <span class="since">Since 0.7.5</span> </p> - <pre> - ... - <cpu match='exact'> - <model>core2duo</model> - <topology sockets='1' cores='2' threads='1'/> - <feature policy='disable' name='lahf_lm'/> - </cpu> - ...</pre> +<pre> + ... + <cpu match='exact'> + <model>core2duo</model> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='disable' name='lahf_lm'/> + </cpu> + ...</pre> <p> In case no restrictions need to be put on CPU model and its features, a @@ -224,12 +224,12 @@ <span class="since">Since 0.7.6</span> </p> - <pre> - ... - <cpu> - <topology sockets='1' cores='2' threads='1'/> - </cpu> - ...</pre> +<pre> + ... + <cpu> + <topology sockets='1' cores='2' threads='1'/> + </cpu> + ...</pre> <dl> <dt><code>cpu</code></dt> @@ -305,12 +305,12 @@ re-configured for the first post-install bootup. </p> - <pre> - ... - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - ...</pre> +<pre> + ... + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + ...</pre> <dl> <dt><code>on_poweroff</code></dt> @@ -350,14 +350,14 @@ toggled on/off. </p> - <pre> - ... - <features> - <pae/> - <acpi/> - <apic/> - </features> - ...</pre> +<pre> + ... + <features> + <pae/> + <acpi/> + <apic/> + </features> + ...</pre> <p> All features are listed within the <code>features</code> @@ -386,10 +386,10 @@ it to be in so called 'localtime'. </p> - <pre> - ... - <clock offset="localtime"/> - ...</pre> +<pre> + ... + <clock offset="localtime"/> + ...</pre> <dl> <dt><code>clock</code></dt> @@ -408,11 +408,12 @@ <span class="since">Since 0.1.3</span> </p> - <pre> - ... - <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> - ...</pre> +<pre> + ... + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + </devices> + ...</pre> <dl> <dt><code>emulator</code></dt> @@ -433,18 +434,20 @@ element. </p> - <pre> - ... - <disk type='file'> - <driver name="tap" type="aio" cache="default"> - <source file='/var/lib/xen/images/fv0'/> - <target dev='hda' bus='ide'/> - <encryption type='...'> - ... - </encryption> - <shareable/> - </disk> - ...</pre> +<pre> + ... + <devices> + <disk type='file'> + <driver name="tap" type="aio" cache="default"> + <source file='/var/lib/xen/images/fv0'/> + <target dev='hda' bus='ide'/> + <encryption type='...'> + ... + </encryption> + <shareable/> + </disk> + </devices> + ...</pre> <dl> <dt><code>disk</code></dt> @@ -500,24 +503,30 @@ 0.4.4 for USB and 0.6.0 for PCI (KVM only)</span>: </p> - <pre> - ... - <hostdev mode='subsystem' type='usb'> - <source> - <vendor id='0x1234'/> - <product id='0xbeef'/> - </source> - </hostdev> - ...</pre> +<pre> + ... + <devices> + <hostdev mode='subsystem' type='usb'> + <source> + <vendor id='0x1234'/> + <product id='0xbeef'/> + </source> + </hostdev> + </devices> + ...</pre> + <p>or:</p> - <pre> - ... - <hostdev mode='subsystem' type='pci'> - <source> - <address bus='0x06' slot='0x02' function='0x0'/> - </source> - </hostdev> - ...</pre> + +<pre> + ... + <devices> + <hostdev mode='subsystem' type='pci'> + <source> + <address bus='0x06' slot='0x02' function='0x0'/> + </source> + </hostdev> + </devices> + ...</pre> <dl> <dt><code>hostdev</code></dt> @@ -556,14 +565,16 @@ <h4><a name="elementsNICS">Network interfaces</a></h4> - <pre> - ... - <interface type='bridge'> - <source bridge='xenbr0'/> - <mac address='00:16:3e:5d:c7:9e'/> - <script path='vif-bridge'/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='bridge'> + <source bridge='xenbr0'/> + <mac address='00:16:3e:5d:c7:9e'/> + <script path='vif-bridge'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSVirtual">Virtual network</a></h5> @@ -589,18 +600,20 @@ <a href="#elementsNICSTargetOverride">overriding the target element</a>). </p> - <pre> - ... - <interface type='network'> - <source network='default'/> - </interface> - ... - <interface type='network'> - <source network='default'/> - <target dev='vnet7'/> - <mac address="11:22:33:44:55:66"/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='network'> + <source network='default'/> + </interface> + ... + <interface type='network'> + <source network='default'/> + <target dev='vnet7'/> + <mac address="11:22:33:44:55:66"/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSBridge">Bridge to LAN</a></h5> @@ -623,18 +636,20 @@ full incoming & outgoing net access just like a physical machine. </p> - <pre> - ... - <interface type='bridge'> - <source bridge='br0'/> - </interface> - - <interface type='bridge'> - <source bridge='br0'/> - <target dev='vnet7'/> - <mac address="11:22:33:44:55:66"/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='bridge'> + <source bridge='br0'/> + </interface> + ... + <interface type='bridge'> + <source bridge='br0'/> + <target dev='vnet7'/> + <mac address="11:22:33:44:55:66"/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSSlirp">Userspace SLIRP stack</a></h5> @@ -647,14 +662,16 @@ VMs to have outgoing access. </p> - <pre> - ... - <interface type='user'/> - ... - <interface type='user'> - <mac address="11:22:33:44:55:66"/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='user'/> + ... + <interface type='user'> + <mac address="11:22:33:44:55:66"/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSEthernet">Generic ethernet connection</a></h5> @@ -669,15 +686,17 @@ overridden. </p> - <pre> - ... - <interface type='ethernet'/> - ... - <interface type='ethernet'> - <target dev='vnet7'/> - <script path='/etc/qemu-ifup-mynet'/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='ethernet'/> + ... + <interface type='ethernet'> + <target dev='vnet7'/> + <script path='/etc/qemu-ifup-mynet'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSMulticast">Multicast tunnel</a></h5> @@ -693,12 +712,14 @@ multicast address block. </p> - <pre> - ... - <interface type='mcast'> - <source address='230.0.0.1' port='5558'/> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='mcast'> + <source address='230.0.0.1' port='5558'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSTCP">TCP tunnel</a></h5> @@ -711,27 +732,31 @@ network access, one of the VMs should have a 2nd NIC which is connected to one of the first 4 network types and do the appropriate routing.</p> - <pre> - ... - <interface type='server'> - <source address='192.168.0.1' port='5558'/> - </interface> - ... - <interface type='client'> +<pre> + ... + <devices> + <interface type='server'> <source address='192.168.0.1' port='5558'/> - </interface> - ...</pre> + </interface> + ... + <interface type='client'> + <source address='192.168.0.1' port='5558'/> + </interface> + </devices> + ...</pre> <h5><a name="elementsNICSModel">Setting the NIC model</a></h5> - <pre> - ... - <interface type='network'> - <source network='default'/> - <target dev='vnet1'/> - <b><model type='ne2k_pci'/></b> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='network'> + <source network='default'/> + <target dev='vnet1'/> + <b><model type='ne2k_pci'/></b> + </interface> + </devices> + ...</pre> <p> For hypervisors which support this, you can set the model of @@ -757,13 +782,15 @@ qemu-kvm -net nic,model=? /dev/null <h5><a name="elementsNICSTargetOverride">Overriding the target element</a></h5> - <pre> - ... - <interface type='network'> - <source network='default'/> - <b><target dev='vnet1'/></b> - </interface> - ...</pre> +<pre> + ... + <devices> + <interface type='network'> + <source network='default'/> + <b><target dev='vnet1'/></b> + </interface> + </devices> + ...</pre> <p> If no target is specified, certain hypervisors will automatically @@ -783,10 +810,12 @@ qemu-kvm -net nic,model=? /dev/null to provide a graphics tablet for absolute cursor movement. </p> - <pre> - ... - <input type='mouse' bus='usb'/> - ...</pre> +<pre> + ... + <devices> + <input type='mouse' bus='usb'/> + </devices> + ...</pre> <dl> <dt><code>input</code></dt> @@ -807,13 +836,15 @@ qemu-kvm -net nic,model=? /dev/null admin. </p> - <pre> - ... - <graphics type='sdl' display=':0.0'/> - <graphics type='vnc' port='5904'/> - <graphics type='rdp' autoport='yes' multiUser='yes' /> - <graphics type='desktop' fullscreen='yes'/> - ...</pre> +<pre> + ... + <devices> + <graphics type='sdl' display=':0.0'/> + <graphics type='vnc' port='5904'/> + <graphics type='rdp' autoport='yes' multiUser='yes' /> + <graphics type='desktop' fullscreen='yes'/> + </devices> + ...</pre> <dl> <dt><code>graphics</code></dt> @@ -867,14 +898,16 @@ qemu-kvm -net nic,model=? /dev/null A video device. </p> - <pre> - ... - <video> - <model type='vga' vram='8192' heads='1'> - <acceleration accel3d='yes' accel3d='yes'/> - </model> - </video> - ...</pre> +<pre> + ... + <devices> + <video> + <model type='vga' vram='8192' heads='1'> + <acceleration accel3d='yes' accel3d='yes'/> + </model> + </video> + </devices> + ...</pre> <dl> <dt><code>video</code></dt> @@ -907,26 +940,27 @@ qemu-kvm -net nic,model=? /dev/null all classed as character devices and so represented using the same syntax. </p> - <pre> - ... - <parallel type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - </parallel> - <serial type='pty'> - <source path='/dev/pts/3'/> - <target port='0'/> - </serial> - <console type='pty'> - <source path='/dev/pts/4'/> - <target port='0'/> - </console> - <channel type='unix'> - <source mode='bind' path='/tmp/guestfwd'/> - <target type='guestfwd' address='10.0.2.1' port='4600'/> - </channel> - </devices> - </domain></pre> +<pre> + ... + <devices> + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + <channel type='unix'> + <source mode='bind' path='/tmp/guestfwd'/> + <target type='guestfwd' address='10.0.2.1' port='4600'/> + </channel> + </devices> + ...</pre> <p> In each of these directives, the top-level element name (parallel, serial, @@ -949,13 +983,15 @@ qemu-kvm -net nic,model=? /dev/null <h6><a name="elementCharParallel">Parallel port</a></h6> - <pre> - ... - <parallel type='pty'> - <source path='/dev/pts/2'/> - <target port='0'/> - </parallel> - ...</pre> +<pre> + ... + <devices> + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + </devices> + ...</pre> <p> <code>target</code> can have a <code>port</code> attribute, which @@ -965,13 +1001,15 @@ qemu-kvm -net nic,model=? /dev/null <h6><a name="elementCharSerial">Serial port</a></h6> - <pre> - ... - <serial type='pty'> - <source path='/dev/pts/3'/> - <target port='0'/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + </devices> + ...</pre> <p> <code>target</code> can have a <code>port</code> attribute, which @@ -987,13 +1025,15 @@ qemu-kvm -net nic,model=? /dev/null virtualized guests without a paravirtualized console. </p> - <pre> - ... - <console type='pty'> - <source path='/dev/pts/4'/> - <target port='0'/> - </console> - ...</pre> +<pre> + ... + <devices> + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + </devices> + ...</pre> <p> If the console is presented as a serial port, the <code>target</code> @@ -1008,13 +1048,15 @@ qemu-kvm -net nic,model=? /dev/null guest. </p> - <pre> - ... - <channel type='unix'> - <source mode='bind' path='/tmp/guestfwd'/> - <target type='guestfwd' address='10.0.2.1' port='4600'/> - </channel> - ...</pre> +<pre> + ... + <devices> + <channel type='unix'> + <source mode='bind' path='/tmp/guestfwd'/> + <target type='guestfwd' address='10.0.2.1' port='4600'/> + </channel> + </devices> + ...</pre> <p> This can be implemented in a variety of ways. The specific type of @@ -1045,12 +1087,14 @@ qemu-kvm -net nic,model=? /dev/null into the virtual machine's logfile </p> - <pre> - ... - <console type='stdio'> - <target port='1'> - </console> - ...</pre> +<pre> + ... + <devices> + <console type='stdio'> + <target port='1'> + </console> + </devices> + ...</pre> <h6><a name="elementsCharFle">Device logfile</a></h6> @@ -1060,13 +1104,15 @@ qemu-kvm -net nic,model=? /dev/null device is written to the file. </p> - <pre> - ... - <serial type="file"> - <source path="/var/log/vm/vm-serial.log"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="file"> + <source path="/var/log/vm/vm-serial.log"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharVC">Virtual console</a></h6> @@ -1076,12 +1122,14 @@ qemu-kvm -net nic,model=? /dev/null hotkey sequence such as "ctrl+alt+3" </p> - <pre> - ... - <serial type='vc'> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type='vc'> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharNull">Null device</a></h6> @@ -1090,12 +1138,14 @@ qemu-kvm -net nic,model=? /dev/null provided to the input. All data written is discarded. </p> - <pre> - ... - <serial type='null'> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type='null'> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharPTY">Pseudo TTY</a></h6> @@ -1105,13 +1155,15 @@ qemu-kvm -net nic,model=? /dev/null serial port locally. </p> - <pre> - ... - <serial type="pty"> - <source path="/dev/pts/3"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="pty"> + <source path="/dev/pts/3"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <p> NB special case if <console type='pty'>, then the TTY @@ -1130,13 +1182,15 @@ qemu-kvm -net nic,model=? /dev/null port. </p> - <pre> - ... - <serial type="dev"> - <source path="/dev/ttyS0"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="dev"> + <source path="/dev/ttyS0"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharPipe">Named pipe</a></h6> @@ -1145,13 +1199,15 @@ qemu-kvm -net nic,model=? /dev/null more info. </p> - <pre> - ... - <serial type="pipe"> - <source path="/tmp/mypipe"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="pipe"> + <source path="/tmp/mypipe"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharTCP">TCP client/server</a></h6> @@ -1160,46 +1216,52 @@ qemu-kvm -net nic,model=? /dev/null remote server. </p> - <pre> - ... - <serial type="tcp"> - <source mode="connect" host="0.0.0.0" service="2445"/> - <protocol type="raw"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="tcp"> + <source mode="connect" host="0.0.0.0" service="2445"/> + <protocol type="raw"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <p> Or as a TCP server waiting for a client connection. </p> - <pre> - ... - <serial type="tcp"> - <source mode="bind" host="127.0.0.1" service="2445"/> - <protocol type="raw"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="tcp"> + <source mode="bind" host="127.0.0.1" service="2445"/> + <protocol type="raw"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <p> Alternatively you can use telnet instead of raw TCP. <p> - <pre> - ... - <serial type="tcp"> - <source mode="connect" host="0.0.0.0" service="2445"/> - <protocol type="telnet"/> - <target port="1"/> - </serial> - ... - <serial type="tcp"> - <source mode="bind" host="127.0.0.1" service="2445"/> - <protocol type="telnet"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="tcp"> + <source mode="connect" host="0.0.0.0" service="2445"/> + <protocol type="telnet"/> + <target port="1"/> + </serial> + ... + <serial type="tcp"> + <source mode="bind" host="127.0.0.1" service="2445"/> + <protocol type="telnet"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharUDP">UDP network console</a></h6> @@ -1208,14 +1270,16 @@ qemu-kvm -net nic,model=? /dev/null sending and receiving packets. This is a lossy service. </p> - <pre> - ... - <serial type="udp"> - <source mode="bind" host="0.0.0.0" service="2445"/> - <source mode="connect" host="0.0.0.0" service="2445"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="udp"> + <source mode="bind" host="0.0.0.0" service="2445"/> + <source mode="connect" host="0.0.0.0" service="2445"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h6><a name="elementsCharUNIX">UNIX domain socket client/server</a></h6> @@ -1224,13 +1288,15 @@ qemu-kvm -net nic,model=? /dev/null accepting connections from local clients. </p> - <pre> - ... - <serial type="unix"> - <source mode="bind" path="/tmp/foo"/> - <target port="1"/> - </serial> - ...</pre> +<pre> + ... + <devices> + <serial type="unix"> + <source mode="bind" path="/tmp/foo"/> + <target port="1"/> + </serial> + </devices> + ...</pre> <h4><a name="elementsSound">Sound devices</a></h4> @@ -1240,10 +1306,12 @@ qemu-kvm -net nic,model=? /dev/null <code>sound</code> element. <span class="since">Since 0.4.3</span> </p> - <pre> - ... - <sound model='es1370'/> - ...</pre> +<pre> + ... + <devices> + <sound model='es1370'/> + </devices> + ...</pre> <dl> <dt><code>sound</code></dt> @@ -1276,15 +1344,19 @@ qemu-kvm -net nic,model=? /dev/null libvirt. </p> - <pre> - ... - <watchdog model='i6300esb'/> - ...</pre> +<pre> + ... + <devices> + <watchdog model='i6300esb'/> + </devices> + ...</pre> - <pre> - ... - <watchdog model='i6300esb' action='poweroff'/> - ...</pre> +<pre> + ... + <devices> + <watchdog model='i6300esb' action='poweroff'/> + </devices> +</domain></pre> <dl> <dt><code>model</code></dt> -- 1.6.3.3

2 2

[libvirt] [PATCH 0/9] Progress monitoring & cancellation of jobs
by Daniel P. Berrange 04 Feb '10

04 Feb '10

This series introduces 2 new APIs to allow long running jobs to be monitored and cancelled. This applies to virDomainMigrate, virDomainSave, virDomainRestore and virDomainCoreDump at least. The implementation is provided for QEMU only, any others that are able to implementation can do so as desired. Usefulness of these new APIs requires use of multiple threads on a single connection, or multiple connections, since the main API calls are still all fully blocking. Instead a parallel thread or process can monitor. This can be seen with virsh In termainl 1 $ virsh save demo demo.img In terminal 2 $ ./virsh domjobinfo demo Job type: Unbounded Time elapsed: 795 ms Data processed: 22446080 bytes Data remaining: 219119616 bytes Data total: 241565696 bytes Memory processed: 22446080 bytes Memory remaining: 219119616 bytes Memory total: 241565696 bytes $ ./virsh domjobinfo demo Job type: Unbounded Time elapsed: 1669 ms Data processed: 139784192 bytes Data remaining: 101781504 bytes Data total: 241565696 bytes Memory processed: 139784192 bytes Memory remaining: 101781504 bytes Memory total: 241565696 bytes $ ./virsh domjobabort demo Back in terminal 1 error: Failed to save domain demo to demo.img error: operation failed: Migration was cancelled by client

1 9

[libvirt] [PATCH] sexpr_string: avoid leak on OOM error path
by Jim Meyering 04 Feb '10

04 Feb '10

>From cc06142a81dc1891dc75306b986ea331f5fd5368 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 17:55:15 +0100 Subject: [PATCH] sexpr_string: avoid leak on OOM error path * src/xen/sexpr.c (sexpr_string): Free sexpr buffer upon allocation failure. --- src/xen/sexpr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/xen/sexpr.c b/src/xen/sexpr.c index 085500d..669f8a2 100644 --- a/src/xen/sexpr.c +++ b/src/xen/sexpr.c @@ -107,30 +107,31 @@ sexpr_nil(void) struct sexpr * sexpr_string(const char *str, ssize_t len) { struct sexpr *ret = sexpr_new(); if (ret == NULL) return ret; ret->kind = SEXPR_VALUE; if (len > 0) { ret->u.value = strndup(str, len); } else { ret->u.value = strdup(str); } if (ret->u.value == NULL) { + VIR_FREE(ret); return NULL; } return ret; } /** * sexpr_cons: * @car: the left operand * @cdr: the right operand * * Implement the CONS operation assembling 2 existing S-Expressions. * Note that in case of error the input data are not freed. * * Returns the resulting S-Expression pointer or NULL in case of error. -- 1.7.0.rc1.199.g9253a

2 1

[libvirt] Suggested schedule for next release
by Daniel Veillard 04 Feb '10

04 Feb '10

Considering the amount of changes accumulating in a month, I suggest to continue with the end-of-month release cycle, which means basically that we would push features to head until Friday 19th and push the next release on the 26. This is a short cycle since Feb is a short month and we skipped a bit on 0.7.6 release, but I have no doubt we will have enough substance :-) There is a number of patches alredy lining up, the new APIs from Jim Fehlig, Dan Berrange clock sync patches, the macvlan patches, and the proposed snapshotting APIs (if we actually end up adding snapshotting I think next release would deserve being named 0.8.0 as this would be a major enhancement, otherwise 0.7.7), etc... Happy hacking ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0