- Devel - libvirt List Archives

[libvirt] [PATCH] examples: test: Kill unsupported maxMemory element
by Peter Krempa 20 Aug '14

20 Aug '14

The "maxMemory" element was never supported by libvirt. Remove it from the test XMLs. (Found while actually trying to add support for a identically named element). --- examples/xml/test/testdomfv0.xml | 1 - examples/xml/test/testnodeinline.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/examples/xml/test/testdomfv0.xml b/examples/xml/test/testdomfv0.xml index 157c8ec..fc209cc 100644 --- a/examples/xml/test/testdomfv0.xml +++ b/examples/xml/test/testdomfv0.xml @@ -7,7 +7,6 @@ <boot dev='hd'/> </os> <memory>524288</memory> - <maxMemory>1524288</maxMemory> <vcpu>4</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/examples/xml/test/testnodeinline.xml b/examples/xml/test/testnodeinline.xml index b353f39..0ec0f1a 100644 --- a/examples/xml/test/testnodeinline.xml +++ b/examples/xml/test/testnodeinline.xml @@ -17,7 +17,6 @@ <boot dev="hd"/> </os> <memory>524288</memory> - <maxMemory>1524288</maxMemory> <vcpu>4</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> -- 2.0.2

2 2

[libvirt] [libvirt-glib] [PATCH v2 1/4] GVirDomain: Fix some doc comments of the snapshot API
by Timm Bäder 20 Aug '14

20 Aug '14

