- Devel - libvirt List Archives

Re: [libvirt] [Qemu-devel] [PATCH v4 03/14] audio: -audiodev command line option: documentation
by Thomas Huth 29 Jan '19

29 Jan '19

On 2019-01-28 23:43, Kővágó, Zoltán wrote: > This patch adds documentation of an -audiodev command line option, that > deprecates the old QEMU_* environment variables for audio backend > configuration. It's syntax is similar to existing options (-netdev, > -device, etc): > > -audiodev driver_name,property=value,... > > Although now it's possible to specify multiple -audiodev options on > command line, multiple audio backends are not supported yet. > > Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu(a)gmail.com> > --- > qemu-options.hx | 222 +++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 219 insertions(+), 3 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 521511ec13..a12931899b 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -416,14 +416,230 @@ The default is @code{en-us}. > ETEXI > > > +HXCOMM Deprecated by -audiodev > DEF("audio-help", 0, QEMU_OPTION_audio_help, > - "-audio-help print list of audio drivers and their options\n", > + "-audio-help show -audiodev equivalent of the currently specified audio settings\n", > QEMU_ARCH_ALL) Note that if you want to deprecate a parameter "officially" (in the sense that it could be removed in a future release), you also have to add an entry to qemu-deprecated.texi. But that could also be done in an additional patch later, so no need to respin just because of this. Thomas

1 0

[libvirt] [PATCH 0/5] Block job handling related fixes (blockdev-add saga)
by Peter Krempa 28 Jan '19

28 Jan '19

Fix the generated documentation and clean up a few corner cases in qemu's block job handling. Peter Krempa (5): lib: Fix docs generated for enum virDomainBlockJobType qemu: blockjob: Make sure that internal states are not reported as event qemu: blockjob: Mark job as started only when it's new qemu: Clear block copy mirror state explicitly qemu: Don't double-free disk->mirror if block commit initialization fails include/libvirt/libvirt-domain.h | 3 ++- src/qemu/qemu_blockjob.c | 7 ++++++- src/qemu/qemu_driver.c | 34 ++++++++++++++------------------ 3 files changed, 23 insertions(+), 21 deletions(-) -- 2.20.1

2 6

[libvirt] [PATCH] qmp: Deprecate query-nodes option of query-blockstats
by Anton Kuchin 28 Jan '19

28 Jan '19

