- Devel - libvirt List Archives

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

07 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 07 Sep '16

07 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

[libvirt] [PATCH] tools: Pass opaque data in vshCompleter and introduce autoCompleteOpaque
by Nishith Shah 06 Sep '16

06 Sep '16

This patch changes the signature of vshCompleters, allowing to pass along some data that we might want to along with the completers; for example, we might want to pass the autocomplete vshControl along with the completer, in case the completer requires a connection to libvirtd. Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com> --- tools/vsh.c | 10 +++++++++- tools/vsh.h | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 3157922..3cc03ec 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -64,6 +64,11 @@ # define SA_SIGINFO 0 #endif +#ifdef WITH_READLINE +/* For autocompletion */ +void *autoCompleteOpaque; +#endif + /* NOTE: It would be much nicer to have these two as part of vshControl * structure, unfortunately readline doesn't support passing opaque data * and only relies on static data accessible from the user-side callback @@ -2808,7 +2813,8 @@ vshReadlineParse(const char *text, int state) res = vshReadlineOptionsGenerator(sanitized_text, state, cmd); } else if (non_bool_opt_exists && data_complete && opt->completer) { if (!completed_list) - completed_list = opt->completer(opt->completer_flags); + completed_list = opt->completer(autoCompleteOpaque, + opt->completer_flags); if (completed_list) { while ((completed_name = completed_list[completed_list_index])) { completed_list_index++; @@ -2858,6 +2864,8 @@ vshReadlineInit(vshControl *ctl) char *histsize_env = NULL; const char *histsize_str = NULL; + /* Opaque data for autocomplete callbacks and connections to libvirtd */ + autoCompleteOpaque = ctl; /* Allow conditional parsing of the ~/.inputrc file. * Work around ancient readline 4.1 (hello Mac OS X), * which declared it as 'char *' instead of 'const char *'. diff --git a/tools/vsh.h b/tools/vsh.h index 7f43055..e53910f 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -123,7 +123,7 @@ typedef struct _vshCmdOpt vshCmdOpt; typedef struct _vshCmdOptDef vshCmdOptDef; typedef struct _vshControl vshControl; -typedef char **(*vshCompleter)(unsigned int flags); +typedef char **(*vshCompleter)(void *opaque, unsigned int flags); /* * vshCmdInfo -- name/value pair for information about command -- 2.1.4

2 1

[libvirt] [PATCH] util: hostcpu: improve CPU freq code for FreeBSD
by Roman Bogorodskiy 06 Sep '16

06 Sep '16

Current implementation uses the dev.cpu.0.freq sysctl that is provided by the cpufreq(4) framework and returns the actual CPU frequency. However, there are environment where it's not available, e.g. when running nested in KVM. In this case fall back to hw.clockrate that reports CPU frequency at the boot time. Resolves (hopefully): https://bugzilla.redhat.com/show_bug.cgi?id=1369964 --- src/util/virhostcpu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 0f03ff8..b5a37a8 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -994,9 +994,16 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, *threads = 1; # ifdef __FreeBSD__ + /* dev.cpu.%d.freq reports current active CPU frequency. It is provided by + * the cpufreq(4) framework. However, it might be disabled or no driver + * available. In this case fallback to "hw.clockrate" which reports boot time + * CPU frequency. */ + if (sysctlbyname("dev.cpu.0.freq", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { - virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); - return -1; + if (sysctlbyname("hw.clockrate", &cpu_freq, &cpu_freq_len, NULL, 0) < 0) { + virReportSystemError(errno, "%s", _("cannot obtain CPU freq")); + return -1; + } } *mhz = cpu_freq; -- 2.7.4

2 2

[libvirt] [PATCH] virsh: Fix *-event error string
by Christophe Fergeau 06 Sep '16

06 Sep '16