Fixes the following warnings from g-ir-scanner and some cosmetic issues: libvirt-gobject-domain.c:1532: Warning: LibvirtGObject: unknown annotation: transfer-none libvirt-gobject-domain.c:1650: Error: LibvirtGObject: identifier not found on the first line: * ^ --- libvirt-gobject/libvirt-gobject-domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index feac6f0..aa2a170 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -1529,10 +1529,10 @@ gvir_domain_create_snapshot(GVirDomain *dom, * gvir_domain_fetch_snapshots: * @dom: The domain * @list_flags: bitwise-OR of #GVirDomainSnapshotListFlags - * @cancellable: (allow-none)(transfer-none): cancellation object - * @error: (allow-none): Place-holder for error or NULL + * @cancellable: (allow-none) (transfer none): cancellation object + * @error: (allow-none): Place-holder for error or %NULL * - * Returns: TRUE on success, FALSE otherwise. + * Returns: %TRUE on success, %FALSE otherwise. */ gboolean gvir_domain_fetch_snapshots(GVirDomain *dom, guint list_flags, @@ -1647,10 +1647,10 @@ static void _fetch_snapshots_async_thread(GTask *task, /** - * + * gvir_domain_fetch_snapshots_async: * @dom: The domain * @list_flags: bitwise-OR of #GVirDomainSnapshotListFlags - * @cancellable: (allow-none)(transfer-none): cancellation object + * @cancellable: (allow-none) (transfer none): cancellation object * @callback: (scope async): completion callback * @user_data: (closure): opaque data for callback */ -- 2.0.4

2 6

[libvirt] [PATCH] numatune: setting --mode does not work well
by Erik Skultety 20 Aug '14

20 Aug '14

When trying to set numatune mode directly using virsh numatune command, correct error is raised, however numatune structure was not deallocated, thus resulting in creating an empty numatune element in the guest XML, if none was present before. Running the same command aftewards results in a successful change with broken XML structure. Patch fixes the deallocation problem as well as checking for invalid attribute combination VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO + a nonempty nodeset. Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1129998 --- src/conf/numatune_conf.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/conf/numatune_conf.c b/src/conf/numatune_conf.c index 48d1d04..45bf0cb 100644 --- a/src/conf/numatune_conf.c +++ b/src/conf/numatune_conf.c @@ -439,7 +439,7 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, { bool create = !*numatunePtr; /* Whether we are creating new struct */ int ret = -1; - virDomainNumatunePtr numatune = NULL; + virDomainNumatunePtr numatune = *numatunePtr; /* No need to do anything in this case */ if (mode == -1 && placement == -1 && !nodeset) @@ -461,9 +461,15 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, goto cleanup; } - if (create && VIR_ALLOC(*numatunePtr) < 0) + if (placement_static && !nodeset) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("nodeset for NUMA memory tuning must be set " + "if 'placement' is 'static'")); + goto cleanup; + } + + if (create && VIR_ALLOC(numatune) < 0) goto cleanup; - numatune = *numatunePtr; if (create) { /* Defaults for new struct */ @@ -492,12 +498,11 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO; } - if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && - !numatune->memory.nodeset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("nodeset for NUMA memory tuning must be set " - "if 'placement' is 'static'")); - goto cleanup; + /* setting nodeset when placement auto is invalid */ + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO && + numatune->memory.nodeset) { + virBitmapFree(numatune->memory.nodeset); + numatune->memory.nodeset = NULL; } if (placement != -1) @@ -505,6 +510,11 @@ virDomainNumatuneSet(virDomainNumatunePtr *numatunePtr, numatune->memory.specified = true; + if (create) { + *numatunePtr = numatune; + numatune = NULL; + } + ret = 0; cleanup: return ret; -- 1.9.3

2 1

[libvirt] [PATCH 00/20] vbox: Rewrite StorageDriver
by Taowei 20 Aug '14

20 Aug '14

The last part of rewriting vbox driver. This series of patch is based on the patches rewriting network driver: https://www.redhat.com/archives/libvir-list/2014-August/msg00842.html Taowei (20): vbox: Rewrite vboxStorageOpen vbox: Rewrite vboxStorageClose vbox: Rewrite vboxConnectNumOfStoragePools vbox: Rewrite vboxConnectListStoragePools vbox: Rewrite vboxStoragePoolLookupByName vbox: Rewrite vboxStoragePoolNumOfVolumes vbox: Rewrite vboxStoragePoolListVolumes vbox: Rewrite vboxStorageVolLookupByName vbox: Rewrite vboxStorageVolLookupByKey vbox: Make FindMedium support old vbox versions vbox: Rewrite vboxStorageVolLookupByPath vbox: Make CreateHardDisk support all vbox versions vbox: Rewrite vboxStorageVolCreateXML vbox: Make IMediumAttachment work with vbox2.2 and 3.0 vbox: Rewrite vboxStorageVolDelete vbox: Rewrite vboxStorageVolGetInfo vbox: Rewrite vboxStorageVolGetXMLDesc vbox: Rewrite vboxStorageVolGetPath vbox: Introducing vboxCommonStorageDriver vbox: Remove unused things in vbox_tmpl.c src/vbox/vbox_common.c | 858 ++++++++++++++++++++++++++++++- src/vbox/vbox_common.h | 22 + src/vbox/vbox_driver.c | 52 +- src/vbox/vbox_tmpl.c | 1142 +++++------------------------------------ src/vbox/vbox_uniformed_api.h | 28 +- 5 files changed, 1039 insertions(+), 1063 deletions(-) -- 1.7.9.5

1 20

[libvirt] [PATCH v3 libvirt 0/3] Add support for qemu usb-mtp device
by Giuseppe Scrivano 20 Aug '14

20 Aug '14

This series adds support for qemu usb-mtp devices. This new version addresses comments for v2: https://www.redhat.com/archives/libvir-list/2014-August/msg00471.html Giuseppe Scrivano (3): conf: add <model> child element to <filesystem> docs: relax <filesystem>/<target> dir element attribute to string qemu: add support for MTP filesystem docs/formatdomain.html.in | 6 +++ docs/schemas/domaincommon.rng | 17 +++++-- src/conf/domain_conf.c | 26 +++++++++++ src/conf/domain_conf.h | 11 +++++ src/qemu/qemu_command.c | 65 ++++++++++++++++---------- tests/domainconfdata/getfilesystem.xml | 5 ++ tests/domainconftest.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-fsmtp.args | 6 +++ tests/qemuxml2argvdata/qemuxml2argv-fsmtp.xml | 30 ++++++++++++ 9 files changed, 140 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fsmtp.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fsmtp.xml -- 1.9.3

4 13

[libvirt] [PATCH] cleanup spaces between parentheses and curly brackets
by Martin Kletzander 20 Aug '14

20 Aug '14

And add a syntax-check for '){$'. It's not perfect, but better than nothing. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- cfg.mk | 6 ++++++ docs/java.html.in | 4 ++-- src/conf/domain_conf.c | 2 +- src/conf/node_device_conf.c | 2 +- src/conf/nwfilter_params.c | 2 +- src/conf/storage_conf.c | 2 +- src/libvirt.c | 8 ++++---- src/lxc/lxc_driver.c | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/rpc/virnettlscontext.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/virdnsmasq.c | 2 +- src/util/virstorageencryption.c | 2 +- src/xen/xen_driver.c | 2 +- src/xen/xen_hypervisor.c | 22 +++++++++++----------- src/xen/xend_internal.c | 6 +++--- tests/libvirtdconftest.c | 2 +- tools/virsh-volume.c | 2 +- 19 files changed, 41 insertions(+), 35 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4e302c8..825e5ce 100644 --- a/cfg.mk +++ b/cfg.mk @@ -943,6 +943,12 @@ sc_prohibit_empty_first_line: print "$(ME): Prohibited empty first line" > "/dev/stderr"; \ } exit fail; }' $$($(VC_LIST_EXCEPT)); +sc_prohibit_parentheses_conjuncted_with_curly_bracket: + @prohibit='\)\{$$' \ + in_vc_files='\.[ch]$$' \ + halt='put space between parentheses and curly bracket' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/docs/java.html.in b/docs/java.html.in index b5812ba..daa7b76 100644 --- a/docs/java.html.in +++ b/docs/java.html.in @@ -130,7 +130,7 @@ public class minitest { Connect conn=null; try{ conn = new Connect("test:///default", true); - } catch (LibvirtException e){ + } catch (LibvirtException e) { System.out.println("exception caught:"+e); System.out.println(e.getError()); } @@ -139,7 +139,7 @@ public class minitest { System.out.println("Domain:" + testDomain.getName() + " id " + testDomain.getID() + " running " + testDomain.getOSType()); - } catch (LibvirtException e){ + } catch (LibvirtException e) { System.out.println("exception caught:"+e); System.out.println(e.getError()); } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d14191f..9557020 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14423,7 +14423,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, dst->os.type, src->os.type); goto error; } - if (src->os.arch != dst->os.arch){ + if (src->os.arch != dst->os.arch) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target domain architecture %s does not match source %s"), virArchToString(dst->os.arch), diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 025d08c..54290ae 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -187,7 +187,7 @@ virNodeDeviceObjPtr virNodeDeviceAssignDef(virNodeDeviceObjListPtr devs, } virNodeDeviceObjLock(device); - if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, device) < 0){ + if (VIR_APPEND_ELEMENT_COPY(devs->objs, devs->count, device) < 0) { virNodeDeviceObjUnlock(device); virNodeDeviceObjFree(device); return NULL; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index a12e645..e561943 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -724,7 +724,7 @@ addToTable(void *payload, const void *name, void *data) return; } - if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0){ + if (virNWFilterHashTablePut(atts->target, (const char *)name, val) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not put variable '%s' into hashmap"), (const char *)name); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index b61d8c0..5a16767 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2122,7 +2122,7 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, def->source.adapter.data.fchost.wwpn)) matchpool = pool; } else if (pool->def->source.adapter.type == - VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST){ + VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) { if (pool->def->source.adapter.data.scsi_host.name) { if (STREQ(pool->def->source.adapter.data.scsi_host.name, def->source.adapter.data.scsi_host.name)) diff --git a/src/libvirt.c b/src/libvirt.c index 992e4f2..8349261 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7613,7 +7613,7 @@ virDomainGetSchedulerType(virDomainPtr domain, int *nparams) virCheckDomainReturn(domain, NULL); conn = domain->conn; - if (conn->driver->domainGetSchedulerType){ + if (conn->driver->domainGetSchedulerType) { schedtype = conn->driver->domainGetSchedulerType(domain, nparams); if (!schedtype) goto error; @@ -10987,7 +10987,7 @@ virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virCheckConnectReturn(conn, NULL); virCheckNonNullArgGoto(uuid, error); - if (conn->networkDriver && conn->networkDriver->networkLookupByUUID){ + if (conn->networkDriver && conn->networkDriver->networkLookupByUUID) { virNetworkPtr ret; ret = conn->networkDriver->networkLookupByUUID(conn, uuid); if (!ret) @@ -14217,7 +14217,7 @@ virStorageVolGetInfo(virStorageVolPtr vol, conn = vol->conn; - if (conn->storageDriver->storageVolGetInfo){ + if (conn->storageDriver->storageVolGetInfo) { int ret; ret = conn->storageDriver->storageVolGetInfo(vol, info); if (ret < 0) @@ -16964,7 +16964,7 @@ virNWFilterLookupByUUID(virConnectPtr conn, const unsigned char *uuid) virCheckConnectReturn(conn, NULL); virCheckNonNullArgGoto(uuid, error); - if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterLookupByUUID){ + if (conn->nwfilterDriver && conn->nwfilterDriver->nwfilterLookupByUUID) { virNWFilterPtr ret; ret = conn->nwfilterDriver->nwfilterLookupByUUID(conn, uuid); if (!ret) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d65dda0..66d708a 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2193,7 +2193,7 @@ lxcDomainParseBlkioDeviceStr(char *blkioDeviceStr, const char *type, } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_READ_BPS)) { if (virStrToLong_ullp(temp, &p, 10, &result[i].rbps) < 0) goto error; - } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){ + } else if (STREQ(type, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) { if (virStrToLong_ullp(temp, &p, 10, &result[i].wbps) < 0) goto error; } else { @@ -2606,7 +2606,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, break; } } - } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){ + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) { for (j = 0; j < ndevices; j++) { if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup, devices[j].path, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 28a56a9..2c56692 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7865,7 +7865,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, break; } } - } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)){ + } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS)) { for (j = 0; j < ndevices; j++) { if (virCgroupSetBlkioDeviceWriteBps(priv->cgroup, devices[j].path, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a62c02f..3972960 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3868,7 +3868,7 @@ qemuMonitorJSONBlockJob(qemuMonitorPtr mon, virReportError(VIR_ERR_OPERATION_INVALID, _("No active operation on device: %s"), device); - } else if (qemuMonitorJSONHasError(reply, "DeviceInUse")){ + } else if (qemuMonitorJSONHasError(reply, "DeviceInUse")) { virReportError(VIR_ERR_OPERATION_FAILED, _("Device %s in use"), device); } else if (qemuMonitorJSONHasError(reply, "NotSupported")) { diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 032ff64..31aac9d 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1003,7 +1003,7 @@ static int virNetTLSContextValidCertificate(virNetTLSContextPtr ctxt, memset(dname, 0, dnamesize); - if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0){ + if ((ret = gnutls_certificate_verify_peers2(sess->session, &status)) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("Unable to verify TLS peer: %s"), gnutls_strerror(ret)); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index f25a7df7..a0b104c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1075,7 +1075,7 @@ get_files(vahControl * ctl) ctl->def->fss[i]->type == VIR_DOMAIN_FS_TYPE_MOUNT && (ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || ctl->def->fss[i]->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) && - ctl->def->fss[i]->src){ + ctl->def->fss[i]->src) { virDomainFSDefPtr fs = ctl->def->fss[i]; if (vah_add_path(&buf, fs->src, fs->readonly ? "r" : "rw", true) != 0) diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 5991fe7..d2c4aa9 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -332,7 +332,7 @@ hostsfileAdd(dnsmasqHostsfile *hostsfile, if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s,%s", mac, ipstr, name) < 0) goto error; - } else if (name && !mac){ + } else if (name && !mac) { if (virAsprintf(&hostsfile->hosts[hostsfile->nhosts].host, "%s,%s", name, ipstr) < 0) goto error; diff --git a/src/util/virstorageencryption.c b/src/util/virstorageencryption.c index 5a401b7..b5fed58 100644 --- a/src/util/virstorageencryption.c +++ b/src/util/virstorageencryption.c @@ -193,7 +193,7 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) ret->format = format; n = virXPathNodeSet("./secret", ctxt, &nodes); - if (n < 0){ + if (n < 0) { goto cleanup; } if (n != 0 && VIR_ALLOC_N(ret->secrets, n) < 0) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 79df3ee..0fc3aca 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2534,7 +2534,7 @@ xenUnifiedNodeDeviceAssignedDomainId(virNodeDevicePtr dev) if (numdomains < 0) { return ret; } - if (numdomains > 0){ + if (numdomains > 0) { if (VIR_ALLOC_N(ids, numdomains) < 0) goto out; if ((numdomains = xenUnifiedConnectListDomains(conn, &ids[0], numdomains)) < 0) { diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 09aa1aa..0931234 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1194,7 +1194,7 @@ xenHypervisorGetSchedulerType(virConnectPtr conn, if (ret < 0) return NULL; - switch (op.u.getschedulerid.sched_id){ + switch (op.u.getschedulerid.sched_id) { case XEN_SCHEDULER_SEDF: ignore_value(VIR_STRDUP(schedulertype, "sedf")); if (nparams) @@ -1257,7 +1257,7 @@ xenHypervisorGetSchedulerParameters(virConnectPtr conn, if (ret < 0) return -1; - switch (op_sys.u.getschedulerid.sched_id){ + switch (op_sys.u.getschedulerid.sched_id) { case XEN_SCHEDULER_SEDF: if (*nparams < XEN_SCHED_SEDF_NPARAM) { virReportError(VIR_ERR_INVALID_ARG, @@ -1360,7 +1360,7 @@ xenHypervisorSetSchedulerParameters(virConnectPtr conn, ret = xenHypervisorDoV2Sys(priv->handle, &op_sys); if (ret == -1) return -1; - switch (op_sys.u.getschedulerid.sched_id){ + switch (op_sys.u.getschedulerid.sched_id) { case XEN_SCHEDULER_SEDF: /* TODO: Implement for Xen/SEDF */ TODO @@ -1885,13 +1885,13 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) if (virXen_getdomaininfo(fd, 0, &info) == 1) { /* RHEL 5.0 */ hv_versions.dom_interface = 3; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver3"); goto done; } /* Fedora 7 */ hv_versions.dom_interface = 4; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver2 dom ver4"); goto done; } @@ -1901,7 +1901,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) if (virXen_getdomaininfo(fd, 0, &info) == 1) { /* xen-3.1 */ hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver3 dom ver5"); goto done; } @@ -1911,7 +1911,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) if (virXen_getdomaininfo(fd, 0, &info) == 1) { /* Fedora 8 */ hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver4 dom ver5"); goto done; } @@ -1921,7 +1921,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) if (virXen_getdomaininfo(fd, 0, &info) == 1) { /* Xen 3.2, Fedora 9 */ hv_versions.dom_interface = 5; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver6 dom ver5"); goto done; } @@ -1943,12 +1943,12 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) hv_versions.sys_interface = 8; /* XEN_SYSCTL_INTERFACE_VERSION */ if (virXen_getdomaininfo(fd, 0, &info) == 1) { hv_versions.dom_interface = 7; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver7"); goto done; } hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver8 dom ver8"); goto done; } @@ -1961,7 +1961,7 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */ if (virXen_getdomaininfo(fd, 0, &info) == 1) { hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ - if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0) { VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8"); goto done; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 519a58f..6d1fec7 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2976,7 +2976,7 @@ xenDaemonGetSchedulerType(virConnectPtr conn, /* get xen_scheduler from xend/node */ ret = sexpr_node(root, "node/xen_scheduler"); - if (ret == NULL){ + if (ret == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("node information incomplete, missing scheduler name")); goto error; @@ -3047,7 +3047,7 @@ xenDaemonGetSchedulerParameters(virConnectPtr conn, goto error; } - switch (sched_nparam){ + switch (sched_nparam) { case XEN_SCHED_SEDF_NPARAM: if (*nparams < XEN_SCHED_SEDF_NPARAM) { virReportError(VIR_ERR_INVALID_ARG, @@ -3152,7 +3152,7 @@ xenDaemonSetSchedulerParameters(virConnectPtr conn, goto error; } - switch (sched_nparam){ + switch (sched_nparam) { case XEN_SCHED_SEDF_NPARAM: /* TODO: Implement for Xen/SEDF */ TODO diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c index 13cfa60..8b93f4e 100644 --- a/tests/libvirtdconftest.c +++ b/tests/libvirtdconftest.c @@ -217,7 +217,7 @@ mymain(void) goto cleanup; } - if (uncomment_all_params(filedata, &params) < 0){ + if (uncomment_all_params(filedata, &params) < 0) { perror("Find params"); ret = -1; goto cleanup; diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index b528928..4f810f8 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1123,7 +1123,7 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd) if (*capacityStr == '-') { /* The API always requires a positive value; but we allow a * negative value for convenience. */ - if (delta && vshCommandOptBool(cmd, "shrink")){ + if (delta && vshCommandOptBool(cmd, "shrink")) { capacityStr++; } else { vshError(ctl, "%s", -- 2.0.4

2 2

[libvirt] [PATCH] qemu: Label all TAP FDs
by Michal Privoznik 20 Aug '14

20 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1095636 When starting up the domain the domain's NICs are allocated. As of 1f24f682 (v1.0.6) we are able to use multiqueue feature on virtio NICs. It breaks network processing into multiple queues which can be processed in parallel by different host CPUs. The queues are, however, created by opening /dev/net/tun several times. Unfortunately, only the first FD in the row is labelled so when turning the multiqueue feature on in the guest, qemu will get AVC denial. Make sure we label all the FDs needed. Moreover, the default label of /dev/net/tun doesn't allow attaching a queue: type=AVC msg=audit(1399622478.790:893): avc: denied { attach_queue } for pid=7585 comm="qemu-kvm" scontext=system_u:system_r:svirt_t:s0:c638,c877 tcontext=system_u:system_r:virtd_t:s0-s0:c0.c1023 tclass=tun_socket And as suggested by SELinux maintainers, the tun FD should be labeled as svirt_t. Therefore, we don't need to adjust any range (as done previously by Guannan in ae368ebf) rather set the seclabel of the domain directly. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 18 +++--------------- src/qemu/qemu_hotplug.c | 6 ++++++ src/security/security_selinux.c | 34 ++-------------------------------- 3 files changed, 11 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a92315a..4bc0368 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -192,10 +192,6 @@ qemuPhysIfaceConnect(virDomainDefPtr def, vmop, cfg->stateDir, virDomainNetGetActualBandwidth(net)); if (rc >= 0) { - if (virSecurityManagerSetTapFDLabel(driver->securityManager, - def, rc) < 0) - goto error; - virDomainAuditNetDevice(def, net, res_ifname, true); VIR_FREE(net->ifname); net->ifname = res_ifname; @@ -203,17 +199,6 @@ qemuPhysIfaceConnect(virDomainDefPtr def, virObjectUnref(cfg); return rc; - - error: - ignore_value(virNetDevMacVLanDeleteWithVPortProfile( - res_ifname, &net->mac, - virDomainNetGetActualDirectDev(net), - virDomainNetGetActualDirectMode(net), - virDomainNetGetActualVirtPortProfile(net), - cfg->stateDir)); - VIR_FREE(res_ifname); - virObjectUnref(cfg); - return -1; } @@ -7201,6 +7186,9 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, } for (i = 0; i < tapfdSize; i++) { + if (virSecurityManagerSetTapFDLabel(driver->securityManager, + def, tapfd[i]) < 0) + goto cleanup; virCommandPassFD(cmd, tapfd[i], VIR_COMMAND_PASS_FD_CLOSE_PARENT); if (virAsprintf(&tapfdName[i], "%d", tapfd[i]) < 0) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index f7e223a..b60bd22 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -922,6 +922,12 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } + for (i = 0; i < tapfdSize; i++) { + if (virSecurityManagerSetTapFDLabel(driver->securityManager, + vm->def, tapfd[i]) < 0) + goto cleanup; + } + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NET_NAME) || virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (qemuAssignDeviceNetAlias(vm->def, net, -1) < 0) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c078cab..5d18493 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2330,47 +2330,17 @@ virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, } static int -virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr, +virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virDomainDefPtr def, int fd) { - struct stat buf; - security_context_t fcon = NULL; virSecurityLabelDefPtr secdef; - char *str = NULL; - int rc = -1; secdef = virDomainDefGetSecurityLabelDef(def, SECURITY_SELINUX_NAME); if (!secdef || !secdef->label) return 0; - if (fstat(fd, &buf) < 0) { - virReportSystemError(errno, _("cannot stat tap fd %d"), fd); - goto cleanup; - } - - if ((buf.st_mode & S_IFMT) != S_IFCHR) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("tap fd %d is not character device"), fd); - goto cleanup; - } - - if (getContext(mgr, "/dev/tap.*", buf.st_mode, &fcon) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot lookup default selinux label for tap fd %d"), fd); - goto cleanup; - } - - if (!(str = virSecuritySELinuxContextAddRange(secdef->label, fcon))) { - goto cleanup; - } else { - rc = virSecuritySELinuxFSetFilecon(fd, str); - } - - cleanup: - freecon(fcon); - VIR_FREE(str); - return rc; + return virSecuritySELinuxFSetFilecon(fd, secdef->label); } static char * -- 1.8.5.5

3 5

[libvirt] [PATCH v3] qemu: Issue rtc-reset-reinjection command after guest-set-time
by Michal Privoznik 20 Aug '14

20 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1103245 An advice appeared there on the qemu-devel list [1]. When a domain is suspended and then resumed guest kernel is not aware of this. So we've introduced virDomainSetTime API that resets the time within guest using qemu-ga. On the other hand, qemu itself is trying to make RTC beat faster to catch the difference. But if we don't tell qemu that guest's time was reset via the other method, both mechanisms are applied resulting in again wrong guest time. In order to avoid summing both corrections we need to tell qemu that it should not use the RTC injection if the guest time is set via guest agent. 1: http://www.mail-archive.com/qemu-devel@nongnu.org/msg236435.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: diff to v2: -introduced capability to test if qemu supports the monitor command diff to v1: -fixed command name in subject -added testcase src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 17 +++++++++++++++++ src/qemu/qemu_monitor.c | 33 +++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 2 ++ tests/qemumonitorjsontest.c | 1 + 8 files changed, 79 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 360cc67..b758b5a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -265,6 +265,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "numa", "memory-backend-file", "usb-audio", + "rtc-reset-reinjection", ); @@ -1424,6 +1425,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "add-fd", QEMU_CAPS_ADD_FD }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, + { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, }; struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2911759..cbd3646 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -213,6 +213,7 @@ typedef enum { QEMU_CAPS_NUMA = 171, /* newer -numa handling with disjoint cpu ranges */ QEMU_CAPS_OBJECT_MEMORY_FILE = 172, /* -object memory-backend-file */ QEMU_CAPS_OBJECT_USB_AUDIO = 173, /* usb-audio device support */ + QEMU_CAPS_RTC_RESET_REINJECTION = 174, /* rtc-reset-reinjection monitor command */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0aa1393..d3f2f8c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16834,6 +16834,13 @@ qemuDomainSetTime(virDomainPtr dom, priv = vm->privateData; + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot set time: qemu doesn't support " + "rtc-reset-reinjection command")); + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; @@ -16850,6 +16857,16 @@ qemuDomainSetTime(virDomainPtr dom, rv = qemuAgentSetTime(priv->agent, seconds, nseconds, rtcSync); qemuDomainObjExitAgent(vm); + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterMonitor(driver, vm); + rv = qemuMonitorRTCResetReinjection(priv->mon); + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) goto endjob; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3d9f87b..77627bc 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4037,3 +4037,36 @@ qemuMonitorGetGuestCPU(qemuMonitorPtr mon, return qemuMonitorJSONGetGuestCPU(mon, arch, data); } + +/** + * qemuMonitorRTCResetReinjection: + * @mon: Pointer to the monitor + * + * Issue rtc-reset-reinjection command. + * This should be used in cases where guest time is restored via + * guest agent so RTC injection is not needed (in fact it will + * confuse guest's RTC). + * + * Returns 0 on success + * -1 on error. + */ +int +qemuMonitorRTCResetReinjection(qemuMonitorPtr mon) +{ + + VIR_DEBUG("mon=%p", mon); + + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (!mon->json) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return -1; + } + + return qemuMonitorJSONRTCResetReinjection(mon); +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c3695f2..4fd6f01 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -790,6 +790,8 @@ int qemuMonitorGetGuestCPU(qemuMonitorPtr mon, virArch arch, virCPUDataPtr *data); +int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon); + /** * When running two dd process and using <> redirection, we need a * shell that will not truncate files. These two strings serve that diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a62c02f..538110c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5851,3 +5851,24 @@ qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, return -1; } } + +int +qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + if (!(cmd = qemuMonitorJSONMakeCommand("rtc-reset-reinjection", + NULL))) + return ret; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5f6c846..d8c9308 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -437,4 +437,6 @@ int qemuMonitorJSONGetDeviceAliases(qemuMonitorPtr mon, int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, virArch arch, virCPUDataPtr *data); + +int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon); #endif /* QEMU_MONITOR_JSON_H */ diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index baee80a..e3fb4f7 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2279,6 +2279,7 @@ mymain(void) DO_TEST_SIMPLE("inject-nmi", qemuMonitorJSONInjectNMI); DO_TEST_SIMPLE("system_wakeup", qemuMonitorJSONSystemWakeup); DO_TEST_SIMPLE("nbd-server-stop", qemuMonitorJSONNBDServerStop); + DO_TEST_SIMPLE("rtc-reset-reinjection", qemuMonitorJSONRTCResetReinjection); DO_TEST_GEN(qemuMonitorJSONSetLink); DO_TEST_GEN(qemuMonitorJSONBlockResize); DO_TEST_GEN(qemuMonitorJSONSetVNCPassword); -- 1.8.5.5

2 1

[libvirt] [PATCH 0/2] Forbid negative blkio device values
by Martin Kletzander 20 Aug '14

20 Aug '14

Commits 0728d472 and 399394ab added suuport for VIR_DOMAIN_BLKIO_DEVICE_*, but all the values were parsed with underflow being allowed. Since there is no point in that, it should be fixed. Unfortunately the code is duplicated (apart from passing device/value pairs as a string :-/), so it needs to be fixed twice. This "series" fixes https://bugzilla.redhat.com/show_bug.cgi?id=1131306 Martin Kletzander (2): lxc: forbid negative blkio values qemu: forbid negative blkio values src/lxc/lxc_driver.c | 8 ++++---- src/qemu/qemu_driver.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.0.4

2 5

[libvirt] [PATCH] qemu: Fix build error introduced in 653137eb957a278b556c6226424aad5395a
by Peter Krempa 20 Aug '14

20 Aug '14

The build failure is caused by a false positive of some static analysys steps done by gcc (that don't happen on -O0). --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c011151..801044b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15807,7 +15807,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, int ret = -1; size_t i; int idx = -1; - int conf_idx; + int conf_idx = -1; bool set_bytes = false; bool set_iops = false; virQEMUDriverConfigPtr cfg = NULL; -- 2.0.2

2 1

[libvirt] [PATCH] qemu: blkiotune: Avoid accessing non-existing disk configuration
by Peter Krempa 20 Aug '14

20 Aug '14

When a user would try changing the persistent IO tuning settings for a disk that was hotplugged to a vm in a transient way, the qemuDomainSetBlockIoTune API would use the same index for both the live and config disk array. The disk was missing from the config array though causing a crash of libvirtd. To fix the issue, determine the indexes separately. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1131819 --- src/qemu/qemu_driver.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0aa1393..c011151 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15807,6 +15807,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, int ret = -1; size_t i; int idx = -1; + int conf_idx; bool set_bytes = false; bool set_iops = false; virQEMUDriverConfigPtr cfg = NULL; @@ -15848,9 +15849,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto endjob; - if (!(device = qemuDiskPathToAlias(vm, disk, &idx))) - goto endjob; - if (virDomainLiveConfigHelperMethod(caps, driver->xmlopt, vm, &flags, &persistentDef) < 0) goto endjob; @@ -15905,6 +15903,15 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto endjob; } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { + if ((conf_idx = virDomainDiskIndexByName(persistentDef, disk, true)) < 0) { + virReportError(VIR_ERR_INVALID_ARG, + _("missing persistent configuration for disk '%s'"), + disk); + goto endjob; + } + } + if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE_IOTUNE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -15913,6 +15920,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto endjob; } + if (!(device = qemuDiskPathToAlias(vm, disk, &idx))) + goto endjob; + /* If the user didn't specify bytes limits, inherit previous * values; likewise if the user didn't specify iops * limits. */ @@ -15937,7 +15947,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_CONFIG) { sa_assert(persistentDef); - oldinfo = &persistentDef->disks[idx]->blkdeviotune; + oldinfo = &persistentDef->disks[conf_idx]->blkdeviotune; if (!set_bytes) { info.total_bytes_sec = oldinfo->total_bytes_sec; info.read_bytes_sec = oldinfo->read_bytes_sec; @@ -15948,7 +15958,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, info.read_iops_sec = oldinfo->read_iops_sec; info.write_iops_sec = oldinfo->write_iops_sec; } - persistentDef->disks[idx]->blkdeviotune = info; + persistentDef->disks[conf_idx]->blkdeviotune = info; ret = virDomainSaveConfig(cfg->configDir, persistentDef); if (ret < 0) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", -- 2.0.2

2 2

[libvirt] A question about scsi controller index
by Wang Rui 20 Aug '14

20 Aug '14

Hi, all I define a VM with a virtio scsi disk and I specify a controller index. <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source file='/mnt/sdb/wangrui/img/sles10_sp3_32_2U-5'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='10' bus='0' target='0' unit='1'/> </disk> Controllers 0-10 are created(in virDomainDefAddDiskControllersForType()) although I have only one scsi disk. Are the controllers 0-9 useful for some reason? If the user specifies controller='n', it will cost extra time and memory for creating controllers from 0 to n-1. It becomes worse if n is a very large value (Usually it's the user's wrong configuration). I think if controllers from 0 to n-1 are kept for other use , we should better to check whether n is meaningless(A very large number is meaningless). BTW, I modify this function. Only the specified index controller will be created. It seems to work fine.

2 1

[libvirt] [PATCH] libxl: do not use hardcoded pygrub path
by Alvaro Lopez Garcia 20 Aug '14

20 Aug '14

According to the Xen documentation the full path was only needed for versions prior to 4.1: "Note: For older versions of Xen Project software (4.1 or earlier) you need to know where in the filesystem pygrub lies. (...) Newer versions of the toolstack know how to look for the path themselves." [1] [1] http://wiki.xen.org/wiki/PyGrub Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1104695 Signed-off-by: Alvaro Lopez Garcia <aloga(a)ifca.unican.es> --- src/libxl/libxl_conf.c | 13 +++++++++++-- src/libxl/libxl_conf.h | 5 ++++- src/libxl/libxl_domain.c | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 1210500..896ea8d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -100,6 +100,7 @@ libxlDriverConfigDispose(void *obj) VIR_FREE(cfg->libDir); VIR_FREE(cfg->saveDir); VIR_FREE(cfg->autoDumpDir); + VIR_FREE(cfg->bootloader); } static int @@ -570,6 +571,7 @@ libxlMakeChrdevStr(virDomainChrDefPtr def, char **buf) static int libxlMakeDomBuildInfo(virDomainDefPtr def, + libxlDriverConfigPtr cfg, libxl_ctx *ctx, libxl_domain_config *d_config) { @@ -688,7 +690,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, if (VIR_STRDUP(b_info->u.pv.bootloader, def->os.bootloader) < 0) goto error; } else if (def->os.kernel == NULL) { - if (VIR_STRDUP(b_info->u.pv.bootloader, LIBXL_BOOTLOADER_PATH) < 0) + if (VIR_STRDUP(b_info->u.pv.bootloader, cfg->bootloader) < 0) goto error; } if (def->os.bootloaderArgs) { @@ -1241,6 +1243,12 @@ libxlDriverConfigNew(void) cfg->version = (cfg->verInfo->xen_version_major * 1000000) + (cfg->verInfo->xen_version_minor * 1000); + /* + * Versions prior to 4.2 need the full pygrub path + */ + if (VIR_STRDUP(cfg->bootloader, cfg->version >= 4002000 ? LIBXL_BOOTLOADER : LIBXL_BOOTLOADER_PATH) < 0) + goto error; + /* This will fill xenstore info about free and dom0 memory if missing, * should be called before starting first domain */ if (libxl_get_free_memory(cfg->ctx, &free_mem)) { @@ -1399,6 +1407,7 @@ libxlMakeCapabilities(libxl_ctx *ctx) int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, + libxlDriverConfigPtr cfg, libxl_ctx *ctx, libxl_domain_config *d_config) { @@ -1407,7 +1416,7 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, if (libxlMakeDomCreateInfo(ctx, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(def, ctx, d_config) < 0) + if (libxlMakeDomBuildInfo(def, cfg, ctx, d_config) < 0) return -1; if (libxlMakeDiskList(def, d_config) < 0) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index da66b4e..9d18c4b 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -53,7 +53,8 @@ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" -# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +# define LIBXL_BOOTLOADER "pygrub" +# define LIBXL_BOOTLOADER_PATH BINDIR "/" LIBXL_BOOTLOADER /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one @@ -99,6 +100,7 @@ struct _libxlDriverConfig { char *libDir; char *saveDir; char *autoDumpDir; + char *bootloader; }; @@ -181,6 +183,7 @@ libxlCreateXMLConf(void); int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, + libxlDriverConfigPtr cfg, libxl_ctx *ctx, libxl_domain_config *d_config); diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index cdac82c..14f048a 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1199,7 +1199,7 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, VIR_FREE(managed_save_path); } - if (libxlBuildDomainConfig(driver->reservedVNCPorts, vm->def, + if (libxlBuildDomainConfig(driver->reservedVNCPorts, vm->def, cfg, priv->ctx, &d_config) < 0) goto endjob; -- 2.1.0.rc1

4 6

[libvirt] [PATCHv2 libvirt] qemu: Issue rtc-reset-reinjection command after guest-set-time
by Michal Privoznik 20 Aug '14

20 Aug '14

https://bugzilla.redhat.com/show_bug.cgi?id=1103245 An advice appeared there on the qemu-devel list [1]. When a domain is suspended and then resumed guest kernel is not aware of this. So we've introduced virDomainSetTime API that resets the time within guest using qemu-ga. On the other hand, qemu itself is trying to make RTC beat faster to catch the difference. But if we don't tell qemu that guest's time was reset via the other method, both mechanisms are applied resulting in again wrong guest time. In order to avoid summing both corrections we need to tell qemu that it should not use the RTC injection if the guest time is set via guest agent. 1: http://www.mail-archive.com/qemu-devel@nongnu.org/msg236435.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Notes: diff to v1: -fixed command name in subject -added testcase src/qemu/qemu_driver.c | 10 ++++++++++ src/qemu/qemu_monitor.c | 33 +++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 2 ++ tests/qemumonitorjsontest.c | 1 + 6 files changed, 69 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b6219ba..bdfd155 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16879,6 +16879,16 @@ qemuDomainSetTime(virDomainPtr dom, rv = qemuAgentSetTime(priv->agent, seconds, nseconds, rtcSync); qemuDomainObjExitAgent(vm); + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterMonitor(driver, vm); + rv = qemuMonitorRTCResetReinjection(priv->mon); + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) goto endjob; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3d9f87b..77627bc 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4037,3 +4037,36 @@ qemuMonitorGetGuestCPU(qemuMonitorPtr mon, return qemuMonitorJSONGetGuestCPU(mon, arch, data); } + +/** + * qemuMonitorRTCResetReinjection: + * @mon: Pointer to the monitor + * + * Issue rtc-reset-reinjection command. + * This should be used in cases where guest time is restored via + * guest agent so RTC injection is not needed (in fact it will + * confuse guest's RTC). + * + * Returns 0 on success + * -1 on error. + */ +int +qemuMonitorRTCResetReinjection(qemuMonitorPtr mon) +{ + + VIR_DEBUG("mon=%p", mon); + + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (!mon->json) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return -1; + } + + return qemuMonitorJSONRTCResetReinjection(mon); +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c3695f2..4fd6f01 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -790,6 +790,8 @@ int qemuMonitorGetGuestCPU(qemuMonitorPtr mon, virArch arch, virCPUDataPtr *data); +int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon); + /** * When running two dd process and using <> redirection, we need a * shell that will not truncate files. These two strings serve that diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a62c02f..538110c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5851,3 +5851,24 @@ qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, return -1; } } + +int +qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + if (!(cmd = qemuMonitorJSONMakeCommand("rtc-reset-reinjection", + NULL))) + return ret; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5f6c846..d8c9308 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -437,4 +437,6 @@ int qemuMonitorJSONGetDeviceAliases(qemuMonitorPtr mon, int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, virArch arch, virCPUDataPtr *data); + +int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon); #endif /* QEMU_MONITOR_JSON_H */ diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index baee80a..e3fb4f7 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2279,6 +2279,7 @@ mymain(void) DO_TEST_SIMPLE("inject-nmi", qemuMonitorJSONInjectNMI); DO_TEST_SIMPLE("system_wakeup", qemuMonitorJSONSystemWakeup); DO_TEST_SIMPLE("nbd-server-stop", qemuMonitorJSONNBDServerStop); + DO_TEST_SIMPLE("rtc-reset-reinjection", qemuMonitorJSONRTCResetReinjection); DO_TEST_GEN(qemuMonitorJSONSetLink); DO_TEST_GEN(qemuMonitorJSONBlockResize); DO_TEST_GEN(qemuMonitorJSONSetVNCPassword); -- 1.8.5.5

3 6

[libvirt] [PATCH 00/14] qemu: Cdrom media change fixes and support for networked storage
by Peter Krempa 20 Aug '14

20 Aug '14

Peter Krempa (14): qemu: Explicitly state that hotplugging cdroms and floppies doesn't work conf: Pass virStorageSource into virDomainDiskSourceIsBlockType qemu: hotplug: Untangle cleanup paths in qemuDomainChangeEjectableMedia qemu: hotplug: Add helper to initialize/teardown new disks for VMs qemu: hotplug: Change arguments for qemuDomainChangeEjectableMedia qemu: hotplug: Format proper source string for cdrom media change qemu: shared: Split out insertion code to the shared device list qemu: shared: Split out shared device list remove code qemu: conf: rename qemuCheckSharedDevice to qemuCheckSharedDisk qemu: conf: Split up qemuAddSharedDevice into per-device-type functions qemu: conf: Split up qemuRemoveSharedDevice into per-device-type functions qemu: conf: Split out code to retrieve hostdev key and reuse it qemu: hotplug: Sanitize shared device removal on media change qemu: hotplug: Reject media change when XML contains disk ABI change src/conf/domain_conf.c | 21 +-- src/conf/domain_conf.h | 5 +- src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_conf.c | 445 ++++++++++++++++++++++++----------------------- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 43 ++--- src/qemu/qemu_hotplug.c | 269 +++++++++++++++------------- src/qemu/qemu_hotplug.h | 3 +- 11 files changed, 414 insertions(+), 384 deletions(-) -- 2.0.2

2 17

[libvirt] [PATCH V1 0/2] cpu: Handle only high order 16 bits of PVR for IBM
by Pradipta Kr. Banerjee 20 Aug '14

20 Aug '14

Handle only high order 16 bits of PVR for IBM Power processors Pradipta Kr. Banerjee (2): cpu: Handle only high order 16 bits of PVR for IBM Power processors cpu_map.xml: Add base POWER8 processor details src/cpu/cpu_map.xml | 5 +++++ src/cpu/cpu_powerpc.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) -- 1.9.3

