- Devel - libvirt List Archives

[libvirt PATCH] qemu: allow passt to self-daemonize
by Laine Stump 14 Feb '23

14 Feb '23

I initially had the passt process being started in an identical fashion to the slirp-helper - libvirt was daemonizing the new process and recording its pid in a pidfile. The problem with this is that, since it is daemonized immediately, any startup error in passt happens after the daemonization, and thus isn't seen by libvirt - libvirt believes that the process has started successfully and continues on its merry way. The result was that sometimes a guest would be started, but there would be no passt process for qemu to use for network traffic. Instead, we should be starting passt in the same manner we start dnsmasq - we just exec it as normal (along with a request that passt create the pidfile, which is just another option on the passt commandline) and wait for the child process to exit; passt then has a chance to parse its commandline and complete all the setup prior to daemonizing itself; if it encounters an error and exits with a non-0 code, libvirt will see the code and know about the failure. We can then grab the output from stderr, log that so the "user" has some idea of what went wrong, and then fail the guest startup. Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/qemu/qemu_passt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index 0f09bf3db8..f640a69c00 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -141,24 +141,23 @@ qemuPasstStart(virDomainObj *vm, g_autofree char *passtSocketName = qemuPasstCreateSocketPath(vm, net); g_autoptr(virCommand) cmd = NULL; g_autofree char *pidfile = qemuPasstCreatePidFilename(vm, net); + g_autofree char *errbuf = NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; size_t i; pid_t pid = (pid_t) -1; int exitstatus = 0; int cmdret = 0; - VIR_AUTOCLOSE errfd = -1; cmd = virCommandNew(PASST); virCommandClearCaps(cmd); - virCommandSetPidFile(cmd, pidfile); - virCommandSetErrorFD(cmd, &errfd); - virCommandDaemonize(cmd); + virCommandSetErrorBuffer(cmd, &errbuf); virCommandAddArgList(cmd, "--one-off", "--socket", passtSocketName, "--mac-addr", virMacAddrFormat(&net->mac, macaddr), + "--pid", pidfile, NULL); if (net->mtu) { @@ -264,7 +263,7 @@ qemuPasstStart(virDomainObj *vm, if (cmdret < 0 || exitstatus != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not start 'passt'. exitstatus: %d"), exitstatus); + _("Could not start 'passt': %s"), errbuf); goto error; } -- 2.39.1

6 14

Plans for the next release
by Jiri Denemark 14 Feb '23

14 Feb '23

We are getting close to the next release of libvirt. To aim for the release on Mar 01 I suggest entering the freeze on Wednesday Feb 22 and tagging RC2 on Monday Feb 27. I hope this works for everyone. Jirka

1 0

[PATCH] feature: Ceph rbd create with data pool attributes set support.
by Guozhonghua 14 Feb '23

14 Feb '23

