- Devel - libvirt List Archives

[libvirt] [PATCH] Delete extra wrap after vol-reisize error
by Yanqiu Zhang 08 Sep '16

08 Sep '16

This patch is to delete the extra wrap "\n" after failed vol-reisize error, both "Failed to change size of volume to" and "Failed to change size of volume by". For error with wrap, there will be an extra wrap between two errors, such as: (1)# virsh vol-resize --pool default --vol vol-test 5M error: Failed to change size of volume 'vol-test' to 5M error: invalid argument: Can't shrink capacity below current capacity unless shrink flag explicitly specified (2)# virsh vol-resize /var/lib/libvirt/images/volds --shrink --delta 10M error: Failed to change size of volume 'volds' by 10M error: invalid argument: can't shrink capacity below existing allocation --- tools/virsh-volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index d35fee1..4b3b4d7 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1128,8 +1128,8 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) ret = true; } else { vshError(ctl, - delta ? _("Failed to change size of volume '%s' by %s\n") - : _("Failed to change size of volume '%s' to %s\n"), + delta ? _("Failed to change size of volume '%s' by %s") + : _("Failed to change size of volume '%s' to %s"), virStorageVolGetName(vol), capacityStr); ret = false; } -- 1.8.3.1

2 1

[libvirt] [libvirt-php][PATCH] libvirt_list_active_domains: Don't free domain before strduping its name
by Michal Privoznik 08 Sep '16

08 Sep '16

There's a bug in the implementation of libvirt_list_active_domains(). We try to return an array of names of active domains. So we iterate over array of domains as returned by libvirt and get each domain's name. But we don't obtain a duplicate of that name rather just a pointer into virDomain object. The very next thing we do is we free the virDomain object and then try to copy what's now invalid pointer. Reverse the order of those two actions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-php.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 2045c59..8edcb10 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -9128,18 +9128,15 @@ PHP_FUNCTION(libvirt_list_active_domains) domain=virDomainLookupByID(conn->conn,ids[i]); if (domain!=NULL) { - name=virDomainGetName(domain); - - if (virDomainFree (domain)) - resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); - - if (name==NULL) - { - efree (ids); + if (!(name = virDomainGetName(domain))) { + efree(ids); RETURN_FALSE; } VIRT_ADD_NEXT_INDEX_STRING(return_value, name); + + if (virDomainFree(domain)) + resource_change_counter(INT_RESOURCE_DOMAIN, conn->conn, domain, 0 TSRMLS_CC); } } efree(ids); -- 2.8.4

2 1

[libvirt] [libvirt-php] libvirt_list_active_domains returns garbage querying a Hyper-V host
by Fernando Casas Schössow 08 Sep '16

08 Sep '16

Hi all, I'm using libvirt-php to manage a Hyper-V 2012 R2 host. When trying to retrieve the active VMs using the function libvirt_list_active_domains() I get an array with the correct amount of items but with garbage instead of the domain names: Array ( [0] => P’*µ [1] => +µ [2] => `„*µ [3] => °Ø*µ [4] => Ð„*µ [5] => `†*µ [6] => [7] => `†*µ [8] => [9] => p+µ [10] => p"+µ [11] => P#+µ [12] => ß*µ ) On the other hand libvirt_list_inactive_domains() and libvirt_list_domains() work as expected returning the right amount of items and the domain names correctly: libvirt_list_inactive_domains() output: Array ( [0] => DCHOMELAB01 [1] => VMFCSW7 [2] => REMOTEAPP01 [3] => MPSSD01 [4] => CS16SVR ) Sofware versions: OS: CentOS Linux release 7.2.1511 (Core) Kernel: 3.10.0-327.28.2.el7.x86_64 PHP: 5.4.16-36.3 libvirt: 2.1.0 libvirt-php: 0.5.2 Node: Hyper-V 2012 R2 Thanks in advance for your replies. Fer

3 5

[libvirt] [PATCH] qemu_driver: protect existed save image
by Chen Hanxiao 08 Sep '16