3 4

[libvirt] How to install libvirt-python from source code?
by Can Zhang 20 Aug '14

20 Aug '14

Hi, I’d like to install a latest version libvirt on CentOS 6.5. I compiled libvirt, it worked well and then I tried to install libvirt-python. The version is libvirt-python-1.2.7, and I used `python setup.py build` and `sudo python setup.py install` to install. But in python, I get errors like: ========== >>> import libvirt Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib64/python2.6/site-packages/libvirt.py", line 28, in <module> raise lib_e ImportError: /usr/lib64/python2.6/site-packages/libvirtmod.so: undefined symbol: virTypedParamsAddBoolean ========== Someone would help? Best regards, Can Zhang

1 0

[libvirt] [PATCH v2 libvirt 0/8] Add support for qemu usb-mtp device
by Giuseppe Scrivano 19 Aug '14

19 Aug '14

This series adds support for qemu usb-mtp devices. This new series addresses comments for v1: https://www.redhat.com/archives/libvir-list/2014-August/msg00381.html Now the XML looks like: <filesystem type='mount'> <source dir='/tmp/mtp_root'/> <model type='mtp'/> <target dir='mtp share'/> </filesystem> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1121781 Giuseppe Scrivano (8): conf: add <model> child element to <filesystem> conf, virDomainFSDefPtr: rename "path" argument to "target" qemu_command: fix block indentation qemu: add support for MTP filesystem docs: add documentation and schema for <filesystem>/<model> docs: relax <filesystem>/<target> dir element attribute to string conf: fix comment tests: add tests for filesystem model mtp docs/formatdomain.html.in | 6 +++ docs/schemas/domaincommon.rng | 17 ++++++-- src/conf/domain_conf.c | 29 ++++++++++++- src/conf/domain_conf.h | 15 ++++++- src/qemu/qemu_command.c | 74 +++++++++++++++++++--------------- tests/domainconfdata/getfilesystem.xml | 5 +++ tests/domainconftest.c | 1 + 7 files changed, 108 insertions(+), 39 deletions(-) -- 1.9.3

