Re: [PATCH 01/21] qemuProcessPrepareQEMUCaps: Don't clear QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE

All the fd-passing setup of chardevs which this hack meant to disable was moved to the host-preparation phase which is skipped for formatting of non-real commandlines. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_process.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index de1146251d..76a52f7a5d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5522,7 +5522,6 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) * qemuProcessPrepareQEMUCaps: * @vm: domain object * @qemuCapsCache: cache of QEMU capabilities - * @processStartFlags: flags based on the VIR_QEMU_PROCESS_START_* enum * * Prepare the capabilities of a QEMU process for startup. This includes * copying the caps to a static cache and potential post-processing depending @@ -5532,8 +5531,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm) */ static int qemuProcessPrepareQEMUCaps(virDomainObj *vm, - virFileCache *qemuCapsCache, - unsigned int processStartFlags) + virFileCache *qemuCapsCache) { qemuDomainObjPrivate *priv = vm->privateData; @@ -5544,9 +5542,6 @@ qemuProcessPrepareQEMUCaps(virDomainObj *vm, vm->def->os.machine))) return -1; - if (processStartFlags & VIR_QEMU_PROCESS_START_STANDALONE)

- virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE); - /* Update qemu capabilities according to lists passed in via namespace */ if (qemuProcessStartUpdateCustomCaps(vm) < 0) return -1;