In some cases, we may use another pool to store the data and one pool to store the meta data of the rbd vol, so it is to use another interface to create the rbd vol, rbd_create4, required. This patch add the feature with xml configure is like as below: <source> <host name='xxx.xxx.xxx.xxx' port='6789'/> <host name='xxx.xxx.xxx.xxx' port='6789'/> <name>rbd_pool</name> <auth type='ceph' username='user_name'> <secret uuid='972327af-360b-4a68-9b0f-99dec10a05dc'/> </auth> <rbdimageoption format='x' feature='x' order='x' stripeunit='x' stripecount='x' journalorder='x' journalpool='x' featureset='x' featureclear='x' datapool='x' flatten='x' cloneformat=' mirrorimagemode=''/> </source> Here we add one item rbdimageoption to set the attributions used when create rbd vol. If the option is not set, then the origin interface rbd_create is called as before. Signed-off-by: Guozhonghua <guozh88(a)chinatelecom.cn> --- src/conf/storage_conf.c | 205 ++++++++++++++++++++++++++++++ src/conf/storage_conf.h | 33 +++++ src/storage/storage_backend_rbd.c | 123 +++++++++++++++++- 3 files changed, 358 insertions(+), 3 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index f5a9636ce2..ac6c700ac1 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -461,6 +461,14 @@ virStoragePoolSourceDeviceClear(virStoragePoolSourceDevice *dev) } +void +virRbdImageOptionClear(virRbdImageOptionsPtr rbd_image_option) +{ + VIR_FREE(rbd_image_option->journal_pool); + VIR_FREE(rbd_image_option->data_pool); +} + + void virStoragePoolSourceClear(virStoragePoolSource *source) { @@ -484,6 +492,7 @@ virStoragePoolSourceClear(virStoragePoolSource *source) VIR_FREE(source->vendor); VIR_FREE(source->product); VIR_FREE(source->protocolVer); + virRbdImageOptionClear(&source->rbdImageOptions); } @@ -514,6 +523,131 @@ virStoragePoolDefFree(virStoragePoolDef *def) } +int +virRbdImageOptionParseXML(virRbdImageOptionsPtr rbd_image_option, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + char *val = NULL; + + ctxt->node = node; + + rbd_image_option->format = -1; + if ((val = virXMLPropString(node, "format"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->format) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->feature = -1; + if ((val = virXMLPropString(node, "feature"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->feature) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->order = -1; + if ((val = virXMLPropString(node, "order"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->order) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->stripe_unit = -1; + if ((val = virXMLPropString(node, "stripeunit"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->stripe_unit) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->stripe_count = -1; + if ((val = virXMLPropString(node, "stripecount"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->stripe_count) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->journal_order = -1; + if ((val = virXMLPropString(node, "journalorder"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->journal_order) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->journal_splay_width = -1; + if ((val = virXMLPropString(node, "journalsplaywidth"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->journal_splay_width) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->journal_pool = virXMLPropString(node, "journalpool"); + + rbd_image_option->feature_set = -1; + if ((val = virXMLPropString(node, "featureset"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->feature_set) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->feature_clear = -1; + if ((val = virXMLPropString(node, "featureclear"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->feature_clear) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->data_pool = virXMLPropString(node, "datapool"); + + rbd_image_option->flatten = -1; + if ((val = virXMLPropString(node, "flatten"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->flatten) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->clone_format = -1; + if ((val = virXMLPropString(node, "cloneformat"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->clone_format) < 0) + goto cleanup; + VIR_FREE(val); + } + + rbd_image_option->mirror_image_mode = -1; + if ((val = virXMLPropString(node, "mirrorimagemode"))) { + if (virStrToLong_l(val, NULL, 10, &rbd_image_option->mirror_image_mode) < 0) + goto cleanup; + VIR_FREE(val); + } + + return 0; +cleanup: + VIR_FREE(val); + return -1; +} + + + void + virRbdImageOptionDefaultSet(virRbdImageOptionsPtr rbd_image_option) + { + rbd_image_option->format = -1; + rbd_image_option->feature = -1; + rbd_image_option->order = -1; + rbd_image_option->stripe_unit = -1; + rbd_image_option->stripe_count = -1; + rbd_image_option->journal_order = -1; + rbd_image_option->journal_splay_width = -1; + rbd_image_option->journal_pool = NULL; + rbd_image_option->feature_set = -1; + rbd_image_option->feature_clear = -1; + rbd_image_option->data_pool = NULL; + rbd_image_option->flatten = -1; + rbd_image_option->clone_format = -1; + rbd_image_option->mirror_image_mode = -1; + } + + static int virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, virStoragePoolSource *source, @@ -522,6 +656,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, { xmlNodePtr authnode; xmlNodePtr adapternode; + xmlNodePtr rbdimageoption; int nsource; size_t i; virStoragePoolOptions *options; @@ -633,6 +768,13 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, source->auth = g_steal_pointer(&authdef); } + if ((rbdimageoption = virXPathNode("./rbdimageoption", ctxt))) { + if (virRbdImageOptionParseXML(&source->rbdImageOptions, rbdimageoption, ctxt) < 0) + goto cleanup; + } else { + virRbdImageOptionDefaultSet(&source->rbdImageOptions); + } + /* Option protocol version string (NFSvN) */ if ((source->protocolVer = virXPathString("string(./protocol/@ver)", ctxt))) { if ((source->format != VIR_STORAGE_POOL_NETFS_NFS) && @@ -988,6 +1130,67 @@ virStoragePoolDefParse(const char *xmlStr, } +static void +virRbdImageOptionFormat(virBufferPtr buf, + virRbdImageOptionsPtr rbdImageOptions) +{ + // not set the rbd image options. + if (rbdImageOptions->format < 0 && rbdImageOptions->feature < 0 && rbdImageOptions->order < 0 + && rbdImageOptions->stripe_unit < 0 && rbdImageOptions->stripe_count < 0 && rbdImageOptions->journal_order < 0 + && rbdImageOptions->journal_splay_width < 0 && (rbdImageOptions->journal_pool != NULL) && rbdImageOptions->feature_set < 0 + && rbdImageOptions->feature_clear < 0 && (rbdImageOptions->data_pool != NULL) && rbdImageOptions->flatten < 0 + && rbdImageOptions->clone_format < 0 && rbdImageOptions->mirror_image_mode < 0) + return; + + virBufferAsprintf(buf, "<rbdimageoption"); + + if (rbdImageOptions->format >= 0) + virBufferAsprintf(buf, " format='%ld'", rbdImageOptions->format); + + if (rbdImageOptions->feature >= 0) + virBufferAsprintf(buf, " feature='%ld'", rbdImageOptions->feature); + + if (rbdImageOptions->order >= 0) + virBufferAsprintf(buf, " order='%ld'", rbdImageOptions->order); + + if (rbdImageOptions->stripe_unit >= 0) + virBufferAsprintf(buf, " stripeunit='%ld'", rbdImageOptions->stripe_unit); + + if (rbdImageOptions->stripe_count >= 0) + virBufferAsprintf(buf, " stripecount='%ld'", rbdImageOptions->stripe_count); + + if (rbdImageOptions->journal_order >= 0) + virBufferAsprintf(buf, " journalorder='%ld'", rbdImageOptions->journal_order); + + if (rbdImageOptions->journal_splay_width >= 0) + virBufferAsprintf(buf, " journalsplaywidth='%ld'", rbdImageOptions->journal_splay_width); + + if (rbdImageOptions->journal_pool) + virBufferAsprintf(buf, " journalpool='%s'", rbdImageOptions->journal_pool); + + if (rbdImageOptions->feature_set >= 0) + virBufferAsprintf(buf, " featureset='%ld'", rbdImageOptions->feature_set); + + if (rbdImageOptions->feature_clear >= 0) + virBufferAsprintf(buf, " featureclear='%ld'", rbdImageOptions->feature_clear); + + if (rbdImageOptions->data_pool) + virBufferAsprintf(buf, " datapool='%s'", rbdImageOptions->data_pool); + + if (rbdImageOptions->flatten >= 0) + virBufferAsprintf(buf, " flatten='%ld'", rbdImageOptions->flatten); + + if (rbdImageOptions->clone_format >= 0) + virBufferAsprintf(buf, " cloneformat='%ld'", rbdImageOptions->clone_format); + + if (rbdImageOptions->mirror_image_mode >= 0) + virBufferAsprintf(buf, " mirrorimagemode='%ld'", rbdImageOptions->mirror_image_mode); + + virBufferAsprintf(buf, "/>\n"); +} + + + static int virStoragePoolSourceFormat(virBuffer *buf, virStoragePoolOptions *options, @@ -1066,6 +1269,8 @@ virStoragePoolSourceFormat(virBuffer *buf, virBufferEscapeString(buf, "<vendor name='%s'/>\n", src->vendor); virBufferEscapeString(buf, "<product name='%s'/>\n", src->product); + virRbdImageOptionFormat(buf, &src->rbdImageOptions); + virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</source>\n"); return 0; diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index fc67957cfe..377ea1cfe2 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -175,6 +175,25 @@ struct _virStoragePoolFeatures { virTristateBool cow; }; +typedef struct _virRbdImageOptions virRbdImageOptions; +typedef virRbdImageOptions *virRbdImageOptionsPtr; +struct _virRbdImageOptions { + int64_t format; + int64_t feature; + int64_t order; + int64_t stripe_unit; + int64_t stripe_count; + int64_t journal_order; + int64_t journal_splay_width; + char *journal_pool; + int64_t feature_set; + int64_t feature_clear; + char *data_pool; + int64_t flatten; + int64_t clone_format; + int64_t mirror_image_mode; +}; + typedef struct _virStoragePoolSource virStoragePoolSource; struct _virStoragePoolSource { @@ -214,6 +233,9 @@ struct _virStoragePoolSource { /* Protocol version value for netfs */ char *protocolVer; + + /* RBD Image Options definition. */ + virRbdImageOptions rbdImageOptions; }; typedef struct _virStoragePoolTarget virStoragePoolTarget; @@ -314,6 +336,9 @@ virStoragePoolSaveConfig(const char *configFile, void virStorageVolDefFree(virStorageVolDef *def); +void +virRbdImageOptionClear(virRbdImageOptionsPtr rbd_image_option); + void virStoragePoolSourceClear(virStoragePoolSource *source); @@ -326,6 +351,14 @@ virStoragePoolSourceFree(virStoragePoolSource *source); void virStoragePoolDefFree(virStoragePoolDef *def); +int +virRbdImageOptionParseXML(virRbdImageOptionsPtr rbd_image_option, + xmlNodePtr node, + xmlXPathContextPtr ctxt); + +void +virRbdImageOptionDefaultSet(virRbdImageOptionsPtr rbd_image_option); + virStoragePoolSource * virStoragePoolDefParseSourceString(const char *srcSpec, int pool_type); diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 05b2c43f79..29c651cbcd 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -878,10 +878,127 @@ virStorageBackendRBDCreateVol(virStoragePoolObj *pool, } static int virStorageBackendRBDCreateImage(rados_ioctx_t io, - char *name, long capacity) + char *name, long capacity, virStoragePoolDefPtr def) { int order = 0; - return rbd_create(io, name, capacity, &order); + int ret = -1; + rbd_image_options_t image_options; + + if (def->source.rbdImageOptions.format < 0 && def->source.rbdImageOptions.feature < 0 + && def->source.rbdImageOptions.order < 0 && def->source.rbdImageOptions.stripe_unit < 0 + && def->source.rbdImageOptions.stripe_count < 0 && def->source.rbdImageOptions.journal_order < 0 + && def->source.rbdImageOptions.journal_splay_width < 0 && (def->source.rbdImageOptions.journal_pool != NULL) + && def->source.rbdImageOptions.feature_set < 0 && def->source.rbdImageOptions.feature_clear < 0 + && (def->source.rbdImageOptions.data_pool != NULL) && def->source.rbdImageOptions.flatten < 0 + && def->source.rbdImageOptions.clone_format < 0 && def->source.rbdImageOptions.mirror_image_mode < 0) { + VIR_DEBUG("Creating RBD image %s, without data pool, with size %lu", name, capacity); + return rbd_create(io, name, capacity, &order); + } + + rbd_image_options_create(&image_options); + + if (def->source.rbdImageOptions.format >= 0) { + VIR_DEBUG("Set rbd image option format:%d, %lu", RBD_IMAGE_OPTION_FORMAT, def->source.rbdImageOptions.format); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FORMAT, + (uint64_t)def->source.rbdImageOptions.format); + } + + if (def->source.rbdImageOptions.feature >= 0) { + VIR_DEBUG("Set rbd image option features:%d, %lu", RBD_IMAGE_OPTION_FEATURES, def->source.rbdImageOptions.feature); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FEATURES, + (uint64_t)def->source.rbdImageOptions.feature); + } + + if (def->source.rbdImageOptions.order >= 0) { + VIR_DEBUG("Set rbd image option order:%d, %lu", RBD_IMAGE_OPTION_ORDER, def->source.rbdImageOptions.order); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_ORDER, + (uint64_t)def->source.rbdImageOptions.order); + } + + if (def->source.rbdImageOptions.stripe_unit >= 0) { + VIR_DEBUG("Set rbd image option stripe_unit:%d, %lu", RBD_IMAGE_OPTION_STRIPE_UNIT, def->source.rbdImageOptions.stripe_unit); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_STRIPE_UNIT, + (uint64_t)def->source.rbdImageOptions.stripe_unit); + } + + if (def->source.rbdImageOptions.stripe_count >= 0) { + VIR_DEBUG("Set rbd image option stipe_count:%d, %lu", RBD_IMAGE_OPTION_STRIPE_COUNT, def->source.rbdImageOptions.stripe_count); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_STRIPE_COUNT, + (uint64_t)def->source.rbdImageOptions.stripe_count); + } + + if (def->source.rbdImageOptions.journal_order >= 0) { + VIR_DEBUG("Set rbd image option journal_order:%d, %lu", RBD_IMAGE_OPTION_JOURNAL_ORDER, def->source.rbdImageOptions.journal_order); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_JOURNAL_ORDER, + (uint64_t)def->source.rbdImageOptions.journal_order); + } + + if (def->source.rbdImageOptions.journal_splay_width >= 0) { + VIR_DEBUG("Set rbd image option journal_splay_width:%d, %lu", RBD_IMAGE_OPTION_JOURNAL_SPLAY_WIDTH, def->source.rbdImageOptions.journal_splay_width); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_JOURNAL_SPLAY_WIDTH, + (uint64_t)def->source.rbdImageOptions.journal_splay_width); + } + + if (def->source.rbdImageOptions.journal_pool != NULL) { + VIR_DEBUG("Set rbd image option journal_pool:%d, %s", RBD_IMAGE_OPTION_JOURNAL_POOL, def->source.rbdImageOptions.journal_pool); + rbd_image_options_set_string(image_options, + RBD_IMAGE_OPTION_JOURNAL_POOL, + def->source.rbdImageOptions.journal_pool); + } + + if (def->source.rbdImageOptions.feature_set >= 0) { + VIR_DEBUG("Set rbd image option feature_set:%d, %lu", RBD_IMAGE_OPTION_FEATURES_SET, def->source.rbdImageOptions.feature_set); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FEATURES_SET, + (uint64_t)def->source.rbdImageOptions.feature_set); + } + + if (def->source.rbdImageOptions.feature_clear >= 0) { + VIR_DEBUG("Set rbd image option feature_clear:%d, %lu", RBD_IMAGE_OPTION_FEATURES_CLEAR, def->source.rbdImageOptions.feature_clear); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FEATURES_CLEAR, + (uint64_t)def->source.rbdImageOptions.feature_clear); + } + + if (def->source.rbdImageOptions.data_pool != NULL) { + VIR_DEBUG("Set rbd image option data_pool:%d, %s", RBD_IMAGE_OPTION_DATA_POOL, def->source.rbdImageOptions.data_pool); + rbd_image_options_set_string(image_options, + RBD_IMAGE_OPTION_DATA_POOL, + def->source.rbdImageOptions.data_pool); + } + + if (def->source.rbdImageOptions.flatten >= 0) { + VIR_DEBUG("Set rbd image option flatten:%d, %lu", RBD_IMAGE_OPTION_FLATTEN, def->source.rbdImageOptions.flatten); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_FLATTEN, + (uint64_t)def->source.rbdImageOptions.flatten); + } + + if (def->source.rbdImageOptions.clone_format >= 0) { + VIR_DEBUG("Set rbd image option clone_format:%d, %lu", RBD_IMAGE_OPTION_CLONE_FORMAT, def->source.rbdImageOptions.clone_format); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_CLONE_FORMAT, + (uint64_t)def->source.rbdImageOptions.clone_format); + } + + if (def->source.rbdImageOptions.mirror_image_mode >= 0) { + VIR_DEBUG("Set rbd image option mirror_image_mode:%d, %lu", RBD_IMAGE_OPTION_MIRROR_IMAGE_MODE, def->source.rbdImageOptions.mirror_image_mode); + rbd_image_options_set_uint64(image_options, + RBD_IMAGE_OPTION_MIRROR_IMAGE_MODE, + (uint64_t)def->source.rbdImageOptions.mirror_image_mode); + } + + ret = rbd_create4(io, name, capacity, image_options); + VIR_DEBUG("Creating RBD image %s, with size:%lu, ret:%d", name, capacity, ret); + rbd_image_options_destroy(image_options); + return ret; } static int @@ -920,7 +1037,7 @@ virStorageBackendRBDBuildVol(virStoragePoolObj *pool, goto cleanup; if (virStorageBackendRBDCreateImage(ptr->ioctx, vol->name, - vol->target.capacity) < 0) { + vol->target.capacity, def) < 0) { virReportSystemError(errno, _("failed to create volume '%s/%s'"), def->source.name, vol->name); goto cleanup; -- 2.29.1.windows.1

