From nobody Mon Feb 9 07:56:21 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616178860; cv=none; d=zohomail.com; s=zohoarc; b=O71EUv9nSpla2sBRwtj04rU1nAcKgzrSrGdS+t6owrwhXQ5MD3ZdkI4BpLajAYR3WsdF+FrcnO2/LkqjQdIUkZFsrfLtSVsex1h8Ks79hk7lUGnNWpyK41b2b0MAHgj0Laf4b4h8UN+Ln4HOrpEO2dXP9SaBgjsUIuB9hNT2alk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616178860; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=43gihqBTP9KQPZ7RjlURhdlqhwyLby20Y2TlnXZqBoc=; b=cwJGAaHd+izfYOG/IM3tOOPHOhnkjFQfLDgDhOAX+lWb7u3JS2brqlaPnka3RbRPorjr9ijN9debTzvCTvwo1YHbYe47UIoZY7qMkcvVxQKHktArZhUtuGkLybj7OlzFHomekZmS3em+vj7m/xuLwMiMsobcvUu3AQSmws0N2yw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616178860884706.3141542921821; Fri, 19 Mar 2021 11:34:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-At6b8NzEN-ivq_LhjBf_SA-1; Fri, 19 Mar 2021 14:34:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D9E81084D70; Fri, 19 Mar 2021 18:34:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3556860BD9; Fri, 19 Mar 2021 18:34:11 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id B4DED4A7CA; Fri, 19 Mar 2021 18:34:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JIY95O024649 for ; Fri, 19 Mar 2021 14:34:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id B55D15D9F2; Fri, 19 Mar 2021 18:34:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07CA85D9E3 for ; Fri, 19 Mar 2021 18:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616178859; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=43gihqBTP9KQPZ7RjlURhdlqhwyLby20Y2TlnXZqBoc=; b=OkAj1uuw24KGoIxJ0c6BUvnhAKznEt8XEXdcIqmFdUeDizy/R3sdMHdSo33aKx5zAxMRRn ohWEz+JdSEIK9eU3LEOQjPs2wuI8eYm8hBhMoxwh0mBvOSnYkX6pLFC+Nhl0Kn6EUguH0L aZ2DuzeNxo23lqJC1tt+UD3XtDgwe6U= X-MC-Unique: At6b8NzEN-ivq_LhjBf_SA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/6] qemu: command: Handle formatting of '-compat' options Date: Fri, 19 Mar 2021 19:33:54 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Enable '-compat' if requested in qemu.conf and supported by qemu to instruct qemu to crash when a deprecated command is used and stop returning deprecated fields. This setting is meant for libvirt developers and such. --- src/qemu/qemu_command.c | 80 +++++++++++++++++++ .../qemu-ns.x86_64-latest.args | 1 + 2 files changed, 81 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1b4fa77867..2388b1a1a1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10325,6 +10325,84 @@ qemuBuildVsockCommandLine(virCommandPtr cmd, } +typedef enum { + QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE =3D 0, + QEMU_COMMAND_DEPRECATION_BEHAVIOR_OMIT, + QEMU_COMMAND_DEPRECATION_BEHAVIOR_REJECT, + QEMU_COMMAND_DEPRECATION_BEHAVIOR_CRASH, + + QEMU_COMMAND_DEPRECATION_BEHAVIOR_LAST +} qemuCommnadDeprecationBehavior; + + +VIR_ENUM_DECL(qemuCommnadDeprecationBehavior); +VIR_ENUM_IMPL(qemuCommnadDeprecationBehavior, + QEMU_COMMAND_DEPRECATION_BEHAVIOR_LAST, + "none", + "omit", + "reject", + "crash"); + +static void +qemuBuildCompatDeprecatedCommandLine(virCommand *cmd, + virQEMUDriverConfig *cfg, + virDomainDef *def, + virQEMUCaps *qemuCaps) +{ + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + qemuDomainXmlNsDefPtr nsdata =3D def->namespaceData; + qemuCommnadDeprecationBehavior behavior =3D QEMU_COMMAND_DEPRECATION_B= EHAVIOR_NONE; + const char *behaviorStr =3D cfg->deprecationBehavior; + int tmp; + + if (nsdata && nsdata->deprecationBehavior) + behaviorStr =3D nsdata->deprecationBehavior; + + if ((tmp =3D qemuCommnadDeprecationBehaviorTypeFromString(behaviorStr)= ) < 0) { + VIR_WARN("Unsupported deprecation behavior '%s' for VM '%s'", + behaviorStr, def->name); + return; + } + + behavior =3D tmp; + + if (behavior =3D=3D QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE) + return; + + /* we don't try to enable this feature at all if qemu doesn't support = it, + * so that a downgrade of qemu version doesn't impact startup of the V= M */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_COMPAT_DEPRECATED)) { + VIR_DEBUG("-compat not supported for VM '%s'", def->name); + return; + } + + /* all active options hide output fields from qemu */ + virBufferAddLit(&buf, "deprecated-output=3Dhide,"); + + switch (behavior) { + case QEMU_COMMAND_DEPRECATION_BEHAVIOR_OMIT: + case QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE: + case QEMU_COMMAND_DEPRECATION_BEHAVIOR_LAST: + default: + /* output field hiding is default for all cases */ + break; + + case QEMU_COMMAND_DEPRECATION_BEHAVIOR_REJECT: + virBufferAddLit(&buf, "deprecated-input=3Dreject,"); + break; + + case QEMU_COMMAND_DEPRECATION_BEHAVIOR_CRASH: + virBufferAddLit(&buf, "deprecated-input=3Dcrash,"); + break; + } + + virBufferTrim(&buf, ","); + + virCommandAddArg(cmd, "-compat"); + virCommandAddArgBuffer(cmd, &buf); +} + + /* * Constructs a argv suitable for launching qemu with config defined * for a given virtual machine. @@ -10385,6 +10463,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; + qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def, qemuCaps); + if (!standalone) virCommandAddArg(cmd, "-S"); /* freeze CPU */ diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index 5a8136a8b7..71b83ca681 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -10,6 +10,7 @@ NS=3Dns \ BAR=3D'' \ /usr/bin/qemu-system-i386 \ -name guest=3DQEMUGuest1,debug-threads=3Don \ +-compat deprecated-output=3Dhide,deprecated-input=3Dcrash \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw",\ "file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ --=20 2.29.2