This option is broken since a6baa60807 in v2.9 and returns mostly zeroes instead of real stats because actual querring of BlockStats that resides in blk is missing. And it makes no sense because with this option BlockDriverState-s are iterated but BlockAcctStats belong to BlockBackend and not BDS since 7f0e9da6f13 in v2.5 Signed-off-by: Anton Kuchin <antonkuchin(a)yandex-team.ru> --- block/qapi.c | 26 +++++++------------------- qapi/block-core.json | 8 +------- qemu-deprecated.texi | 5 +++++ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index c66f949db8..19d4b4ee42 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -502,8 +502,7 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) &ds->x_flush_latency_histogram); } -static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, - bool blk_level) +static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs) { BlockStats *s = NULL; @@ -517,7 +516,7 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, /* Skip automatically inserted nodes that the user isn't aware of in * a BlockBackend-level command. Stay at the exact node for a node-level * command. */ - while (blk_level && bs->drv && bs->implicit) { + while (bs->drv && bs->implicit) { bs = backing_bs(bs); assert(bs); } @@ -531,12 +530,12 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, if (bs->file) { s->has_parent = true; - s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level); + s->parent = bdrv_query_bds_stats(bs->file->bs); } - if (blk_level && bs->backing) { + if (bs->backing) { s->has_backing = true; - s->backing = bdrv_query_bds_stats(bs->backing->bs, blk_level); + s->backing = bdrv_query_bds_stats(bs->backing->bs); } return s; @@ -577,21 +576,10 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, { BlockStatsList *head = NULL, **p_next = &head; BlockBackend *blk; - BlockDriverState *bs; /* Just to be safe if query_nodes is not always initialized */ if (has_query_nodes && query_nodes) { - for (bs = bdrv_next_node(NULL); bs; bs = bdrv_next_node(bs)) { - BlockStatsList *info = g_malloc0(sizeof(*info)); - AioContext *ctx = bdrv_get_aio_context(bs); - - aio_context_acquire(ctx); - info->value = bdrv_query_bds_stats(bs, false); - aio_context_release(ctx); - - *p_next = info; - p_next = &info->next; - } + error_setg(errp, "Option query_nodes is deprecated"); } else { for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) { BlockStatsList *info; @@ -604,7 +592,7 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, } aio_context_acquire(ctx); - s = bdrv_query_bds_stats(blk_bs(blk), true); + s = bdrv_query_bds_stats(blk_bs(blk)); s->has_device = true; s->device = g_strdup(blk_name(blk)); diff --git a/qapi/block-core.json b/qapi/block-core.json index 91685be6c2..2dd5f6032c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -892,13 +892,7 @@ # # Query the @BlockStats for all virtual block devices. # -# @query-nodes: If true, the command will query all the block nodes -# that have a node name, in a list which will include "parent" -# information, but not "backing". -# If false or omitted, the behavior is as before - query all the -# device backends, recursively including their "parent" and -# "backing". Filter nodes that were created implicitly are -# skipped over in this mode. (Since 2.3) +# @query-nodes: deprecated since 3.2 # # Returns: A list of @BlockStats for each virtual block devices. # diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836..e1e04ced7d 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -112,6 +112,11 @@ Use ``device_add'' for hotplugging vCPUs instead of ``cpu-add''. See documentation of ``query-hotpluggable-cpus'' for additional details. +@subsection query-blockstats (since 3.2) + +"query-nodes" parameter is not supported anymore because blockstats +are not a prorerty of node. + @section Human Monitor Protocol (HMP) commands @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) -- 2.19.1

5 7

[libvirt] [PATCH] conf: Add check to avoid a NULL compare for SysfsPath
by Cheng Lin 28 Jan '19

28 Jan '19

If the two sysfs_path are both NULL, there may be an incorrect object returned for virNodeDeviceObjListFindBySysfsPath(). This check exists in old interface virNodeDeviceFindBySysfsPath(). e.g. virNodeDeviceFindBySysfsPath(virNodeDeviceObjListPtr devs, const char *sysfs_path) { ... if ((devs->objs[i]->def->sysfs_path != NULL) && (STREQ(devs->objs[i]->def->sysfs_path, sysfs_path))) { ... } Signed-off-by: Cheng Lin <cheng.lin130(a)zte.com.cn> --- src/conf/virnodedeviceobj.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index c8ad131..2e40de5 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -207,7 +207,8 @@ virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, int want = 0; virObjectLock(obj); - if (STREQ_NULLABLE(obj->def->sysfs_path, sysfs_path)) + if ((obj->def->sysfs_path != NULL) && + (STREQ_NULLABLE(obj->def->sysfs_path, sysfs_path))) want = 1; virObjectUnlock(obj); return want; -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: Assume migration with iscsi migration is safe
by Michal Privoznik 28 Jan '19

28 Jan '19

If a domain has a disk that is type='network' and protocol='iscsi' then there is no need to require @cache or UNSAFE migration flag. iscsi is a block device not a filesystem after all. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 52aa665640..9a7077f710 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1249,7 +1249,8 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def, else if (rc == 1) continue; } else if (disk->src->type == VIR_STORAGE_TYPE_NETWORK && - disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) { + (disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD || + disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)) { continue; } -- 2.19.2

2 1

[libvirt] [PATCH] lib: Use more of VIR_STEAL_PTR()
by Michal Privoznik 28 Jan '19

28 Jan '19

From: Your Name <you(a)example.com> We have this very handy macro called VIR_STEAL_PTR() which steals one pointer into the other and sets the other to NULL. The following coccinelle patch was used to create this commit: @ rule1 @ identifier a, b; @@ - b = a; ... - a = NULL; + VIR_STEAL_PTR(b, a); Some places were clean up afterwards to make syntax-check happy (e.g. some curly braces were removed where the body become a one liner). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_addr.c | 6 ++---- src/conf/domain_conf.c | 21 +++++++-------------- src/conf/secret_conf.c | 3 +-- src/conf/storage_conf.c | 3 +-- src/conf/virnetworkobj.c | 3 +-- src/conf/virsecretobj.c | 3 +-- src/libvirt-domain.c | 12 ++++-------- src/phyp/phyp_driver.c | 3 +-- src/qemu/qemu_domain.c | 6 ++---- src/qemu/qemu_driver.c | 12 ++++-------- src/qemu/qemu_migration.c | 12 ++++-------- src/security/virt-aa-helper.c | 3 +-- src/storage/storage_driver.c | 6 ++---- src/test/test_driver.c | 3 +-- src/util/virdbus.c | 18 ++++++------------ src/util/virrotatingfile.c | 3 +-- src/util/virstoragefile.c | 6 ++---- src/vz/vz_driver.c | 14 ++++---------- src/vz/vz_sdk.c | 6 ++---- tests/networkxml2conftest.c | 3 +-- tools/virsh-domain.c | 3 +-- tools/virsh-snapshot.c | 3 +-- 22 files changed, 50 insertions(+), 102 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 618fce44f0..04c4e6d7e1 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1757,8 +1757,7 @@ virDomainVirtioSerialAddrSetCreateFromDomain(virDomainDefPtr def) addrs) < 0) goto cleanup; - ret = addrs; - addrs = NULL; + VIR_STEAL_PTR(ret, addrs); cleanup: virDomainVirtioSerialAddrSetFree(addrs); return ret; @@ -2095,8 +2094,7 @@ virDomainUSBAddressHubNew(size_t nports) goto cleanup; hub->nports = nports; - ret = hub; - hub = NULL; + VIR_STEAL_PTR(ret, hub); cleanup: virDomainUSBAddressHubFree(hub); return ret; diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 22979e6c4e..9409d93c23 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7900,8 +7900,7 @@ virDomainNetIPParseXML(xmlNodePtr node) goto cleanup; } - ret = ip; - ip = NULL; + VIR_STEAL_PTR(ret, ip); cleanup: VIR_FREE(prefixStr); @@ -13482,10 +13481,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, goto error; } - if (!address) { - address = addressCompat; - addressCompat = NULL; - } + if (!address) + VIR_STEAL_PTR(address, addressCompat); } if (def->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET) { @@ -13497,10 +13494,8 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, goto error; } - if (!socketPath) { - socketPath = socketCompat; - socketCompat = NULL; - } + if (!socketPath) + VIR_STEAL_PTR(socketPath, socketCompat); } if (address && address[0] && @@ -14747,8 +14742,7 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xmlopt, goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: ctxt->node = save; VIR_FREE(tmp); @@ -16187,8 +16181,7 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, } } - ret = iommu; - iommu = NULL; + VIR_STEAL_PTR(ret, iommu); cleanup: ctxt->node = save; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 3a5aa72563..ca6cc194a2 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -193,8 +193,7 @@ secretXMLParseNode(xmlDocPtr xml, xmlNodePtr root) if (virXPathNode("./usage", ctxt) != NULL && virSecretDefParseUsage(ctxt, def) < 0) goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: VIR_FREE(prop); diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 55db7a96f5..ba5b1f1783 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -587,8 +587,7 @@ virStoragePoolDefParseSourceString(const char *srcSpec, node) < 0) goto cleanup; - ret = def; - def = NULL; + VIR_STEAL_PTR(ret, def); cleanup: virStoragePoolSourceFree(def); xmlFreeDoc(doc); diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e6b01388f5..3749dda751 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -602,8 +602,7 @@ virNetworkObjAssignDefLocked(virNetworkObjListPtr nets, obj->persistent = !(flags & VIR_NETWORK_OBJ_LIST_ADD_LIVE); } - ret = obj; - obj = NULL; + VIR_STEAL_PTR(ret, obj); cleanup: virNetworkObjEndAPI(&obj); diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 78911c0908..c4e7b06eca 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -394,8 +394,7 @@ virSecretObjListAdd(virSecretObjListPtr secrets, virObjectRef(obj); } - ret = obj; - obj = NULL; + VIR_STEAL_PTR(ret, obj); cleanup: virSecretObjEndAPI(&obj); diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 75c9014c0e..d919a44803 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3046,9 +3046,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, VIR_MIGRATE_AUTO_CONVERGE); VIR_DEBUG("Prepare3 %p flags=0x%x", dconn, destflags); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { if (virTypedParamsReplaceString(&params, &nparams, @@ -3111,9 +3110,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ VIR_DEBUG("Perform3 %p uri=%s", domain->conn, uri); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; /* dconnuri not relevant in non-P2P modes, so left NULL here */ if (useParams) { @@ -3150,9 +3148,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, */ VIR_DEBUG("Finish3 %p ret=%d", dconn, ret); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { if (virTypedParamsGetString(params, nparams, @@ -3227,9 +3224,8 @@ virDomainMigrateVersion3Full(virDomainPtr domain, if (notify_source) { VIR_DEBUG("Confirm3 %p ret=%d domain=%p", domain->conn, ret, domain); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { ret = domain->conn->driver->domainMigrateConfirm3Params diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 4acc6ce734..4ffa08ff43 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1468,8 +1468,7 @@ phypGetBackingDevice(virConnectPtr conn, const char *managed_system, if (VIR_STRDUP(backing_device, char_ptr) < 0) goto cleanup; } else { - backing_device = ret; - ret = NULL; + VIR_STEAL_PTR(backing_device, ret); } char_ptr = strchr(backing_device, '\n'); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f42903a343..6eeabe0df1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11645,8 +11645,7 @@ qemuDomainCreateDeviceRecursive(const char *device, } VIR_FREE(devTmp); VIR_FREE(target); - target = tmp; - tmp = NULL; + VIR_STEAL_PTR(target, tmp); } if (qemuDomainCreateDeviceRecursive(target, data, @@ -12601,8 +12600,7 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver, } VIR_FREE(fileTmp); VIR_FREE(target); - target = tmp; - tmp = NULL; + VIR_STEAL_PTR(target, tmp); } data.target = target; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d8e4618bd..5387150bbd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6655,11 +6655,9 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, virFreeError(err); /* use the user provided XML */ - ret = newdef; - newdef = NULL; + VIR_STEAL_PTR(ret, newdef); } else { - ret = newdef_migr; - newdef_migr = NULL; + VIR_STEAL_PTR(ret, newdef_migr); } cleanup: @@ -12705,10 +12703,8 @@ qemuDomainMigratePerform(virDomainPtr dom, goto cleanup; } - if (flags & VIR_MIGRATE_PEER2PEER) { - dconnuri = uri; - uri = NULL; - } + if (flags & VIR_MIGRATE_PEER2PEER) + VIR_STEAL_PTR(dconnuri, uri); /* Do not output cookies in v2 protocol, since the cookie * length was not sufficiently large, causing failures diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 950d9cd615..6c66ff6648 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4170,9 +4170,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, VIR_MIGRATE_AUTO_CONVERGE); VIR_DEBUG("Prepare3 %p", dconn); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { if (!(st = virStreamNew(dconn, 0))) @@ -4239,9 +4238,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, VIR_DEBUG("Perform3 %p uri=%s", sconn, NULLSTR(uri)); qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { ret = qemuMigrationSrcPerformTunnel(driver, vm, st, persist_xml, @@ -4281,9 +4279,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, */ VIR_DEBUG("Finish3 %p ret=%d", dconn, ret); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (useParams) { @@ -4362,9 +4359,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, */ VIR_DEBUG("Confirm3 %p cancelled=%d vm=%p", sconn, cancelled, vm); VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; ret = qemuMigrationSrcConfirmPhase(driver, vm, cookiein, cookieinlen, diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 56d7cfadf1..8e22e9978a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -355,8 +355,7 @@ create_profile(const char *profile, const char *profile_name, if (!(tmp = virStringReplace(pcontent, template_end, replace_files))) goto clean_all; VIR_FREE(pcontent); - pcontent = tmp; - tmp = NULL; + VIR_STEAL_PTR(pcontent, tmp); } /* write the file */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 4a13e90481..878a40cac5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1936,8 +1936,7 @@ storageVolCreateXML(virStoragePoolPtr pool, VIR_INFO("Creating volume '%s' in storage pool '%s'", newvol->name, def->name); - vol = newvol; - newvol = NULL; + VIR_STEAL_PTR(vol, newvol); voldef = NULL; cleanup: @@ -2130,8 +2129,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, VIR_INFO("Creating volume '%s' in storage pool '%s'", newvol->name, def->name); - vol = newvol; - newvol = NULL; + VIR_STEAL_PTR(vol, newvol); voldef = NULL; cleanup: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1d81772a46..568c52aa28 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5595,8 +5595,7 @@ testNodeDeviceCreateXML(virConnectPtr conn, if (VIR_STRDUP(dev->parentName, def->parent) < 0) goto cleanup; - ret = dev; - dev = NULL; + VIR_STEAL_PTR(ret, dev); cleanup: virNodeDeviceObjEndAPI(&obj); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 691f182387..6725e0edb0 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -762,8 +762,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen; narray = (size_t)va_arg(args, int); @@ -789,8 +788,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, VIR_FREE(newiter); goto cleanup; } - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = vsig; nstruct = strlen(types); narray = (size_t)-1; @@ -821,8 +819,7 @@ virDBusMessageIterEncode(DBusMessageIter *rootiter, goto cleanup; } VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen - 2; narray = (size_t)-1; @@ -1059,8 +1056,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct, narray) < 0) goto cleanup; VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen; if (arrayref) { @@ -1090,8 +1086,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, VIR_DEBUG("Push failed"); goto cleanup; } - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = vsig; nstruct = strlen(types); narray = (size_t)-1; @@ -1118,8 +1113,7 @@ virDBusMessageIterDecode(DBusMessageIter *rootiter, nstruct, narray) < 0) goto cleanup; VIR_FREE(contsig); - iter = newiter; - newiter = NULL; + VIR_STEAL_PTR(iter, newiter); types = t + 1; nstruct = skiplen - 2; narray = (size_t)-1; diff --git a/src/util/virrotatingfile.c b/src/util/virrotatingfile.c index d7dc3bd1ce..7a268319a6 100644 --- a/src/util/virrotatingfile.c +++ b/src/util/virrotatingfile.c @@ -406,8 +406,7 @@ virRotatingFileWriterRollover(virRotatingFileWriterPtr file) } VIR_FREE(nextpath); - nextpath = thispath; - thispath = NULL; + VIR_STEAL_PTR(nextpath, thispath); } } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bd4b0274df..70fe551e5f 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1233,8 +1233,7 @@ virStorageFileGetMetadataFromFD(const char *path, * update the metadata.*/ meta->type = VIR_STORAGE_TYPE_DIR; meta->format = VIR_STORAGE_FILE_DIR; - ret = meta; - meta = NULL; + VIR_STEAL_PTR(ret, meta); goto cleanup; } @@ -1256,8 +1255,7 @@ virStorageFileGetMetadataFromFD(const char *path, else if (S_ISBLK(sb.st_mode)) meta->type = VIR_STORAGE_TYPE_BLOCK; - ret = meta; - meta = NULL; + VIR_STEAL_PTR(ret, meta); cleanup: virStorageSourceFree(meta); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 7e9ef932dc..e86a788b09 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -182,12 +182,8 @@ vzDestroyDriverConnection(void) vzConnPtr privconn_list; virMutexLock(&vz_driver_lock); - driver = vz_driver; - vz_driver = NULL; - - privconn_list = vz_conn_list; - vz_conn_list = NULL; - + VIR_STEAL_PTR(driver, vz_driver); + VIR_STEAL_PTR(privconn_list, vz_conn_list); virMutexUnlock(&vz_driver_lock); while (privconn_list) { @@ -3203,9 +3199,8 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, VIR_MIGRATE_PARAM_DEST_XML, dom_xml) < 0) goto done; - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; virObjectUnlock(dom); ret = dconn->driver->domainMigratePrepare3Params @@ -3226,9 +3221,8 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom, } VIR_FREE(cookiein); - cookiein = cookieout; cookieinlen = cookieoutlen; - cookieout = NULL; + VIR_STEAL_PTR(cookiein, cookieout); cookieoutlen = 0; if (vzDomainMigratePerformStep(dom, driver, params, nparams, cookiein, cookieinlen, flags) < 0) { diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 63d013deac..b9fd03c0d2 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -928,8 +928,7 @@ prlsdkParseNetAddress(char *addr) goto cleanup; ip->prefix = nbits; - ret = ip; - ip = NULL; + VIR_STEAL_PTR(ret, ip); cleanup: if (!ret) @@ -4768,8 +4767,7 @@ prlsdkParseSnapshotTree(const char *treexml) goto cleanup; } - ret = snapshots; - snapshots = NULL; + VIR_STEAL_PTR(ret, snapshots); cleanup: virDomainSnapshotObjListFree(snapshots); diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 367e30b994..c362149c29 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -51,8 +51,7 @@ testCompareXMLToConfFiles(const char *inxml, const char *outconf, dnsmasqCapsPtr "except-interface=lo\n"))) goto fail; VIR_FREE(actual); - actual = tmp; - tmp = NULL; + VIR_STEAL_PTR(actual, tmp); #endif if (virTestCompareToFile(actual, outconf) < 0) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e63fc028b9..34f9e6b5c6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8423,8 +8423,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(desc); - desc = desc_edited; - desc_edited = NULL; + VIR_STEAL_PTR(desc, desc_edited); } if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e3d4cda0fc..6d8e2b299b 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1356,8 +1356,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, virshSnapSorter); snaplist->nsnaps -= deleted; - ret = snaplist; - snaplist = NULL; + VIR_STEAL_PTR(ret, snaplist); cleanup: virshSnapshotListFree(snaplist); -- 2.19.2

3 3

[libvirt] [PATCH] virfile: Detect ceph as shared FS
by Michal Privoznik 28 Jan '19

28 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1665553 Ceph can be mounted just like any other filesystem and in fact is a shared and cluster filesystem. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virfile.c | 9 ++++++++- src/util/virfile.h | 1 + src/util/virstoragefile.c | 3 ++- tests/virfiledata/mounts3.txt | 2 ++ tests/virfilemock.c | 5 +++++ tests/virfiletest.c | 1 + 6 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 263c92667c..271bf5e796 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3465,6 +3465,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...) # ifndef FUSE_SUPER_MAGIC # define FUSE_SUPER_MAGIC 0x65735546 # endif +# ifndef CEPH_SUPER_MAGIC +# define CEPH_SUPER_MAGIC 0x00C36400 +# endif # define PROC_MOUNTS "/proc/mounts" @@ -3607,6 +3610,9 @@ virFileIsSharedFSType(const char *path, if ((fstypes & VIR_FILE_SHFS_CIFS) && (f_type == CIFS_SUPER_MAGIC)) return 1; + if ((fstypes & VIR_FILE_SHFS_CEPH) && + (f_type == CEPH_SUPER_MAGIC)) + return 1; return 0; } @@ -3769,7 +3775,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_OCFS | VIR_FILE_SHFS_AFS | VIR_FILE_SHFS_SMB | - VIR_FILE_SHFS_CIFS); + VIR_FILE_SHFS_CIFS | + VIR_FILE_SHFS_CEPH); } diff --git a/src/util/virfile.h b/src/util/virfile.h index 93484e5444..65432da13a 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -220,6 +220,7 @@ enum { VIR_FILE_SHFS_AFS = (1 << 3), VIR_FILE_SHFS_SMB = (1 << 4), VIR_FILE_SHFS_CIFS = (1 << 5), + VIR_FILE_SHFS_CEPH = (1 << 6), }; int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index bd4b0274df..895c8f90de 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1359,7 +1359,8 @@ int virStorageFileIsClusterFS(const char *path) */ return virFileIsSharedFSType(path, VIR_FILE_SHFS_GFS2 | - VIR_FILE_SHFS_OCFS); + VIR_FILE_SHFS_OCFS | + VIR_FILE_SHFS_CEPH); } #ifdef LVS diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt index 134c6e8f81..68eded048c 100644 --- a/tests/virfiledata/mounts3.txt +++ b/tests/virfiledata/mounts3.txt @@ -33,3 +33,5 @@ host:/nfs /nfs nfs4 rw,relatime,vers=4.1,rsize=1048576,wsize=1048576,namlen=255, dev /nfs/blah devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=4093060,mode=755 0 0 host:/gv0 /gluster fuse.glusterfs rw 0 0 root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0 +192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 +192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 diff --git a/tests/virfilemock.c b/tests/virfilemock.c index fb6bd5e699..499135d773 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -86,6 +86,9 @@ setmntent(const char *filename, const char *type) #ifndef FUSE_SUPER_MAGIC # define FUSE_SUPER_MAGIC 0x65735546 #endif +#ifndef CEPH_SUPER_MAGIC +# define CEPH_SUPER_MAGIC 0x00c36400 +#endif static int @@ -132,6 +135,8 @@ statfs_mock(const char *mtab, ftype = CIFS_SUPER_MAGIC; } else if (STRPREFIX(mb.mnt_type, "fuse")) { ftype = FUSE_SUPER_MAGIC; + } else if (STRPREFIX(mb.mnt_type, "ceph")) { + ftype = CEPH_SUPER_MAGIC; } else { /* Everything else is EXT4. We don't care really for other paths. */ ftype = EXT4_SUPER_MAGIC; diff --git a/tests/virfiletest.c b/tests/virfiletest.c index b1cb831bfd..6cc599a81b 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -455,6 +455,7 @@ mymain(void) DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gluster/sshfs/file", false); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/some/symlink/file", true); + DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true); return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- 2.19.2

2 2

[libvirt] [PATCH 0/2] add debugcon-isa chardev guest interface
by Nikolay Shirokovskiy 28 Jan '19

28 Jan '19

It corresponds to QEMU's isa-debugcon device. It can be used to output debug info by firmware at least. I do not introduce capability to test for the device because it was supported long before current minimal 1.5.0 version. Nikolay Shirokovskiy (2): conf: add debugcon-isa chardev guest interface qemu: implement debugcon-isa chardev docs/formatdomain.html.in | 11 ++++++ docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 6 +++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 13 +++++++ src/qemu/qemu_domain.c | 20 +++++++++++ tests/qemuxml2argvdata/channel-debugcon-isa.args | 29 ++++++++++++++++ tests/qemuxml2argvdata/channel-debugcon-isa.xml | 34 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/channel-debugcon-isa.xml | 41 +++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/channel-debugcon-isa.args create mode 100644 tests/qemuxml2argvdata/channel-debugcon-isa.xml create mode 100644 tests/qemuxml2xmloutdata/channel-debugcon-isa.xml -- 1.8.3.1

6 13

[libvirt] [PATCH 0/3] Facilitate running libvirt builds via docker including cross-compilation
by Daniel P. Berrangé 28 Jan '19

28 Jan '19

For a while QEMU has provided simple make rules for building QEMU inside standard docker container environments. This provides an equivalent mechanism for libvirt inspired by QEMU's. This series depends on the cross compiler images defined by: https://www.redhat.com/archives/libvir-list/2019-January/msg01039.html QEMU actually builds the container images on developer's machines locally. Libvirt already hosts pre-built images on quay.io, so that is used directly as it is quicker to download these than build them locally each time. Daniel P. Berrangé (3): tests: add targets for building libvirt inside docker containers tests: add cross compiler images to CI test help output tests: perform cross compiler builds on GitLab CI .gitignore | 1 + .gitlab-ci.yml | 38 ++++++++++++ Makefile.am | 2 + tests/Makefile.ci.inc | 134 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 175 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 tests/Makefile.ci.inc -- 2.20.1

1 4

[libvirt] [PATCH v2 0/1] qemu_hotplug.c: check address before hotplug
by Daniel Henrique Barboza 26 Jan '19

26 Jan '19

Changes in v2: - removed the function to check for alias - added a new function to check for address in the VM definition Daniel Henrique Barboza (1): qemu_hotplug.c: check disk address before hotplug src/qemu/qemu_hotplug.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) -- 2.20.1