1 0

Re: [PATCH 1/2] log: Add separate debug option for logging invalid memory accesses
by Philippe Mathieu-Daudé 13 Feb '23

13 Feb '23

On 13/2/23 18:17, Peter Xu wrote: > On Mon, Feb 13, 2023 at 05:34:04PM +0100, BALATON Zoltan wrote: >> On Mon, 13 Feb 2023, Peter Xu wrote: >>> On Mon, Feb 13, 2023 at 03:47:42PM +0100, BALATON Zoltan wrote: >>>> On Mon, 13 Feb 2023, Peter Xu wrote: >>>>> On Mon, Feb 13, 2023 at 12:41:29PM +0100, Thomas Huth wrote: >>>>>> On 07/02/2023 17.33, BALATON Zoltan wrote: >>>>>>> On Tue, 31 Jan 2023, BALATON Zoltan wrote: >>>>>>>> On Thu, 19 Jan 2023, BALATON Zoltan wrote: >>>>>>>>> Currently -d guest_errors enables logging of different invalid actions >>>>>>>>> by the guest such as misusing hardware, accessing missing features or >>>>>>>>> invalid memory areas. The memory access logging can be quite verbose >>>>>>>>> which obscures the other messages enabled by this debug switch so >>>>>>>>> separate it by adding a new -d memaccess option to make it possible to >>>>>>>>> control it independently of other guest error logs. >>>>>>>>> >>>>>>>>> Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> >>>>>>>> >>>>>>>> Ping? Could somebody review and pick it up please? >>>>>>> >>>>>>> Ping? >>>>>> >>>>>> Patch makes sense to me and looks fine, so: >>>>>> >>>>>> Reviewed-by: Thomas Huth <thuth(a)redhat.com> >>>>>> >>>>>> ... I think this should go via one of the "Memory API" maintainers branches? >>>>>> Paolo? Peter? David? >>>>> >>>>> Paolo normally does the pull, I assume that'll still be the case. The >>>>> patch looks good to me if Phil's comment will be addressed on merging with >>>>> the old mask, which makes sense to me: >>>> >>>> Keeping the old mask kind of defies the purpose. I've tried to explain that >>>> in the commit message but now that two of you did not get it maybe that >>>> message needs to be clarified instead? >>> >>> I think it's clear enough. My fault to not read carefully into the >>> message, sorry. >>> >>> However, could you explain why a memory_region_access_valid() failure >>> shouldn't belong to LOG_GUEST_ERROR? >>> >>> commit e54eba1986f6c4bac2951e7f90a849cd842e25e4 >>> Author: Peter Maydell <peter.maydell(a)linaro.org> >>> Date: Thu Oct 18 14:11:35 2012 +0100 >>> >>> qemu-log: Add new log category for guest bugs >>> >>> Add a new category for device models to log guest behaviour >>> which is likely to be a guest bug of some kind (accessing >>> nonexistent registers, reading 32 bit wide registers with >>> a byte access, etc). Making this its own log category allows >>> those who care (mostly guest OS authors) to see the complaints >>> without bothering most users. >>> >>> Such an illegal memory access is definitely a suitable candidate of guest >>> misbehave to me. >> >> Problem is that a lot of machines have unimplemented hardware that are valid >> on real machine but we don't model them so running guests which access these >> generate constant flow of unassigned memory access log which obscures the >> actual guest_errors when an modelled device is accessed in unexpected ways. >> For an example you can try booting MorphOS on mac99,via=pmu as described >> here: http://zero.eik.bme.hu/~balaton/qemu/amiga/#morphos >> (or the pegasos2 command too). We could add dummy registers to silence these >> but I think it's better to either implement it correctly or leave it >> unimplemented so we don't hide errors by the dummy implementation. >> >>> Not to mention Phil always have a good point that you may be violating >>> others using guest_error already so what they wanted to capture can >>> misterious going away without noticing, even if it may service your goal. >>> IOW it's a slight ABI and I think we ned justification to break it. >> >> Probably this should be documented in changelog or do we need depracation >> for a debug option meant for developers mostly? I did not think so. Also I >> can't think of other way to solve this without changing what guest_erorrs do >> unless we change the name of that flag as well. Also not that when this was >> originally added it did not contain mem access logs as those were controlled >> by a define in memory.c until Philippe changed it and added them to >> guest_errors. So in a way I want the previous functionality back. > > I see, thanks. > > Indeed it's only a debug option, so I don't know whether the abi needs the > attention here. > > I quickly looked at all the masks and afaict this is really a special and > very useful one that if I'm a cloud provider I can run some script trying > to capture those violations using this bit to identify suspecious guests. > > So I think it would still be great to not break it if possible, IMHO. > > Since currently I don't see an immediate limitation of having qemu log mask > being a single bit for each of the entry, one way to satisfy your need (and > also keep the old behavior, iiuc), is to make guest_errors a sugar syntax > to cover 2 bits. It shouldn't be complicated at all, I assume: > > +/* This covers the generic guest errors besides memory violations */ > #define LOG_GUEST_ERROR (1 << 11) > > +/* > + * This covers the guest errors on memory violations; see LOG_GUEST_ERROR > + * for generic guest errors. > + */ > +#define LOG_GUEST_ERROR_MEM (1 << 21) > +#define LOG_GUEST_ERROR_ALL (LOG_GUEST_ERROR | LOG_GUEST_ERROR_MEM) > > - { LOG_GUEST_ERROR, "guest_errors", > + { LOG_GUEST_ERROR_ALL, "guest_errors", > > Then somehow squashed with your changes. It'll make "guest_errors" not > exactly matching the name of LOG_* but I think it may not be a big concern. Thanks Peter for having a look. Cc'ing libvir-list@ to see if this change could have an impact. If no one else object I'm OK to take the patch as is, except if you (Peter) want the description to be reworded. Regards, Phil.