When using virsh net-event non-existing-net the error message says that 'either --list or event type is required' This is misleading as 'virsh net-event $valid-event-type' is not going to work either. What is expected is 'virsh net-event --event $valid-event-type' This commit fixes the string in pool-event, nodedev-event, event, and net-event. --- tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-nodedev.c | 2 +- tools/virsh-pool.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a614512..702a8bd8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12694,7 +12694,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) } } else if (!all) { vshError(ctl, "%s", - _("one of --list, --all, or event type is required")); + _("one of --list, --all, or --event type is required")); return false; } diff --git a/tools/virsh-network.c b/tools/virsh-network.c index eec7faf..c6bd132 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1238,7 +1238,7 @@ cmdNetworkEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } if ((event = virshNetworkEventIdTypeFromString(eventName)) < 0) { diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 805c0ff..0e695b9 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -903,7 +903,7 @@ cmdNodeDeviceEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index d25851e..70b2bdd 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -2057,7 +2057,7 @@ cmdPoolEvent(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) return false; if (!eventName) { - vshError(ctl, "%s", _("either --list or event type is required")); + vshError(ctl, "%s", _("either --list or --event type is required")); return false; } -- 2.7.4

2 2

[libvirt] qapi DEVICE_DELETED event issued *before* instance_finalize?!
by Alex Williamson 06 Sep '16

06 Sep '16

Hey, I'm out of my QOM depth, so I'll just beg for help in advance. I noticed in testing vfio-pci hotunplug that the host seems to be trying to reclaim the device before QEMU is actually done with it, there's a very short race where libvirt has seen the DEVICE_DELETED event and tries to unbind the physical device from vfio-pci, the use count is clearly non-zero because the host driver tries to send a device request, but that event channel has already been torn down. Nearly immediately after, QEMU finally releases the device, but we can't do a proper reset due to some issues with device references in the kernel. When I run gdb on QEMU with breakpoints at qapi_event_send_device_deleted() and vfio_instance_finalize(), the QAPI even happens first. Clearly this is horribly wrong, right? I can't unmap my references to the vfio device file until my instance_finalize is called, so I'm always going to have that open when libvirt takes the DEVICE_DELETED event as a cue to return the device to host drivers. The call chains look like this: #0 qapi_event_send_device_deleted (has_device=true, device=0x7f5ca3e36fb0 "hostdev0", path=0x7f5c89e84fe0 "/machine/peripheral/hostdev0", errp=0x7f5ca241f9e8 <error_abort>) at qapi-event.c:412 #1 0x00007f5ca1701608 in device_unparent (obj=0x7f5ca43ffc00) at hw/core/qdev.c:1115 #2 0x00007f5ca18b7891 in object_finalize_child_property (obj=0x7f5ca380f500, name=0x7f5ca3f21da0 "hostdev0", opaque=0x7f5ca43ffc00) at qom/object.c:1362 #3 0x00007f5ca18b56b2 in object_property_del_child (obj=0x7f5ca380f500, child=0x7f5ca43ffc00, errp=0x0) at qom/object.c:422 #4 0x00007f5ca18b5790 in object_unparent (obj=0x7f5ca43ffc00) at qom/object.c:441 #5 0x00007f5ca16c1f31 in acpi_pcihp_eject_slot (s=0x7f5ca4c41268, bsel=0, slots=4) at hw/acpi/pcihp.c:139 #0 vfio_instance_finalize (obj=0x7f5ca43ffc00) at /net/gimli/home/alwillia/Work/qemu.git/hw/vfio/pci.c:2731 #1 0x00007f5ca18b57c0 in object_deinit (obj=0x7f5ca43ffc00, type=0x7f5ca376f490) at qom/object.c:448 #2 0x00007f5ca18b5831 in object_finalize (data=0x7f5ca43ffc00) at qom/object.c:462 #3 0x00007f5ca18b6782 in object_unref (obj=0x7f5ca43ffc00) at qom/object.c:896 #4 0x00007f5ca1550cc0 in memory_region_unref (mr=0x7f5ca43fff00) at /net/gimli/home/alwillia/Work/qemu.git/memory.c:1476 #5 0x00007f5ca1553886 in do_address_space_destroy (as=0x7f5ca43ffe10) at /net/gimli/home/alwillia/Work/qemu.git/memory.c:2272 It appears that DEVICE_DELETED only means the VM is done with the device but libvirt is interpreting it as QEMU is done with the device. Which is correct? Do we need a new event or do we need to fix the ordering of this event? An ordering fix would be more compatible with existing libvirt. Thanks, Alex

5 8

[libvirt] virt-admin commands aliases
by Erik Skultety 06 Sep '16

06 Sep '16

Hi there, after my presentation at KVM Forum, it was pointed out from the audience that we might think about doing something about the naming of the virt-admin's comands, since there is some sort of inconsistency: srv- vs. client- vs. dmn- (not merged yet). When I sent patches to upstream I already knew that the naming was not optimal, but I didn't come up with anything better so I hoped that the reviewer might think of something better which unfortunately did not happen. Anyway, there are multiple options how this can be approached but I'm not 100% satisfied with neither of them: 1) rename the commands completely Although clean, obviously this is the non-preferred option because this would break any backwards compatibility however, I think there is a fair chance that people haven't actually started using it yet (although that might change between 7.3 and 7.4). 2) create aliases for non-abbreviated forms of the commands That way, srv- would become server- and dmn- would become daemon-. However, by doing this we'll end up with 6 almost identical entries in the commands structure which might be error-prone once we decide to add/create&add a flag to the command primitive, since the flag would have to be added both to the alias and to the original (unlikely, but possible that someone might forget about that) 3) abbreviate client- to something like clnt- Identical to the above except for the amount of duplicate entries which would be reduced to 2 4) leave it as is if such a consensus is reached and accepted I guess this does no need any additional comments. Thanks for any ideas. Erik