3 18

[libvirt] [PATCH v3 0/2] bhyve: add volumes support
by Roman Bogorodskiy 19 Aug '14

19 Aug '14

Changes from v1: - Add volume support for the bhyveload command as well to allow booting from a volume Changes from v2: - Move disk source pool translation to storage/storage_driver.c instead of conf/domain_conf.c, because having that in conf/domain_conf.c requires pulling storage driver that is not needed for many drivers Roman Bogorodskiy (2): conf: make disk source pool translation generic bhyve: add volumes support src/bhyve/bhyve_command.c | 17 ++- src/bhyve/bhyve_command.h | 7 +- src/bhyve/bhyve_driver.c | 4 +- src/bhyve/bhyve_process.c | 4 +- src/qemu/qemu_conf.c | 243 ------------------------------------------ src/qemu/qemu_conf.h | 3 - src/qemu/qemu_driver.c | 6 +- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_process.c | 5 +- src/storage/storage_driver.c | 245 +++++++++++++++++++++++++++++++++++++++++++ src/storage/storage_driver.h | 4 + tests/Makefile.am | 3 + tests/bhyvexml2argvtest.c | 5 +- tests/qemuxml2argvtest.c | 3 +- 14 files changed, 287 insertions(+), 265 deletions(-) -- 1.9.0

