- Devel - libvirt List Archives

[libvirt] [libvirt-php][PATCH 0/7] Rework libvirt_domain_new a bit
by Michal Privoznik 08 Dec '17

08 Dec '17

Patches for: https://bugzilla.redhat.com/show_bug.cgi?id=1513190 You can also get the patches from my github: https://github.com/zippy2/libvirt-php/commits/libvirt_domain_new Apart from usual case where I just push patches immediately, I'm gonna give others chance to review since it's not trivial change set. Michal Privoznik (7): Make installation_get_xml hurt my eyes less. Rework libvirt_domain_new a bit installation_get_xml: Don't override defaults of <on_reboot/> and friends util: Introduce VIR_FREE libvirt_domain_new: Resolve couple of memleaks installation_get_xml: Resolve couple of memleaks src: Use VIR_FREE instead of free src/libvirt-connection.c | 26 ++--- src/libvirt-domain.c | 278 +++++++++++++++++++++++++++-------------------- src/libvirt-network.c | 26 ++--- src/libvirt-node.c | 9 +- src/libvirt-nodedev.c | 52 ++++----- src/libvirt-nwfilter.c | 6 +- src/libvirt-php.c | 234 ++++++++++++++++++++------------------- src/libvirt-php.h | 2 +- src/libvirt-snapshot.c | 4 +- src/libvirt-storage.c | 20 ++-- src/util.c | 2 +- src/util.h | 6 + src/vncfunc.c | 5 +- 13 files changed, 362 insertions(+), 308 deletions(-) -- 2.13.6

2 15

[libvirt] [PATCH v2] qemu: Add support for hot unplug redirdev device
by Chen Hanxiao 08 Dec '17

08 Dec '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We lacked of hot unplugging redirdev device. This patch add support for it. We could use detach-device --live now. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- v2: add news section docs/news.xml | 9 ++++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 3 ++ 4 files changed, 126 insertions(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index 0ec9857e2..ec32dc850 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -35,6 +35,15 @@ <libvirt> <release version="v4.0.0" date="unreleased"> <section title="New features"> + <change> + <summary> + qemu: Add support for hot unplug redirdev device + </summary> + <description> + We've supported hotplug redirdev device, but lacked of + hot unplug feature. Now we can do it by libvirt. + </description> + </change> </section> <section title="Improvements"> </section> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..180bd0ebf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7787,6 +7787,9 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_INPUT: ret = qemuDomainDetachInputDevice(vm, dev->data.input); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redirdev); + break; case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: @@ -7796,7 +7799,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 24631cb8f..d97aa6051 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4375,6 +4375,74 @@ qemuDomainRemoveInputDevice(virDomainObjPtr vm, return 0; } +static int +qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + virObjectEventPtr event; + char *charAlias = NULL; + char *tlsAlias = NULL; + char *secAlias = NULL; + ssize_t idx; + int ret = -1; + + VIR_DEBUG("Removing redirdev device %s from domain %p %s", + redirdev->info.alias, vm, vm->def->name); + + if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) + goto cleanup; + + if (redirdev->source->type == VIR_DOMAIN_CHR_TYPE_TCP && + redirdev->source->data.tcp.haveTLS == VIR_TRISTATE_BOOL_YES) { + + if (!(tlsAlias = qemuAliasTLSObjFromSrcAlias(charAlias))) + goto cleanup; + + /* Best shot at this as the secinfo is destroyed after process launch + * and this path does not recreate it. Thus, if the config has the + * secret UUID and we have a serial TCP chardev, then formulate a + * secAlias which we'll attempt to destroy. */ + if (cfg->chardevTLSx509secretUUID && + !(secAlias = qemuDomainGetSecretAESAlias(charAlias, false))) + goto cleanup; + } + + qemuDomainObjEnterMonitor(driver, vm); + /* Usually device_del will remove related chardev as well, + * So we don't need to check its return value. + */ + ignore_value(qemuMonitorDetachCharDev(priv->mon, charAlias)); + + if (tlsAlias) + ignore_value(qemuMonitorDelObject(priv->mon, tlsAlias)); + if (secAlias) + ignore_value(qemuMonitorDelObject(priv->mon, secAlias)); + + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + virDomainAuditRedirdev(vm, redirdev, "detach", true); + + event = virDomainEventDeviceRemovedNewFromObj(vm, redirdev->info.alias); + qemuDomainEventQueue(driver, event); + + if ((idx = virDomainRedirdevDefFind(vm->def, redirdev)) >= 0) + virDomainRedirdevDefRemove(vm->def, idx); + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); + virDomainRedirdevDefFree(redirdev); + + ret = 0; + + cleanup: + VIR_FREE(charAlias); + VIR_FREE(tlsAlias); + VIR_FREE(secAlias); + return ret; +} + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, @@ -5112,6 +5180,49 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, return ret; } +int +qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + int ret = -1; + qemuDomainObjPrivatePtr priv = vm->privateData; + virDomainDefPtr vmdef = vm->def; + virDomainRedirdevDefPtr tmpRedirdevDef; + ssize_t idx; + + if ((idx = virDomainRedirdevDefFind(vmdef, redirdev)) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("no matching redirdev was not found")); + return -1; + } + + tmpRedirdevDef = vm->def->redirdevs[idx]; + + if (!tmpRedirdevDef->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("alias not set for redirdev device")); + return -1; + } + + qemuDomainMarkDeviceForRemoval(vm, &tmpRedirdevDef->info); + + qemuDomainObjEnterMonitor(driver, vm); + if (qemuMonitorDelDevice(priv->mon, tmpRedirdevDef->info.alias) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + goto cleanup; + } + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) + ret = qemuDomainRemoveRedirdevDevice(driver, vm, tmpRedirdevDef); + + cleanup: + qemuDomainResetDeviceRemoval(vm); + return ret; +} + int qemuDomainDetachNetDevice(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 3e0d618e0..6c642c4fd 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -125,6 +125,9 @@ int qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, int qemuDomainDetachWatchdog(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainWatchdogDefPtr watchdog); +int qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev); int qemuDomainAttachInputDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.14.3