08 Sep '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We may overwrite existed save image by 'virsh save' command. This patch will check qemu save headers before trying to rewrite it. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_driver.c | 141 +++++++++++++++++++++++++++++++------------------ 1 file changed, 89 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a0ac2ef..56aa079 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2806,6 +2806,73 @@ bswap_header(virQEMUSaveHeaderPtr hdr) } +static int +qemuSaveHeaderCheck(int fd, + virQEMUSaveHeaderPtr header, + const char *path, + bool unlink_corrupt) +{ + int ret = -1; + + if (saferead(fd, header, sizeof(*header)) != sizeof(*header)) { + if (unlink_corrupt) { + if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { + virReportSystemError(errno, + _("cannot remove corrupt file: %s"), + path); + goto error; + } + return -3; + } + virReportError(VIR_ERR_OPERATION_FAILED, + "%s", _("failed to read qemu header")); + goto error; + } + + if (memcmp((*header).magic, QEMU_SAVE_MAGIC, sizeof((*header).magic)) != 0) { + const char *msg = _("image magic is incorrect"); + + if (memcmp((*header).magic, QEMU_SAVE_PARTIAL, + sizeof((*header).magic)) == 0) { + msg = _("save image is incomplete"); + if (unlink_corrupt) { + if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { + virReportSystemError(errno, + _("cannot remove corrupt file: %s"), + path); + goto error; + } + return -3; + } + } + virReportError(VIR_ERR_OPERATION_FAILED, "%s", msg); + goto error; + } + + if ((*header).version > QEMU_SAVE_VERSION) { + /* convert endianess and try again */ + bswap_header(header); + } + + if ((*header).version > QEMU_SAVE_VERSION) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("image version is not supported (%d > %d)"), + (*header).version, QEMU_SAVE_VERSION); + goto error; + } + + if ((*header).xml_len <= 0) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("invalid XML length: %d"), (*header).xml_len); + goto error; + } + + ret = 0; + + error: + return ret; +} + /* return -errno on failure, or 0 on success */ static int qemuDomainSaveHeader(int fd, const char *path, const char *xml, @@ -2827,6 +2894,7 @@ qemuDomainSaveHeader(int fd, const char *path, const char *xml, _("failed to write xml to '%s'"), path); goto endjob; } + endjob: return ret; } @@ -3067,6 +3135,24 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; } } + + /* don't overwrite exsited save files */ + if (virFileExists(path)) { + virQEMUSaveHeader header_tmp; + fd = qemuOpenFile(driver, NULL, path, O_RDONLY, NULL, NULL); + if (fd < 0) + goto cleanup; + + if (qemuSaveHeaderCheck(fd, &header_tmp, path, false) >= 0) { + ret = -EEXIST; + virReportError(VIR_ERR_OPERATION_FAILED, + _("failed to write existed image file '%s'"), + path); + goto cleanup; + } + VIR_FORCE_CLOSE(fd); + } + fd = qemuOpenFile(driver, vm, path, O_WRONLY | O_TRUNC | O_CREAT | directFlag, &needUnlink, &bypassSecurityDriver); @@ -6327,6 +6413,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, bool unlink_corrupt) { int fd = -1; + int ret = -1; virQEMUSaveHeader header; char *xml = NULL; virDomainDefPtr def = NULL; @@ -6353,58 +6440,8 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, VIR_FILE_WRAPPER_BYPASS_CACHE))) goto error; - if (saferead(fd, &header, sizeof(header)) != sizeof(header)) { - if (unlink_corrupt) { - if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { - virReportSystemError(errno, - _("cannot remove corrupt file: %s"), - path); - goto error; - } - return -3; - } - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("failed to read qemu header")); + if ((ret = qemuSaveHeaderCheck(fd, &header, path, unlink_corrupt)) < 0) goto error; - } - - if (memcmp(header.magic, QEMU_SAVE_MAGIC, sizeof(header.magic)) != 0) { - const char *msg = _("image magic is incorrect"); - - if (memcmp(header.magic, QEMU_SAVE_PARTIAL, - sizeof(header.magic)) == 0) { - msg = _("save image is incomplete"); - if (unlink_corrupt) { - if (VIR_CLOSE(fd) < 0 || unlink(path) < 0) { - virReportSystemError(errno, - _("cannot remove corrupt file: %s"), - path); - goto error; - } - return -3; - } - } - virReportError(VIR_ERR_OPERATION_FAILED, "%s", msg); - goto error; - } - - if (header.version > QEMU_SAVE_VERSION) { - /* convert endianess and try again */ - bswap_header(&header); - } - - if (header.version > QEMU_SAVE_VERSION) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("image version is not supported (%d > %d)"), - header.version, QEMU_SAVE_VERSION); - goto error; - } - - if (header.xml_len <= 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("invalid XML length: %d"), header.xml_len); - goto error; - } if (VIR_ALLOC_N(xml, header.xml_len) < 0) goto error; @@ -6439,7 +6476,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, VIR_FORCE_CLOSE(fd); virObjectUnref(caps); - return -1; + return ret; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) -- 1.8.3.1