2 5

[libvirt] [PATCH 0/3] Fixes for GPL / LGPL statements
by Thomas Huth 25 Jan '19

25 Jan '19

Here are some fixes for files in libvirt where the GPL or LGPL statements are slightly wrong. Thomas Huth (3): bootstrap.conf: Fix LGPL information tools/virt-xml-validate: Fix GPL information docs/governance: Clarify the version number of the LGPL bootstrap.conf | 2 +- docs/governance.html.in | 2 +- tools/virt-xml-validate.in | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH 0/2] virjson improvements [incremental backup saga]
by Eric Blake 25 Jan '19

25 Jan '19

Upstream qemu stabilized the QMP command block-dirty-bitmap-merge to take an array of strings as the sources to merge into a destination bitmap; this is a lot nicer for libvirt, compared to the alternative where qemu 3.1 x-block-dirty-bitmap-merge had to be called multiple times with the potential for some odd cleanup after partial failure scenarios. This series prepares virjson for use in my incremental backup work. Eric Blake (2): virjson: always raise vir error on append failures virjson: add convenience wrapper for appending string to array src/util/virjson.h | 2 ++ src/libvirt_private.syms | 1 + src/util/virjson.c | 28 +++++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) -- 2.20.1

2 3

[libvirt] [PATCH] tools: Document completer callback
by Michal Privoznik 25 Jan '19

25 Jan '19

Strictly speaking, this should go near vshCompleter typedef declaration. However, I find it more useful near actual completer implementations. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-completer.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c index cfbfeae328..7a637a0cfa 100644 --- a/tools/virsh-completer.c +++ b/tools/virsh-completer.c @@ -35,6 +35,38 @@ #include "virxml.h" +/** + * A completer callback is a function that accepts three arguments: + * + * @ctl: virsh control structure + * @cmd: parsed input + * @flags: optional flags to alter completer's behaviour + * + * The @ctl contains connection to the daemon (should completer + * need it). Any completer that requires connection must check + * whether connection is still alive. + * + * The @cmd then holds parsed user input which might be missing + * some arguments (user is still typing the command), but may + * already contain important data. For instance if completer + * needs domain XML it may inspect @cmd to find --domain. Using + * existing wrappers is advised. If @cmd does not contain all + * necessary bits, completer might return sensible defaults (i.e. + * generic values not tailored to specific use case) or return + * NULL (i.e. no strings are offered to the user for completion). + * + * The @flags then contain .completer_flags value defined for + * each use or 0 if no .completer_flags were specified. If a + * completer is generic enough @flags can be used to alter it's + * behaviour. For instance, a completer to fetch names of domains + * can use @flags to return names of only domains in particular + * state that the command accepts. + * + * Under no circumstances a completer can output anything. Nor to + * stdout nor to stderr. This would harm the user experience. + */ + + char ** virshDomainNameCompleter(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED, -- 2.19.2

2 1

[libvirt] [PATCH v2 0/3] Rebase LXC network definition to support version 3.0
by Julio Faracco 24 Jan '19

24 Jan '19

The series propose a new way to define NICs inside LXC native. It is needed because LXC version 3.X uses indexes to define NICs and the current algorithm is not able to support them. At least, if you consider settings defined using a random logic. v1-v2: Includes Michal's suggestions. Julio Faracco (3): lxc: refactoring LXC network definition with a sparse array. tests: Change legacy network configs to version 3.0 with indexes. tests: Include a random network testcase to test indexes. src/lxc/lxc_native.c | 195 ++++++++++++------ .../lxcconf2xml-ethernet-v3.config | 16 +- .../lxcconf2xml-fstab-v3.config | 10 +- .../lxcconf2xml-macvlannetwork-v3.config | 10 +- .../lxcconf2xml-miscnetwork-v3.config | 38 ++-- .../lxcconf2xml-physnetwork-v3.config | 14 +- .../lxcconf2xml-simple-v3.config | 18 +- .../lxcconf2xml-vlannetwork-v3.config | 10 +- tests/lxcconf2xmltest.c | 1 + 9 files changed, 187 insertions(+), 125 deletions(-) -- 2.19.1

3 6

[libvirt] [PATCH] virPortAllocatorSetUsed: ignore port 0
by Ján Tomko 24 Jan '19

24 Jan '19

Similar to what commit 86dba8f3 did for virPortAllocatorRelease, ignore port 0 in virPortAllocatorSetUsed. For all the reasonable use cases the callers already check that the port is non-zero, however if the port from the XML overflows unsigned short and turns into 0, it can be set as used by virPortAllocatorSetUsed but not released by virPortAllocatorRelease. Also skip port '0' in virPortAllocatorSetUsed to make this behavior symmetric. The serenity was disturbed by commit 5dbda5e9 which started using virPortAllocatorRelease instead of virPortAllocatorSetUsed (false). https://bugzilla.redhat.com/show_bug.cgi?id=1591645 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/util/virportallocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index db95a601c7..d48963c1ff 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -294,6 +294,9 @@ virPortAllocatorSetUsed(unsigned short port) if (!pa) return -1; + if (!port) + return 0; + virObjectLock(pa); if (virBitmapIsBitSet(pa->bitmap, port) || -- 2.16.4

2 1

[libvirt] [PATCH] docs: Add more iscsi-direct references to storage pages
by John Ferlan 24 Jan '19

24 Jan '19

Found that it was missing in formatstorage and had a few typos in the storage driver page. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- noted while working on other stuff... Also although <initiator> is supported by the "iscsi" pool as well, it's not something ever documented since commit 6aabcb5bd (0.7.5). I could add a note that it's optional to use with the "iscsi" pool if desired. docs/formatstorage.html.in | 20 ++++++++++++++++---- docs/storage.html.in | 8 ++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index b6bf3edbd2..979e170c08 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -18,7 +18,9 @@ The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, <code>fs</code>, <code>netfs</code>, <code>disk</code>, - <code>iscsi</code>, <code>logical</code>, <code>scsi</code> + <code>iscsi</code>, + <code>iscsi-direct</code>(<span class="since">since 4.7.0</span>), + <code>logical</code>, <code>scsi</code> (all <span class="since">since 0.4.1</span>), <code>mpath</code> (<span class="since">since 0.7.1</span>), <code>rbd</code> (<span class="since">since 0.9.13</span>), <code>sheepdog</code> @@ -125,11 +127,12 @@ <dt><code>device</code></dt> <dd>Provides the source for pools backed by physical devices (pool types <code>fs</code>, <code>logical</code>, <code>disk</code>, - <code>iscsi</code>, <code>zfs</code>, <code>vstorage</code>). + <code>iscsi</code>, <code>iscsi-direct</code>, <code>zfs</code>, + <code>vstorage</code>). May be repeated multiple times depending on backend driver. Contains a required attribute <code>path</code> which is either the fully qualified path to the block device node or for <code>iscsi</code> - the iSCSI Qualified Name (IQN). + or <code>iscsi-direct</code> the iSCSI Qualified Name (IQN). <span class="since">Since 0.4.1</span> <p>An optional attribute <code>part_separator</code> for each <code>path</code> may be supplied. Valid values for the attribute @@ -334,6 +337,7 @@ <dt><code>host</code></dt> <dd>Provides the source for pools backed by storage from a remote server (pool types <code>netfs</code>, <code>iscsi</code>, + <code>iscsi-direct</code>, <code>rbd</code>, <code>sheepdog</code>, <code>gluster</code>). Will be used in combination with a <code>directory</code> or <code>device</code> element. Contains an attribute <code>name</code> @@ -348,11 +352,19 @@ server. See the <a href="storage.html">storage driver page</a> for any restrictions for specific storage backends. <span class="since">Since 0.4.1</span></dd> + <dt><code>initiator</code></dt> + <dd>Required by the <code>iscsi-direct</code> pool in order to provide + the iSCSI Qualified Name (IQN) to communicate with the pool's + <code>device</code> target IQN. There is one sub-element + <code>iqn</code> with the <code>name</code> attribute to describe + the IQN for the initiator. + <span class="since">Since 4.7.0</span></dd> <dt><code>auth</code></dt> <dd>If present, the <code>auth</code> element provides the authentication credentials needed to access the source by the setting of the <code>type</code> attribute (pool - types <code>iscsi</code>, <code>rbd</code>). The <code>type</code> + types <code>iscsi</code>, <code>iscsi-direct</code>, <code>rbd</code>). + The <code>type</code> must be either "chap" or "ceph". Use "ceph" for Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP (Challenge-Handshake Authentication Protocol) iSCSI diff --git a/docs/storage.html.in b/docs/storage.html.in index 9adcc2a87f..c8617aace5 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -437,9 +437,9 @@ <h2><a id="StorageBackendISCSIDirect">iSCSI direct pool</a></h2> <p> - This is a variant of the iSCSI pool. Instead of unsing iscsiadm, it uses + This is a variant of the iSCSI pool. Instead of using iscsiadm, it uses libiscsi. - It require a host, a path which is the target iqn and an initiator iqn. + It requires a host, a path which is the target IQN, and an initiator IQN. </p> <h3>Example pool input</h3> @@ -457,12 +457,12 @@ <h3>Valid pool format types</h3> <p> - The iSCSI volume pool does not use the pool format type element. + The iSCSI direct volume pool does not use the pool format type element. </p> <h3>Valid volume format types</h3> <p> - The iSCSI volume pool does not use the volume format type element. + The iSCSI direct volume pool does not use the volume format type element. </p> <h2><a id="StorageBackendSCSI">SCSI pool</a></h2> -- 2.20.1