4 6

[libvirt] [PATCH] qemu: Don't warn about missing device in DEVICE_DELETED event
by Jiri Denemark 06 Sep '16

06 Sep '16

Debug priority is good enough for this. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3d0a120..8384314 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -941,7 +941,7 @@ qemuMonitorJSONHandleDeviceDeleted(qemuMonitorPtr mon, virJSONValuePtr data) const char *device; if (!(device = virJSONValueObjectGetString(data, "device"))) { - VIR_WARN("missing device in device deleted event"); + VIR_DEBUG("missing device in device deleted event"); return; } -- 2.10.0

2 1

[libvirt] [PATCH 0/2] util: storage: Fixes for the JSON pseudo protocol parser
by Peter Krempa 06 Sep '16

06 Sep '16

Gluster protocol type was not set properly and the RBD protocol was missing. Peter Krempa (2): util: storage: Properly set protocol type when parsing gluster json string util: storage: Add json pseudo protocol support for legacy RBD strings src/util/virstoragefile.c | 26 ++++++++++++++++++++++++++ tests/virstoragetest.c | 10 ++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) -- 2.9.2

2 3

[libvirt] [PATCH] docs: Add libvirt-go Go bindings to binding page
by Roman Mohr 06 Sep '16

06 Sep '16

Signed-off-by: Roman Mohr <rmohr(a)redhat.com> --- docs/bindings.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 95cfe25..7fe26df 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -14,6 +14,10 @@ C#: Arnaud Champion develops <a href="csharp.html">C# bindings</a>. </li> + <li> + Go: Kyle Kelley et al. are developing + <a href="https://github.com/rgbkrk/libvirt-go">Go bindings</a>. + </li> <li> Java: Daniel Veillard develops <a href="java.html">Java bindings</a>. -- 2.5.5

2 1

[libvirt] [PATCH 0/2] Improve handling of QEMU core dumping
by Daniel P. Berrange 06 Sep '16

06 Sep '16

Daniel P. Berrange (2): qemu: add a max_core setting to qemu.conf for core dump size qemu: allow turning off QEMU guest RAM dump globally src/libvirt_private.syms | 2 ++ src/qemu/libvirtd_qemu.aug | 5 +++++ src/qemu/qemu.conf | 31 +++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 18 ++++++++++++------ src/qemu/qemu_conf.c | 20 ++++++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_process.c | 1 + src/qemu/test_libvirtd_qemu.aug.in | 2 ++ src/util/vircommand.c | 14 ++++++++++++++ src/util/vircommand.h | 1 + src/util/virprocess.c | 36 ++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 1 + tests/qemuxml2argvtest.c | 4 ++++ 13 files changed, 131 insertions(+), 6 deletions(-) -- 2.7.4

3 6