2 2

[libvirt] NPIV storage pools do not map to same LUN units across hosts.
by Nitesh Konkar 07 Sep '16

07 Sep '16

Link: http://wiki.libvirt.org/page/NPIV_in_libvirt Topic: Virtual machine configuration change to use vHBA LUN There is a NPIV storage pool defined on two hosts and pool contains a total of 8 volumes, allocated from a storage device. Source: # virsh vol-list poolvhba0 Name Path ------------------------------------------------------------------------------ unit:0:0:0 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000366 unit:0:0:1 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000367 unit:0:0:2 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000368 unit:0:0:3 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000369 unit:0:0:4 /dev/disk/by-id/wwn-0x6005076802818bda300000000000036a unit:0:0:5 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000380 unit:0:0:6 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000381 unit:0:0:7 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000382 -------------------------------------------------------------------- Destination: -------------------------------------------------------------------- # virsh vol-list poolvhba0 Name Path ------------------------------------------------------------------------------ unit:0:0:0 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000380 unit:0:0:1 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000381 unit:0:0:2 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000382 unit:0:0:3 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000367 unit:0:0:4 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000368 unit:0:0:5 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000366 unit:0:0:6 /dev/disk/by-id/wwn-0x6005076802818bda300000000000036a unit:0:0:7 /dev/disk/by-id/wwn-0x6005076802818bda3000000000000369 -------------------------------------------------------------------- As you can see in the above output,the same set of eight LUNs from the storage server have been mapped, but the order that the LUNs are probed on each host is different, resulting in different unit names on the two different hosts . If the the guest XMLs is referencing its storage by "unit" number then is it safe to migrate such guests because the "unit number" is assigned by the driver according to the specific way it probes the storage and hence when you migrate these guests , it results in different unit names on the destination hosts. Thus the migrated guest gets mapped to the wrong LUNs and is given the wrong disks. The problem is that the LUN numbers on the destination host and source host do not agree. Example, LUN 0 on source_host, for example, may be LUN 5 on destination_host. When the guest is given the wrong disk, it suffers a fatal I/O error. (This is manifested as fatal I/O errors since the guest has no idea that its disks just changed out under it.)The migration does not take into account that the unit numbers do match on on the source and destination sides. So, should libvirt make sure that the guest domains reference NPIV pool volumes by their globally-unique wwn instead of by "unit" numbers? The guest XML references its storage by "unit" number. Eg:- <disk type='volume' device='lun'> <driver name='qemu' type='raw' cache='none'/> <source pool='poolvhba0' volume='unit:0:0:0'/> <backingStore/> <target dev='vdb' bus='virtio'/> <alias name='virtio-disk1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </disk> I am planning to write a patch for it. Any comments on the above observation/approach would be appreciated. Thanks, Nitesh.

2 1

[libvirt] [PATCH] virt-admin: Output srv-clients-set data as unsigned int rather than signed
by Erik Skultety 07 Sep '16

07 Sep '16

Unfortunately, commit a8962f70 only fixed first half of the reported issue of virt-admin outputting negative values where unsigned int is expected by BZ below, so this commit represents the other missing half of the fix. resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1356769 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under trivial rule. Erik tools/virt-admin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 513054b..12ec057 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -857,7 +857,7 @@ cmdSrvClientsInfo(vshControl *ctl, const vshCmd *cmd) } for (i = 0; i < nparams; i++) - vshPrint(ctl, "%-20s: %d\n", params[i].field, params[i].value.ui); + vshPrint(ctl, "%-20s: %u\n", params[i].field, params[i].value.ui); ret = true; -- 2.5.5

1 0

[libvirt] [libvirt-php] libvirt_connect not reading out credential info on 0.5.2
by Fernando Casas Schössow 07 Sep '16

07 Sep '16