2 4

[libvirt] [RFC] Introduce API for retrieving bulk domain stats
by Peter Krempa 19 Aug '14

19 Aug '14

I'd like to propose a (hopefully) fairly future-proof API to retrieve various statistics for domains. The motivation is that management layers that use libvirt usually poll libvirt for statistics using various split up APIs we currently provide. To get all the necessary stuff, the mgmt app need to issue Ndomains * Napis calls and cope with the various returned formats. The APIs I'm wanting to introduce here will: 1) Return data in a format that we can expand in the future and is hierarchical. For starters I'll use XML, with possible expansion to something like JSON if it will be favourable for a consumer (switchable by a flag) 2) Stats for multiple (all) domains can be queried at once and are returned in one call. This will allow to decrease the overhead necessary to issue multiple calls per domain multiplied by the count of domains. 3) Selectable (bit mask) fields in the returned format. This will allow to retrieve only specific stats according to the APPs need. The returned XML will have the following format: <domainstats> <domain name='vm1'> <state>running</state> <cpus> <cpu id='1'> <state>running</state> <time>10001231231</time> </cpu> <cpu id='2'> <state>offline</state> <time>10001231231</time> <cpu> </cpus> ... </domain> <domain name='vm2'> <state>paused</state> ... </domain> <domain name='vm3'> <state>running</state> ... </domain> </domainstats> Initially the implementation will introduce the option to retrieve block, interface and cpu stats with the possibility to add more in the future. The stats groups will be enabled using a bit field @stats passed as the function argument. A few groups for inspiration: VIR_DOMAIN_STATS_CPU VIR_DOMAIN_STATS_BLOCK VIR_DOMAIN_STATS_INTERFACE As this is a first draft and dump of my mind on this subject it may be a bit rough, so suggestions are welcome. Thanks for looking. Peter --- include/libvirt/libvirt.h.in | 12 ++++ src/driver.h | 8 +++ src/libvirt.c | 127 +++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 +++ 4 files changed, 154 insertions(+) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 47ea695..72ab617 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2501,6 +2501,18 @@ int virDomainDetachDeviceFlags(virDomainPtr domain, int virDomainUpdateDeviceFlags(virDomainPtr domain, const char *xml, unsigned int flags); +char *virConnectGetAllDomainStats(virConnectPtr conn, + unsigned int stats, + unsigned int flags); + +char *virDomainListGetStats(virDomainPtr *doms, + unsigned int stats, + unsigned int flags); + +char *virDomainGetStats(virDomainPtr dom, + unsigned int stats, + unsigned int flags); + /* * BlockJob API */ diff --git a/src/driver.h b/src/driver.h index 158df79..2650e90 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1191,6 +1191,13 @@ typedef int unsigned int flags); +typedef char * +(*virDrvDomainListGetStats)(virConnectPtr conn, + virDomainPtr *doms, + unsigned int ndoms, + unsigned int stats, + unsigned int flags); + typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1411,6 +1418,7 @@ struct _virDriver { virDrvDomainSetTime domainSetTime; virDrvNodeGetFreePages nodeGetFreePages; virDrvConnectGetDomainCapabilities connectGetDomainCapabilities; + virDrvDomainListGetStats domainListGetStats; }; diff --git a/src/libvirt.c b/src/libvirt.c index 992e4f2..10e0b70 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21341,3 +21341,130 @@ virConnectGetDomainCapabilities(virConnectPtr conn, virDispatchError(conn); return NULL; } + + +/** + * virConnectGetAllDomainStats: + * @conn: pointer to the hypervisor connection + * @stats: stats to return, binary OR of virDomainStats + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Report statistics of various parameters for a running VM. + * + * Returns an XML containing the requested stats or NULL on error. The + * returned string shall be freed by the caller. + */ +char * +virConnectGetAllDomainStats(virConnectPtr conn, + unsigned int stats, + unsigned int flags) +{ + char *ret = NULL; + + VIR_DEBUG("conn=%p, stats=0x%x, flags=0x%x", + conn, stats, flags); + + virResetLastError(); + + virCheckConnectReturn(conn, NULL); + + if (!conn->driver->domainListGetStats) { + virReportUnsupportedError(); + goto cleanup; + } + + ret = conn->driver->domainListGetStats(conn, NULL, 0, stats, flags); + + cleanup: + if (!ret) + virDispatchError(conn); + + return ret; +} + + +/** + * virDomainListGetStats: + * @doms: NULL terminated array of domains + * @stats: stats to return, binary OR of virDomainStats + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Report statistics of various parameters for a running VM. + * + * Returns an XML containing the requested stats or NULL on error. The + * returned string shall be freed by the caller. + */ +char * +virDomainListGetStats(virDomainPtr *doms, + unsigned int stats, + unsigned int flags) +{ + virConnectPtr conn = NULL; + virDomainPtr *nextdom = doms; + unsigned int ndoms = 0; + char *ret = NULL; + + VIR_DEBUG("doms=%p, stats=0x%x, flags=0x%x", + doms, stats, flags); + + virResetLastError(); + + if (!*doms) { + virReportError(VIR_ERR_INVALID_ARG, + _("doms array in %s must contain at leas one domain"), + __FUNCTION__); + goto cleanup; + } + + conn = doms[0]->conn; + + if (!conn->driver->domainListGetStats) { + virReportUnsupportedError(); + goto cleanup; + } + + while (*(++nextdom)) { + virDomainPtr dom = *nextdom; + + virCheckDomainGoto(dom, cleanup); + + if (dom->conn != conn) { + virReportError(VIR_ERR_INVALID_ARG, + _("domains in 'doms' array must belong to a " + "single connection in %s"), __FUNCTION__); + goto cleanup; + } + + ndoms++; + } + + ret = conn->driver->domainListGetStats(conn, doms, ndoms, stats, flags); + + cleanup: + if (!ret) + virDispatchError(conn); + return ret; +} + + +/** + * virDomainGetStats: + * @dom: a domain object + * @stats: stats to return, binary OR of virDomainStats + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Convenience wrapper to get stats for a single domain. + * See virDomainListGetStats for more info. + * + * Returns an XML containing the requested stats or NULL on error. The + * returned string shall be freed by the caller. + */ +char * +virDomainGetStats(virDomainPtr dom, + unsigned int stats, + unsigned int flags) +{ + virDomainPtr doms[2] = {dom, NULL}; + + return virDomainListGetStats(doms, stats, flags); +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 9f4016a..5bb25ab 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -670,4 +670,11 @@ LIBVIRT_1.2.7 { virConnectGetDomainCapabilities; } LIBVIRT_1.2.6; +LIBVIRT_1.2.8 { + global: + virDomainListGetStats; + virDomainGetStats; + virConnectGetAllDomainStats; +} LIBVIRT_1.2.7; + # .... define new API here using predicted next version number .... -- 2.0.2

