- Devel - libvirt List Archives

[libvirt] [PATCH] Fix build wihout macvtap or virtualport
by Ján Tomko 06 May '14

06 May '14

Commit 1b14c44 broke the build on FreeBSD by changing the signature of a few functions without updating the corresponding stubs that are used when WITH_MACVTAP or WITH_VIRTUALPORT is not defined. --- Pushed under the build-breaker rule. src/util/virnetdevmacvlan.c | 8 ++++---- src/util/virnetdevvportprofile.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 56a5f6b..cb85b74 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1068,13 +1068,13 @@ int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED) int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, const virMacAddr *macaddress ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, - enum virNetDevMacVLanMode mode ATTRIBUTE_UNUSED, + virNetDevMacVLanMode mode ATTRIBUTE_UNUSED, bool withTap ATTRIBUTE_UNUSED, int vnet_hdr ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, char **res_ifname ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, + virNetDevVPortProfileOp vmop ATTRIBUTE_UNUSED, char *stateDir ATTRIBUTE_UNUSED, virNetDevBandwidthPtr bandwidth ATTRIBUTE_UNUSED) { @@ -1100,7 +1100,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUS const char *linkdev ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); @@ -1112,7 +1112,7 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UN const char *linkdev ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform")); diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 7354b2c..0f43b02 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1248,7 +1248,7 @@ int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, const unsigned char *vmuuid ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED, + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED, bool setlink_only ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", @@ -1261,7 +1261,7 @@ int virNetDevVPortProfileDisassociate(const char *macvtap_ifname ATTRIBUTE_UNUSE const virMacAddr *macvtap_macaddr ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, int vf ATTRIBUTE_UNUSED, - enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) + virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Virtual port profile association not supported on this platform")); -- 1.8.3.2

1 0

[libvirt] libvirt 1.2.4 and virt-manager 0.9.0 are not incompatible
by xeon_feng 06 May '14

06 May '14

Hello everyone I encountered a problem when I completed the update of libvirt from 0.10 to 1.2.4 . The problem was that virt-manager(version 0.9.0) could not start and reported error : "ImportError: /usr/lib64/libvirt.so.0: version 'LIBVIRT_PRIVIATE_0.10.2' not found (required by /usr/lib64/python2.6/site-packages/libvirtmod.so)". I found the libvirt.so.0 link file just in the /usr/lib64/ directory , but it was linking to libvirt.so.0.1002.4 .not to the libvirt.so.0.10.2 I made libvirt.so.0 to link to libvirt.so.0.10.2 and restarted virt-manager , virt-manager started normally then restarted libvirtd failure, reporting error:l “ibvirtd: /usr/lib64/libvirt.so.0: version 'LIBVIRT_1.2.3' not found (require by libvirtd) .....” I made libvirt.so.0 to link to libvirt.so.0.1002.4 and restart libvirtd , libvirtd started normally again. Please help me to resolve the problem and give me some advise.... Thanks a lot.. Xeon.Feng

2 1

[libvirt] [PATCH] docs: fix a typo in formatdomain
by Chen Hanxiao 06 May '14

06 May '14

s/virual/virtual Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b1be724..4f19473 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4787,7 +4787,7 @@ qemu-kvm -net nic,model=? /dev/null <p> The nmdm device driver, available on FreeBSD, provides two - tty devices connected together by a virual null modem cable. + tty devices connected together by a virtual null modem cable. <span class="since">Since 1.2.4</span> </p> -- 1.9.0

2 1

[libvirt] Question about QCOW2 and Libvirt Storage Pools
by Solly Ross 06 May '14

06 May '14

Hi, I'm doing some work getting libvirt storage pools into OpenStack, as they definitely make certain operations much easier for the Nova libvirt driver. However, one thing I noticed is that since storage pools automatically refresh on reboot, initial creation information gets lost. This poses a problem, since libvirt probes for file type for the filesystem-based pools (dir, fs, netfs, etc), and can erroneously detect a RAW file as another file type (for instance, QCOW2). Is there a reason libvirt doesn't have an option to persist (to disk) the unchanging parts of the volume XML? Best Regards, Solly Ross P.S. we currently deal with a similar problem in OpenStack by saving the file type to disk the first time we use the image file. However, it would be nice if libvirt could handle this for us, at some point, as it seems like it would be a good thing to have in libvirt.

2 1

[libvirt] [PATCH 1/2] virsh: Replace list element to defined variable
by Li Yang 06 May '14