I'm running libvirt-php 0.5.2 on CentOS 7 with libvirt 2.1.0. Using virsh I'm able to connect to hyper-v hosts correctly but using libvirt-php it fails during authentication since it seems that the credentials are not being passed along. This is the php code I'm using: <?php $logfile = 'test.log'; unlink($logfile); if (!libvirt_logfile_set($logfile)) die('Cannot set the log file'); $connstr = 'hyperv://user@hyperv-host/?transport=http'; $credentials = array(VIR_CRED_AUTHNAME=>'Administrator',VIR_CRED_PASSPHRASE=>'somepass'); $conn = libvirt_connect($connstr, false, $credentials); echo libvirt_get_last_error(); unset($conn); $fp = fopen($logfile, 'r'); $str = fread($fp, filesize($logfile)); fclose($fp); echo '<pre>'; echo $str; print_r($credentials); echo '</pre>'; ?> And this is the output: authentication failed: Password request failed [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_connect: Found 0 elements for credentials [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_virConnectAuthCallback: cred 0, type 5, prompt Enter Administrator's password for hyperv-host challenge hyperv-host [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_virConnectAuthCallback: result (null) (0) [2016-09-02 11:10:02 libvirt-php/core ]: libvirt_connect: Cannot establish connection to hyperv://Administrator@hyperv-host/?transport=http Array ( [2] => Administrator [5] => somepass ) Note the "Found 0 elements for credentials". After doing some googling I found an email thread "[libvirt] [libvirt-php PATCH 0/3] Fix PHP5 compatibilty issues." that I think is related to my problem, especially patch 2/3. I also checked github project and saw that those patches are already merged in the code so I went ahead and apply them to 0.5.2 source code and rebuild: use VIRT_FOREACH macros everywhere - Commit: f4b760d libvirt_connect: use loop macros to read cred info - Commit: d704106 Define macros for looping php hash tables - Commit: 673a0bf The build went fine but now when I'm trying to connect to the hyper-v host using libvirt-php I get an internal server error (500) so it seems PHP is crashing. From the system log I see: kernel: traps: php-cgi[43452] general protection ip:7f63907f74a0 sp:7fff12d61f68 error:0 in libvirt.so.0.2001.0[7f6390735000+385000] Is there any other patch that I'm missing? Any ideas on how to fix the libvirt_connect credentials issue without applying the patches above? Sofware versions: OS: CentOS Linux release 7.2.1511 (Core) Kernel: 3.10.0-327.28.2.el7.x86_64 PHP: 5.4.16-36.3.el7_2.x86_64 libvirt: 2.1.0-4.1.x86_64 libvirt-php: 0.5.2 Thanks in advance for your replies. Fer

2 12

[libvirt] [PATCH] util: fix crash in virClassIsDerivedFrom for CloseCallbacks objects
by Maxim Nestratov 07 Sep '16

07 Sep '16

There is a possibility that qemu driver frees by unreferencing its closeCallbacks pointer as it has the only reference to the object, while in fact not all users of CloseCallbacks called thier virCloseCallbacksUnset. Backtrace is the following: Thread #1: 0 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 1 in virCondWait (c=<optimized out>, m=<optimized out>) at util/virthread.c:154 2 in virThreadPoolFree (pool=0x7f0810110b50) at util/virthreadpool.c:266 3 in qemuStateCleanup () at qemu/qemu_driver.c:1116 4 in virStateCleanup () at libvirt.c:808 5 in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1660 Thread #2: 0 in virClassIsDerivedFrom (klass=0xdeadbeef, parent=0x7f0837c694d0) at util/virobject.c:169 1 in virObjectIsClass (anyobj=anyobj@entry=0x7f08101d4760, klass=<optimized out>) at util/virobject.c:365 2 in virObjectLock (anyobj=0x7f08101d4760) at util/virobject.c:317 3 in virCloseCallbacksUnset (closeCallbacks=0x7f08101d4760, vm=vm@entry=0x7f08101d47b0, cb=cb@entry=0x7f081d078fc0 <qemuProcessAutoDestroy>) at util/virclosecallbacks.c:163 4 in qemuProcessAutoDestroyRemove (driver=driver@entry=0x7f081018be50, vm=vm@entry=0x7f08101d47b0) at qemu/qemu_process.c:6368 5 in qemuProcessStop (driver=driver@entry=0x7f081018be50, vm=vm@entry=0x7f08101d47b0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=flags@entry=0) at qemu/qemu_process.c:5854 6 in processMonitorEOFEvent (vm=0x7f08101d47b0, driver=0x7f081018be50) at qemu/qemu_driver.c:4585 7 qemuProcessEventHandler (data=<optimized out>, opaque=0x7f081018be50) at qemu/qemu_driver.c:4629 8 in virThreadPoolWorker (opaque=opaque@entry=0x7f0837c4f820) at util/virthreadpool.c:145 9 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 10 in start_thread () from /lib64/libpthread.so.0 Let's reference CloseCallbacks object in virCloseCallbacksSet and unreference in virCloseCallbacksUnset. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/util/virclosecallbacks.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virclosecallbacks.c b/src/util/virclosecallbacks.c index 82d4071..891a92b 100644 --- a/src/util/virclosecallbacks.c +++ b/src/util/virclosecallbacks.c @@ -141,6 +141,7 @@ virCloseCallbacksSet(virCloseCallbacksPtr closeCallbacks, virObjectRef(vm); } + virObjectRef(closeCallbacks); ret = 0; cleanup: virObjectUnlock(closeCallbacks); @@ -180,6 +181,8 @@ virCloseCallbacksUnset(virCloseCallbacksPtr closeCallbacks, ret = 0; cleanup: virObjectUnlock(closeCallbacks); + if (!ret) + virObjectUnref(closeCallbacks); return ret; } -- 2.4.11

