- Devel - libvirt List Archives

[libvirt] [Patch v5] Add VMware Workstation and Player driver
by Jean-Baptiste Rouault 23 Dec '10

23 Dec '10

* Changes since v4: Fix a bug and a memory leak in vmwareParsePath() Remove domainSave/Restore functions because more work is needed on them

4 11

[libvirt] [PATCH] virsh: Add --force option to update-device
by Jiri Denemark 23 Dec '10

23 Dec '10

--- tools/virsh.c | 5 +++++ tools/virsh.pod | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4e37f2d..774d937 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8293,6 +8293,7 @@ static const vshCmdOptDef opts_update_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, N_("XML file")}, {"persistent", VSH_OT_BOOL, 0, N_("persist device update")}, + {"force", VSH_OT_BOOL, 0, N_("force device update")}, {NULL, 0, 0, NULL} }; @@ -8331,6 +8332,10 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) } else { flags = VIR_DOMAIN_DEVICE_MODIFY_LIVE; } + + if (vshCommandOptBool(cmd, "force")) + flags |= VIR_DOMAIN_DEVICE_MODIFY_FORCE; + ret = virDomainUpdateDeviceFlags(dom, buffer, flags); VIR_FREE(buffer); diff --git a/tools/virsh.pod b/tools/virsh.pod index 9cb6829..9c45a61 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -731,12 +731,14 @@ I<type> can be either I<network> to indicate a physical network device or I<brid It is recommended to use the I<mac> option to distinguish between the interfaces if more than one are present on the domain. -=item B<update-device> I<domain-id> I<file> optional I<--persistent> - -Update the characteristics of a device associated with I<domain-id>, -based on the device definition in an XML I<file>. If the I<--persistent> -option is used, the changes will affect the next boot of the domain. -See the documentation to learn about libvirt XML format for a device. +=item B<update-device> I<domain-id> I<file> optional I<--persistent> I<--force> + +Update the characteristics of a device associated with I<domain-id>, based on +the device definition in an XML I<file>. If the I<--persistent> option is +used, the changes will affect the next boot of the domain. The I<--force> +option can be used to force device update, e.g., to eject a CD-ROM even if it +is locked/mounted in the domain. See the documentation to learn about libvirt +XML format for a device. =back -- 1.7.3.4

2 2

[libvirt] [PATCH] fix virsh coredumps when using ext transport
by Wen Congyang 23 Dec '10

23 Dec '10

when we use an external process to connect remote libvirtd, virsh will coredump: # virsh -c qemu+ext://<target_ip>/system?command=cmd Segmentation fault (core dumped) This bug was caused by 3348a97b. Signed-off-by: Wen Congyang <wency(a)cn.fujitsu.com> --- src/remote/remote_driver.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fae191c..1c13f4a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -802,6 +802,18 @@ doRemoteOpen (virConnectPtr conn, goto failed; } + /* Run the external process. */ + if (!cmd_argv) { + if (VIR_ALLOC_N(cmd_argv, 2) < 0) + goto out_of_memory; + + cmd_argv[0] = strdup(command); + if (cmd_argv[0] == NULL) + goto out_of_memory; + + cmd_argv[1] = NULL; + } + if (virExec((const char**)cmd_argv, NULL, NULL, &pid, sv[1], &(sv[1]), &(errfd[1]), VIR_EXEC_CLEAR_CAPS) < 0) -- 1.7.1

2 3

[libvirt] [PATCH] Fix memory leak in virsh
by Hu Tao 23 Dec '10

23 Dec '10