2 2

[libvirt] [PATCH] qemu: blockjob: Reset disk source index after pivot
by Peter Krempa 07 Dec '17

07 Dec '17

Since we are re-detecting the backing chain after pivoting to the active block commit target (or block copy target) the disk index needs to be reset to 0. This is necessary since we move a member of the backing chain to disk->src but clear indexes only starting from disk->src->backingStore. The freshly detected images have indexes starting from 1, but since we've pivoted into an image which was previously a backing store it would have a non-0 index. The lookup function would then return the top of the chain for queries like 'vda[1]' instead of the first backing store. This problem will not be present once we keep the disk indexes stable. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1519745 --- src/qemu/qemu_blockjob.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 0b1616a214..617e4ee564 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -175,6 +175,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, disk->mirror = NULL; disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE; disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; + disk->src->id = 0; ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk, true, true)); ignore_value(qemuBlockNodeNamesDetect(driver, vm, asyncJob)); -- 2.15.0

2 1

[libvirt] [PATCH] libvirt-python : PyObject memory leak
by Peng Hao 07 Dec '17

07 Dec '17

libvirt_virConnectDomainEventTunableCallback leak a PyObject Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- libvirt-override.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt-override.c b/libvirt-override.c index d746350..eab9b62 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6665,6 +6665,7 @@ libvirt_virConnectDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED Py_XDECREF(pyobj_dict); } else { Py_DECREF(pyobj_ret); + Py_DECREF(pyobj_dict); ret = 0; } -- 1.8.3.1

2 1

[libvirt] [REBASE PATCH v2 00/10] Implement query-dump command
by John Ferlan 07 Dec '17

07 Dec '17

Original v2: https://www.redhat.com/archives/libvir-list/2017-November/msg00779.html Rebase due to additional capabilitiies v2 Cover: v1: https://www.redhat.com/archives/libvir-list/2017-November/msg00731.html Differences from v1 (besides more patches) Rather than use a timing loop in order to fetch the dump stats and the presence of the 'query-dump' command, let's use the DUMP_COMPLETED event and wire that up in order to determine when the dump has been completed. In the mean time, the previous timing loop is converted into a qemuDomainGetJobInfoDumpStats to be called if the "right conditions" exist. Also found/fixed a couple of minor issues from v1 regarding usage "dumpformat" instead of just "format" from my patch 2 adjustment and a type for qemuMonitorDumpStatus (was qemuMontiorDumpStatus in v1). NB: (from v1 cover): Details in the patches. Essentially though QEMU 2.6 added the ability to perform the 'dump-guest-memory' via a thread by adding a 'detach' boolean to the command. In order to watch the progress of the thread the 'query-dump' command was added. The query-dump will return just the current status, the total size to be dumped, and the current progress. So using the migrate stats data in the DomainJobInfo we can then save our current progress allowing tools such as virsh to watch that progress. As an added benefit, the dump-guest-memory is now truly asynchronous. John Ferlan (10): qemu: Clean up style for the qemuDumpToFd definition qemu: Alter dump-guest-memory command generation qemu: Add support for DUMP_COMPLETED event qemu: Introduce qemuProcessHandleDumpCompleted qemu: Introduce qemuMonitor[JSON]QueryDump qemu: Add new parameter to qemuMonitorDumpToFd qemu: Introduce qemuDomainGetJobInfoMigrationStats qemu: Introduce qemuDomainGetJobInfoDumpStats qemu: Add dump completed event to the capabilities qemu: Allow showing the dump progress for memory only dump src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 157 ++++++++++++++++++--- src/qemu/qemu_monitor.c | 39 ++++- src/qemu/qemu_monitor.h | 33 ++++- src/qemu/qemu_monitor_json.c | 122 ++++++++++++++-- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_process.c | 23 +++ .../caps_2.10.0-gicv2.aarch64.xml | 1 + .../caps_2.10.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemumonitorjsontest.c | 3 +- 27 files changed, 365 insertions(+), 42 deletions(-) -- 2.13.6