[libvirt] [PATCH] Prefix major/minor with gnu_dev_
by Michal Privoznik 06 Sep '16

06 Sep '16

In the latest glibc, major() and minor() functions are marked as deprecated (glibc commit dbab6577): CC util/libvirt_util_la-vircgroup.lo util/vircgroup.c: In function 'virCgroupGetBlockDevString': util/vircgroup.c:768:5: error: '__major_from_sys_types' is deprecated: In the GNU C Library, `major' is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use `major', include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro `major', you should #undef it after including <sys/types.h>. [-Werror=deprecated-declarations] if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) ^~ In file included from /usr/include/features.h:397:0, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdio.h:28, from ../gnulib/lib/stdio.h:43, from util/vircgroup.c:26: /usr/include/sys/sysmacros.h:87:1: note: declared here __SYSMACROS_DEFINE_MAJOR (__SYSMACROS_FST_IMPL_TEMPL) ^ Applications are supposed to use gnu_dev_major() or gnu_dev_minor() respectively. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_audit.c | 4 ++-- src/lxc/lxc_controller.c | 10 +++++----- src/lxc/lxc_driver.c | 26 +++++++++++++------------- src/util/vircgroup.c | 10 +++++----- src/util/virutil.c | 6 +++--- tests/vircgroupmock.c | 16 ++++++++-------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 53a58ac..d0bfa58 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -52,8 +52,8 @@ virDomainAuditGetRdev(const char *path) if (stat(path, &sb) == 0 && (S_ISCHR(sb.st_mode) || S_ISBLK(sb.st_mode))) { - int maj = major(sb.st_rdev); - int min = minor(sb.st_rdev); + int maj = gnu_dev_major(sb.st_rdev); + int min = gnu_dev_minor(sb.st_rdev); ignore_value(virAsprintfQuiet(&ret, "%02X:%02X", maj, min)); } return ret; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 825b4d4..3bf7eb2 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1520,7 +1520,7 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl) LXC_STATE_DIR, ctrl->def->name, devs[i].path) < 0) goto cleanup; - dev_t dev = makedev(devs[i].maj, devs[i].min); + dev_t dev = gnu_dev_makedev(devs[i].maj, devs[i].min); if (mknod(path, S_IFCHR, dev) < 0 || chmod(path, devs[i].mode)) { virReportSystemError(errno, @@ -1592,7 +1592,7 @@ virLXCControllerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, } VIR_DEBUG("Creating dev %s (%d,%d)", - dstfile, major(sb.st_rdev), minor(sb.st_rdev)); + dstfile, gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dstfile, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1672,7 +1672,7 @@ virLXCControllerSetupHostdevCapsStorage(virDomainDefPtr vmDef, mode = 0700 | S_IFBLK; VIR_DEBUG("Creating dev %s (%d,%d)", dst, - major(sb.st_rdev), minor(sb.st_rdev)); + gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1751,7 +1751,7 @@ virLXCControllerSetupHostdevCapsMisc(virDomainDefPtr vmDef, mode = 0700 | S_IFCHR; VIR_DEBUG("Creating dev %s (%d,%d)", dst, - major(sb.st_rdev), minor(sb.st_rdev)); + gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -1911,7 +1911,7 @@ static int virLXCControllerSetupDisk(virLXCControllerPtr ctrl, * to that normally implied by the device name */ VIR_DEBUG("Creating dev %s (%d,%d) from %s", - dst, major(sb.st_rdev), minor(sb.st_rdev), tmpsrc); + dst, gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev), tmpsrc); if (mknod(dst, mode, sb.st_rdev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index da98b38..3fe79fd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3714,7 +3714,7 @@ lxcDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, * to that normally implied by the device name */ VIR_DEBUG("Creating dev %s (%d,%d)", - data->file, major(data->dev), minor(data->dev)); + data->file, gnu_dev_major(data->dev), gnu_dev_minor(data->dev)); if (mknod(data->file, data->mode, data->dev) < 0) { virReportSystemError(errno, _("Unable to create device %s"), @@ -3895,8 +3895,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms) < 0) goto cleanup; @@ -3915,8 +3915,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, file) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms) < 0) VIR_WARN("cannot deny device %s for domain %s", src, vm->def->name); @@ -4152,8 +4152,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) goto cleanup; @@ -4165,8 +4165,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, def->source.caps.u.storage.block) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); @@ -4221,8 +4221,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, if (virCgroupAllowDevice(priv->cgroup, 'c', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) goto cleanup; @@ -4237,8 +4237,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, def->source.caps.u.misc.chardev) < 0) { if (virCgroupDenyDevice(priv->cgroup, 'c', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) VIR_WARN("cannot deny device %s for domain %s", def->source.caps.u.storage.block, vm->def->name); diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f2477d5..f4f6a01 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -765,7 +765,7 @@ virCgroupGetBlockDevString(const char *path) /* Automatically append space after the string since all callers * use it anyway */ - if (virAsprintf(&ret, "%d:%d ", major(sb.st_rdev), minor(sb.st_rdev)) < 0) + if (virAsprintf(&ret, "%d:%d ", gnu_dev_major(sb.st_rdev), gnu_dev_minor(sb.st_rdev)) < 0) return NULL; return ret; @@ -2941,8 +2941,8 @@ virCgroupAllowDevicePath(virCgroupPtr group, return virCgroupAllowDevice(group, S_ISCHR(sb.st_mode) ? 'c' : 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms); } @@ -3032,8 +3032,8 @@ virCgroupDenyDevicePath(virCgroupPtr group, return virCgroupDenyDevice(group, S_ISCHR(sb.st_mode) ? 'c' : 'b', - major(sb.st_rdev), - minor(sb.st_rdev), + gnu_dev_major(sb.st_rdev), + gnu_dev_minor(sb.st_rdev), perms); } diff --git a/src/util/virutil.c b/src/util/virutil.c index 170dd59..b0770bc 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1616,7 +1616,7 @@ virIsDevMapperDevice(const char *dev_name) if (!stat(dev_name, &buf) && S_ISBLK(buf.st_mode) && - dm_is_dm_major(major(buf.st_rdev))) + dm_is_dm_major(gnu_dev_major(buf.st_rdev))) return true; return false; @@ -1664,9 +1664,9 @@ virGetDeviceID(const char *path, int *maj, int *min) return -EINVAL; if (maj) - *maj = major(sb.st_rdev); + *maj = gnu_dev_major(sb.st_rdev); if (min) - *min = minor(sb.st_rdev); + *min = gnu_dev_minor(sb.st_rdev); return 0; } diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index ce6fd46..8f69047 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -562,11 +562,11 @@ int __lxstat(int ver, const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real___lxstat(ver, path, sb); @@ -593,11 +593,11 @@ int lstat(const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real_lstat(path, sb); @@ -624,11 +624,11 @@ int __xstat(int ver, const char *path, struct stat *sb) free(newpath); } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { ret = real___xstat(ver, path, sb); @@ -661,11 +661,11 @@ int stat(const char *path, struct stat *sb) } } else if (STRPREFIX(path, fakedevicedir0)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(8, 0); + sb->st_rdev = gnu_dev_makedev(8, 0); return 0; } else if (STRPREFIX(path, fakedevicedir1)) { sb->st_mode = S_IFBLK; - sb->st_rdev = makedev(9, 0); + sb->st_rdev = gnu_dev_makedev(9, 0); return 0; } else { if (!(newpath = strdup(path))) -- 2.8.4