06 May '14

Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 47974fe..e996c72 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -558,7 +558,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *usageStr = virSecretUsageTypeTypeToString(usageType); char uuid[VIR_UUID_STRING_BUFLEN]; - if (virSecretGetUUIDString(list->secrets[i], uuid) < 0) { + if (virSecretGetUUIDString(sec, uuid) < 0) { vshError(ctl, "%s", _("Failed to get uuid of secret")); goto cleanup; } -- 1.7.1

3 3

Re: [libvirt] [virt-tools-list] [virt-manager PATCH] test: Fix tests with latest libvirt
by Cole Robinson 06 May '14

06 May '14

On 05/04/2014 10:59 PM, Chen Hanxiao wrote: > Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> > --- > tests/cli-test-xml/compare/virt-clone-clone-auto1.xml | 6 ++++++ > tests/cli-test-xml/compare/virt-clone-clone-auto2.xml | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml > index b9fde61..03b7b5c 100644 > --- a/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml > +++ b/tests/cli-test-xml/compare/virt-clone-clone-auto1.xml > @@ -22,16 +22,19 @@ > <disk type="block" device="floppy"> > <driver type="vmdk"/> > <source dev="/dev/disk-pool/diskvol1-clone"/> > + <backingStore/> > <target dev="fda" bus="fdc"/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > <disk type="block" device="disk"> > <source dev="/dev/disk-pool/diskvol2"/> > + <backingStore/> > <target dev="sda" bus="scsi"/> > <readonly/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > <disk type="block" device="cdrom"> > + <backingStore/> > <target dev="sdb" bus="scsi"/> > <readonly/> > <address type="drive" controller="0" bus="0" target="0" unit="1"/> > @@ -39,6 +42,7 @@ > <disk type="block" device="disk"> > <driver type="qcow2"/> > <source dev="/dev/default-pool/collidevol1.img"/> > + <backingStore/> > <target dev="sdc" bus="scsi"/> > <readonly/> > <shareable/> > @@ -46,11 +50,13 @@ > </disk> > <disk type="file" device="disk"> > <source file="/dev/default-pool/default-vol-clone"/> > + <backingStore/> > <target dev="hda" bus="ide"/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > <disk type="file" device="disk"> > <source file="/dev/default-pool/testvol2-clone.img"/> > + <backingStore/> > <target dev="hdb" bus="ide"/> > <address type="drive" controller="0" bus="0" target="0" unit="1"/> > </disk> > diff --git a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml > index fb78434..bbbde76 100644 > --- a/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml > +++ b/tests/cli-test-xml/compare/virt-clone-clone-auto2.xml > @@ -22,6 +22,7 @@ > <disk type="file" device="disk"> > <driver type="qcow2"/> > <source file="/dev/default-pool/newvm.img"/> > + <backingStore/> > <target dev="hda" bus="ide"/> > <address type="drive" controller="0" bus="0" target="0" unit="0"/> > </disk> > Hmm, what is actually going on here? I know latest libvirt added backingStore chain XML to the domain XML, but what does a bare <backingStore/> mean here? Anyone on the libvirt side know if this is intentional? - Cole

2 2

[libvirt] [PATCH V2 0/3] support flags in libxlDomain{Shutdown, Reboot}
by Jim Fehlig 06 May '14

06 May '14

This small series is a V2 of https://www.redhat.com/archives/libvir-list/2014-April/msg00837.html Patch 1 adds VIR_DOMAIN_SHUTDOWN_PARAVIRT and VIR_REBOOT_SHUTDOWN_PARAVIRT flags to the API as requested by danpb. Patch 2 makes use of the shutdown flags in libxlDomainShutdownFlags. Patch 3 does the same for libxlDomainReboot. Jim Fehlig (3): Introduce a new flag for controlling shutdown/reboot libxl: support PARAVIRT and ACPI shutdown flags libxl: support PARAVIRT and ACPI reboot flags include/libvirt/libvirt.h.in | 2 ++ src/libxl/libxl_driver.c | 64 +++++++++++++++++++++++++++++++++++--------- tools/virsh-domain.c | 14 +++++++--- tools/virsh.pod | 8 +++--- 4 files changed, 68 insertions(+), 20 deletions(-) -- 1.8.1.4

3 13

[libvirt] [PATCH 0/2] virstoragefile cleanups
by Eric Blake 06 May '14

06 May '14

I found these cleanups while trying to solve the regression that John identified, where we are losing the correct capacity read from a qcow2 header when it comes time to dump a volume's xml. I still plan to get that regression fixed before 1.2.4 goes out the door, but this was worth posting in the meantime. Eric Blake (2): conf: avoid null deref during storage probe conf: drop extra storage probe src/libvirt_private.syms | 1 - src/storage/storage_backend_fs.c | 8 -------- src/storage/storage_backend_gluster.c | 5 ----- src/util/virstoragefile.c | 37 ++++++++++++++++------------------- src/util/virstoragefile.h | 7 ++----- 5 files changed, 19 insertions(+), 39 deletions(-) -- 1.9.0

2 6

[libvirt] [PATCH] bhyve: report cpuTime in bhyveDomainGetInfo
by Roman Bogorodskiy 05 May '14

05 May '14

Add a helper function virBhyveGetDomainTotalCpuStats() to obtain process CPU time using kvm (kernel memory interface) and use it to set cpuTime field of the virDomainInfo struct in bhyveDomainGetInfo(). --- configure.ac | 7 +++++++ src/bhyve/bhyve_driver.c | 9 +++++++++ src/bhyve/bhyve_process.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.h | 3 +++ 4 files changed, 59 insertions(+) diff --git a/configure.ac b/configure.ac index 12338d4..2e5fa1a 100644 --- a/configure.ac +++ b/configure.ac @@ -2684,6 +2684,13 @@ AC_CHECK_DECLS([cpuset_getaffinity], #include <sys/cpuset.h> ]) +# Check for BSD kvm (kernel memory interface) +if test $with_freebsd = yes; then + AC_CHECK_LIB([kvm], [kvm_getprocs], [], + [AC_MSG_ERROR([BSD kernel memory interface library is required to build on FreeBSD])] + ) +fi + # Check if we need to look for ifconfig if test "$want_ifconfig" = "yes"; then AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 6d681fd..0780e74 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -268,6 +268,15 @@ bhyveDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) if (virDomainGetInfoEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (virDomainObjIsActive(vm)) { + if (virBhyveGetDomainTotalCpuStats(vm, &(info->cpuTime)) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("Cannot read cputime for domain")); + goto cleanup; + } + } else + info->cpuTime = 0; + info->state = virDomainObjGetState(vm, NULL); info->maxMem = vm->def->mem.max_balloon; info->nrVirtCpu = vm->def->vcpus; diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index a557bc5..b6f0f2c 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -22,7 +22,11 @@ #include <config.h> #include <fcntl.h> +#include <kvm.h> +#include <sys/param.h> #include <sys/types.h> +#include <sys/sysctl.h> +#include <sys/user.h> #include <sys/ioctl.h> #include <net/if.h> #include <net/if_tap.h> @@ -246,3 +250,39 @@ virBhyveProcessStop(bhyveConnPtr driver, virCommandFree(cmd); return ret; } + +int +virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, + unsigned long long *cpustats) +{ + struct kinfo_proc *kp; + kvm_t *kd; + char errbuf[_POSIX2_LINE_MAX]; + int nprocs; + int ret = -1; + + if ((kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf)) == NULL) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to get kvm descriptor: %s"), + errbuf); + return -1; + + } + + kp = kvm_getprocs(kd, KERN_PROC_PID, vm->pid, &nprocs); + if (kp == NULL || nprocs != 1) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("Unable to obtain information about pid: %d"), + (int)vm->pid); + goto cleanup; + } + + *cpustats = kp->ki_runtime * 1000ull; + + ret = 0; + + cleanup: + kvm_close(kd); + + return ret; +} diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index f91504e..3049ad0 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -34,6 +34,9 @@ int virBhyveProcessStop(bhyveConnPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason); +int virBhyveGetDomainTotalCpuStats(virDomainObjPtr vm, + unsigned long long *cpustats); + typedef enum { VIR_BHYVE_PROCESS_START_AUTODESTROY = 1 << 0, } bhyveProcessStartFlags; -- 1.9.0

2 4

[libvirt] [PATCH v3] storageVolCreateXMLFrom: Allow multiple accesses to origvol
by Michal Privoznik 05 May '14

05 May '14

When creating a new volume, it is possible to copy data into it from another already existing volume (referred to as @origvol). Obviously, the read-only access to @origvol is required, which is thread safe (probably not performance-wise though). However, with current code both @newvol and @origvol are marked as building for the time of copying data from the @origvol to @newvol. The rationale behind is to disallow some operations on both @origvol and @newvol, e.g. vol-wipe, vol-delete, vol-download. While it makes sense to not allow such operations on partly copied mirror, but it doesn't make sense to disallow vol-create on the source (@origvol). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v2: - changed the error message if volume is in use - reworded commit message src/conf/storage_conf.h | 1 + src/storage/storage_driver.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 9ad38e1..eae959c 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -64,6 +64,7 @@ struct _virStorageVolDef { int type; /* enum virStorageVolType */ unsigned int building; + unsigned int in_use; virStorageVolSource source; virStorageSource target; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..542b382 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1640,6 +1640,13 @@ storageVolDelete(virStorageVolPtr obj, if (virStorageVolDeleteEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), @@ -1912,8 +1919,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, /* Drop the pool lock during volume allocation */ pool->asyncjobs++; - origvol->building = 1; newvol->building = 1; + origvol->in_use++; virStoragePoolObjUnlock(pool); if (origpool) { @@ -1929,7 +1936,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, virStoragePoolObjLock(origpool); storageDriverUnlock(driver); - origvol->building = 0; + origvol->in_use--; newvol->building = 0; allocation = newvol->target.allocation; pool->asyncjobs--; @@ -2076,6 +2083,13 @@ storageVolUpload(virStorageVolPtr obj, if (virStorageVolUploadEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), @@ -2167,6 +2181,13 @@ storageVolResize(virStorageVolPtr obj, if (virStorageVolResizeEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), @@ -2474,6 +2495,13 @@ storageVolWipePattern(virStorageVolPtr obj, if (virStorageVolWipePatternEnsureACL(obj->conn, pool->def, vol) < 0) goto cleanup; + if (vol->in_use) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume '%s' is still in use."), + vol->name); + goto cleanup; + } + if (vol->building) { virReportError(VIR_ERR_OPERATION_INVALID, _("volume '%s' is still being allocated."), -- 1.9.0

2 1