- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Support to detach redirdev device
by Osier Yang 05 Mar '16

05 Mar '16

Attaching redirdev device has been supported for a while, but detaching is not never implemented. Simple procedure to test: % lsusb Bus 001 Device 014: ID 0781:5567 SanDisk Corp. Cruzer Blade % usbredirserver -p 4000 0781:5567 % virsh attach-device test usb.xml % cat usb.xml <redirdev bus='usb' type='tcp'> <source mode='connect' host='192.168.84.6' service='4000'/> </redirdev> % virsh detach-device test usb.xml % virsh qemu-monitor-command test --pretty '{"execute": "query-chardev"}' | grep 4000 On success, the chardev should not seen in output of above command. --- src/conf/domain_conf.c | 67 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++ src/libvirt_private.syms | 3 ++ src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 3 ++ 6 files changed, 176 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3b15cb4..d304232 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13825,6 +13825,73 @@ virDomainMemoryRemove(virDomainDefPtr def, return ret; } +ssize_t +virDomainRedirdevFind(virDomainDefPtr def, + virDomainRedirdevDefPtr redirdev) +{ + size_t i; + + for (i = 0; i < def->nredirdevs; i++) { + virDomainRedirdevDefPtr tmp = def->redirdevs[i]; + + if (redirdev->bus != tmp->bus) + continue; + + virDomainChrSourceDef source_chr = redirdev->source.chr; + virDomainChrSourceDef tmp_chr = tmp->source.chr; + + if (source_chr.type != tmp_chr.type) + continue; + + switch (source_chr.type) { + case VIR_DOMAIN_CHR_TYPE_TCP: + if (STRNEQ_NULLABLE(source_chr.data.tcp.host, + tmp_chr.data.tcp.host)) + continue; + if (STRNEQ_NULLABLE(source_chr.data.tcp.service, + tmp_chr.data.tcp.service)) + continue; + if (source_chr.data.tcp.listen != tmp_chr.data.tcp.listen) + continue; + if (source_chr.data.tcp.protocol != tmp_chr.data.tcp.protocol) + continue; + break; + + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + if (source_chr.data.spicevmc != tmp_chr.data.spicevmc) + continue; + break; + + default: + /* Unlikely, currently redirdev only supports character device of + * type "tcp" and "spicevmc". + */ + break; + } + + if (redirdev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + !virDomainDeviceInfoAddressIsEqual(&redirdev->info, &tmp->info)) + continue; + + break; + } + + if (i < def->nredirdevs) + return i; + + return -1; +} + +virDomainRedirdevDefPtr +virDomainRedirdevRemove(virDomainDefPtr def, + size_t idx) +{ + virDomainRedirdevDefPtr ret = def->redirdevs[idx]; + + VIR_DELETE_ELEMENT(def->redirdevs, idx, def->nredirdevs); + + return ret; +} char * virDomainDefGetDefaultEmulator(virDomainDefPtr def, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1de3be3..03c0155 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2538,6 +2538,10 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def); void virDomainHostdevDefFree(virDomainHostdevDefPtr def); void virDomainHubDefFree(virDomainHubDefPtr def); void virDomainRedirdevDefFree(virDomainRedirdevDefPtr def); +ssize_t virDomainRedirdevFind(virDomainDefPtr def, + virDomainRedirdevDefPtr redirdev); +virDomainRedirdevDefPtr virDomainRedirdevRemove(virDomainDefPtr def, + size_t idx); void virDomainRedirFilterDefFree(virDomainRedirFilterDefPtr def); void virDomainShmemDefFree(virDomainShmemDefPtr def); void virDomainDeviceDefFree(virDomainDeviceDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4b40612..ad7d82c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -423,6 +423,9 @@ virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeToString; virDomainRedirdevBusTypeFromString; virDomainRedirdevBusTypeToString; +virDomainRedirdevDefFree; +virDomainRedirdevFind; +virDomainRedirdevRemove; virDomainRNGBackendTypeToString; virDomainRNGDefFree; virDomainRNGFind; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45ff3c0..8905af6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7736,6 +7736,9 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_MEMORY: ret = qemuDomainDetachMemoryDevice(driver, vm, dev->data.memory); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redirdev); + break; case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -7748,7 +7751,6 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_SHMEM: - 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 dc76268..bbe8aa7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3287,6 +3287,49 @@ qemuDomainRemoveRNGDevice(virQEMUDriverPtr driver, } +static int +qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event; + char *charAlias = NULL; + ssize_t idx; + int rc; + int ret = -1; + + VIR_DEBUG("Removing redirdev device %s from domain %p %s", + redirdev->info.alias, vm, vm->def->name); + + if (virAsprintf(&charAlias, "char%s", redirdev->info.alias) < 0) + return -1; + + qemuDomainObjEnterMonitor(driver, vm); + rc = qemuMonitorDetachCharDev(priv->mon, charAlias); + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto cleanup; + + virDomainAuditRedirdev(vm, redirdev, "detach", rc == 0); + + if (rc < 0) + goto cleanup; + + event = virDomainEventDeviceRemovedNewFromObj(vm, redirdev->info.alias); + qemuDomainEventQueue(driver, event); + + if ((idx = virDomainRedirdevFind(vm->def, redirdev)) >= 0) + virDomainRedirdevRemove(vm->def, idx); + qemuDomainReleaseDeviceAddress(vm, &redirdev->info, NULL); + virDomainRedirdevDefFree(redirdev); + + ret = 0; + + cleanup: + VIR_FREE(charAlias); + return ret; +} + int qemuDomainRemoveDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -3318,6 +3361,10 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret = qemuDomainRemoveMemoryDevice(driver, vm, dev->data.memory); break; + case VIR_DOMAIN_DEVICE_REDIRDEV: + ret = qemuDomainRemoveRedirdevDevice(driver, vm, dev->data.redirdev); + break; + case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: @@ -3327,7 +3374,6 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: - case VIR_DOMAIN_DEVICE_REDIRDEV: case VIR_DOMAIN_DEVICE_SMARTCARD: case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: @@ -4318,3 +4364,52 @@ qemuDomainDetachMemoryDevice(virQEMUDriverPtr driver, qemuDomainResetDeviceRemoval(vm); return ret; } + +int +qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + virDomainRedirdevDefPtr tmp; + ssize_t idx; + int rc; + int ret = -1; + + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("qemu does not support -device")); + return -1; + } + + if ((idx = virDomainRedirdevFind(vm->def, redirdev)) < 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("device not present in domain configuration")); + return -1; + } + + tmp = vm->def->redirdevs[idx]; + + if (!tmp->info.alias) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("alias not set for redirdev device")); + return -1; + } + + qemuDomainMarkDeviceForRemoval(vm, &tmp->info); + + qemuDomainObjEnterMonitor(driver, vm); + rc = qemuMonitorDelDevice(priv->mon, tmp->info.alias); + if (qemuDomainObjExitMonitor(driver, vm) || rc < 0) + goto cleanup; + + rc = qemuDomainWaitForDeviceRemoval(vm); + if (rc == 0 || rc == 1) + ret = qemuDomainRemoveRedirdevDevice(driver, vm, tmp); + else + ret = 0; + + cleanup: + qemuDomainResetDeviceRemoval(vm); + return ret; +} diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index 4140da3..4ef42e9 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -51,6 +51,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, int qemuDomainAttachRedirdevDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainRedirdevDefPtr hostdev); +int qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainRedirdevDefPtr redirdev); int qemuDomainAttachHostDevice(virConnectPtr conn, virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.1.4

2 2

[libvirt] patch doc/apps.html.in
by Alex Roithman 05 Mar '16

05 Mar '16

Follow to http://libvirt.org/apps.html#add send the patch.

1 0

[libvirt] [PATCH 0/3] vz: disk format support
by Mikhail Feoktistov 04 Mar '16

04 Mar '16

Mikhail Feoktistov (3): vz: add vzInitVersion function vz: add virStorageFileFormat to connection structure vz: check supported disk format src/vz/vz_driver.c | 52 +++++++----------------------------------- src/vz/vz_sdk.c | 28 ++++++++++++++++------- src/vz/vz_sdk.h | 2 +- src/vz/vz_utils.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_utils.h | 10 +++++++++ 5 files changed, 105 insertions(+), 53 deletions(-) -- 1.8.3.1

1 4

[libvirt] [PATCH] virLXCProcessMonitorInitNotify: Initialize @inode
by Michal Privoznik 04 Mar '16

04 Mar '16

This is an error message I've just seen. Fix it by initializing @inode. CC lxc/libvirt_driver_lxc_impl_la-lxc_process.lo lxc/lxc_process.c: In function 'virLXCProcessMonitorInitNotify': lxc/lxc_process.c:767:23: error: 'inode' may be used uninitialized in this function [-Werror=maybe-uninitialized] virDomainAuditInit(vm, initpid, inode); ^ Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/lxc/lxc_process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 50bee48..5e0bbe2 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -749,7 +749,7 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED virLXCDriverPtr driver = lxc_driver; virLXCDomainObjPrivatePtr priv; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); - ino_t inode; + ino_t inode = 0; virObjectLock(vm); @@ -762,7 +762,6 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED (unsigned long long)initpid, err && err->message ? err->message : "<unknown>"); virResetLastError(); - inode = 0; } virDomainAuditInit(vm, initpid, inode); -- 2.4.10

1 0

[libvirt] [PATCH v3 0/2] cleanup resolving persistent/running/current flags
by Nikolay Shirokovskiy 04 Mar '16

04 Mar '16

Changes from version2 ===================== 1. Already ACKed or PUSHed patches are dropped. 2. Patch of reusing virDomainObjUpdateModificationImpact is splitted into lxc and libxl and compilation is fixed. Nikolay Shirokovskiy (2): lxc: reuse virDomainObjUpdateModificationImpact libxl: reuse virDomainObjUpdateModificationImpact src/libxl/libxl_driver.c | 63 ++++------------------------------------ src/lxc/lxc_driver.c | 75 ++++-------------------------------------------- 2 files changed, 12 insertions(+), 126 deletions(-) -- 1.8.3.1

3 4

[libvirt] [PATCH] tools: do not leak uri in disconnect handler
by Ján Tomko 04 Mar '16

04 Mar '16

Commit 035947e introduced a call to virConnectGetURI without a matching free() in virshCatchDisconnect. Also fix vshAdmCatchDisconnect where it was copied by commit 6dd7e42. https://bugzilla.redhat.com/show_bug.cgi?id=1303891 --- tools/virsh.c | 1 + tools/virt-admin.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/virsh.c b/tools/virsh.c index 72446be..57b4ff3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -124,6 +124,7 @@ virshCatchDisconnect(virConnectPtr conn, break; } vshError(ctl, _(str), NULLSTR(uri)); + VIR_FREE(uri); if (error) { virSetError(error); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 3c818a3..c470536 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -92,6 +92,7 @@ vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, } vshError(ctl, _(str), NULLSTR(uri)); + VIR_FREE(uri); if (error) { virSetError(error); -- 2.4.10

2 1

[libvirt] [PATCH v2 0/4] cleanup resolving persistent/running/current flags
by Nikolay Shirokovskiy 03 Mar '16

03 Mar '16

Original name of series was: Subject: [PATCH 0/3] make virDomainObjGetPersistentDef return only persistent definition Changes from version1 ===================== Original motivation of the series was fixing virDomainObjGetPersistentDef so that it would not return configs other than persistent. However the final patch that does it in the first version is absent in current version. I think the fix should be done another way and in different series. Thus this version has only misc cleanups which are better splitted into patches in this version. A few words why I leave patch for virDomainObjGetPersistentDef. First I should not return NULL from the function as this value already has different meaning - memory allocation error and there is code that checks for this error. This code calls virDomainObjGetPersistentDef unconditionally but later use the return value only for persistent domains, thus it could get NULL pointer on function call and treat it as an allocation error. I think the proper way would be chaning virDomainObjGetPersistentDef so it could not fail that is not call virDomainObjSetDefTransient. Looks like this is already true because drivers that distiguish between running/persistent config call virDomainObjSetDefTransient ealy in the domain start process (and even two times) so that later calls for virDomainObjSetDefTransient are unnecessary. Nikolay Shirokovskiy (4): virDomainObjUpdateModificationImpact: reduce nesting libxlDomainSetMemoryFlags : reuse virDomainLiveConfigHelperMethod lxc, libxl: reuse virDomainObjUpdateModificationImpact libxlDomainPinVcpuFlags: remove check duplicates src/conf/domain_conf.c | 12 +++--- src/libxl/libxl_driver.c | 103 ++++------------------------------------------- src/lxc/lxc_driver.c | 75 +++------------------------------- 3 files changed, 19 insertions(+), 171 deletions(-) -- 1.8.3.1

3 14

[libvirt] [PATCH] Use correct LDFLAGS for leaseshelper
by Jiri Denemark 03 Mar '16

03 Mar '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index a316b4d..d57d303 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2810,6 +2810,10 @@ libvirt_iohelper_CFLAGS = \ if WITH_NETWORK libexec_PROGRAMS += libvirt_leaseshelper libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) +libvirt_leaseshelper_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) libvirt_leaseshelper_LDADD = \ libvirt_util.la \ ../gnulib/lib/libgnu.la -- 2.7.2

2 1

[libvirt] [PATCH] qemu: Check if domain is active in GetControlInfo
by Jiri Denemark 03 Mar '16

03 Mar '16

Reporting status of a control connection makes no sense for an inactive domain. https://bugzilla.redhat.com/show_bug.cgi?id=1281706 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bd4071..9fd4c57 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2763,6 +2763,12 @@ qemuDomainGetControlInfo(virDomainPtr dom, if (virDomainGetControlInfoEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto cleanup; + } + priv = vm->privateData; memset(info, 0, sizeof(*info)); -- 2.7.2

2 1

[libvirt] [PATCH] qemu: forbid renaming domain which has managedsave file
by Shanzhi Yu 03 Mar '16

03 Mar '16

after rename a domain which has managedsave file, the new name domain can't boot up from the state it saved, and the managedsave file will exist with the original name. Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bd4071..036a367 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20000,6 +20000,12 @@ static int qemuDomainRename(virDomainPtr dom, goto endjob; } + if (vm->hasManagedSave) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("can't rename a domain has managedsave file")); + goto endjob; + } + if (virDomainObjListRename(driver->domains, vm, new_name, flags, qemuDomainRenameCallback, driver) < 0) goto endjob; -- 2.5.0

1 0