--- tools/virsh.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4e37f2d..8c123bb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10935,8 +10935,10 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) if (tk == VSH_TK_ERROR) goto syntaxError; - if (tk != VSH_TK_ARG) + if (tk != VSH_TK_ARG) { + VIR_FREE(tkdata); break; + } if (cmd == NULL) { /* first token must be command name */ -- 1.7.3.1 -- Thanks, Hu Tao

2 2

[libvirt] [BUG] intermediate snapshot deleted
by Philipp Hahn 22 Dec '10

22 Dec '10

Hello, I encountered another problem: snapshots are linked to there parent snapshot. If the parent snapshot is deleted, the chain gets broken and deleting the child snapshot terminates with an error message: > error: Domain snapshot not found: no domain snapshot parent with matching name '1291813671' I can reproduce this using the following sequence of commands for my test-domain called "test" using a singel qcow2 image: # virsh snapshot-create test # 1291813670 # virsh snapshot-create test # 1291813671 # virsh snapshot-create test # 1291813672 # virsh snapshot-delete test 1291813671 # virsh snapshot-delete test 1291813672 Is this problem known (libvirt-0.8.3)? Reverting to such an unlinked snapshot is still possible, but deleting it is not. Sincerely Philipp Hahn -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 28359 Bremen fax: +49 421 22 232-99 http://www.univention.de

2 1

[libvirt] [PATCH] Set bitmap size when allocating a bitmap
by Jim Fehlig 22 Dec '10

22 Dec '10

I began noticing a race when reserving VNC ports as described here https://www.redhat.com/archives/libvir-list/2010-November/msg00379.html Turns out that we were not initializing the size field of bitmap struct when allocating the bitmap. This subsequently caused virBitmapSetBit() to fail since bitmap->size is 0, hence we never actually reserved the port. --- src/util/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/bitmap.c b/src/util/bitmap.c index 1b0c9da..9741668 100644 --- a/src/util/bitmap.c +++ b/src/util/bitmap.c @@ -73,6 +73,7 @@ virBitmapPtr virBitmapAlloc(size_t size) return NULL; } + bitmap->size = size; return bitmap; } -- 1.7.3.1

2 2

[libvirt] [PATCH] esx: Add support for storage volume deletion
by Matthias Bolte 22 Dec '10

22 Dec '10

--- src/esx/esx_storage_driver.c | 50 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi_generator.input | 7 +++++ 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index e6803c2..544551c 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1377,6 +1377,54 @@ esxStorageVolumeCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc, static int +esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + + virCheckFlags(0, -1); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_DeleteVirtualDisk_Task(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, priv->autoAnswer, + &taskInfoState, &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Could not delete volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + + return result; +} + + + +static int esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) { int result = -1; @@ -1574,7 +1622,7 @@ static virStorageDriver esxStorageDriver = { esxStorageVolumeLookupByPath, /* volLookupByPath */ esxStorageVolumeCreateXML, /* volCreateXML */ esxStorageVolumeCreateXMLFrom, /* volCreateXMLFrom */ - NULL, /* volDelete */ + esxStorageVolumeDelete, /* volDelete */ NULL, /* volWipe */ esxStorageVolumeGetInfo, /* volGetInfo */ esxStorageVolumeDumpXML, /* volGetXMLDesc */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 4018c6e..bd2da11 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -735,6 +735,13 @@ method CreateVirtualDisk_Task returns ManagedObjectReference r end +method DeleteVirtualDisk_Task returns ManagedObjectReference r + ManagedObjectReference _this:VirtualDiskManager r + String name r + ManagedObjectReference datacenter o +end + + method DestroyPropertyFilter ManagedObjectReference _this r end -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Add support for storage volume wiping
by Matthias Bolte 22 Dec '10

22 Dec '10

--- src/esx/esx_storage_driver.c | 50 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi_generator.input | 7 +++++ 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 544551c..12c8f5e 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1425,6 +1425,54 @@ esxStorageVolumeDelete(virStorageVolPtr volume, unsigned int flags) static int +esxStorageVolumeWipe(virStorageVolPtr volume, unsigned int flags) +{ + int result = -1; + esxPrivate *priv = volume->conn->storagePrivateData; + char *datastorePath = NULL; + esxVI_ManagedObjectReference *task = NULL; + esxVI_TaskInfoState taskInfoState; + char *taskInfoErrorMessage = NULL; + + virCheckFlags(0, -1); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + if (virAsprintf(&datastorePath, "[%s] %s", volume->pool, volume->name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (esxVI_ZeroFillVirtualDisk_Task(priv->primary, datastorePath, + priv->primary->datacenter->_reference, + &task) < 0 || + esxVI_WaitForTaskCompletion(priv->primary, task, NULL, + esxVI_Occurrence_None, priv->autoAnswer, + &taskInfoState, &taskInfoErrorMessage) < 0) { + goto cleanup; + } + + if (taskInfoState != esxVI_TaskInfoState_Success) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, _("Could not wipe volume: %s"), + taskInfoErrorMessage); + goto cleanup; + } + + result = 0; + + cleanup: + VIR_FREE(datastorePath); + esxVI_ManagedObjectReference_Free(&task); + VIR_FREE(taskInfoErrorMessage); + + return result; +} + + + +static int esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info) { int result = -1; @@ -1623,7 +1671,7 @@ static virStorageDriver esxStorageDriver = { esxStorageVolumeCreateXML, /* volCreateXML */ esxStorageVolumeCreateXMLFrom, /* volCreateXMLFrom */ esxStorageVolumeDelete, /* volDelete */ - NULL, /* volWipe */ + esxStorageVolumeWipe, /* volWipe */ esxStorageVolumeGetInfo, /* volGetInfo */ esxStorageVolumeDumpXML, /* volGetXMLDesc */ esxStorageVolumeGetPath, /* volGetPath */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index bd2da11..2d903e4 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -916,3 +916,10 @@ method WaitForUpdates returns UpdateSet r ManagedObjectReference _this:PropertyCollector r String version o end + + +method ZeroFillVirtualDisk_Task returns ManagedObjectReference r + ManagedObjectReference _this:VirtualDiskManager r + String name r + ManagedObjectReference datacenter o +end -- 1.7.0.4

2 2

[libvirt] [PATCH] qemu: Return SPICE ports on domain shutdown
by Jiri Denemark 22 Dec '10

22 Dec '10

Commit ed0d9f6c0cdd56f38ce31b8d9b5293162addaa23 added support for automatic port allocation for SPICE but forgot to mark such ports as unused when they are not used anymore. --- src/qemu/qemu_driver.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1a26a50..1de6f4a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2491,6 +2491,19 @@ static int qemudNextFreePort(struct qemud_driver *driver, } +static void +qemudReturnPort(struct qemud_driver *driver, + int port) +{ + if (port < QEMU_VNC_PORT_MIN) + return; + + if (virBitmapClearBit(driver->reservedVNCPorts, + port - QEMU_VNC_PORT_MIN) < 0) + VIR_DEBUG("Could not mark port %d as unused", port); +} + + static int qemuAssignPCIAddresses(virDomainDefPtr def) { @@ -2696,6 +2709,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (tlsPort < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to find an unused SPICE TLS port")); + qemudReturnPort(driver, port); goto cleanup; } } @@ -3099,14 +3113,14 @@ retry: */ if ((vm->def->ngraphics == 1) && vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC && - vm->def->graphics[0]->data.vnc.autoport && - vm->def->graphics[0]->data.vnc.port >= QEMU_VNC_PORT_MIN) { - if (virBitmapClearBit(driver->reservedVNCPorts, - vm->def->graphics[0]->data.vnc.port - \ - QEMU_VNC_PORT_MIN) < 0) { - VIR_DEBUG("virBitmapClearBit failed on bit %d", - vm->def->graphics[0]->data.vnc.port - QEMU_VNC_PORT_MIN); - } + vm->def->graphics[0]->data.vnc.autoport) { + qemudReturnPort(driver, vm->def->graphics[0]->data.vnc.port); + } + if ((vm->def->ngraphics == 1) && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE && + vm->def->graphics[0]->data.spice.autoport) { + qemudReturnPort(driver, vm->def->graphics[0]->data.spice.port); + qemudReturnPort(driver, vm->def->graphics[0]->data.spice.tlsPort); } vm->pid = -1; -- 1.7.3.4

3 4

[libvirt] API break from the VMware player driver
by Chris Lalancette 22 Dec '10

22 Dec '10

All, I'll preface this by saying that I'm not 100% sure I'm correct. But I still think there may be an API break that was introduced with the VMware player driver. In include/libvirt/virterror.h, VIR_FROM_VMWARE was added to the *middle* of the enum for virErrorDomain. If any clients of libvirt happen to be using hardcoded numbers, then they will now have the wrong number for everything after VIR_FROM_VMWARE. Looking back through the history of virErrorDomain, it doesn't seem like this is the first time this has happened. What's the thinking with virErrorDomain? Part of the API, or up to the clients to properly use the named enums? -- Chris Lalancette

4 6