3 2

[libvirt] Nice golang bindings for libvirt
by Roman Mohr 06 Sep '16

06 Sep '16

Hi all, I have been using these pretty nice libvirt-binding library for golang [1]. It is under active development, pretty well maintained and has a very nice travis setup to run tests against libvirt [2]. I was wondering if the bindings could be added to [3] on libvirt.org. Best Regards, Roman [1] https://github.com/rgbkrk [2] https://github.com/rgbkrk/libvirt-go/blob/master/.travis.yml [3] https://libvirt.org/bindings.html

2 2

[libvirt] [libvirt-glib/libvirt-gconfig 00/17] Graphics: Introduce the new Remote and Local classes (and also implement a few missing methods).
by Fabiano Fidêncio 06 Sep '16

06 Sep '16

While trying to use libvirt-gobject and libvirt-gconfig for accessing VMs and looking at their config, instead of using libvirt and parsing XML directly, I found out that a few methods have been missing and that libvirt-gconfig is not exactly thought for the "reading their config" use case (see more explanations on the 10th and 14th commits. This series, unfortunately, introduces an ABI breakage. Fabiano Fidêncio (17): gconfig: Implement gvir_config_domain_graphics_vnc_get_autoport() gconfig: Implement gvir_config_domain_graphics_spice_get_autoport() gconfig: Implement gvir_config_domain_graphics_rdp_get_autoport() gconfig: Implement gvir_config_domain_graphics_sdl_get_display() gconfig: Implement gvir_config_domain_graphics_sdl_get_fullscreen() gconfig: Implement gvir_config_domain_graphics_spice_get_tls_port() gconfig: Implement gvir_config_domain_graphics_spice_{get,set}_host() gconfig: Implement gvir_config_domain_graphics_vnc_{get,set}_host() gconfig: Implement gvir_config_domain_graphics_rdp_{get,set}_host() gconfig: Add GVirCofigDomainGraphicsRemote class gconfig: Adapt GVirConfigDomainGraphicsSpice to GVirConfigDomainGraphicsRemote gconfig: Adapt GVirConfigDomainGraphicsRdp to GVirConfigDomainGraphicsRemote gconfig: Adapt GVirConfigDomainGraphicsVnc to GVirConfigDomainGraphicsRemote gconfig: Add GVirCofigDomainGraphicsLocal class gconfig: Adapt GVirConfigDomainGraphicsSdl to GVirConfigDomainGraphicsLocal gconfig: Adapt GVirConfigDomainGraphicsDesktop to GVirConfigDomainGraphicsLocal gconfig,graphics: Avoid crash when gvir_config_object_new_from_xml() returns NULL libvirt-gconfig/Makefile.am | 4 + .../libvirt-gconfig-domain-graphics-desktop.c | 14 ++- .../libvirt-gconfig-domain-graphics-desktop.h | 4 +- .../libvirt-gconfig-domain-graphics-local.c | 97 +++++++++++++++++++ .../libvirt-gconfig-domain-graphics-local.h | 68 ++++++++++++++ .../libvirt-gconfig-domain-graphics-rdp.c | 32 ++++++- .../libvirt-gconfig-domain-graphics-rdp.h | 9 +- .../libvirt-gconfig-domain-graphics-remote.c | 103 +++++++++++++++++++++ .../libvirt-gconfig-domain-graphics-remote.h | 70 ++++++++++++++ .../libvirt-gconfig-domain-graphics-sdl.c | 19 +++- .../libvirt-gconfig-domain-graphics-sdl.h | 6 +- .../libvirt-gconfig-domain-graphics-spice.c | 40 +++++++- .../libvirt-gconfig-domain-graphics-spice.h | 10 +- .../libvirt-gconfig-domain-graphics-vnc.c | 32 ++++++- .../libvirt-gconfig-domain-graphics-vnc.h | 9 +- libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 20 ++++ po/POTFILES.in | 2 + 18 files changed, 513 insertions(+), 28 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-local.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-local.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-remote.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-graphics-remote.h -- 2.5.0

2 30

[libvirt] virsh blockcopy or virDomainBlockCopy auto converge
by Vasiliy Tolstov 06 Sep '16

06 Sep '16

Does it possible to add something like auto converge in live migration to blockcopy ? In my case i'm try to do virsh blockcopy --pivot and sometime it fails because domain write more data and it needs to be copied. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH v2 0/3] virsh: Option completers and small improvements/fixes for autocomplete
by Nishith Shah 05 Sep '16

05 Sep '16

This series introduces option completers and adds some minor improvements and fixes(not bugs per se, just better/sane behavior) in vshReadlineParse. The first patch introduces the usage of option completers to auto-complete arguments for a particular option. The second and third patches provide small improvements like completing the options of type VSH_OT_ARGV or VSH_OT_DATA, and to complete multiple options as well, if a previous option requires an argument, and that argument has been provided. --- v2: Fix an infinite while loop bug v1: https://www.redhat.com/archives/libvir-list/2016-August/msg01009.html Nishith Shah (3): virsh: Introduce usage of option completers to auto-complete arguments virsh: Allow data or argument options to be completed as well virsh: Complete multiple options when any one option requires data tools/vsh.c | 75 ++++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 26 deletions(-) -- 2.1.4

2 4

[libvirt] Call for mentors: Outreachy December - March
by Stefan Hajnoczi 05 Sep '16

05 Sep '16

The Outreachy open source internship programme is running a December - March round. Outreachy promotes participation of underrepresented groups in open source. If you would like to be a mentor please reply. What is a mentor? Mentors help interns with their project and evaluate their progress. The mentor is the point of contact for the intern and advises them on the development process, technical challenges, etc. Mentors propose a list of project ideas which they are willing to mentor at the start of the application phase. What are the requirements for mentors? You must be a regular contributor to QEMU, KVM, or libvirt. You must be willing to spend ~5 hours/week between 6 Dec - 6 Mar. Timeline: Internship candidates apply: 12 Sep - 17 Oct Coding period: 6 Dec - 6 Mar Outreachy website: https://www.gnome.org/outreachy/ Overview of open source internship programmes: http://vmsplice.net/~stefan/stefanha-kvm-forum-2016.pdf Please let me know if you have any questions. Stefan

1 1

[libvirt] [libvirt-perl][PATCH 0/2] Add more PERF_PARAM_* constants
by Michal Privoznik 05 Sep '16

05 Sep '16

Now that libvirt-2.2.0 is out, we should: a) do the libvirt-perl release too b) adapt to new constants pushed to 2.3.0 Michal Privoznik (2): Bump version to 2.3.0 Add more PERF_PARAM_* constants Changes | 5 +++++ Makefile.PL | 2 +- README | 2 +- Virt.xs | 4 ++++ lib/Sys/Virt.pm | 2 +- lib/Sys/Virt/Domain.pm | 27 +++++++++++++++++++++++++++ 6 files changed, 39 insertions(+), 3 deletions(-) -- 2.8.4