2 1

[libvirt] [PATCH v3 00/11] Allow adding mountOpts to the storage pool mount command
by John Ferlan 24 Jan '19

24 Jan '19

v2: https://www.redhat.com/archives/libvir-list/2019-January/msg00164.html Changes since v2: * Split out the noexec, nodev, nosuid, and (new) ro into the first 3 patches as "known" or "supported" mount options that can be added. I avoided just adding them noexec, nodev, and nosuid by default. * Add patches 4-6 to essentially support the nfsvers option * The rest of the patches are reworked to add support for namespace at the pool level (as opposed to the v2 at the source level). John Ferlan (11): conf: Add some defined NFS Storage Pool mount options storage: Add mountOpts to the storage pool mount command line virsh: Add source-mount-opts for pool commands conf: Add optional NFS Source Pool <protocol ver='n'/> option storage: Add the nfsvers to the command line virsh: Add source-protocol-ver for pool commands conf: Introduce virStoragePoolXMLNamespace nfs: Add infrastructure to manage XML namespace options docs,tests: Add schema, description, and tests for NFS namespace storage: Add NFS storage pool namespace options to command line rbd: Utilize storage pool namespace to manage config options docs/formatstorage.html.in | 137 +++++++++++++++ docs/schemas/storagepool.rng | 70 ++++++++ src/conf/storage_conf.c | 120 ++++++++++++- src/conf/storage_conf.h | 40 +++++ src/libvirt_private.syms | 1 + src/storage/storage_backend_fs.c | 128 ++++++++++++++ src/storage/storage_backend_rbd.c | 166 +++++++++++++++++- src/storage/storage_util.c | 47 +++++ src/storage/storage_util.h | 14 ++ tests/Makefile.am | 4 +- .../pool-netfs-mountopts.argv | 1 + .../pool-netfs-ns-mountopts.argv | 2 + .../pool-netfs-protocol-ver.argv | 1 + tests/storagepoolxml2argvtest.c | 6 + .../pool-netfs-mountopts.xml | 24 +++ .../pool-netfs-ns-mountopts.xml | 29 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 17 ++ .../pool-netfs-mountopts.xml | 24 +++ .../pool-netfs-ns-mountopts.xml | 29 +++ .../pool-netfs-protocol-ver.xml | 21 +++ .../pool-rbd-ns-configopts.xml | 20 +++ tests/storagepoolxml2xmltest.c | 9 + tools/virsh-pool.c | 44 ++++- tools/virsh.pod | 10 ++ 25 files changed, 977 insertions(+), 8 deletions(-) create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-ns-mountopts.argv create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml create mode 100644 tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml -- 2.20.1

3 15

[libvirt] [PATCH 00/11] qemu: format CCID controllers after USB hubs
by Ján Tomko 24 Jan '19

24 Jan '19

https://bugzilla.redhat.com/show_bug.cgi?id=1599971 Ján Tomko (11): qemu: move out legacy USB controller formatting qemu: exit early if USB_CONTROLLER_MODEL_NONE is present Add qemuBuildDomainForbidLegacyUSBController qemu: separate counting of legacy USB controllers qemu: separate counting of USB controllers qemuBuildControllerDevStr: remove nusbcontroller argument qemu: Introduce qemuBuildControllersByTypeCommandLine qemu: format CCID controllers after USB hubs qemuBuildControllersByTypeCommandLine: free devstr in the cleanup section rename qemuBuildControllerDevCommandLine qemuBuildControllersCommandLine: use i instead of j as the counter src/qemu/qemu_command.c | 222 +++++++++++------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_hotplug.c | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- .../smartcard-controller.args | 2 +- .../smartcard-host-certificates-database.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 2 +- 13 files changed, 150 insertions(+), 97 deletions(-) -- 2.20.1

2 13

[libvirt] [python PATCH 0/3] travis: misc fixes to build
by Daniel P. Berrangé 24 Jan '19

24 Jan '19

Fix the travis build which has been broken for a while Daniel P. Berrangé (3): travis: remove python 2.6 and 3.6 from build matrix travis: switch from trusty to xenial dist travis: add testing of 5.0.0 release .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1

2 4

[libvirt] [PATCH v2 00/17] implement cgroups v2 devices support
by Pavel Hrdina 24 Jan '19

24 Jan '19

In cgroups v2 there is no devices controller, BPF should be used instead. Changes in v2: - fixed build on bsd and older kernels without cgroup BPF - cgroup bpf devices code moved to separate file Documentation for eBPF: <http://man7.org/linux/man-pages/man2/bpf.2.html> <https://www.kernel.org/doc/Documentation/networking/filter.txt> <https://docs.cilium.io/en/v1.3/bpf/> Pavel Hrdina (17): util: introduce virbpf helpers vircgroup: introduce virCgroupV2DevicesAvailable vircgroup: introduce virCgroupV2DevicesAttachProg vircgroup: introduce virCgroupV2DevicesDetectProg vircgroup: introduce virCgroupV2DevicesCreateProg vircgroup: introduce virCgroupV2DevicesPrepareProg vircgroup: introduce virCgroupV2DevicesRemoveProg vircgroup: introduce virCgroupV2DeviceGetPerms vircgroup: introduce virCgroupV2DevicesGetKey vircgroup: introduce virCgroupV2AllowDevice vircgroup: introduce virCgroupV2DenyDevice vircgroup: introduce virCgroupV2AllowAllDevices vircgroup: introduce virCgroupV2DenyAllDevices vircgroup: workaround devices in hybrid mode vircgroupv2: detech BPF program before removing cgroup vircgroupv2: use dummy process to workaround kernel bug with systemd vircgroupmock: mock virCgroupV2DevicesAvailable configure.ac | 6 + include/libvirt/virterror.h | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 27 ++ src/lxc/lxc_cgroup.c | 1 + src/qemu/qemu_cgroup.c | 6 +- src/util/Makefile.inc.am | 4 + src/util/virbpf.c | 437 +++++++++++++++++++++ src/util/virbpf.h | 271 +++++++++++++ src/util/vircgroup.c | 19 +- src/util/vircgroup.h | 1 + src/util/vircgroupbackend.h | 3 +- src/util/vircgrouppriv.h | 12 + src/util/vircgroupv1.c | 9 +- src/util/vircgroupv2.c | 119 +++++- src/util/vircgroupv2devices.c | 625 ++++++++++++++++++++++++++++++ src/util/vircgroupv2devices.h | 57 +++ src/util/virerror.c | 1 + src/util/virsystemd.c | 2 +- src/util/virsystemd.h | 2 + tests/vircgroupdata/hybrid.parsed | 2 +- tests/vircgroupmock.c | 7 + tests/vircgrouptest.c | 4 +- 23 files changed, 1608 insertions(+), 10 deletions(-) create mode 100644 src/util/virbpf.c create mode 100644 src/util/virbpf.h create mode 100644 src/util/vircgroupv2devices.c create mode 100644 src/util/vircgroupv2devices.h -- 2.20.1

3 25

[libvirt] [PATCH 0/3] Improve block job handling docs
by Peter Krempa 24 Jan '19

24 Jan '19

Modernize documentation for our APIs and clean up some old cruft. Some of those may be slightly controversial. Peter Krempa (3): qemu: Don't reject making domain persistent if block copy is running lib: Clarify that any block job may block VM save or device detach lib: domain: Emphasise that users should wait for block job READY state via events src/libvirt-domain.c | 33 +++++++++++++-------------------- src/qemu/qemu_driver.c | 6 ------ 2 files changed, 13 insertions(+), 26 deletions(-) -- 2.20.1

2 5

[libvirt] [PATCH v2 0/4] Restructure firewall rules for virtual networks into private chains
by Daniel P. Berrangé 24 Jan '19

24 Jan '19

v1: https://www.redhat.com/archives/libvir-list/2018-November/msg00018.html The virtual networks in NAT mode are supposed to only allow outbound network access for guests. Unfortunately due to ordering of the firewall rules libvirt creates, when you have multiple virtual networks, guests on the more recently created virtual networks can connect to guests on old virtual networks. This was reported way back in 2008 but we always thought the fix would be very complicated to deal with, so we've been putting it off forever. In parallel with this there's also been a long standing desire since 2009 to move our firewall rules out of the builtin chains, to libvirt private chains. This is to make it easier for admins to use hook scripts to setup rules in the builtin chains that take priority over rules libvirt creates. In implementing the changes to use private chains, I suddenly realized that fixing the network to network traffic blocking problem was trivial if I grouped the forwarding rules into three distinct sets. So this series finally fixes an annoying 10 year old bug, and implements a 9 year old RFE. It may take us a while, but we'll get to your bugs eventually ;-) Changed in v2: - Detect whether chains already exist before creating them - Only try to delete legacy rules from builtin chain during startup Daniel P. Berrangé (4): network: add platform driver callbacks around firewall reload util: pass layer into firewall query callback util: create private chains for virtual network firewall rules util: move virtual network firwall rules into private chains src/libvirt_private.syms | 2 + src/network/bridge_driver.c | 13 +- src/network/bridge_driver_linux.c | 32 +++ src/network/bridge_driver_nop.c | 11 + src/network/bridge_driver_platform.h | 3 + src/nwfilter/nwfilter_ebiptables_driver.c | 17 +- src/util/virfirewall.c | 2 +- src/util/virfirewall.h | 1 + src/util/viriptables.c | 254 +++++++++++++++--- src/util/viriptables.h | 4 + .../nat-default-linux.args | 32 +-- .../nat-ipv6-linux.args | 48 ++-- .../nat-many-ips-linux.args | 60 ++--- .../nat-no-dhcp-linux.args | 46 ++-- .../nat-tftp-linux.args | 34 +-- .../route-default-linux.args | 22 +- tests/virfirewalltest.c | 3 +- 17 files changed, 405 insertions(+), 179 deletions(-) -- 2.19.2

3 9

[libvirt] [PATCH 0/3] Some random fixes
by Michal Privoznik 24 Jan '19

24 Jan '19

*** BLURB HERE *** Michal Prívozník (3): virPCIGetNetName: Initialize @netname to NULL virpci: Fix memleak in virPCIDeviceIterDevices domain_conf: Free egl render node in virDomainGraphicsDefFree src/conf/domain_conf.c | 3 +++ src/util/virnetdev.c | 2 -- src/util/virpci.c | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.19.2

2 8

[libvirt] [PATCH] qemu-nbd: Deprecate qemu-nbd --partition
by Eric Blake 24 Jan '19

24 Jan '19