2 4

[libvirt] [PATCH] qemu: guest agent: introduce new error code VIR_ERR_AGENT_UNSYNCED
by Maxim Nestratov 07 Sep '16

07 Sep '16

From: Yuri Pudgorodskiy <yur(a)virtuozzo.com> A separate error code will help recognize real failures from necessity to try again Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- include/libvirt/virterror.h | 2 ++ src/qemu/qemu_agent.c | 6 +++--- src/util/virerror.c | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 2ec560e..efe83aa 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -315,6 +315,8 @@ typedef enum { VIR_ERR_AUTH_UNAVAILABLE = 94, /* authentication unavailable */ 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 */ } virErrorNumber; /** diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index eeede6b..fdc4fed 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -966,21 +966,21 @@ qemuAgentGuestSync(qemuAgentPtr mon) goto cleanup; if (!sync_msg.rxObject) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNSYNCED, "%s", _("Missing monitor reply object")); goto cleanup; } if (virJSONValueObjectGetNumberUlong(sync_msg.rxObject, "return", &id_ret) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_AGENT_UNSYNCED, "%s", _("Malformed return value")); goto cleanup; } VIR_DEBUG("Guest returned ID: %llu", id_ret); if (id_ret != id) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_AGENT_UNSYNCED, _("Guest agent returned ID: %llu instead of %llu"), id_ret, id); goto cleanup; diff --git a/src/util/virerror.c b/src/util/virerror.c index 1177570..2958308 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -1394,6 +1394,12 @@ virErrorMsg(virErrorNumber error, const char *info) else errmsg = _("Client not found: %s"); break; + case VIR_ERR_AGENT_UNSYNCED: + if (info == NULL) + errmsg = _("guest agent replied with wrong id to guest-sync command"); + else + errmsg = _("guest agent replied with wrong id to guest-sync command: %s"); + break; } return errmsg; } -- 2.4.11

3 4

[libvirt] [PATCH] virsh: use virConnectGetDomainCapabilities with maxvcpus
by Shivaprasad G Bhat 07 Sep '16

07 Sep '16

virsh maxvcpus --type kvm output is useless on PPC. Also, in commit e6806d79 we documented not rely on virConnectGetMaxVcpus output. Fix the maxvcpus to use virConnectGetDomainCapabilities now to make it useful. The call is made to use the default emulator binary and to check for the host machine and arch which is what the command intends to show anyway. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- tools/virsh-host.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 57f0c0e..505cfbb 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -607,16 +607,38 @@ cmdMaxvcpus(vshControl *ctl, const vshCmd *cmd) { const char *type = NULL; int vcpus; + char *caps = NULL; + const unsigned int flags = 0; /* No flags so far */ + xmlDocPtr xml = NULL; + xmlXPathContextPtr ctxt = NULL; virshControlPtr priv = ctl->privData; if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) return false; - if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) - return false; + caps = virConnectGetDomainCapabilities(priv->conn, NULL, NULL, NULL, type, flags); + if (caps) { + xml = virXMLParseStringCtxt(caps, _("(domainCapabilities)"), &ctxt); + if (!xml) { + VIR_FREE(caps); + return false; + } - vshPrint(ctl, "%d\n", vcpus); + virXPathInt("string(./vcpu[1]/@max)", ctxt, &vcpus); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(caps); + } else { + if (last_error && last_error->code != VIR_ERR_NO_SUPPORT) + return false; + + vshResetLibvirtError(); + if ((vcpus = virConnectGetMaxVcpus(priv->conn, type)) < 0) + return false; + } + + vshPrint(ctl, "%d\n", vcpus); return true; }

2 2