4 6

[libvirt] [libvirt-glib] [PATCH 0/4] Add more snapshot API
by mail＠baedert.org 19 Aug '14

19 Aug '14

From: Timm Bäder <mail(a)baedert.org> The following 4 patches add some more snapshot API to libvirt-glib. I wasn't sure where to put _revert_to really, the libvirt API sounds like it belongs into GVirDomain (i.e. gvir_domain_revert_to_snapshot), but virDomainRevertToSnapshot only takes a pointer to the snapshot. The implementation of gvir_domain_snapshot_set_config does not allow renaming of the snapshot as that will just create a new snapshot in any case (should that by documented?). But it looks like the same is true for gvir_domain_set_config? Timm Bäder (4): GVirDomainSnapshot: Add _is_current GVirDomainSnapshot: Add _revert_to GVirDomainSnapshot: Add _set_config GVirDomain: Add _has_current_snapshot libvirt-gobject/libvirt-gobject-domain-snapshot.c | 120 ++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain-snapshot.h | 26 +++++ libvirt-gobject/libvirt-gobject-domain.c | 30 ++++++ libvirt-gobject/libvirt-gobject-domain.h | 3 + libvirt-gobject/libvirt-gobject.sym | 4 + 5 files changed, 183 insertions(+) -- 2.0.3