The existing qemu-nbd --partition code claims to handle logical partitions up to 8, since its introduction in 2008 (commit 7a5ca86). However, the implementation is bogus (actual MBR logical partitions form a sort of linked list, with one partition per extended table entry, rather than four logical partitions in a single extended table), making the code unlikely to work for anything beyond -P5 on actual guest images. What's more, the code does not support GPT partitions, which are becoming more popular, and maintaining device subsetting in both NBD and the raw device is unnecessary maintenance burden. And nbdkit has just added code to properly handle an arbitrary number of MBR partitions, along with its existing code for handling GPT partitions. Note that obtaining the offsets of a partition can be learned by using 'qemu-nbd -c /dev/nbd0 file.qcow2 && sfdisk --dump /dev/nbd0', but by the time you've done that, you might as well just mount /dev/nbd0p1 that the kernel creates for you. Start the clock on the deprecation cycle, with an example of how to write device subsetting without using -P. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- qemu-deprecated.texi | 27 +++++++++++++++++++++++++++ qemu-nbd.texi | 6 ++++-- qemu-nbd.c | 2 ++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 219206a836f..12f8b30943f 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -175,3 +175,30 @@ The above, converted to the current supported format: @subsubsection "irq": "" (since 3.0.0) The ``irq'' property is obsoleted. + +@section Related binaries + +@subsection qemu-nbd --partition (since 4.0.0) + +The ``qemu-nbd --partition $digit'' code (also spelled @option{-P}) +can only handle MBR partitions, and does not correctly handle logical +partitions beyond partition 5. If you know the relative position of +the partition (perhaps by using @code{sfdisk} or similar, either in +the guest or when mapping the entire device through /dev/nbd0 in the +host), you can achieve the effect of exporting just that subset of the +disk by use of the @option{--image-opts} option with a raw blockdev +using the @code{offset} and @code{size} parameters layered on top of +any other existing blockdev. + +For example, if partition 1 is 100MiB starting at 1MiB, the old command + +@example{qemu-nbd -P 1 -f qcow2 file.qcow2} + +can be rewritten as: + +@example{qemu-nbd --image-opts driver=raw,offset=1M,size=100M,file.driver=qcow2,file.backing.driver=file,file.backing.filename=file.qcow2} + +Alternatively, the @code{nbdkit} project provides a more powerful +partition filter on top of its nbd plugin, which can be used to select +an arbitrary MBR or GPT partition on top of any other full-image NBD +export. diff --git a/qemu-nbd.texi b/qemu-nbd.texi index 386bece4680..d0c51828149 100644 --- a/qemu-nbd.texi +++ b/qemu-nbd.texi @@ -56,8 +56,10 @@ auto-detecting. @item -r, --read-only Export the disk as read-only. @item -P, --partition=@var{num} -Only expose MBR partition @var{num}. Understands physical partitions -1-4 and logical partitions 5-8. +Deprecated: Only expose MBR partition @var{num}. Understands physical +partitions 1-4 and logical partition 5. New code should instead use +@option{--image-opts} with the raw driver wrapping a subset of the +original image. @item -B, --bitmap=@var{name} If @var{filename} has a qcow2 persistent bitmap @var{name}, expose that bitmap via the ``qemu:dirty-bitmap:@var{name}'' context diff --git a/qemu-nbd.c b/qemu-nbd.c index 1f7b2a03f5d..00c07fd27ea 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -787,6 +787,8 @@ int main(int argc, char **argv) flags &= ~BDRV_O_RDWR; break; case 'P': + warn_report("The '-P' option is deprecated; use --image-opts with " + "a raw device wrapper for subset exports instead"); if (qemu_strtoi(optarg, NULL, 0, &partition) < 0 || partition < 1 || partition > 8) { error_report("Invalid partition '%s'", optarg); -- 2.20.1

3 4

[libvirt] [PATCH] qemu: improve compile-time check of qemuBlockjobState mapping
by Eric Blake 23 Jan '19

23 Jan '19

Asserting the value we set four lines earlier in qemuBlockjobState doesn't buy us any safety (if the public header adds a value, we end up skipping that value without the compiler warning us of our gap); what we really want is to assert that the value auto-assigned by the compiler matches the actual last value in the public headers (as was done below for qemuBlockJobType). Add useful comments while at it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The spelling VIR_DOMAIN_BLOCK_JOB_LAST vs. VIR_DOMAIN_BLOCK_JOB_TYPE_LAST took me on a wild goose chase; the least I can do is make the code nicer for the next reader. src/qemu/qemu_blockjob.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index ed63f2c709..c7325c6daf 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -29,15 +29,17 @@ * This enum has to map all known block job states from enum virDomainBlockJobType * to the same values. All internal blockjobs can be mapped after and don't * need to have stable values. */ typedef enum { + /* Mapped to public enum */ QEMU_BLOCKJOB_STATE_COMPLETED = VIR_DOMAIN_BLOCK_JOB_COMPLETED, QEMU_BLOCKJOB_STATE_FAILED = VIR_DOMAIN_BLOCK_JOB_FAILED, QEMU_BLOCKJOB_STATE_CANCELLED = VIR_DOMAIN_BLOCK_JOB_CANCELED, QEMU_BLOCKJOB_STATE_READY = VIR_DOMAIN_BLOCK_JOB_READY, - QEMU_BLOCKJOB_STATE_NEW = VIR_DOMAIN_BLOCK_JOB_LAST, + /* Additional enum values local to qemu */ + QEMU_BLOCKJOB_STATE_NEW, QEMU_BLOCKJOB_STATE_RUNNING, QEMU_BLOCKJOB_STATE_LAST } qemuBlockjobState; verify((int)QEMU_BLOCKJOB_STATE_NEW == VIR_DOMAIN_BLOCK_JOB_LAST); @@ -45,15 +47,17 @@ verify((int)QEMU_BLOCKJOB_STATE_NEW == VIR_DOMAIN_BLOCK_JOB_LAST); * This enum has to map all known block job types from enum virDomainBlockJobType * to the same values. All internal blockjobs can be mapped after and don't * need to have stable values. */ typedef enum { + /* Mapped to public enum */ QEMU_BLOCKJOB_TYPE_NONE = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN, QEMU_BLOCKJOB_TYPE_PULL = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL, QEMU_BLOCKJOB_TYPE_COPY = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY, QEMU_BLOCKJOB_TYPE_COMMIT = VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT, QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT = VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT, + /* Additional enum values local to qemu */ QEMU_BLOCKJOB_TYPE_INTERNAL, QEMU_BLOCKJOB_TYPE_LAST } qemuBlockJobType; verify((int)QEMU_BLOCKJOB_TYPE_INTERNAL == VIR_DOMAIN_BLOCK_JOB_TYPE_LAST); -- 2.20.1

2 1

[libvirt] [PATCH v3 0/4] util: Fixing libvirt errors on cavium/thunder-nicvf
by dann frazier 23 Jan '19

23 Jan '19

Following up on my offer to take the baton[*], here's a v3 of this series that should address the provided feedback provided for Radoslaw's v2. ThunderX is Cavium SoC. This platform contain SRIOV NIC. Unlike other commonly known network devices it does not have VF functionality duplicated in its PF. PF is purely management device (on HW level). This creates several problems with existing libvirt code as in many places libvirt assumes that each VF netdev has PF netdev assigned. This patch series trying to address issues which can be easily fixed. (mostly bug fixes found while working on full featured solution) First patch in series is most important as it allows to unblock the netdev detection and use <hostdev> on this platform.i <interface type="hostdev" still does not work as it requires bigger changes both on netdev driver and in libvirt itself. More details about those issues can be found at: https://bugs.linaro.org/show_bug.cgi?id=3778 https://bugs.launchpad.net/charm-nova-compute/+bug/1771662 v3: - Reinstated error path in virNetDevGetPhysicalFunction() - Add missing free of *pfname in error path - Use proper < 0 comparisons when checking for errors v2: - error reporting taken out of virNetDevGetPhysicalFunction() and moved to calling function virNetDevGetVirtualFunctionInfo() - curly braces removed from single line - net-> model check removed as STREQ_NULLABLE() follows [*] https://www.redhat.com/archives/libvir-list/2019-January/msg00201.html Radoslaw Biernacki (4): util: fixing wrong assumption that PF has to have netdev assigned util: Code simplification util: Fix for NULL dereference util: Fixing invalid error checking from virPCIGetNetname() src/qemu/qemu_domain_address.c | 13 ++++---- src/util/virhostdev.c | 2 +- src/util/virnetdev.c | 55 ++++++++++++---------------------- 3 files changed, 25 insertions(+), 45 deletions(-) -- 2.20.1

3 9

[libvirt] [PATCH 0/2] apparmor: support named profiles
by Jim Fehlig 23 Jan '19

23 Jan '19

Upstream apparmor is switching to named profiles. Many profiles have already made the switch. Patch 1 changes the libvirtd profile to account for dnsmasq's switch to a named profile. Patch 2 is optional and changes the libvirtd profile to a named profile. It will need a bit of coorindation with upstream apparmor since the dnsmasq profile currently has 'peer=/usr/sbin/libvirtd'. Jim Fehlig (2): apparmor: Add support for named profiles apparmor: convert libvirtd profile to a named profile src/security/apparmor/usr.sbin.libvirtd | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.19.2

2 5

[libvirt] [PATCH 0/3] Update some recent/previous x86_64 qemu capabilities
by John Ferlan 23 Jan '19

23 Jan '19

The existing 2.12 and 3.1 caps are based on a pre-release RC, so update to at least the release version. The 3.0 caps were missing the sev-guest (as were the 3.1 caps), so hand massage the .replies output to make sure they're added. There really "should be" some way to do these automagically... With these in place review of Nikolay's upstream posting related to using l2 cache will be "cleaner"... John Ferlan (3): qemu: Update x86_64 QEMU 2.12.0 capabilities qemu: Update x86_64 QEMU 3.0.0 capabilities qemu: Update x86_64 QEMU 3.1.0 capabilities .../qemu_2.12.0.x86_64.xml | 37 +- .../caps_2.12.0.x86_64.replies | 513 +++++++++--------- .../caps_2.12.0.x86_64.xml | 182 ++----- .../caps_3.0.0.x86_64.replies | 73 +-- .../caps_3.0.0.x86_64.xml | 19 +- .../caps_3.1.0.x86_64.replies | 93 ++-- .../caps_3.1.0.x86_64.xml | 28 +- 7 files changed, 412 insertions(+), 533 deletions(-) -- 2.20.1

4 8

[libvirt] [PATCH] libxl: Set current memory value after successful balloon
by Jim Fehlig 23 Jan '19

23 Jan '19

The libxl driver does not set the new memory value in the active domain def after a successful balloon. This results in the old memory value in <currentMemory>. E.g. virsh dumpxml test | grep currentMemory <currentMemory unit='KiB'>20971520</currentMemory> virsh setmem test 16777216 --live virsh dumpxml test | grep currentMemory <currentMemory unit='KiB'>20971520</currentMemory> Set the new memory value in active domain def after a successful call to libxl_set_memory_target(). Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e30c9891d2..f11597b0d7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1676,6 +1676,7 @@ libxlDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, " with libxenlight"), vm->def->id); goto endjob; } + vm->def->mem.cur_balloon = newmem; } if (flags & VIR_DOMAIN_MEM_CONFIG) { -- 2.19.2

2 1

[libvirt] [PATCH] qemu-options: Remove deprecated "-virtioconsole" option
by Thomas Huth 23 Jan '19

23 Jan '19

It's been deprecated since QEMU 3.0, and nobody complained so far, so it is time to remove this option now. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/qdev-device-use.txt | 4 ---- include/hw/boards.h | 1 - qemu-deprecated.texi | 5 ---- qemu-options.hx | 10 -------- vl.c | 61 +----------------------------------------------- 5 files changed, 1 insertion(+), 80 deletions(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 98229b3..cc53e97 100644 --- a/docs/qdev-device-use.txt +++ b/docs/qdev-device-use.txt @@ -190,10 +190,6 @@ The appropriate DEVNAME depends on the machine type. For type "pc": -device usb-braille,chardev=braille -chardev braille,id=braille -* -virtioconsole becomes - -device virtio-serial-pci,class=C,vectors=V,ioeventfd=IOEVENTFD,max_ports=N - -device virtconsole,is_console=NUM,nr=NR,name=NAME - LEGACY-CHARDEV translates to -chardev HOST-OPTS... as follows: * null becomes -chardev null diff --git a/include/hw/boards.h b/include/hw/boards.h index f82f284..5df67d2 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -181,7 +181,6 @@ struct MachineClass { int default_cpus; unsigned int no_serial:1, no_parallel:1, - use_virtcon:1, no_floppy:1, no_cdrom:1, no_sdcard:1, diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 72b8191..5cc18b4 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -60,11 +60,6 @@ The @code{--no-frame} argument works with SDL 1.2 only. The other user interfaces never implemented this in the first place. So this will be removed together with SDL 1.2 support. -@subsection -virtioconsole (since 3.0.0) - -Option @option{-virtioconsole} has been replaced by -@option{-device virtconsole}. - @subsection -clock (since 3.0.0) The @code{-clock} option is ignored since QEMU version 1.7.0. There is no diff --git a/qemu-options.hx b/qemu-options.hx index 269eda7..5330603 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3635,16 +3635,6 @@ character to Control-t. @end table ETEXI -DEF("virtioconsole", HAS_ARG, QEMU_OPTION_virtiocon, \ - "-virtioconsole c\n" \ - " set virtio console\n", QEMU_ARCH_ALL) -STEXI -@item -virtioconsole @var{c} -@findex -virtioconsole -Set virtio console. -This option is deprecated, please use @option{-device virtconsole} instead. -ETEXI - DEF("show-cursor", 0, QEMU_OPTION_show_cursor, \ "-show-cursor show cursor\n", QEMU_ARCH_ALL) STEXI diff --git a/vl.c b/vl.c index a5ae5f2..595d610 100644 --- a/vl.c +++ b/vl.c @@ -164,7 +164,6 @@ int no_frame; static int num_serial_hds; static Chardev **serial_hds; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; -Chardev *virtcon_hds[MAX_VIRTIO_CONSOLES]; int win2k_install_hack = 0; int singlestep = 0; int smp_cpus; @@ -215,7 +214,6 @@ bool xen_domid_restrict; static int has_defaults = 1; static int default_serial = 1; static int default_parallel = 1; -static int default_virtcon = 1; static int default_monitor = 1; static int default_floppy = 1; static int default_cdrom = 1; @@ -236,8 +234,6 @@ static struct { { .driver = "ide-drive", .flag = &default_cdrom }, { .driver = "scsi-cd", .flag = &default_cdrom }, { .driver = "scsi-hd", .flag = &default_cdrom }, - { .driver = "virtio-serial-pci", .flag = &default_virtcon }, - { .driver = "virtio-serial", .flag = &default_virtcon }, { .driver = "VGA", .flag = &default_vga }, { .driver = "isa-vga", .flag = &default_vga }, { .driver = "cirrus-vga", .flag = &default_vga }, @@ -2374,7 +2370,6 @@ struct device_config { DEV_BT, /* -bt */ DEV_SERIAL, /* -serial */ DEV_PARALLEL, /* -parallel */ - DEV_VIRTCON, /* -virtioconsole */ DEV_DEBUGCON, /* -debugcon */ DEV_GDB, /* -gdb, -s */ DEV_SCLP, /* s390 sclp */ @@ -2472,39 +2467,6 @@ static int parallel_parse(const char *devname) return 0; } -static int virtcon_parse(const char *devname) -{ - QemuOptsList *device = qemu_find_opts("device"); - static int index = 0; - char label[32]; - QemuOpts *bus_opts, *dev_opts; - - if (strcmp(devname, "none") == 0) - return 0; - if (index == MAX_VIRTIO_CONSOLES) { - error_report("too many virtio consoles"); - exit(1); - } - - bus_opts = qemu_opts_create(device, NULL, 0, &error_abort); - qemu_opt_set(bus_opts, "driver", "virtio-serial", &error_abort); - - dev_opts = qemu_opts_create(device, NULL, 0, &error_abort); - qemu_opt_set(dev_opts, "driver", "virtconsole", &error_abort); - - snprintf(label, sizeof(label), "virtcon%d", index); - virtcon_hds[index] = qemu_chr_new_mux_mon(label, devname); - if (!virtcon_hds[index]) { - error_report("could not connect virtio console" - " to character backend '%s'", devname); - return -1; - } - qemu_opt_set(dev_opts, "chardev", label, &error_abort); - - index++; - return 0; -} - static int debugcon_parse(const char *devname) { QemuOpts *opts; @@ -3546,15 +3508,6 @@ int main(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_virtiocon: - warn_report("This option is deprecated, " - "use '-device virtconsole' instead"); - add_device_config(DEV_VIRTCON, optarg); - default_virtcon = 0; - if (strncmp(optarg, "mon:", 4) == 0) { - default_monitor = 0; - } - break; case QEMU_OPTION_parallel: add_device_config(DEV_PARALLEL, optarg); default_parallel = 0; @@ -4171,9 +4124,6 @@ int main(int argc, char **argv, char **envp) if (!has_defaults || machine_class->no_parallel) { default_parallel = 0; } - if (!has_defaults || !machine_class->use_virtcon) { - default_virtcon = 0; - } if (!has_defaults || machine_class->no_floppy) { default_floppy = 0; } @@ -4206,8 +4156,7 @@ int main(int argc, char **argv, char **envp) * usage, -nographic is just a no-op in this case. */ if (nographic - && (default_parallel || default_serial - || default_monitor || default_virtcon)) { + && (default_parallel || default_serial || default_monitor)) { error_report("-nographic cannot be used with -daemonize"); exit(1); } @@ -4224,13 +4173,9 @@ int main(int argc, char **argv, char **envp) add_device_config(DEV_PARALLEL, "null"); if (default_serial && default_monitor) { add_device_config(DEV_SERIAL, "mon:stdio"); - } else if (default_virtcon && default_monitor) { - add_device_config(DEV_VIRTCON, "mon:stdio"); } else { if (default_serial) add_device_config(DEV_SERIAL, "stdio"); - if (default_virtcon) - add_device_config(DEV_VIRTCON, "stdio"); if (default_monitor) monitor_parse("stdio", "readline", false); } @@ -4241,8 +4186,6 @@ int main(int argc, char **argv, char **envp) add_device_config(DEV_PARALLEL, "vc:80Cx24C"); if (default_monitor) monitor_parse("vc:80Cx24C", "readline", false); - if (default_virtcon) - add_device_config(DEV_VIRTCON, "vc:80Cx24C"); } #if defined(CONFIG_VNC) @@ -4473,8 +4416,6 @@ int main(int argc, char **argv, char **envp) exit(1); if (foreach_device_config(DEV_PARALLEL, parallel_parse) < 0) exit(1); - if (foreach_device_config(DEV_VIRTCON, virtcon_parse) < 0) - exit(1); if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0) exit(1); -- 1.8.3.1

2 3

[libvirt] [PATCH v3 0/5] add disk driver metadata_cache_size option
by Nikolay Shirokovskiy 23 Jan '19

23 Jan '19

As this patch series only works with -blockdev configurations it is better to be pushed only after -blockdev is supported. Then 'news' and 'xml' patch need to be updated to have correct libvirt version. Diff from v2 [1]: ================= - move caps patch to top - add news patch - add _CAPPED to capabilitity name to distinguish from correspondent qemu capabilitiy - better option explanation in formatdomain.html - misc tests/english fixes as suggested We have come to agreement with John in mailing list to support QEMU versions which do not let use INT64_MAX as "maximum" value. But this will require changing qemuBlockStorageSourceGetFormatQcow2Props and a lot of other functions signature (which was not noticed during conversation). Thus I don't add such a functionality. Anyway the patch requires -blockdev from QEMU so we could only support single QEMU 3.0 version. [1] https://www.redhat.com/archives/libvir-list/2018-November/msg00313.html Nikolay Shirokovskiy (5): qemu: caps: add QEMU_CAPS_QCOW2_L2_CACHE_SIZE_CAPPED xml: add disk driver metadata_cache_size option qemu: support metadata-cache-size for blockdev news: add notice for new metadata cache size policy option DO NOT APPLY: add xml2argv test for metadata_cache_size docs/formatdomain.html.in | 11 ++++++ docs/news.xml | 11 ++++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 17 +++++++++ src/conf/domain_conf.h | 9 +++++ src/qemu/qemu_block.c | 5 ++- src/qemu/qemu_capabilities.c | 5 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 23 ++++++++++++ src/qemu/qemu_domain.c | 2 ++ src/util/virstoragefile.c | 1 + src/util/virstoragefile.h | 1 + .../qemuxml2argvdata/disk-metadata_cache_size.args | 39 ++++++++++++++++++++ .../qemuxml2argvdata/disk-metadata_cache_size.xml | 35 ++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../disk-metadata_cache_size.xml | 41 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 17 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-metadata_cache_size.args create mode 100644 tests/qemuxml2argvdata/disk-metadata_cache_size.xml create mode 100644 tests/qemuxml2xmloutdata/disk-metadata_cache_size.xml -- 1.8.3.1

2 12

[libvirt] [PATCH v2] virt-aa-helper: generate rules for gl enabled graphics devices
by Christian Ehrhardt 23 Jan '19

23 Jan '19

This adds the virt-aa-helper support for gl enabled graphics devices to generate rules for the needed rendernode paths. Example in domain xml: <graphics type='spice'> <gl enable='yes' rendernode='/dev/dri/bar'/> </graphics> results in: "/dev/dri/bar" rw, Special cases are: - multiple devices with rendernodes -> all are added - non explicit rendernodes -> follow recently added virHostGetDRMRenderNode - rendernode without opengl (in egl-headless for example) -> still add the node Updates in V2: - avoid leaking rendernode - logically group patch hunks - drop base /dev/dri access - simplify detection of the need for a default rendernode - add tests in tests/virt-aa-helper-test - rebased to recent master Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1757085 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 12 ++++++++++++ tests/virt-aa-helper-test | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 64a425671d..a84dd5a8c9 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1062,6 +1062,18 @@ get_files(vahControl * ctl) for (i = 0; i < ctl->def->ngraphics; i++) { virDomainGraphicsDefPtr graphics = ctl->def->graphics[i]; size_t n; + const char *rendernode = virDomainGraphicsGetRenderNode(graphics); + + if (rendernode) + vah_add_file(&buf, rendernode, "rw"); + else + if (virDomainGraphicsNeedsAutoRenderNode(graphics)) { + char * defaultRenderNode = virHostGetDRMRenderNode(); + if (defaultRenderNode) { + vah_add_file(&buf, defaultRenderNode, "rw"); + VIR_FREE(defaultRenderNode); + } + } for (n = 0; n < graphics->nListens; n++) { virDomainGraphicsListenDef listenObj = graphics->listens[n]; diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index fb400574dc..6e674bfe5c 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -378,6 +378,12 @@ testme "0" "input dev passthrough" "-r -u $valid_uuid" "$test_xml" "$disk2.*rw,$ sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,<memory>524288</memory>,<memory>1048576</memory>,g" -e "s,</devices>,<memory model='nvdimm'><source><path>$disk2</path></source><target><size unit='KiB'>524288</size><node>0</node></target></memory></devices>,g" "$template_xml" > "$test_xml" testme "0" "nvdimm" "-r -u $valid_uuid" "$test_xml" "$disk2.*rw,$" +sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<graphics type='egl-headless'><gl rendernode='/dev/dri/testegl1'/></graphics></devices>,g" "$template_xml" > "$test_xml" +testme "0" "dri egl" "-r -u $valid_uuid" "$test_xml" "/dev/dri/testegl1.*rw,$" + +sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<graphics type='spice'><gl enable='yes' rendernode='/dev/dri/testegl2'/></graphics></devices>,g" "$template_xml" > "$test_xml" +testme "0" "dri spice" "-r -u $valid_uuid" "$test_xml" "/dev/dri/testegl2.*rw,$" + testme "0" "help" "-h" echo "" >$output -- 2.17.1

3 4

[libvirt] [PATCH python] rpm spec: remove %{extra_release} from spec
by Daniel P. Berrangé 22 Jan '19

22 Jan '19

The %{extra_release} field was previously populated by data from the old autobuild.sh file but is no longer used. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a trivial patch libvirt-python.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 21dc713..5bcf1eb 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -34,7 +34,7 @@ Summary: The libvirt virtualization API python2 binding Name: libvirt-python Version: @PY_VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org License: LGPLv2+ -- 2.20.1

2 1

[libvirt] [PATCH 0/4] Couple of apparmor related fixes
by Michal Privoznik 22 Jan '19

22 Jan '19

Firstly, the virt-aa-helper was never installed under /usr/lib or /usr/lib64. Since it's introduction it lives under /usr/libexec and therefore the profile name should reflect that. Secondly, the profile misses some binaries we use. And lastly, some other internal binaries are misplaced in the profile. Michal Prívozník (4): apparmor: Fix parthelper, iohelper and virt-aa-helper paths in profiles apparmor: Allow libvirt to spawn virt-aa-helper and libvirt_lxc docs: Fix virt-aa-helper location apparmor: Rename virt-aa-helper profile docs/drvqemu.html.in | 2 +- src/security/Makefile.inc.am | 10 +++++----- ...bvirt.virt-aa-helper => usr.libexec.virt-aa-helper} | 6 +++--- src/security/apparmor/usr.sbin.libvirtd | 6 ++++-- 4 files changed, 13 insertions(+), 11 deletions(-) rename src/security/apparmor/{usr.lib.libvirt.virt-aa-helper => usr.libexec.virt-aa-helper} (90%) -- 2.19.2

3 11

[libvirt] [PATCH 00/10] RFC: conf: partially net model enum conversion
by Cole Robinson 22 Jan '19

22 Jan '19

This series is base on my virtio-transitional work, since it touches a lot of the same code: https://www.redhat.com/archives/libvir-list/2019-January/msg00593.html This series partially converts the net->model value from a string to an enum. We wrap the existing ->model string in accessor functions, rename it to ->modelstr, add a ->model enum, and convert internal driver usage bit by bit. At the end, all driver code that is acting on specific network model values is comparing against an enum, not a string. This is only partial because of xen/libxl/xm and qemu drivers, which if they don't know anything particular about the model string will just place it on the qemu command line/xen config and see what happens. So basically if I were to pass in <model type='idontexist'/> qemu would turn that into -device idontexist,... That behavior is untouched by this series. Unwinding it will take some thought. For starters would be populating the enum with any qemu/xen network model that a user could realistically have a working config with. Then maybe tainting the VM if modelstr is used. Then after some time the final round could be causing domains to fail to start, but not fail to parse, so they don't disappear on upgrade but still break in an obvious way that will generate complaints/bugreports. But we should agree on a plan for it. Other caveats: * vz and bhyve drivers are not compile tested * vmx and virtualbox drivers previously would do a case insensitive compare on the model value passed in via the user XML. Current patches don't preserve that. I don't know how much it matters for these drivers for reading fresh XML vs roundtrip XML from converted native formats (which _will_ correct the case issue). If we want to fix this we will need to tolower() the modelstr value in the XML parser. I think there's a gnulib function for it but I haven't explored it deeply Cole Robinson (10): tests: Add several net model passthrough tests conf: net: Add wrapper functions for <model> value conf: net: Rename 'model' to 'modelstr' conf: net: Add model enum, and netfront value vz: convert to net model enum bhyve: convert to net model enum qemu: Partially convert to net model enum vmx: convert to net model enum vbox: Convert to net enum model conf: Add VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING src/bhyve/bhyve_command.c | 15 +-- src/bhyve/bhyve_parse_command.c | 10 +- src/conf/domain_conf.c | 105 ++++++++++++++---- src/conf/domain_conf.h | 35 +++++- src/libvirt_private.syms | 4 + src/libxl/libxl_conf.c | 8 +- src/libxl/libxl_domain.c | 1 + src/qemu/qemu_command.c | 33 +++--- src/qemu/qemu_domain.c | 32 +++--- src/qemu/qemu_domain_address.c | 14 +-- src/qemu/qemu_driver.c | 14 ++- src/qemu/qemu_hotplug.c | 15 ++- src/qemu/qemu_parse_command.c | 5 +- src/security/virt-aa-helper.c | 3 +- src/vbox/vbox_common.c | 29 +++-- src/vmx/vmx.c | 55 ++++----- src/vz/vz_driver.c | 7 +- src/vz/vz_sdk.c | 17 ++- src/xenconfig/xen_common.c | 31 +++--- src/xenconfig/xen_sxpr.c | 30 ++--- tests/qemuxml2argvdata/net-many-models.args | 39 +++++++ tests/qemuxml2argvdata/net-many-models.xml | 37 ++++++ tests/qemuxml2argvtest.c | 1 + tests/xlconfigdata/test-net-fakemodel.cfg | 24 ++++ tests/xlconfigdata/test-net-fakemodel.xml | 39 +++++++ tests/xlconfigtest.c | 1 + .../test-paravirt-net-fakemodel.cfg | 13 +++ .../test-paravirt-net-fakemodel.xml | 40 +++++++ .../test-paravirt-net-modelstr.cfg | 13 +++ tests/xmconfigtest.c | 1 + .../xml2sexpr-fv-net-many-models.sexpr | 1 + .../xml2sexpr-fv-net-many-models.xml | 43 +++++++ tests/xml2sexprtest.c | 1 + 33 files changed, 534 insertions(+), 182 deletions(-) create mode 100644 tests/qemuxml2argvdata/net-many-models.args create mode 100644 tests/qemuxml2argvdata/net-many-models.xml create mode 100644 tests/xlconfigdata/test-net-fakemodel.cfg create mode 100644 tests/xlconfigdata/test-net-fakemodel.xml create mode 100644 tests/xmconfigdata/test-paravirt-net-fakemodel.cfg create mode 100644 tests/xmconfigdata/test-paravirt-net-fakemodel.xml create mode 100644 tests/xmconfigdata/test-paravirt-net-modelstr.cfg create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml -- 2.20.1

2 13

[libvirt] [PATCH 0/2] qemu: Improve and document states handled in qemuProcessHandleAcpiOstInfo
by Peter Krempa 22 Jan '19

22 Jan '19

We did not handle all the possible error states of memory unplug. Add more ACPI table documentation and fix the code to conform to it. Peter Krempa (2): qemu: process: Improve documentation of values handled by qemuProcessHandleAcpiOstInfo qemu: process: Handle all failure values for dimms in qemuProcessHandleAcpiOstInfo src/qemu/qemu_process.c | 44 +++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) -- 2.20.1

3 4

[libvirt] [PATCH] rpm spec: remove %{extra_release} from spec
by Daniel P. Berrangé 22 Jan '19

22 Jan '19

The %{extra_release} field was previously populated by data from the old autobuild.sh file but is no longer used. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 567721f424..2e572e2a01 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -214,7 +214,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} License: LGPLv2+ URL: https://libvirt.org/ diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 7c7ab4146d..249abb8475 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -35,7 +35,7 @@ Name: mingw-libvirt Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ -- 2.20.1

2 3

[libvirt] [PATCH] virt-aa-helper: generate rules for gl enabled graphics devices
by Christian Ehrhardt 22 Jan '19

22 Jan '19

This adds the virt-aa-helper support for gl enabled graphics devices to generate rules for the needed rendernode paths. Example in domain xml: <graphics type='spice'> <gl enable='yes' rendernode='/dev/dri/bar'/> </graphics> results in: "/dev/dri" r, "/dev/dri/bar" rw, Special cases are: - multiple devices with rendernodes -> all are added - non explicit rendernodes -> follow recently added virHostGetDRMRenderNode - rendernode without opengl (in egl-headless for example) -> still add the node Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1757085 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 64a425671d..327a8a0202 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -938,7 +938,7 @@ get_files(vahControl * ctl) size_t i; char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; - bool needsVfio = false, needsvhost = false; + bool needsVfio = false, needsvhost = false, needDefaultRenderNode = false; /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); @@ -1062,6 +1062,10 @@ get_files(vahControl * ctl) for (i = 0; i < ctl->def->ngraphics; i++) { virDomainGraphicsDefPtr graphics = ctl->def->graphics[i]; size_t n; + const char *rendernode = virDomainGraphicsGetRenderNode(graphics); + + if (rendernode) + vah_add_file(&buf, rendernode, "rw"); for (n = 0; n < graphics->nListens; n++) { virDomainGraphicsListenDef listenObj = graphics->listens[n]; @@ -1071,6 +1075,20 @@ get_files(vahControl * ctl) vah_add_file(&buf, listenObj.socket, "rw")) goto cleanup; } + + if (graphics->data.spice.gl == VIR_TRISTATE_BOOL_YES) { + if (!rendernode) + needDefaultRenderNode = true; + } + } + + if (virDomainGraphicsDefHasOpenGL(ctl->def)) + vah_add_file(&buf, "/dev/dri", "r"); + + if (needDefaultRenderNode) { + const char *rendernode = virHostGetDRMRenderNode(); + if (rendernode) + vah_add_file(&buf, virHostGetDRMRenderNode(), "rw"); } if (ctl->def->ngraphics == 1 && -- 2.17.1

3 4

[libvirt] [PATCHv2 0/8]
by Ján Tomko 22 Jan '19

22 Jan '19

For: https://bugzilla.redhat.com/show_bug.cgi?id=1602418 v1: https://www.redhat.com/archives/libvir-list/2019-January/msg00490.html v2: * fixed memory leaks pointed out by John in v1 Patches without R-b: [4/8] cowardly refused to unref the private data in Secret.*Destroy [8/8] fixed the logic to include checking whether the domain actually has a VNC graphics and amended the commit message Ján Tomko (8): conf: introduce virDomainGraphicsNew conf: add privateData to virDomainGraphicsDef qemu: add qemuDomainGraphicsPrivate data with a tlsAlias qemu: prepare secret for the graphics upfront qemu_process: fix debug message qemu.conf: add vnc_tls_x509_secret_uuid qemu: add support for encrypted VNC TLS keys qemu: error out when vnc vncTLSx509secretUUID is unsupported src/conf/domain_conf.c | 30 ++++- src/conf/domain_conf.h | 5 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 + src/qemu/qemu_command.c | 19 +++- src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 107 ++++++++++++++++++ src/qemu/qemu_domain.h | 13 +++ src/qemu/qemu_process.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + ...graphics-vnc-tls-secret.x86_64-latest.args | 36 ++++++ .../graphics-vnc-tls-secret.xml | 30 +++++ tests/qemuxml2argvtest.c | 5 + 14 files changed, 250 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml -- 2.20.1

2 10

[libvirt] [PATCH] docs: use JavaScript based PolicyKit .rules files
by Mark McLoughlin 21 Jan '19

21 Jan '19

PolicyKit authentication rules have switched to a JavaScript based format quite some time ago. See: http://davidz25.blogspot.com/2012/06/authorization-rules-in-polkit.html While backwards compat for the old .pkla format is still available, it makes sense to point people first at the new format. The SSHPolicyKitSetup wiki page seems pretty stale, so remove the reference to it. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- docs/auth.html.in | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index afd6cd7f9b..33afe0a8ad 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -184,15 +184,29 @@ Default policy will still allow any application to connect to the RO socket. </p> <p> The default policy can be overridden by creating a new policy file in the -local override directory <code>/etc/polkit-1/localauthority/50-local.d/</code>. -Policy files should have a unique name ending with .pkla. Using reverse DNS -naming works well. Information on the options available can be found by -reading the pklocalauthority man page. The two libvirt daemon actions -available are named <code>org.libvirt.unix.manage</code> for full management -access, and <code>org.libvirt.unix.monitor</code> for read-only access. +<code>/etc/polkit-1/rules.d</code> directory. Information on the options +available can be found by reading the <code>polkit(8)</code> man page. The +two libvirt actions are named <code>org.libvirt.unix.manage</code> for full +management access, and <code>org.libvirt.unix.monitor</code> for read-only +access. +</p> + <p> +As an example, creating <code>/etc/polkit-1/rules.d/80-libvirt-manage.rules</code> +with the following gives the user <code>fred</code> full management access +when accessing from an active local session: </p> +<pre>polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.unix.manage" && + subject.local && subject.active && subject.user == "fred") { + return polkit.Result.YES; + } +});</pre> <p> -As an example, this gives the user <code>fred</code> full management access: +Older versions of PolicyKit used policy files ending with .pkla in the +local override directory <code>/etc/polkit-1/localauthority/50-local.d/</code>. +Compatibility with this older format is provided by <a +href="https://pagure.io/polkit-pkla-compat">polkit-pkla-compat</a>. As an +example, this gives the user <code>fred</code> full management access: </p> <pre>[Allow fred libvirt management permissions] Identity=unix-user:fred @@ -200,10 +214,6 @@ Action=org.libvirt.unix.manage ResultAny=yes ResultInactive=yes ResultActive=yes</pre> - <p> -Further examples of PolicyKit setup can be found on the -<a href="http://wiki.libvirt.org/page/SSHPolicyKitSetup">wiki page</a>. - </p> <h2><a id="ACL_server_sasl">SASL pluggable authentication</a></h2> <p> -- 2.20.1

2 1

[libvirt] [PATCH 0/2] qemu: Don't format 'cache' for empty cdroms
by Peter Krempa 21 Jan '19

21 Jan '19

See patch 2/2 for explanation. Peter Krempa (2): tests: qemuxml2argv: Add test case for empty CDROM with cache mode qemu: command: Don't format image properties for empty -drive src/qemu/qemu_command.c | 47 ++++++++++--------- tests/qemuxml2argvdata/disk-cdrom.args | 6 ++- .../disk-cdrom.x86_64-2.12.0.args | 9 ++-- .../disk-cdrom.x86_64-latest.args | 9 ++-- tests/qemuxml2argvdata/disk-cdrom.xml | 6 +++ tests/qemuxml2xmloutdata/disk-cdrom.xml | 6 +++ 6 files changed, 52 insertions(+), 31 deletions(-) -- 2.20.1

3 9

[libvirt] [PATCH 0/4] qemu_conf: use VIR_AUTOFREE in the recently created
by Ján Tomko 21 Jan '19

21 Jan '19

Ján Tomko (4): virQEMUDriverConfigLoadProcessEntry: use VIR_AUTOFREE virQEMUDriverConfigLoadNVRAMEntry: use VIR_AUTOFREE virQEMUDriverConfigLoadSecurityEntry: use VIR_AUTOFREE virQEMUDriverConfigLoadSWTPMEntry: use VIR_AUTOFREE src/qemu/qemu_conf.c | 131 +++++++++++++++++++++------------------------------ 1 file changed, 55 insertions(+), 76 deletions(-) -- 2.16.4

2 8

[libvirt] [PATCH] rpm spec: don't assume %{fedora} exists as a macro
by Daniel P. Berrangé 21 Jan '19

21 Jan '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed under the "fix the previous build breaker fix" rule :-( Sorry. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 567721f424..823f0753ae 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -110,7 +110,7 @@ %endif # Ceph dropping support for 32-bit hosts -%if 0%{fedora} >= 30 +%if 0%{?fedora} >= 30 %ifarch %{arm} %{ix86} %define with_storage_rbd 0 %endif -- 2.20.1

2 1

[libvirt] [PATCH] config-post: Remove duplicated 'undef WITH_CAPNG'
by Radostin Stoyanov 21 Jan '19

21 Jan '19

Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- config-post.h | 1 - 1 file changed, 1 deletion(-) diff --git a/config-post.h b/config-post.h index dd4ef8fc0b..54731feff7 100644 --- a/config-post.h +++ b/config-post.h @@ -69,7 +69,6 @@ # undef WITH_VIRTUALPORT # undef WITH_SECDRIVER_SELINUX # undef WITH_SECDRIVER_APPARMOR -# undef WITH_CAPNG #endif /* LIBVIRT_NSS */ #ifndef __GNUC__ -- 2.20.1

2 1

[libvirt] [PATCH 0/8] qemu: VNC: support encrypted server TLS keys
by Ján Tomko 21 Jan '19

21 Jan '19

Applies on top of my qemu.conf cleanups: https://www.redhat.com/archives/libvir-list/2019-January/msg00401.html https://bugzilla.redhat.com/show_bug.cgi?id=1602418 Ján Tomko (8): conf: introduce virDomainGraphicsNew conf: add privateData to virDomainGraphicsDef qemu: add qemuDomainGraphicsPrivate data with a tlsAlias qemu: prepare secret for the graphics upfront qemu_process: fix debug message qemu.conf: add vnc_tls_x509_secret_uuid qemu: add support for encrypted VNC TLS keys qemu: error out when vnc vncTLSx509secretUUID is unsupported src/conf/domain_conf.c | 27 ++++- src/conf/domain_conf.h | 5 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++ src/qemu/qemu_command.c | 19 +++- src/qemu/qemu_conf.c | 3 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 102 ++++++++++++++++++ src/qemu/qemu_domain.h | 13 +++ src/qemu/qemu_process.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + ...graphics-vnc-tls-secret.x86_64-latest.args | 36 +++++++ .../graphics-vnc-tls-secret.xml | 30 ++++++ tests/qemuxml2argvtest.c | 5 + 14 files changed, 241 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/graphics-vnc-tls-secret.xml -- 2.20.1

2 19

[libvirt] [PATCH] rpm spec: disable ceph on 32-bit architectures
by Daniel P. Berrangé 21 Jan '19

21 Jan '19

Ceph in upstream and Fedora has dropped support for building on host architectures which are 32-bit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for RPM builds libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index b04cf53eb8..567721f424 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -109,6 +109,12 @@ %define with_storage_zfs 0 %endif +# Ceph dropping support for 32-bit hosts +%if 0%{fedora} >= 30 + %ifarch %{arm} %{ix86} + %define with_storage_rbd 0 + %endif +%endif # RHEL doesn't ship OpenVZ, VBox, PowerHypervisor, # VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), -- 2.20.1

1 0

[libvirt] [PATCH] qemu: fix i6300esb watchdog hotplug on Q35
by Laine Stump 18 Jan '19

18 Jan '19

When commit 361c8dc17 added support for hotplugging the i6300esb watchdog device (first in libvirt-3.9.0), it accidentally contstructed the commandline for the device_add command before allocating a PCI address for the device. With no PCI address specified in the command, the watchdog would simply be placed at the lowest unused PCI slot. On a 440fx guest, this doesn't cause a problem, because libvirt's PCI address allocation algorithm would most likely give the same address anyway (usually a slot on pci-root), so nobody noticed the omission of address from the command. But on a Q35 guest, the lowest unused PCI slot is on pcie-root, which doesn't support hotplug; libvirt knows enough to assign a PCI address that is on a pcie-to-pci-bridge (because its slots *do* support hotplug), but qemu doesn't, so if there is no PCI address in the command, qemu just tries to plug the new device into pcie-root, and fails because it doesn't support hotplug, e.g.: error: Failed to attach device from watchdog.xml error: internal error: unable to execute QEMU command 'device_add': Bus 'pcie.0' does not support hotplugging The solution is simply to build the command string after assigning a PCI address, not before. Resolves: https://bugzilla.redhat.com/1666559 Signed-off-by: Laine Stump <laine(a)laine.org> --- src/qemu/qemu_hotplug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a1c3ca999b..40c693483e 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3280,9 +3280,6 @@ qemuDomainAttachWatchdog(virQEMUDriverPtr driver, if (qemuAssignDeviceWatchdogAlias(watchdog) < 0) return -1; - if (!(watchdogstr = qemuBuildWatchdogDevStr(vm->def, watchdog, priv->qemuCaps))) - return -1; - if (watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) { if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) goto cleanup; @@ -3294,6 +3291,9 @@ qemuDomainAttachWatchdog(virQEMUDriverPtr driver, goto cleanup; } + if (!(watchdogstr = qemuBuildWatchdogDevStr(vm->def, watchdog, priv->qemuCaps))) + goto cleanup; + /* QEMU doesn't have a 'dump' action; we tell qemu to 'pause', then libvirt listens for the watchdog event, and we perform the dump ourselves. so convert 'dump' to 'pause' for the qemu cli */ -- 2.20.1

2 1

[libvirt] ANNOUNCE: libvirt-dbus 1.3.0 released
by Pavel Hrdina 18 Jan '19

18 Jan '19

I'm happy to announce the release of libvirt-dbus 1.3.0. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. You can download it here: https://libvirt.org/sources/dbus/libvirt-dbus-1.3.0.tar.xz * New features - Support for all relevant interface APIs up to libvirt 3.0.0 * Bug fixes - Storage volumes and with special characters in the name are now correctly listed * Build-system improvements - Detect flake8 automatically - Install daemon under @sbindir@ - Fix version check for dependencies Thanks everybody who contributed! Pavel

1 0

[libvirt] [PATCH 00/23] Clean up qemu.conf parsing
by Ján Tomko 18 Jan '19

18 Jan '19

Remove the odd three-phase defaults filling for TLS cert dirs and split out the huge function into smaller ones based on the entry groups in the augeas file. Ján Tomko (23): qemu: fix double space in augeas file qemu: group swtpm entry in augeas file qemu.conf: fill out TLS verify attributes after parsing qemu: fill out usage-specific TLS settings after parsing qemu_conf: split out virQEMUDriverConfigLoadSWTPMEntry qemu_conf: split out virQEMUDriverConfigLoadMemoryEntry qemu_conf: split out virQEMUDriverConfigLoadSecurityEntry qemu_conf: split out virQEMUDriverConfigLoadGlusterDebugEntry qemu_conf: split out virQEMUDriverConfigLoadNVRAMEntry qemu_conf: split out virQEMUDriverConfigLoadLogEntry qemu_conf: split out virQEMUDriverConfigLoadNetworkEntry qemu_conf: split out virQEMUDriverConfigLoadRPCEntry qemu_conf: split out virQEMUDriverConfigLoadDeviceEntry qemu_conf: split out virQEMUDriverConfigLoadProcessEntry qemu_conf: split out virQEMUDriverConfigLoadSaveEntry qemu_conf: split out virQEMUDriverConfigLoadRemoteDisplayEntry qemu_conf: split out virQEMUDriverConfigLoadSpecificTLS qemu_conf: split out virQEMUDriverConfigLoadSPICEEntry qemu_conf: split out virQEMUDriverConfigLoadNographicsEntry qemu_conf: split out virQEMUDriverConfigLoadVNCEntry qemu_conf: split out virQEMUDriverConfigLoadDefaultTLSEntry qemu_conf: rename checkdefaultTLSx509certdir qemu_conf: fix stray space src/qemu/libvirtd_qemu.aug | 9 +- src/qemu/qemu_conf.c | 751 +++++++++++++++++++++++-------------- src/qemu/qemu_conf.h | 8 +- src/qemu/qemu_driver.c | 3 + 4 files changed, 480 insertions(+), 291 deletions(-) -- 2.20.1

2 52

[libvirt] [PATCH v1 1/1] qemu_hotplug.c: assert disk->info.alias unique before hotplug
by Daniel Henrique Barboza 18 Jan '19

18 Jan '19

In a case where we want to hotplug the following disk: <disk type='file' device='disk'> (...) <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> In a QEMU guest that has a single OS disk, as follows: <disk type='file' device='disk'> (...) <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> What happens is that the existing guest disk will receive the ID 'scsi0-0-0-0' due to how Libvirt calculate the alias based on the address in qemu_alias.c, qemuAssignDeviceDiskAlias. When hotplugging a disk that happens to have the same address, Libvirt will calculate the same ID to it and attempt to device_add. QEMU will refuse it: $ virsh attach-device dhb hp-disk-dup.xml error: Failed to attach device from hp-disk-dup.xml error: internal error: unable to execute QEMU command 'device_add': Duplicate ID 'scsi0-0-0-0' for device And Libvirt follows it up with a cleanup code in qemuDomainAttachDiskGeneric that ends up removing what supposedly is a faulty hotplugged disk but, in this case, ends up being the original guest disk. This happens because Libvirt doesn't differentiate the error received by QMP device_add. An argument can be made for how QMP device_add should provide a different error code for this scenario. A quicker way to solve the problem is presented in this patch: let us check the generated alias against the aliases already presented in the disks in the VM definition. If a match happens, error out without calling device_add. After this patch, this is the result of the previous attach-device call: $ ./run tools/virsh attach-device dhb ~/hp-disk-dup.xml [sudo] password for danielhb: error: Failed to attach device from /home/danielhb/hp-disk-dup.xml error: operation failed: attached disk conflicts with existing device id 'scsi0-0-0-0' Reported-by: Srikanth Aithal <bssrikanth(a)in.ibm.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- src/qemu/qemu_hotplug.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a1c3ca999b..7c770211ab 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -875,6 +875,27 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver, } +/** + * qemuDomainDeviceAliasIsUnique: + * + * Searches the existing domain disks to check if a given alias is + * unique. */ +static bool +qemuDomainDeviceAliasIsUnique(virDomainDefPtr def, char *alias) +{ + int idx; + + for (idx = (def->ndisks - 1); idx >= 0; idx--) { + if (def->disks[idx]->info.alias && + (strcmp(def->disks[idx]->info.alias, alias) == 0)) { + + return false; + } + } + return true; +} + + /** * qemuDomainAttachDiskGeneric: * @@ -897,6 +918,13 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0) goto error; + if (!qemuDomainDeviceAliasIsUnique(vm->def, disk->info.alias)) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("attached disk conflicts with existing " + "device id '%s'"), disk->info.alias); + goto error; + } + if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0) goto error; -- 2.20.1

2 2