From nobody Mon Feb 9 07:55:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584284274; cv=none; d=zohomail.com; s=zohoarc; b=mplCtFxiI0FaRAppPPp4Iwr4StFo/aXRAUiS4TnAhnKfY42NDVXHZTGUZXUK1Ylqqsq6xq3MVGrILO9rHv0K6YNdxtrLFBnoOyy24NumOHx92+FHvGi+y9pdcNbSrd28j6vzIw5a7okPDMdqLqm9I5iwbGtlPHuQuHwTYYv2niY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584284274; h=Content-Type:Content-Transfer-Encoding:Cc: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=Z6aCsPL4uWFE1dWzC6dlBVL7Q5LaL2uq+ko0gQ6saTk=; b=Cs92CblmpX3D/cQxXCMCL3X8MIXRaQlibqtPbZ4yVhWkJp1fCtKQdwsA2wZOStrxt/FMaOQCXGJLT5oHe4CmRIrI0gjOAdgaDokRw6B4IILczkTO9uxISaEbIP/KO0MYVT4eakPXMhV6bCTS9LgSZgccEGuPVJj1B+53AtkYCKU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584284274126913.330332101493; Sun, 15 Mar 2020 07:57:54 -0700 (PDT) Received: from localhost ([::1]:54832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDUi8-00068A-DI for importer@patchew.org; Sun, 15 Mar 2020 10:57:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40536) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDUXk-0005Zy-Sm for qemu-devel@nongnu.org; Sun, 15 Mar 2020 10:47:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDUXi-0002VI-Sq for qemu-devel@nongnu.org; Sun, 15 Mar 2020 10:47:08 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:54698 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDUXh-0002OI-D0 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 10:47:05 -0400 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-138-cN7XsCFJP1K4eVgbWjtpfQ-1; Sun, 15 Mar 2020 10:47:00 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B140313F8; Sun, 15 Mar 2020 14:46:59 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 82AD691D8D; Sun, 15 Mar 2020 14:46:59 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E235811336B0; Sun, 15 Mar 2020 15:46:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584283624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z6aCsPL4uWFE1dWzC6dlBVL7Q5LaL2uq+ko0gQ6saTk=; b=EZR32uxB5Xb0kLXD6VPYJ8L0w8lzJhFczWahMswZtzMDYZJYx6Kr+7X/ilqUBhADqkHkga 6euI60glO0700N5Yn231fUJ/07+UaR9eGvVRXGDcgIlA3iL7fzPTu86AD1BhXD0O3a7NEQ aM83fJ7M8zY+Sf1oPr6lULNKPhWfJZI= X-MC-Unique: cN7XsCFJP1K4eVgbWjtpfQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v3 34/34] qapi: New -compat deprecated-input=crash Date: Sun, 15 Mar 2020 15:46:53 +0100 Message-Id: <20200315144653.22660-35-armbru@redhat.com> In-Reply-To: <20200315144653.22660-1-armbru@redhat.com> References: <20200315144653.22660-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Policy "crash" calls abort() when deprecated input is received. Bugs in integration tests may mask the error from policy "reject". Provide a larger hammer: crash outright. Masking that seems unlikely. Signed-off-by: Markus Armbruster --- qapi/compat.json | 3 ++- qapi/qmp-dispatch.c | 1 + qapi/qobject-input-visitor.c | 1 + qemu-options.hx | 4 +++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qapi/compat.json b/qapi/compat.json index fd6f8e932c..ec24567639 100644 --- a/qapi/compat.json +++ b/qapi/compat.json @@ -11,11 +11,12 @@ # # @accept: Accept silently # @reject: Reject with an error +# @crash: abort() the process # # Since: 5.0 ## { 'enum': 'CompatPolicyInput', - 'data': [ 'accept', 'reject' ] } + 'data': [ 'accept', 'reject', 'crash' ] } =20 ## # @CompatPolicyOutput: diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 516ee9b0b7..2c8fac02cd 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -141,6 +141,7 @@ QDict *qmp_dispatch(QmpCommandList *cmds, QObject *requ= est, "Deprecated command %s disabled by policy", command); goto out; + case COMPAT_POLICY_INPUT_CRASH: default: abort(); } diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 6ea93f5a7a..a74c901be9 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -654,6 +654,7 @@ static bool qobject_input_deprecated(Visitor *v, const = char *name, error_setg(errp, "Deprecated parameter '%s' disabled by policy", name); return false; + case COMPAT_POLICY_INPUT_CRASH: default: abort(); } diff --git a/qemu-options.hx b/qemu-options.hx index 5459e6c94c..7168a0cb9c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3358,7 +3358,7 @@ DEFHEADING() DEFHEADING(Debug/Expert options:) =20 DEF("compat", HAS_ARG, QEMU_OPTION_compat, - "-compat [deprecated-input=3Daccept|reject][,deprecated-output=3Daccep= t|hide]\n" + "-compat [deprecated-input=3Daccept|reject|crash][,deprecated-output= =3Daccept|hide]\n" " Policy for handling deprecated management interfaces\= n", QEMU_ARCH_ALL) SRST @@ -3369,6 +3369,8 @@ SRST Accept deprecated commands and arguments ``deprecated-input=3Dreject`` Reject deprecated commands and arguments + ``deprecated-input=3Dcrash`` + Crash on deprecated command ``deprecated-output=3Daccept`` (default) Emit deprecated command results and events ``deprecated-output=3Dhide`` --=20 2.21.1