1 0

[PATCH] test: Introduce chxml2xmltest
by Michal Privoznik 13 Feb '23

13 Feb '23

Whilst reviewing a patch upstream (that ended up as v9.0.0-200-g092176e5ec), I realized we don't have a single xml2xml test for CH driver. Well, introduce the test with one simple test case for now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- We could also benefit from xml2arg test, but I'll leave that for future ourselves. tests/chxml2xmlin/basic.xml | 30 ++++++++++++++ tests/chxml2xmlout/basic.xml | 1 + tests/chxml2xmltest.c | 77 ++++++++++++++++++++++++++++++++++++ tests/meson.build | 6 +++ 4 files changed, 114 insertions(+) create mode 100644 tests/chxml2xmlin/basic.xml create mode 120000 tests/chxml2xmlout/basic.xml create mode 100644 tests/chxml2xmltest.c diff --git a/tests/chxml2xmlin/basic.xml b/tests/chxml2xmlin/basic.xml new file mode 100644 index 0000000000..911aa7c621 --- /dev/null +++ b/tests/chxml2xmlin/basic.xml @@ -0,0 +1,30 @@ +<domain type='kvm'> + <name>cloudhypervisor</name> + <uuid>4dea22b3-1d52-d8f3-2516-782e98ab3fa0</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <kernel>hypervisor-fw</kernel> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/local/bin/cloud-hypervisor</emulator> + <disk type='file' device='disk'> + <source file='disk.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='ethernet'> + <mac address='52:54:00:5c:e4:84'/> + <model type='virtio'/> + </interface> + <console type='pty'> + <target type='serial' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/chxml2xmlout/basic.xml b/tests/chxml2xmlout/basic.xml new file mode 120000 index 0000000000..eb8df546aa --- /dev/null +++ b/tests/chxml2xmlout/basic.xml @@ -0,0 +1 @@ +../chxml2xmlin/basic.xml \ No newline at end of file diff --git a/tests/chxml2xmltest.c b/tests/chxml2xmltest.c new file mode 100644 index 0000000000..97b485dc4a --- /dev/null +++ b/tests/chxml2xmltest.c @@ -0,0 +1,77 @@ +#include <config.h> + +#include <testutils.h> + +#include "ch/ch_conf.h" + +struct testInfo { + const char *name; + virCHDriver *driver; + testCompareDomXML2XMLResult expectResult; +}; + +typedef enum { + FLAG_IS_DIFFERENT = 1 << 0, + FLAG_EXPECT_FAILURE = 1 << 1, +} virBhyveXMLToXMLTestFlags; + +static int +testCompareXMLToXMLHelper(const void *data) +{ + const struct testInfo *info = data; + g_autofree char *xml_in = NULL; + g_autofree char *xml_out = NULL; + + xml_in = g_strdup_printf("%s/chxml2xmlin/%s.xml", + abs_srcdir, info->name); + xml_out = g_strdup_printf("%s/chxml2xmlout/%s.xml", + abs_srcdir, info->name); + + return testCompareDomXML2XMLFiles(NULL, info->driver->xmlopt, + xml_in, xml_out, false, 0, + info->expectResult); +} + +static int +mymain(void) +{ + int ret = 0; + virCHDriver *driver = NULL; + + driver = g_new0(virCHDriver, 1); + + if (!(driver->caps = virCHDriverCapsInit())) { + fprintf(stderr, "unable to initialize driver capabilities\n"); + goto cleanup; + } + + if (!(driver->xmlopt = chDomainXMLConfInit(driver))) { + fprintf(stderr, "unable to initialize driver XMLOPT\n"); + goto cleanup; + } + +#define DO_TEST_FULL(name, expectResult) \ + do { \ + const struct testInfo info = {name, driver, expectResult}; \ + if (virTestRun("CH XML-2-XML " name, \ + testCompareXMLToXMLHelper, &info) < 0) \ + ret = -1; \ + } while (0) + +#define DO_TEST(name) \ + DO_TEST_FULL(name, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS) + +#define DO_TEST_FAIL_PARSE(name) \ + DO_TEST_FULL(name, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE) + + DO_TEST("basic"); + + cleanup: + virObjectUnref(driver->xmlopt); + virObjectUnref(driver->caps); + g_free(driver); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIR_TEST_MAIN(mymain) diff --git a/tests/meson.build b/tests/meson.build index 3365dce307..15b049c6ac 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -347,6 +347,12 @@ if conf.has('WITH_BHYVE') ] endif +if conf.has('WITH_CH') + tests += [ + { 'name': 'chxml2xmltest', 'link_with': [ ch_driver_impl ] }, + ] +endif + if conf.has('WITH_ESX') tests += [ { 'name': 'esxutilstest', 'deps': [ esx_dep ] }, -- 2.39.1