5 19

[libvirt] [RFC] powerpc : Add support for VM in compat mode
by Prerna Saxena 19 Aug '14

19 Aug '14

PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. Eg,in compatibility mode, a POWER8 host can run a "Power7" VM,conforming to PowerISA v2.06, while a POWER7 host can run a "POWER6" VM, conforming to PowerISA v2.05. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commit 6d9412ea. Now, a "compat" mode VM can be run by invoking this qemu commandline on a POWER8 host: -cpu host,compat=power7 as against the older specification of "-cpu power7". However, running in compatibility mode is not identical to running natively on an older processor. Hence the virtualization stack needs to explicitly provide for a compat-mode VM. This patch allows libvirt to extend the "fallback" semantics of cpu model to describe this new mode for PowerKVM guests. Additionally with the new scheme of things, qemu doesn't provide a way to query for the supported compat models and models returned when querying with '-cpu ?' are no longer valid. Hence removing the check cpuModelIsAllowed() for now. When a user wants to request a power7 vm to run in compatibility mode on a Power8 host, this can be described in XML as follows : <cpu mode='custom' match='exact'> <model fallback='compat'>power7</model> </cpu> An alternative approach could be to leave the libvirt XML intact, and merely change the backend qemu command generation when the VM-requested cpu does not match the host processor. Looking forward to suggestions on how this can best be implemented.. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index ebdaa19..2f41bd7 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -47,7 +47,8 @@ VIR_ENUM_IMPL(virCPUMatch, VIR_CPU_MATCH_LAST, VIR_ENUM_IMPL(virCPUFallback, VIR_CPU_FALLBACK_LAST, "allow", - "forbid") + "forbid", + "compat") VIR_ENUM_IMPL(virCPUFeaturePolicy, VIR_CPU_FEATURE_LAST, "force", diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 8c932ce..50354f2 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -65,6 +65,7 @@ VIR_ENUM_DECL(virCPUMatch) typedef enum { VIR_CPU_FALLBACK_ALLOW, VIR_CPU_FALLBACK_FORBID, + VIR_CPU_FALLBACK_COMPAT, VIR_CPU_FALLBACK_LAST } virCPUFallback; diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index b220448..218c013 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -457,8 +457,8 @@ ppcCompare(virCPUDefPtr host, static int ppcDecode(virCPUDefPtr cpu, const virCPUData *data, - const char **models, - unsigned int nmodels, + const char **models ATTRIBUTE_UNUSED, + unsigned int nmodels ATTRIBUTE_UNUSED, const char *preferred ATTRIBUTE_UNUSED, unsigned int flags) { @@ -478,13 +478,6 @@ ppcDecode(virCPUDefPtr cpu, goto cleanup; } - if (!cpuModelIsAllowed(model->name, models, nmodels)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU model %s is not supported by hypervisor"), - model->name); - goto cleanup; - } - if (VIR_STRDUP(cpu->model, model->name) < 0 || (model->vendor && VIR_STRDUP(cpu->vendor, model->vendor->name) < 0)) { goto cleanup; @@ -498,7 +491,6 @@ ppcDecode(virCPUDefPtr cpu, return ret; } - static void ppcDataFree(virCPUDataPtr data) { @@ -561,8 +553,8 @@ ppcUpdate(virCPUDefPtr guest, static virCPUDefPtr ppcBaseline(virCPUDefPtr *cpus, unsigned int ncpus, - const char **models, - unsigned int nmodels, + const char **models ATTRIBUTE_UNUSED, + unsigned int nmodels ATTRIBUTE_UNUSED, unsigned int flags) { struct ppc_map *map = NULL; @@ -582,13 +574,6 @@ ppcBaseline(virCPUDefPtr *cpus, goto error; } - if (!cpuModelIsAllowed(model->name, models, nmodels)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU model %s is not supported by hypervisor"), - model->name); - goto error; - } - for (i = 0; i < ncpus; i++) { const struct ppc_vendor *vnd; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1d5bce6..94e9b78 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6176,7 +6176,9 @@ qemuBuildCpuArgStr(virQEMUDriverPtr driver, *hasHwVirt = hasSVM > 0 ? true : false; } - if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) { + if ((cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) || + ((cpu->mode == VIR_CPU_MODE_HOST_MODEL) && + (def->os.arch == VIR_ARCH_PPC64))) { const char *mode = virCPUModeTypeToString(cpu->mode); if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_HOST)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -6208,7 +6210,13 @@ qemuBuildCpuArgStr(virQEMUDriverPtr driver, if (cpuDecode(guest, data, (const char **)cpus, ncpus, preferred) < 0) goto cleanup; - virBufferAdd(&buf, guest->model, -1); + if (def->os.arch == VIR_ARCH_PPC64 && + cpu->fallback == VIR_CPU_FALLBACK_COMPAT) { + virBufferAddLit(&buf, "host"); + virBufferAsprintf(&buf, ",compat=%s", guest->model); + } else + virBufferAdd(&buf, guest->model, -1); + if (guest->vendor_id) virBufferAsprintf(&buf, ",vendor=%s", guest->vendor_id); for (i = 0; i < guest->nfeatures; i++) { -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 2

