- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/2] qemu: Fix stalls during live core dump
by Jiri Denemark 08 Feb '12

08 Feb '12

Qemu uses non-blocking I/O which doesn't play nice with regular file descriptors. We need to pass a pipe to qemu when dumping core to avoid stalls in live mode. Version 2: - generalize virFileDirectFd a bit more as suggested by Eric Jiri Denemark (2): util: Generalize virFileDirectFd qemu: Always use iohelper for dumping domain core src/qemu/qemu_driver.c | 45 +++++++++++-------- src/util/virfile.c | 118 +++++++++++++++++++++++++++++------------------- src/util/virfile.h | 21 ++++++--- 3 files changed, 112 insertions(+), 72 deletions(-) -- 1.7.8.4

2 7

[libvirt] [PATCH] qemu: Fix memory leak when building -cpu argument
by Jiri Denemark 08 Feb '12

08 Feb '12

Reported by Alex Jia: ==21503== 112 (32 direct, 80 indirect) bytes in 1 blocks are definitely lost in loss record 37 of 40 ==21503== at 0x4A04A28: calloc (vg_replace_malloc.c:467) ==21503== by 0x4A8991: virAlloc (memory.c:101) ==21503== by 0x505A6C: x86DataCopy (cpu_x86.c:247) ==21503== by 0x507B34: x86Compute (cpu_x86.c:1225) ==21503== by 0x43103C: qemuBuildCommandLine (qemu_command.c:3561) ==21503== by 0x41C9F7: testCompareXMLToArgvHelper (qemuxml2argvtest.c:183) ==21503== by 0x41E10D: virtTestRun (testutils.c:141) ==21503== by 0x41B942: mymain (qemuxml2argvtest.c:705) ==21503== by 0x41D7E7: virtTestMain (testutils.c:696) --- I should really stop postponing my work to emebed the architecture into cpu data so that cpuDataFree() only needs one argument. src/qemu/qemu_command.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0e26df1..a346f1e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3666,8 +3666,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, ret = 0; cleanup: - if (guest) - cpuDataFree(guest->arch, data); + cpuDataFree(host->arch, data); virCPUDefFree(guest); virCPUDefFree(cpu); -- 1.7.8.4

2 2

[libvirt] [PATCH] Update symbols file for virFileDirectFd/virFileWrapperFd rename
by Daniel P. Berrange 08 Feb '12

08 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- src/libvirt_private.syms | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6ad36c..eeafd38 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1158,10 +1158,9 @@ virAuditSend; # virfile.h virFileClose; -virFileDirectFdClose; -virFileDirectFdFlag; -virFileDirectFdFree; -virFileDirectFdNew; +virFileWrapperFdClose; +virFileWrapperFdFree; +virFileWrapperFdNew; virFileFclose; virFileFdopen; virFileRewrite; -- 1.7.7.6

3 2

[libvirt] [PATCH] Populate /dev/std{in, out, err} symlinks in LXC containers
by Daniel P. Berrange 08 Feb '12