2 3

[libvirt] [PATCH] conf: Fix initialization value of 'multi' in PCI address
by Xian Han Yu 05 Sep '16

05 Sep '16

The 'multi' element in PCI address struct used as 'virTristateSwitch', and its default value is 'VIR_TRISTATE_SWITCH_ABSENT'. Current PCI process use 'false' to initialization 'multi', which is ambiguously for assignment or comparison. This patch use '{0}' to initialize the whole PCI address struct, which fix the 'multi' initialization and makes code more simplify and explicitly. Signed-off-by: Xian Han Yu <xhyubj(a)linux.vnet.ibm.com> --- src/conf/domain_addr.c | 2 +- src/conf/node_device_conf.c | 2 +- src/qemu/qemu_domain_address.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index a0c2f88..cf6b73d 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -569,7 +569,7 @@ virDomainPCIAddressGetNextSlot(virDomainPCIAddressSetPtr addrs, /* default to starting the search for a free slot from * the first slot of domain 0 bus 0... */ - virPCIDeviceAddress a = { 0, 0, 0, 0, false }; + virPCIDeviceAddress a = {0}; char *addrStr = NULL; if (addrs->nbuses == 0) { diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index a23d8ef..c8e30d9 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1163,7 +1163,7 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt, goto cleanup; for (i = 0; i < nAddrNodes; i++) { - virPCIDeviceAddress addr = { 0, 0, 0, 0, 0 }; + virPCIDeviceAddress addr = {0}; if (virPCIDeviceAddressParseXML(addrNodes[i], &addr) < 0) goto cleanup; if (VIR_ALLOC(pciAddr) < 0) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 3d52d72..bb16738 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -1096,7 +1096,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* USB2 needs special handling to put all companions in the same slot */ if (IS_USB2_CONTROLLER(def->controllers[i])) { - virPCIDeviceAddress addr = { 0, 0, 0, 0, false }; + virPCIDeviceAddress addr = {0}; bool foundAddr = false; memset(&tmp_addr, 0, sizeof(tmp_addr)); -- 2.5.5

2 4