[libvirt] [PATCH] virsh: Fix comment for net-undefine
by Li Yang 19 Aug '14

19 Aug '14

net-undefine doesn't only undefine an inactive network, but also an active network(persistent), it just cannot undefine a transient network. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-network.c | 4 ++-- tools/virsh.pod | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index fc08b09..578abe0 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -798,10 +798,10 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_network_undefine[] = { {.name = "help", - .data = N_("undefine an inactive network") + .data = N_("undefine a persistent network") }, {.name = "desc", - .data = N_("Undefine the configuration for an inactive network.") + .data = N_("Undefine the configuration for a persistent network.") }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index f07deec..9efb920 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2557,7 +2557,8 @@ Start a (previously defined) inactive network. =item B<net-undefine> I<network> -Undefine the configuration for an inactive network. +Undefine the configuration for a persistent network. If the network is active, +make it to be transient. =item B<net-uuid> I<network-name> -- 1.7.1

2 1

[libvirt] [PATCH] driver: Move virDrvNetworkGetDHCPLeases to the appropriate section
by Peter Krempa 19 Aug '14

19 Aug '14

The prototype was along with domain API prototypes instead of network API ones. --- Notes: Pushed as trivial. src/driver.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/driver.h b/src/driver.h index c769675..158df79 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1190,11 +1190,6 @@ typedef int unsigned long long *counts, unsigned int flags); -typedef int -(*virDrvNetworkGetDHCPLeases)(virNetworkPtr network, - const char *mac, - virNetworkDHCPLeasePtr **leases, - unsigned int flags); typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1509,7 +1504,11 @@ typedef int typedef int (*virDrvNetworkIsPersistent)(virNetworkPtr net); - +typedef int +(*virDrvNetworkGetDHCPLeases)(virNetworkPtr network, + const char *mac, + virNetworkDHCPLeasePtr **leases, + unsigned int flags); typedef struct _virNetworkDriver virNetworkDriver; typedef virNetworkDriver *virNetworkDriverPtr; -- 2.0.2

1 0

[libvirt] [PATCH 1/1] virsh: add missing auto-converge option for 'migrate' in virsh man page
by Pradipta Kr. Banerjee 19 Aug '14

19 Aug '14

* tools/virsh.pod (migrate): Add --auto-converge flag Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- tools/virsh.pod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index b665d6e..d6849b8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1289,7 +1289,7 @@ to the I<uri> namespace is displayed instead of being modified. =item B<migrate> [I<--live>] [I<--offline>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>] -[I<--compressed>] [I<--abort-on-error>] +[I<--compressed>] [I<--abort-on-error>] [I<--auto-converge>] I<domain> I<desturi> [I<migrateuri>] [I<graphicsuri>] [I<listen-address>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] @@ -1314,7 +1314,8 @@ used to reject the migration if the hypervisor lacks change protection support. I<--verbose> displays the progress of migration. I<--compressed> activates compression of memory pages that have to be transferred repeatedly during live migration. I<--abort-on-error> cancels the migration if a soft -error (for example I/O error) happens during the migration. +error (for example I/O error) happens during the migration. I<--auto-converge> +forces convergence during live migration B<Note>: Individual hypervisors usually do not support all possible types of migration. For example, QEMU does not support direct migration. -- 1.9.3

2 1