08 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some applications expect /dev/std{in,out,err} to exist. Populate them during container startup as symlinks to /proc/self/fd --- src/lxc/lxc_container.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 04af39b..cb51bbc 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -584,6 +584,14 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM, 0666, "/dev/random" }, { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM, 0666, "/dev/urandom" }, }; + const struct { + const char *src; + const char *dst; + } links[] = { + { "/proc/self/fd/0", "/dev/stdin" }, + { "/proc/self/fd/1", "/dev/stdout" }, + { "/proc/self/fd/2", "/dev/stderr" }, + }; /* Populate /dev/ with a few important bits */ for (i = 0 ; i < ARRAY_CARDINALITY(devs) ; i++) { @@ -597,6 +605,15 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths) } } + for (i = 0 ; i < ARRAY_CARDINALITY(links) ; i++) { + if (symlink(links[i].src, links[i].dst) < 0) { + virReportSystemError(errno, + _("Failed to symlink device %s to %s"), + links[i].dst, links[i].src); + return -1; + } + } + if (access("/dev/pts/ptmx", W_OK) == 0) { /* We have private devpts capability, so bind that */ if (virFileTouch("/dev/ptmx", 0666) < 0) -- 1.7.7.6

2 1

[libvirt] [PATCH] Replace truncate() with ftruncate()
by Daniel P. Berrange 08 Feb '12

08 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Mingw32 does not have any truncate() API defined, but it does have ftruncate(). So replace use of the former with the latter --- src/util/storage_file.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 8260adb..a8661e3 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -939,12 +939,29 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta) int virStorageFileResize(const char *path, unsigned long long capacity) { - if (truncate(path, capacity) < 0) { + int fd = -1; + int ret = -1; + + if ((fd = open(path, O_RDWR)) < 0) { + virReportSystemError(errno, _("Unable to open '%s'"), path); + goto cleanup; + } + + if (ftruncate(fd, capacity) < 0) { virReportSystemError(errno, _("Failed to truncate file '%s'"), path); - return -1; + goto cleanup; } - return 0; + if (VIR_CLOSE(fd) < 0) { + virReportSystemError(errno, _("Unable to save '%s'"), path); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FORCE_CLOSE(fd); + return ret; } #ifdef __linux__ -- 1.7.7.6

2 1

[libvirt] [PATCH 0/2] Don't lose running domains configured with no seclabel
by Jiri Denemark 08 Feb '12

08 Feb '12

It's not exactly obvious but these two patches fix quite an ugly bug affecting setups without any useful security driver (i.e., either explicitly or implicitly using driver 'none'). When a domain is defined without any <seclabel> element in its XML and started by libvirt, an incorrect <seclabel> element is put into its runtime XML configuration which causes such domain to disappear from libvirt when libvirtd is restarted. Without these patches, the incorrect element is <seclabel type='dynamic' relabel='yes'/> after applying patch 2/2, the element is <seclabel type='none' relabel='yes'/> which is still wrong and after applying both of these patches, correct element <seclabel type='none'/> is placed into the runtime XML configuration. Jiri Denemark (2): seclabel: Do not output relabel attribute for type 'none' security: Driver 'none' cannot create confined guests src/conf/domain_conf.c | 9 +++++---- src/security/security_manager.c | 20 ++++++++++++++++++++ .../qemuxml2argv-seclabel-none.xml | 2 +- tests/seclabeltest.c | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) -- 1.7.8.4

2 7

[libvirt] libvirt build errors
by Chandrashekhar Jamadarkhani (cjamadar) 08 Feb '12

08 Feb '12

Hi, While doing make, I got below errors. Got same build errors for libvirt-0.9.8 and libvirt-0.9.9. Appreciate your help on this. CC libvirt_driver_nwfilter_la-nwfilter_driver.lo CC libvirt_driver_nwfilter_la-nwfilter_gentech_driver.lo CC libvirt_driver_nwfilter_la-nwfilter_ebiptables_driver.lo CC libvirt_driver_nwfilter_la-nwfilter_learnipaddr.lo In file included from /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap.h:45, from nwfilter/nwfilter_learnipaddr.c:29: /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/pcap.h:339: warning: redundant redeclaration of 'bpf_filter' [-Wredundant-decls] /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/bpf.h:919: warning: previous declaration of 'bpf_filter' was here /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/pcap.h:340: warning: redundant redeclaration of 'bpf_validate' [-Wredundant-decls] /usr/cisco/packages/libpcap/libpcap-1.0.0/include/pcap/bpf.h:918: warning: previous declaration of 'bpf_validate' was here CCLD libvirt_driver_nwfilter.la libtool: link: require no space between `-L' and `/usr/cisco/packages/libpcap/libpcap-1.0.0/lib' make[3]: *** [libvirt_driver_nwfilter.la] Error 1 make[3]: Leaving directory `/nobackup/vsm/libvirt-0.9.8/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/nobackup/vsm/libvirt-0.9.8/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/nobackup/vsm/libvirt-0.9.8' make: *** [all] Error 2 [root@blr-vxr-009 libvirt-0.9.8]# Thanks, Chandrashekhar

2 3

[libvirt] [test-API][PATCH] Add new APIs and fix problems in connectAPI
by Wayne Sun 08 Feb '12

08 Feb '12

* add 8 new APIs get_sys_info(self, flag = 0) get_memory_stats(self, cellNum, flag = 0) get_cpu_stats(self, cpuNum, flag = 0) is_alive(self) change_begin(self, flag = 0) change_commit(self, flag = 0) change_rollback(self, flag = 0) suspend_for_duration(self, target, duration, flag = 0) * remove outdated ref(self, uri) function * fix typo in following functions migrate(self, domain, flags, dname, uri, bandwidth) networkLookupByUUID(self, uuid) numOfDefinedDomains(self) numOfDomains(self) nwfilterLookupByUUID(self, uuid) --- lib/connectAPI.py | 83 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 72 insertions(+), 11 deletions(-) diff --git a/lib/connectAPI.py b/lib/connectAPI.py index 9f2b728..87b0a59 100644 --- a/lib/connectAPI.py +++ b/lib/connectAPI.py @@ -105,6 +105,15 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_sys_info(self, flag = 0): + try: + sysinfo = self.conn.getSysinfo(flag) + return sysinfo + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_type(self): try: type = self.conn.getType() @@ -123,19 +132,18 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def ref(self, uri): + def get_cells_free_memory(self, startCell, maxCells): try: - refer = self.conn.ref() - return refer + cfreemem = self.conn.getCellsFreeMemory(startCell, maxCells) + return cfreemem except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_cells_free_memory(self, startCell, maxCells): + def get_memory_stats(self, cellNum, flag = 0): try: - cfreemem = self.conn.getCellsFreeMemory(startCell, maxCells) - return cfreemem + return self.conn.getMemoryStats(cellNum, flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -158,6 +166,14 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_cpu_stats(self, cpuNum, flag = 0): + try: + return self.conn.getCPUStats(cpuNum, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def compare_cpu(self, xmlDesc, flag = 0): try: return self.conn.compareCPU(xmlDesc, flag) @@ -208,6 +224,14 @@ class ConnectAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def is_alive(self): + try: + return self.conn.isAlive() + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def isEncrypted(self): try: return self.conn.isEncrypted() @@ -307,7 +331,7 @@ class ConnectAPI(object): def migrate(self, domain, flags, dname, uri, bandwidth): try: - return self.migrate(self, domain, flags, dname, uri, bandwidth) + return self.conn.migrate(domain, flags, dname, uri, bandwidth) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -315,7 +339,7 @@ class ConnectAPI(object): def networkLookupByUUID(self, uuid): try: - return self.networkLookupByUUID(self, uuid) + return self.conn.networkLookupByUUID(uuid) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -323,7 +347,7 @@ class ConnectAPI(object): def numOfDefinedDomains(self): try: - return self.numOfDefinedDomains(self) + return self.conn.numOfDefinedDomains() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -331,7 +355,7 @@ class ConnectAPI(object): def numOfDomains(self): try: - return self.numOfDomains(self) + return self.conn.numOfDomains() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -339,7 +363,39 @@ class ConnectAPI(object): def nwfilterLookupByUUID(self, uuid): try: - return self.nwfilterLookupByUUID(self, uuid) + return self.conn.nwfilterLookupByUUID(uuid) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def change_begin(self, flag = 0): + try: + return self.conn.changeBegin(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def change_commit(self, flag = 0): + try: + return self.conn.changeCommit(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def change_rollback(self, flag = 0): + try: + return self.conn.changeRollback(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def suspend_for_duration(self, target, duration, flag = 0): + try: + return self.conn.suspendForDuration(target, duration, flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() @@ -348,3 +404,8 @@ class ConnectAPI(object): VIR_CRED_AUTHNAME = libvirt.VIR_CRED_AUTHNAME VIR_CRED_PASSPHRASE = libvirt.VIR_CRED_PASSPHRASE +# virNodeSuspendTarget +VIR_NODE_SUSPEND_TARGET_MEM = 0 +VIR_NODE_SUSPEND_TARGET_DISK = 1 +VIR_NODE_SUSPEND_TARGET_HYBRID = 2 +VIR_NODE_SUSPEND_TARGET_LAST = 3 -- 1.7.1

2 1

[libvirt] [PATCH] virsh: update virsh desc help docs
by ajia＠redhat.com 08 Feb '12

08 Feb '12

From: Alex Jia <ajia(a)redhat.com> The function cmdDesc says 'current is ignored', so should remove related part from help docs. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c107d8c..e60ef5a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1038,7 +1038,6 @@ static const vshCmdOptDef opts_desc[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"live", VSH_OT_BOOL, 0, N_("modify/get running state")}, {"config", VSH_OT_BOOL, 0, N_("modify/get persistent configuration")}, - {"current", VSH_OT_BOOL, 0, N_("modify/get current state configuration")}, {"title", VSH_OT_BOOL, 0, N_("modify the title instead of description")}, {"edit", VSH_OT_BOOL, 0, N_("open an editor to modify the description")}, {"new-desc", VSH_OT_ARGV, 0, N_("message")}, -- 1.7.1

2 1

[libvirt] [PATCH] virsh: Plug memory leak on cmdDesc
by ajia＠redhat.com 08 Feb '12

08 Feb '12

From: Alex Jia <ajia(a)redhat.com> Forgot to free the domain object, this will intruduce resource leaks including memory leak and FD leaks. * tools/virsh.c(cmdDesc): fix memory leak. * How to reproduce? % virsh desc <domain> No description for domain: <domain> error: Failed to disconnect from the hypervisor, 1 leaked reference(s) Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virsh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index bff7d5d..c107d8c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1167,6 +1167,8 @@ cleanup: unlink(tmp); VIR_FREE(tmp); } + if (dom) + virDomainFree(dom); return ret; } -- 1.7.1

3 2

[libvirt] [PATCH v2] virsh: Do not check the input XML at virsh layer for cmdDetachDevice
by Osier Yang 08 Feb '12

08 Feb '12

Any device XML doesn't use the same order as libvirt generates, or uses decimal for attributes like "slot" of "<address>" will cause device detaching to fail, as virsh compares the XML simply earlier in strict manner before internal parsing. This is regression introduced by ea7182c. v1 is here: https://www.redhat.com/archives/libvir-list/2012-January/msg00395.html v1 - v2: * The two useful functions is left unchanged, marked as unused. --- tools/virsh.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 72ca93a..7997cbb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13153,6 +13153,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) * @n2 second node * returns true in case n1 covers n2, false otherwise. */ +__attribute__((unused)) static bool vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { @@ -13278,6 +13279,7 @@ cleanup: * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML * is touched only in case of success. */ +__attribute__((unused)) static int vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, char **newXML) @@ -13412,7 +13414,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; const char *from = NULL; - char *buffer = NULL, *new_buffer = NULL; + char *buffer = NULL; int ret; bool funcRet = false; unsigned int flags; @@ -13431,27 +13433,13 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); - if (ret < 0) { - if (ret == -2) { - vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); - } else if (ret == -3) { - vshError(ctl, "%s", _("given XML selects too many devices. " - "Please, be more specific")); - } else { - /* vshCompleteXMLFromDomain() already printed error message, - * so nothing to do here. */ - } - goto cleanup; - } - if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_AFFECT_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; - ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); + ret = virDomainDetachDeviceFlags(dom, buffer, flags); } else { - ret = virDomainDetachDevice(dom, new_buffer); + ret = virDomainDetachDevice(dom, buffer); } if (ret < 0) { @@ -13463,7 +13451,6 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) funcRet = true; cleanup: - VIR_FREE(new_buffer); VIR_FREE(buffer); virDomainFree(dom); return funcRet; -- 1.7.7.3

3 4

[libvirt] [PATCH] build: avoid gcc 4.7 warning about inlines
by Eric Blake 07 Feb '12

07 Feb '12

gcc 4.7 complains: util/virhashcode.c:49:17: error: always_inline function might not be inlinable [-Werror=attributes] util/virhashcode.c:35:17: error: always_inline function might not be inlinable [-Werror=attributes] Normal 'inline' is a hint that the compiler may ignore; the fact that the function is static is good enough. We don't care if the compiler decided not to inline after all. * src/util/virhashcode.c (getblock, fmix): Relax attribute. --- Pushing under the build-breaker rule; this lets the build get further on rawhide (it later fails with: GEN remote/remote_protocol.h /usr/bin/rpcgen: C preprocessor failed with exit code 1 cannot shutdown /usr/bin/rpcgen: at ./rpc/genprotocol.pl line 122. that I still have to investigate). src/util/virhashcode.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index 6d91793..d16d544 100644 --- a/src/util/virhashcode.c +++ b/src/util/virhashcode.c @@ -31,8 +31,7 @@ #include "bitrotate.h" /* slower than original but handles platforms that do only aligned reads */ -__attribute__((always_inline)) -static uint32_t getblock(const uint8_t *p, int i) +static inline uint32_t getblock(const uint8_t *p, int i) { uint32_t r; size_t size = sizeof(r); @@ -45,8 +44,7 @@ static uint32_t getblock(const uint8_t *p, int i) /* * Finalization mix - force all bits of a hash block to avalanche */ -__attribute__((always_inline)) -static uint32_t fmix(uint32_t h) +static inline uint32_t fmix(uint32_t h) { h ^= h >> 16; h *= 0x85ebca6b; -- 1.7.7.6

1 2

[libvirt] [PATCH] storage: Don't unsparsify images when cloning
by Cole Robinson 07 Feb '12

07 Feb '12

Input to the volume cloning code is a source volume and an XML descriptor for the new volume. It is possible for the new volume to have a greater size than source volume, at which point libvirt will just stick 0s on the end of the new image (for raw format anyways). Unfortunately a logic error messed up our tracking of the of the excess amount that needed to be written: end result is that sparse clones were made very much non-sparse, and cloning regular disk images could end up excessively sized (though data unaltered). Drop the 'remain' variable entriely here since it's redundant, and track actual allocation directly against the desired 'total'. --- src/storage/storage_backend.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 1c22112..caac2f8 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -127,7 +127,6 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, int inputfd = -1; int amtread = -1; int ret = 0; - unsigned long long remain; size_t rbytes = READ_BLOCK_SIZE_DEFAULT; size_t wbytes = 0; int interval; @@ -165,13 +164,11 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, goto cleanup; } - remain = *total; - while (amtread != 0) { int amtleft; - if (remain < rbytes) - rbytes = remain; + if (*total < rbytes) + rbytes = *total; if ((amtread = saferead(inputfd, buf, rbytes)) < 0) { ret = -errno; @@ -180,7 +177,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, inputvol->target.path); goto cleanup; } - remain -= amtread; + *total -= amtread; /* Loop over amt read in 512 byte increments, looking for sparse * blocks */ @@ -225,8 +222,6 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } inputfd = -1; - *total -= remain; - cleanup: VIR_FORCE_CLOSE(inputfd); -- 1.7.7.5

2 4

[libvirt] [PATCH] Bug fix: Allow sysinfo to display processor information
by Prerna Saxena 07 Feb '12

07 Feb '12

From: Prerna Saxena <prerna(a)linux.vnet.ibm.com> Date: Mon, 6 Feb 2012 13:46:10 +0530 Subject: [PATCH] Bugfix: Allow sysinfo to display 'processor' information Calls to virSysinfoParseBIOS(), virSysinfoParseSystem() would update the buffer pointer 'base', so the processor information would be lost before virSysinfoParseProcessor() was called. Sysinfo would therefore not be able to display processor details -- It only described <bios>, <system> and <memory_device> details. Before the fix: --------------- virsh # sysinfo <sysinfo type='smbios'> <bios> .... </bios> <system> .... </system> <memory_device> .... </memory_device> After the fix: ------------- virsh # sysinfo <sysinfo type='smbios'> <bios> .... </bios> <system> .... </system> <processor> .... </processor> <memory_device> .... </memory_device> --- src/util/sysinfo.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index de3108a..d92d655 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -483,16 +483,17 @@ virSysinfoRead(void) { base = outbuf; + ret->nprocessor = 0; + ret->processor = NULL; + if ((base = virSysinfoParseProcessor(base, ret)) == NULL) + goto no_memory; + if ((base = virSysinfoParseBIOS(base, ret)) == NULL) goto no_memory; if ((base = virSysinfoParseSystem(base, ret)) == NULL) goto no_memory; - ret->nprocessor = 0; - ret->processor = NULL; - if ((base = virSysinfoParseProcessor(base, ret)) == NULL) - goto no_memory; ret->nmemory = 0; ret->memory = NULL; -- 1.7.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 4

[libvirt] [PATCH 0/2] qemu: Fix stalls during live core dump
by Jiri Denemark 07 Feb '12

07 Feb '12

Qemu uses non-blocking I/O which doesn't play nice with regular file descriptors. We need to pass a pipe to qemu when dumping core to avoid stalls in live mode. Jiri Denemark (2): util: Generalize virFileDirectFd qemu: Always use iohelper for dumping domain core src/qemu/qemu_driver.c | 41 +++++++++++--------- src/util/virfile.c | 98 ++++++++++++++++++++++++++--------------------- src/util/virfile.h | 18 +++++---- 3 files changed, 86 insertions(+), 71 deletions(-) -- 1.7.8.4

2 8

[libvirt] [PATCH v2 0/1] qemu-ga: add guest-sync-delimited
by Michael Roth 07 Feb '12

07 Feb '12

Sorry for the somewhat redundant cover letter, but needed to note that: This applies on top of "[PATCH v2 0/8] qemu-ga: add support for Windows", and can also be obtained from: git://github.com/mdroth/qemu.git qga-guest-sync-delimited CHANGES SINCE v1: - removed deprecation flag for guest-sync, still useful for some implementations As noted in the commit there's a wiki write-up with more details on what exactly this is for: http://wiki.qemu.org/Features/QAPI/GuestAgent#QEMU_Guest_Agent_Protocol It's not absolutely required, but it does make dealing with some communication corner cases a heck of a lot easier for stream-based (as opposed to readline-based) client implementations.

2 4

[libvirt] [PATCH] build: don't require avahi during install
by Laine Stump 07 Feb '12

07 Feb '12

See: https://bugzilla.redhat.com/show_bug.cgi?id=785269 The specfile requires avahi during install if libvirt was built with avahi support, but there are many situations where it is undesirable to install avahi due to security concerns. If we still Build-require avahi-devel during the build, but don't require it at install time, it will be used if present, and ignored if not. --- libvirt.spec.in | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f279d6d..dab9650 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -272,9 +272,6 @@ Requires: %{name}-client = %{version}-%{release} Requires: module-init-tools # for /sbin/ip & /sbin/tc Requires: iproute -%if %{with_avahi} -Requires: avahi -%endif %endif %if %{with_network} Requires: dnsmasq >= 2.41 -- 1.7.7.6

2 4

[libvirt] [PATCH] Allow polkit auth for VNC and SSH users
by Cole Robinson 07 Feb '12

07 Feb '12

If you are sitting in front of a physical machine and logged in as a regular user, you can connect to the system libvirtd instance by providing a root password to policykit. This is how most virt-manager users talk to libvirt. However, if you are launching virt-manager over ssh -X, or over VNC started from say /etc/sysconfig/vncservers, our policykit policy rejects the user outright, providing no option to provide the root password. This is confusing to users and doesn't seem to serve much point. Change the policy to allow inactive (VNC) and non-local (SSH, VNC) to provide root credentials for accessing system libvirtd. We use auth_admin rather than auth_admin_keep so that credentials aren't cached at all, and every subsequent reconnection to libvirt requires auth. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=625115 Similar change to PackageKit policy: https://bugzilla.redhat.com/show_bug.cgi?id=528511 --- daemon/libvirtd.policy-0 | 4 ++-- daemon/libvirtd.policy-1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/libvirtd.policy-0 b/daemon/libvirtd.policy-0 index b6da946..5d6845c 100644 --- a/daemon/libvirtd.policy-0 +++ b/daemon/libvirtd.policy-0 @@ -34,8 +34,8 @@ file are instantly applied. <defaults>  - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin_keep_session</allow_active> </defaults> </action> diff --git a/daemon/libvirtd.policy-1 b/daemon/libvirtd.policy-1 index 6fa3a5e..c2bec1f 100644 --- a/daemon/libvirtd.policy-1 +++ b/daemon/libvirtd.policy-1 @@ -34,8 +34,8 @@ file are instantly applied. <defaults>  - <allow_any>no</allow_any> - <allow_inactive>no</allow_inactive> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin_keep</allow_active> </defaults> </action> -- 1.7.7.5

2 2

[libvirt] [PATCH] qemu_agent: Issue guest-sync prior to every command
by Michal Privoznik 07 Feb '12

07 Feb '12

If we issue guest command and GA is not running, the issuing thread will block endlessly. We can check for GA presence by issuing guest-sync with unique ID (timestamp). We don't want to issue real command as even if GA is not running, once it is started, it process all commands written to GA socket. If we receive reply, it might be from a previous sync command, so we need to compare received ID for equality with the given one. --- Some background on this: -GA socked is always writeable, even with no GA running (!) -writing something to dead socket (=without any GA listening) will thus succeed. However, when one will (after a period of time) start the GA, it will read and process all written data. This makes timeout implementation harder. -Therefore issuing a GA command without any GA running will block indefinitely. My solution to this is: Issue harmless guest-sync command which returns given identifier. To avoid blocking, do a timed wait (5 seconds). This is the only case where we do a timed wait, regular GA commands will of course wait without any timeout. If GA didn't reply within those 5 seconds, we store an ID so we can compare it later and report 'GA unavailable'; Note that guest won't get into a different state as libvirt thinks it is in. Then, if GA is ever started, it start to process our sync commands. And all we have to do is check if we have ever issued such ID. If not an error is reported. However, there is still race: 1) GA will reply to our guest-sync 2) GA gets terminated 3) we issue regular command (e.g. fs-freeze) I am not sure this is avoidable. But this patch makes current situation bearable. src/qemu/qemu_agent.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 159 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9df5546..5ecf893 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -39,6 +39,7 @@ #include "virterror_internal.h" #include "json.h" #include "virfile.h" +#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -106,6 +107,10 @@ struct _qemuAgent { /* If anything went wrong, this will be fed back * the next monitor msg */ virError lastError; + + /* Array of IDs issued to GA via guest-sync */ + unsigned long long *ids; + size_t ids_size; }; #if DEBUG_RAW_IO @@ -147,6 +152,7 @@ static void qemuAgentFree(qemuAgentPtr mon) (mon->cb->destroy)(mon, mon->vm); ignore_value(virCondDestroy(&mon->notify)); virMutexDestroy(&mon->lock); + VIR_FREE(mon->ids); VIR_FREE(mon->buffer); VIR_FREE(mon); } @@ -316,6 +322,8 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, { virJSONValuePtr obj = NULL; int ret = -1; + size_t i; + unsigned long long id; VIR_DEBUG("Line [%s]", line); @@ -340,6 +348,40 @@ qemuAgentIOProcessLine(qemuAgentPtr mon, obj = NULL; ret = 0; } else { + /* If we've received something like: + * {"return": 1234} + * it is likely that somebody started GA + * which is now processing our previous + * guest-sync command. Check this and if so, + * don't report an error however return silently + */ + if (virJSONValueObjectGetNumberUlong(obj, "return", &id) == 0) { + for (i = 0; i < mon->ids_size; i++) { + if (mon->ids[i] != id) + continue; + + VIR_DEBUG("Received delayed reply to guest-sync: %llu", + id); + + if (mon->ids_size > 1) { + memmove(&mon->ids[i], + &mon->ids[i + 1], + sizeof(*mon->ids) * (mon->ids_size - (i + 1))); + + mon->ids_size--; + if (VIR_REALLOC_N(mon->ids, mon->ids_size) < 0) { + /* Ignore, harmless */ + } + } else { + VIR_FREE(mon->ids); + mon->ids_size = 0; + } + + ret = 0; + goto cleanup; + } + } + qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected JSON reply '%s'"), line); } @@ -813,11 +855,28 @@ void qemuAgentClose(qemuAgentPtr mon) qemuAgentUnlock(mon); } +#define QEMU_AGENT_WAIT_TIME (1000ull * 5) +/** + * qemuAgentSend: + * @mon: Monitor + * @msg: Message + * @timeout: use timeout? + * + * Send @msg to agent @mon. + * Wait max QEMU_AGENT_WAIT_TIME for agent + * to reply. + * + * Returns: 0 on success, + * -2 on timeout, + * -1 otherwise + */ static int qemuAgentSend(qemuAgentPtr mon, - qemuAgentMessagePtr msg) + qemuAgentMessagePtr msg, + bool timeout) { int ret = -1; + unsigned long long now, then; /* Check whether qemu quit unexpectedly */ if (mon->lastError.code != VIR_ERR_OK) { @@ -827,13 +886,26 @@ static int qemuAgentSend(qemuAgentPtr mon, return -1; } + if (timeout) { + if (virTimeMillisNow(&now) < 0) + return -1; + then = now + QEMU_AGENT_WAIT_TIME; + } + mon->msg = msg; qemuAgentUpdateWatch(mon); while (!mon->msg->finished) { - if (virCondWait(&mon->notify, &mon->lock) < 0) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to wait on monitor condition")); + if ((timeout && virCondWaitUntil(&mon->notify, &mon->lock, then) < 0) || + (!timeout && virCondWait(&mon->notify, &mon->lock) < 0)) { + if (errno == ETIMEDOUT) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Guest agent not available for now")); + ret = -2; + } else { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to wait on monitor condition")); + } goto cleanup; } } @@ -855,6 +927,83 @@ cleanup: } +/** + * qemuAgentGuestSync: + * @mon: Monitor + * + * Send guest-sync with unique ID and wait for + * reply. If we get one, check if received ID + * is equal to given. + * + * Returns: 0 on success, + * -1 otherwise + */ +static int +qemuAgentGuestSync(qemuAgentPtr mon) +{ + int ret = -1; + int send_ret; + unsigned long long id, id_ret; + qemuAgentMessage sync_msg; + + memset(&sync_msg, 0, sizeof sync_msg); + + if (virTimeMillisNow(&id) < 0) + return -1; + + if (virAsprintf(&sync_msg.txBuffer, + "{\"execute\":\"guest-sync\", " + "\"arguments\":{\"id\":%llu}}", id) < 0) { + virReportOOMError(); + return -1; + } + sync_msg.txLength = strlen(sync_msg.txBuffer); + + VIR_DEBUG("Sending guest-sync command with ID: %llu", id); + + send_ret = qemuAgentSend(mon, &sync_msg, true); + + VIR_DEBUG("Agent guest-sync returned: %d", send_ret); + + if (send_ret == -1) { + /* error reported */ + goto cleanup; + } else if (send_ret == -2) { + /* don't report errors as we don't want to + * overwrite the one from qemuAgentSend() */ + if (VIR_REALLOC_N(mon->ids, mon->ids_size) == 0) + mon->ids[mon->ids_size++] = id; + goto cleanup; + } + + if (!sync_msg.rxObject) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Missing monitor reply object")); + goto cleanup; + } + + if (virJSONValueObjectGetNumberUlong(sync_msg.rxObject, + "return", &id_ret) < 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed return value")); + goto cleanup; + } + + VIR_DEBUG("Guest returned ID: %llu", id_ret); + if (id_ret != id) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Guest agent returned ID: %llu instead of %llu"), + id_ret, id); + goto cleanup; + } + ret = 0; + +cleanup: + virJSONValueFree(sync_msg.rxObject); + VIR_FREE(sync_msg.txBuffer); + return ret; +} + static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, @@ -866,6 +1015,11 @@ qemuAgentCommand(qemuAgentPtr mon, *reply = NULL; + if (qemuAgentGuestSync(mon) < 0) { + /* helper reported the error */ + return -1; + } + memset(&msg, 0, sizeof msg); if (!(cmdstr = virJSONValueToString(cmd))) { @@ -880,12 +1034,11 @@ qemuAgentCommand(qemuAgentPtr mon, VIR_DEBUG("Send command '%s' for write", cmdstr); - ret = qemuAgentSend(mon, &msg); + ret = qemuAgentSend(mon, &msg, false); VIR_DEBUG("Receive command reply ret=%d rxObject=%p", ret, msg.rxObject); - if (ret == 0) { if (!msg.rxObject) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.7.3.4

3 3

[libvirt] [PATCH 0/1] qemu-ga: add guest-sync-delimited
by Michael Roth 07 Feb '12

07 Feb '12

Sorry for the somewhat redundant cover letter, but needed to note that: This applies on top of "[PATCH v2 0/8] qemu-ga: add support for Windows", and can also be obtained from: git://github.com/mdroth/qemu.git qga-guest-sync-delimited As noted in the commit there's a wiki write-up with more details on what exactly this is for: http://wiki.qemu.org/Features/QAPI/GuestAgent#QEMU_Guest_Agent_Protocol It's not absolutely required, but it does make dealing with some communication corner cases a heck of a lot easier.

2 3

[libvirt] [PATCH] pyhton: Don't link against libvirt_util.la
by Michal Privoznik 07 Feb '12

07 Feb '12

As we already link with libvirt.la which contains libvirt_utils.la. Double linking causes global symbols to be presented twice and thus confusion. This partially reverts c700613b8d463212d142c97108b7a2352e23e559 --- python/Makefile.am | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 9b791d7..0305bcc 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -41,11 +41,9 @@ EXTRA_DIST = \ if WITH_PYTHON mylibs = \ $(top_builddir)/src/libvirt.la \ - $(top_builddir)/src/libvirt_util.la \ $(top_builddir)/gnulib/lib/libgnu.la myqemulibs = \ $(top_builddir)/src/libvirt-qemu.la \ - $(top_builddir)/src/libvirt_util.la \ $(top_builddir)/gnulib/lib/libgnu.la all-local: libvirt.py libvirt_qemu.py -- 1.7.3.4

3 3

[libvirt] [PATCH] libvirtd: Enable private /tmp under systemd.
by Eric Blake 07 Feb '12

07 Feb '12

The last intentional use of /tmp by libvirt was patched in commit bd6083c9b; we can add an extra measure of security by explicitly requesting that libvirtd's /tmp is not visible to arbitrary users. See https://bugzilla.redhat.com/782474 * daemon/libvirtd.service.in (Service): Enable PrivateTmp. --- daemon/libvirtd.service.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 8f2458a..cf68440 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -17,6 +17,7 @@ ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS ExecReload=/bin/kill -HUP $MAINPID # Override the maximum number of opened files #LimitNOFILE=2048 +PrivateTmp=true [Install] WantedBy=multi-user.target -- 1.7.7.6

2 2

[libvirt] [RFC] Specific vcpu hot-(un)plug API proposal
by Peter Krempa 07 Feb '12

07 Feb '12

Hypervisors are starting to support hot-(un)plugging of specific vcpus. This adds more flexibility for the management tools to decide which CPU should be added or removed. Libvirt's API in current state does not allow to choose arbitrary vCPU id's for the new vCPU's and does not support removing arbitrary vCPUs either. I propose a following API to enable working with specific vCPUs: /** * virDomainAddVcpu: * @domain: pointer to domain object * @vcpu: ID of the vcpu socket to plug the virtual CPU to * @flags: bitwise-OR of virDomainModificationImpact * * Dynamicaly add a CPU to the domain. Attach the cpu to the ID specified * by @vcpu. Note that this call may fail if the underlying virtualization * hypervisor does not support adding cpu's with specific ID or if maximum * number of CPUs is arbitrary limited. * * The @vcpu parameter identifies the vcpu ID the new vcpu should be attached * to. If -1 is specified, the new cpu is added to the first available ID. * * @flags may include VIR_DOMAIN_AFFECT_LIVE to affect a running * domain (which may fail if domain is not active), or * VIR_DOMAIN_AFFECT_CONFIG to affect the next boot via the XML * description of the domain. Both flags may be set. * If neither flag is specified (that is, @flags is VIR_DOMAIN_AFFECT_CURRENT), * then an inactive domain modifies persistent setup, while an active domain * is hypervisor-dependent on whether just live or both live and persistent * state is changed. * * Returns 0 in case of success, -1 in case of failure. */ int virDomainAddVcpu(virDomainPtr domain, int vcpu, unsigned int flags) /** * virDomainRemoveVcpu: * @domain: pointer to domain object * @vcpu: ID of the vcpu socket to plug the virtual CPU to * @flags: bitwise-OR of virDomainModificationImpact * * Dynamicaly remove a CPU from the domain. Remove the the vcpu with ID * specified by @vcpu. Note that this call may fail if the underlying * virtualization hypervisor does not support hot-unplugging vcpus with * specific ID or vcpus in general. * * The @vcpu parameter identifies the vcpu ID that should be removed. * If -1 is specified, the cpu with the highest ID is removed. * * @flags may include VIR_DOMAIN_AFFECT_LIVE to affect a running * domain (which may fail if domain is not active), or * VIR_DOMAIN_AFFECT_CONFIG to affect the next boot via the XML * description of the domain. Both flags may be set. * If neither flag is specified (that is, @flags is VIR_DOMAIN_AFFECT_CURRENT), * then an inactive domain modifies persistent setup, while an active domain * is hypervisor-dependent on whether just live or both live and persistent * state is changed. * * Returns 0 in case of success, -1 in case of failure. */ int virDomainRemoveVcpu(virDomainPtr domain, int vcpu, unsigned int flags) What are your thoughts on this? Thanks Peter

3 2

[libvirt] segment fault from libvirtmod
by Guannan Ren 07 Feb '12

07 Feb '12

Hi, The Makefile.am in python forget to add probes.o if WITH_DTRACE but after I added it and tried to connect, using libvirt.open("qemu:///system") in python , it reported: "segment fault" I tried to figure out, but failed. If anyone can help this, thanks. The following is the backtrace: #0 0x0000003c62a810a4 in free () from /lib64/libc.so.6 #1 0x00007ffff1836f29 in virFree (ptrptr=0x6a6a28) at util/memory.c:310 #2 0x00007ffff1849692 in virResetError (err=0x6a6a20) at util/virterror.c:387 #3 0x00007ffff13e2761 in do_open (name=0x7ffff7ed6444 "qemu:///system", auth=0x0, flags=0) at libvirt.c:1093 #4 0x00007ffff13e4d44 in virConnectOpen (name=0x7ffff7ed6444 "qemu:///system") at libvirt.c:1350 #5 0x00007ffff1824879 in libvirt_virConnectOpen (self=<optimized out>, args=<optimized out>) at libvirt.c:3637 #6 0x0000003c652dffbb in PyEval_EvalFrameEx () from /usr/lib64/libpython2.7.so.1.0 #7 0x0000003c652e0580 in PyEval_EvalFrameEx () from /usr/lib64/libpython2.7.so.1.0 #8 0x0000003c652e15a5 in PyEval_EvalCodeEx () from /usr/lib64/libpython2.7.so.1.0 #9 0x0000003c652e16d2 in PyEval_EvalCode () from /usr/lib64/libpython2.7.so.1.0 #10 0x0000003c652fb9ec in ?? () from /usr/lib64/libpython2.7.so.1.0 #11 0x0000003c652fc7f0 in PyRun_FileExFlags () from /usr/lib64/libpython2.7.so.1.0 #12 0x0000003c652fd26f in PyRun_SimpleFileExFlags () from /usr/lib64/libpython2.7.so.1.0 #13 0x0000003c6530e745 in Py_Main () from /usr/lib64/libpython2.7.so.1.0 #14 0x0000003c62a2169d in __libc_start_main () from /lib64/libc.so.6 #15 0x0000000000400651 in _start () Guannan Ren

4 6

[libvirt] [test-API][PATCH] Add 8 new APIs in domainAPI
by Wayne Sun 07 Feb '12

07 Feb '12

* new APIs reset(self, domname, flag = 0) get_vcpu_pin_info(self, domname, flag) is_updated(self, domname) inject_NMI(self, domname, flag = 0) open_console(self, domname, dev_name, stream, flag = 0) open_graphics(self, domname, idx, fd, flag = 1) screenshot(self, domname, stream, screen, flag = 0) get_migrate_max_speed(self, domname, flag = 0) A bug is filed to migrateGetMaxSpeed() about parameters, it'll affect get_migrate_max_speed() function, but the parameters should remain the status quo. Change will be followed up anyway. open_graphics() will not work now for lack qemu support, missing add_client qemu command. for dev_name in open_console, pass the alias name of console, serial or parallel port. * deleted outdated function get_ref(self, domname) --- lib/domainAPI.py | 91 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 83 insertions(+), 8 deletions(-) diff --git a/lib/domainAPI.py b/lib/domainAPI.py index 91f2ba3..a8086ab 100644 --- a/lib/domainAPI.py +++ b/lib/domainAPI.py @@ -261,6 +261,16 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def reset(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + retval = dom_obj.reset(flag) + return retval + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_info(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -335,36 +345,46 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_ref(self, domname): + def get_vcpus(self, domname): try: dom_obj = self.get_domain_by_name(domname) - ref = dom_obj.ref() - return ref + vcpu_info = dom_obj.vcpus() + return vcpu_info except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def get_vcpus(self, domname): + def set_pin_vcpu(self, domname, vcpu, cpumap): try: dom_obj = self.get_domain_by_name(domname) - vcpu_info = dom_obj.vcpus() - return vcpu_info + pin_vcpu = dom_obj.pinVcpu(vcpu, cpumap) + return pin_vcpu except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def set_pin_vcpu(self, domname, vcpu, cpumap): + def set_pin_vcpu_flags(self, domname, vcpu, cpumap, flag): try: dom_obj = self.get_domain_by_name(domname) - pin_vcpu = dom_obj.pinVcpu(vcpu, cpumap) + pin_vcpu = dom_obj.pinVcpuFlags(vcpu, cpumap, flag) return pin_vcpu except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def get_vcpu_pin_info(self, domname, flag): + try: + dom_obj = self.get_domain_by_name(domname) + pin_vcpu_info = dom_obj.vcpuPinInfo(flag) + return pin_vcpu_info + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def get_uuid(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -716,6 +736,15 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def is_updated(self, domname): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.isUpdated() + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + def job_info(self, domname): try: dom_obj = self.get_domain_by_name(domname) @@ -878,6 +907,50 @@ class DomainAPI(object): code = e.get_error_code() raise exception.LibvirtAPI(message, code) + def inject_NMI(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.injectNMI(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def open_console(self, domname, dev_name, stream, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.openConsole(dev_name, stream, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def open_graphics(self, domname, idx, fd, flag = 1): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.openGraphics(idx, fd, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def screenshot(self, domname, stream, screen, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.screenshot(stream, screen, flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def get_migrate_max_speed(self, domname, flag = 0): + try: + dom_obj = self.get_domain_by_name(domname) + return dom_obj.migrateGetMaxSpeed(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) # DomainState VIR_DOMAIN_NOSTATE = 0 @@ -903,3 +976,5 @@ VIR_DOMAIN_AFFECT_CURRENT = 0 VIR_DOMAIN_AFFECT_LIVE = 1 VIR_DOMAIN_AFFECT_CONFIG = 2 +# virDomainOpenGraphicsFlags +VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH = 1 -- 1.7.1

1 0