2 12

[libvirt] [PATCHv2 0/7] Remove some repetitive code from qemuDomainNamespace* functions
by Ján Tomko 07 Dec '17

07 Dec '17

Rebased + rename path to paths in one more function. Ján Tomko (7): qemuDomainNamespaceTeardownHostdev: rename path to paths qemuDomainNamespaceSetupHostdev: rename path to paths Introduce qemuDomainNamespaceMknodPaths Introduce qemuDomainNamespaceMknodPath Introduce qemuDomainNamespaceUnlinkPaths Introduce qemuDomainNamespaceUnlinkPath Do not pass driver to qemuDomainNamespace{Setup,Teardown} functions src/qemu/qemu_domain.c | 394 ++++++++++++++++++------------------------------ src/qemu/qemu_domain.h | 30 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 42 +++--- 4 files changed, 176 insertions(+), 292 deletions(-) -- 2.13.6

3 11

[libvirt] [PATCH] qemuDomainNamespaceSetupDisk: initialize npaths
by Ján Tomko 07 Dec '17

07 Dec '17

Introduced by commit d3db304. Reported-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 75cecb1bb..d7150cae1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10034,7 +10034,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, { virStorageSourcePtr next; char **paths = NULL; - size_t npaths; + size_t npaths = 0; int ret = -1; if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) -- 2.13.6

1 0

[libvirt] [PATCH] docs: domain: Fix documentation of the 'snapshot' attribute for <disk>
by Peter Krempa 07 Dec '17

07 Dec '17

Emphasise the valid values by wrapping them in <code> and reword the last sentence so that the invalid value example can be dropped. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1523070 --- docs/formatdomain.html.in | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 29a9681467..01db83e608 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2584,17 +2584,16 @@ <dt><code>snapshot</code></dt> <dd> Indicates the default behavior of the disk during disk snapshots: - "internal" requires a file format such as qcow2 that can store - both the snapshot and the data changes since the snapshot; - "external" will separate the snapshot from the live data; and - "no" means the disk will not participate in snapshots. Read-only - disks default to "no", while the default for other disks depends - on the hypervisor's capabilities. Some hypervisors allow a - per-snapshot choice as well, during + "<code>internal</code>" requires a file format such as qcow2 that + can store both the snapshot and the data changes since the snapshot; + "<code>external</code>" will separate the snapshot from the live + data; and "<code>no</code>" means the disk will not participate in + snapshots. Read-only disks default to "<code>no</code>", while the + default for other disks depends on the hypervisor's capabilities. + Some hypervisors allow a per-snapshot choice as well, during <a href="formatsnapshot.html">domain snapshot creation</a>. - Not all snapshot modes are supported; for example, - <code>snapshot='yes'</code> with a transient disk generally - does not make sense. + Not all snapshot modes are supported; for example, enabling + snapshots with a transient disk generally does not make sense. <span class="since">Since 0.9.5</span> </dd> </dl> -- 2.15.0

2 1

[libvirt] [PATCH] virerror: mark VIR_ERR_AGENT_UNSYNCED as DEPRECATED
by Chen Hanxiao 07 Dec '17

07 Dec '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Since commit 5e5019bf, we've no longer use VIR_ERR_AGENT_UNSYNCED anymore. Mark it as DEPRECATED. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- include/libvirt/virterror.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index d2b5f1fd4..91ba29784 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -318,7 +318,7 @@ typedef enum { VIR_ERR_NO_SERVER = 95, /* Server was not found */ VIR_ERR_NO_CLIENT = 96, /* Client was not found */ VIR_ERR_AGENT_UNSYNCED = 97, /* guest agent replies with wrong id - to guest-sync command */ + to guest-sync command (DEPRECATED)*/ VIR_ERR_LIBSSH = 98, /* error in libssh transport driver */ } virErrorNumber; -- 2.14.3

2 3

[libvirt] Snapshot: Request to review patch
by Madhu Pavan 07 Dec '17

07 Dec '17

Hi all, Could someone please review https://www.redhat.com/archives/libvir-list/2017-October/msg01333.html This patch is based on comments from Jiri Denemark ( https://www.redhat.com/archives/libvir-list/2017-October/msg01275.html ) This patch potentially fixes https://bugzilla.redhat.com/show_bug.cgi?id=1494471 Thanks, Madhu.

2 1