2 1

[PATCH] qemu: blockjob: Handle 'pending' blockjob state only when we need it
by Peter Krempa 13 Feb '23

13 Feb '23

The 'pending' state needs to be handled by the blockjob code only when the snapshot code requests a block-commit without auto-finalization. If we always handle it we fail to properly remove the blockjob data for the 'blockdev-create' job as that also transitions trhough 'pending' but we'd never update it once it reaches 'concluded' as the code already thinks that the job has finished and is no longer watching it. Introduce a 'processPending' property into block job data and set it only when we know that we need to process 'pending'. Fixes: 90d9bc9d74a5157167548b26c00b1a016655e295 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2168769 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_block.c | 1 + src/qemu/qemu_blockjob.c | 19 ++++++++++--------- src/qemu/qemu_blockjob.h | 4 ++++ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4c06565e0f..5e700eff99 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3373,6 +3373,7 @@ qemuBlockCommit(virDomainObj *vm, if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource, baseSource, flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE, + autofinalize, flags))) goto cleanup; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index cb2d05d71d..a20cf1db62 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -274,6 +274,7 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, virStorageSource *top, virStorageSource *base, bool delete_imgs, + virTristateBool autofinalize, unsigned int jobflags) { g_autoptr(qemuBlockJobData) job = NULL; @@ -290,6 +291,7 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, job->data.commit.top = top; job->data.commit.base = base; job->data.commit.deleteCommittedImages = delete_imgs; + job->processPending = autofinalize == VIR_TRISTATE_BOOL_NO; job->jobflags = jobflags; if (qemuBlockJobRegister(job, vm, disk, true) < 0) @@ -532,8 +534,6 @@ qemuBlockJobRefreshJobs(virDomainObj *vm) if (job->state == QEMU_BLOCKJOB_STATE_NEW || job->state == QEMU_BLOCKJOB_STATE_RUNNING) job->newstate = newstate; - } else if (newstate == QEMU_BLOCKJOB_STATE_PENDING) { - job->newstate = newstate; } /* don't update the job otherwise */ } @@ -1568,13 +1568,14 @@ qemuBlockJobEventProcess(virQEMUDriver *driver, case QEMU_BLOCKJOB_STATE_PENDING: /* Similarly as for 'ready' state we should handle it only when - * previous state was 'new' or 'running' as there are other cases - * when it can be emitted by QEMU. Currently we need this only when - * deleting non-active external snapshots. */ - if (job->state == QEMU_BLOCKJOB_STATE_NEW || - job->state == QEMU_BLOCKJOB_STATE_RUNNING) { - job->state = job->newstate; - qemuDomainSaveStatus(vm); + * previous state was 'new' or 'running' and only if the blockjob code + * is handling finalization of the job explicitly. */ + if (job->processPending) { + if (job->state == QEMU_BLOCKJOB_STATE_NEW || + job->state == QEMU_BLOCKJOB_STATE_RUNNING) { + job->state = job->newstate; + qemuDomainSaveStatus(vm); + } } job->newstate = -1; break; diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e9b283da20..f1ac43b4c7 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -138,6 +138,9 @@ struct _qemuBlockJobData { int brokentype; /* the previous type of a broken blockjob qemuBlockJobType */ + bool processPending; /* process the 'pending' state of the job, if the job + should not be auto-finalized */ + bool invalidData; /* the job data (except name) is not valid */ bool reconnected; /* internal field for tracking whether job is live after reconnect to qemu */ }; @@ -175,6 +178,7 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm, virStorageSource *top, virStorageSource *base, bool delete_imgs, + virTristateBool autofinalize, unsigned int jobflags); qemuBlockJobData * -- 2.39.1

2 1

[libvirt PATCH 0/1] Do not add stub console to ch VMs
by Praveen K Paladugu 10 Feb '23

10 Feb '23

This patch resolves https://gitlab.com/libvirt/libvirt/-/issues/344 I tested various versions of cloud-hypervisor between v15 - v29. All of them fail to start a test VM without this patch. Praveen K Paladugu (1): ch: Do not add stub console to ch VMs src/ch/ch_domain.c | 1 + src/conf/domain_conf.c | 7 ++++--- src/conf/domain_conf.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.34.1

3 3

[libvirt PATCH] conf: Allow conventional PCI devices to be marked as integrated
by Andrea Bolognani 10 Feb '23

10 Feb '23

Integrated PCI devices can be either PCIe (virtio-iommu) or conventional PCI (pvpanic-pci). Right now libvirt will refuse to assign an address on pcie.0 for the latter, but that's an undesirable limitation that we can easily remove. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/domain_addr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 76f9c12ca6..b6534f502c 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -306,8 +306,11 @@ virDomainPCIAddressFlagsCompatible(virPCIDeviceAddress *addr, if (addr->bus == 0) { /* pcie-root doesn't usually allow endpoint devices to be * plugged directly into it, but for integrated devices - * that's exactly what we want */ - busFlags |= VIR_PCI_CONNECT_AUTOASSIGN; + * that's exactly what we want. It also refuses conventional + * PCI devices by default, but in the case of integrated + * devices both types are fine */ + busFlags |= VIR_PCI_CONNECT_TYPE_PCI_DEVICE | + VIR_PCI_CONNECT_AUTOASSIGN; } else { if (reportError) { virReportError(errType, -- 2.39.1

2 1

[libvirt PATCH] gitlab: Ask users not to attach screenshots to bug reports
by Andrea Bolognani 10 Feb '23

10 Feb '23

Hopefully including this request in ALL CAPITAL LETTERS in the issue template will cut down on the number of screenshots that end up cluttering bug reports by at least a tiny bit. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitlab/issue_templates/bug.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index f220671a06..b923be0ca0 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -17,3 +17,4 @@ ## Additional information   + -- 2.39.1

5 10

[PATCH] qemu_extdevice: Do cleanup host only for VIR_DOMAIN_TPM_TYPE_EMULATOR
by Michal Privoznik 10 Feb '23

10 Feb '23

We only set up host for VIR_DOMAIN_TPM_TYPE_EMULATOR and thus similarly, we should do cleanup for the same type. This also fixes a crasher, in which qemuTPMEmulatorCleanupHost() accesses tpm->data.emulator.storagepath which is NULL for VIR_DOMAIN_TPM_TYPE_EXTERNAL. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2168762 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_extdevice.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index f7b2e2e653..fdefe59215 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -162,7 +162,10 @@ qemuExtDevicesCleanupHost(virQEMUDriver *driver, return; for (i = 0; i < def->ntpms; i++) { - qemuExtTPMCleanupHost(def->tpms[i], flags, outgoingMigration); + virDomainTPMDef *tpm = def->tpms[i]; + + if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR) + qemuExtTPMCleanupHost(tpm, flags, outgoingMigration); } } -- 2.39.1

2 1