From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654239985; cv=none; d=zohomail.com; s=zohoarc; b=SvX92DNpEJuk0UCO8iYEooXAp1tTaov0CFBzBkIPptlIq6SwEFk4bVsshgN19679YlFeCg1gFNWjdmAMonGfYnph8nAop2d5gX62yMnkTIW1tiSymFvarirh62QAfZyBzUaN7JYGmHTm60ARQ6MeKgvliGiwCAs8yM9o3Ae44Kk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654239985; h=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=Po38TlkhPSei0IEAV6dTh8v15AE2DMIhUgzmC4QekMY=; b=dbc1qcOpmWlm9upM7IJtMyOLcbmytJPuTanVSu8RmcGFUqTcVrfJKNBdnwT3oBm9TNZUs9Ttqm6epdTm7j6j0jbmCIk3GyLH3pm27LswS5pnViFaSKrZzwPAcIETohEbLrB0w1G/02c/yRJA3brW0yP2uCckw3QpM8GJXVoF58E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165423998578179.06586621581232; Fri, 3 Jun 2022 00:06:25 -0700 (PDT) Received: from localhost ([::1]:37092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1O3-0000bI-Sb for importer@patchew.org; Fri, 03 Jun 2022 03:06:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HC-0005dS-SL for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1H9-0003Ha-5B for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:18 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-516-1uIp_tq_N1qEjz9Qose34A-1; Fri, 03 Jun 2022 02:59:11 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7EC76802809; Fri, 3 Jun 2022 06:59:11 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 075E02166B26; Fri, 3 Jun 2022 06:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Po38TlkhPSei0IEAV6dTh8v15AE2DMIhUgzmC4QekMY=; b=IVCz4X5pLzy+usun2TrO9IDyTY10wrCIsOjIrNRqmocNwWpKqimkpB+fF2UA/bIVUxtde8 kOv+QylvCS+YKzdiHbgdkzwwwD1DTypTFZJ0lmr+EwiyINTPJjd9Jaz5tN/zeqD6UOMmmL rUsL6sVGGgggiiHXTy9D4z+qdX6hTzA= X-MC-Unique: 1uIp_tq_N1qEjz9Qose34A-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, "Dr. David Alan Gilbert" Subject: [PULL 01/12] s390: Typo fix FLOATING_POINT_SUPPPORT_ENH Date: Fri, 3 Jun 2022 08:58:54 +0200 Message-Id: <20220603065905.23805-2-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654239988056100001 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" One less P needed. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20220523115123.150340-1-dgilbert@redhat.com> Signed-off-by: Thomas Huth --- target/s390x/cpu_features_def.h.inc | 2 +- target/s390x/gen-features.c | 6 +++--- target/s390x/tcg/translate.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/s390x/cpu_features_def.h.inc b/target/s390x/cpu_feature= s_def.h.inc index e86662bb3b..3603e5fb12 100644 --- a/target/s390x/cpu_features_def.h.inc +++ b/target/s390x/cpu_features_def.h.inc @@ -58,7 +58,7 @@ DEF_FEAT(ENHANCED_MONITOR, "emon", STFL, 36, "Enhanced-mo= nitor facility") DEF_FEAT(FLOATING_POINT_EXT, "fpe", STFL, 37, "Floating-point extension fa= cility") DEF_FEAT(ORDER_PRESERVING_COMPRESSION, "opc", STFL, 38, "Order Preserving = Compression facility") DEF_FEAT(SET_PROGRAM_PARAMETERS, "sprogp", STFL, 40, "Set-program-paramete= rs facility") -DEF_FEAT(FLOATING_POINT_SUPPPORT_ENH, "fpseh", STFL, 41, "Floating-point-s= upport-enhancement facilities") +DEF_FEAT(FLOATING_POINT_SUPPORT_ENH, "fpseh", STFL, 41, "Floating-point-su= pport-enhancement facilities") DEF_FEAT(DFP, "dfp", STFL, 42, "DFP (decimal-floating-point) facility") DEF_FEAT(DFP_FAST, "dfphp", STFL, 43, "DFP (decimal-floating-point) facili= ty has high performance") DEF_FEAT(PFPO, "pfpo", STFL, 44, "PFPO instruction") diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index c03ec2c9a9..ad140184b9 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -374,7 +374,7 @@ static uint16_t base_GEN10_GA1[] =3D { S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2, S390_FEAT_GENERAL_INSTRUCTIONS_EXT, S390_FEAT_EXECUTE_EXT, - S390_FEAT_FLOATING_POINT_SUPPPORT_ENH, + S390_FEAT_FLOATING_POINT_SUPPORT_ENH, S390_FEAT_DFP, S390_FEAT_DFP_FAST, S390_FEAT_PFPO, @@ -476,7 +476,7 @@ static uint16_t full_GEN9_GA2[] =3D { S390_FEAT_MOVE_WITH_OPTIONAL_SPEC, S390_FEAT_EXTRACT_CPU_TIME, S390_FEAT_COMPARE_AND_SWAP_AND_STORE, - S390_FEAT_FLOATING_POINT_SUPPPORT_ENH, + S390_FEAT_FLOATING_POINT_SUPPORT_ENH, S390_FEAT_DFP, }; =20 @@ -700,7 +700,7 @@ static uint16_t qemu_V3_1[] =3D { S390_FEAT_GENERAL_INSTRUCTIONS_EXT, S390_FEAT_EXECUTE_EXT, S390_FEAT_SET_PROGRAM_PARAMETERS, - S390_FEAT_FLOATING_POINT_SUPPPORT_ENH, + S390_FEAT_FLOATING_POINT_SUPPORT_ENH, S390_FEAT_STFLE_45, S390_FEAT_STFLE_49, S390_FEAT_LOCAL_TLB_CLEARING, diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index b40cb84bae..fd2433d625 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -6185,17 +6185,17 @@ enum DisasInsnEnum { #define FAC_Z S390_FEAT_ZARCH #define FAC_CASS S390_FEAT_COMPARE_AND_SWAP_AND_STORE #define FAC_DFP S390_FEAT_DFP -#define FAC_DFPR S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* DFP-round= ing */ +#define FAC_DFPR S390_FEAT_FLOATING_POINT_SUPPORT_ENH /* DFP-roundi= ng */ #define FAC_DO S390_FEAT_STFLE_45 /* distinct-operands */ #define FAC_EE S390_FEAT_EXECUTE_EXT #define FAC_EI S390_FEAT_EXTENDED_IMMEDIATE #define FAC_FPE S390_FEAT_FLOATING_POINT_EXT -#define FAC_FPSSH S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* FPS-sign-= handling */ -#define FAC_FPRGR S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* FPR-GR-tr= ansfer */ +#define FAC_FPSSH S390_FEAT_FLOATING_POINT_SUPPORT_ENH /* FPS-sign-h= andling */ +#define FAC_FPRGR S390_FEAT_FLOATING_POINT_SUPPORT_ENH /* FPR-GR-tra= nsfer */ #define FAC_GIE S390_FEAT_GENERAL_INSTRUCTIONS_EXT #define FAC_HFP_MA S390_FEAT_HFP_MADDSUB #define FAC_HW S390_FEAT_STFLE_45 /* high-word */ -#define FAC_IEEEE_SIM S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* IEEE-exce= ption-simulation */ +#define FAC_IEEEE_SIM S390_FEAT_FLOATING_POINT_SUPPORT_ENH /* IEEE-excep= tion-simulation */ #define FAC_MIE S390_FEAT_STFLE_49 /* misc-instruction-extensions = */ #define FAC_LAT S390_FEAT_STFLE_49 /* load-and-trap */ #define FAC_LOC S390_FEAT_STFLE_45 /* load/store on condition 1 */ --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240715; cv=none; d=zohomail.com; s=zohoarc; b=h8a2yzY9AJ3GXRLDkD7VztZ/PmHBYXFxTHhxxV8ecaMkAbsLoW2bUL9R0molylU4g0sggxjMOUZhWtQkIwLM7lwZrRAxTCYKn+URYHt+3bsx4QwrIgfx+KAnA1xVx6xmWd+cymRpbrnVf8WVJUmvmgWGSImTgy5RC2Psp0EwPds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240715; h=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=QUw7z6x9Tgf6A2qRi9nZZdwmOe3FoMGIzHEbW6Rsc9Q=; b=cOevXtTHw9cNFenv/PUjfIALN9DoqC7G3/sBh3Ygqjs7ntaS9QQl13lsDfLEhrNZxImhFwYhnLoYTcwZmJdbOUnJyikSs4XUy88ysNilaPMpaIIC3MUgIYzwpsr8QXii6Ong4CQaLixgSORPoXow7jgKM6tgmBCgiixcCKwWySk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240715661160.4293475762438; Fri, 3 Jun 2022 00:18:35 -0700 (PDT) Received: from localhost ([::1]:52586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1Zq-0003DT-2r for importer@patchew.org; Fri, 03 Jun 2022 03:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HE-0005e2-R8 for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43633) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HC-0003I2-Fb for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:19 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-N4wYtu4pNf2hlFxeWLKyDA-1; Fri, 03 Jun 2022 02:59:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8855785A5BC; Fri, 3 Jun 2022 06:59:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17BE52166B26; Fri, 3 Jun 2022 06:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QUw7z6x9Tgf6A2qRi9nZZdwmOe3FoMGIzHEbW6Rsc9Q=; b=HAbt4FQmkw7gFZU8+gRLLj4TZM5tukHKWSLrF51JK4KhEjm6EVoE4r2PtHsqexPToTTcqF xgnb7xY+jHaG2CBScXdhrihKqOYIZZo+/QzkUoiLsKQEzDFn+RDVEX3folcNqSXo+KGVs7 fX7uCYzjneSvNXs8Ek8lrAD3sfHCDuU= X-MC-Unique: N4wYtu4pNf2hlFxeWLKyDA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Cornelia Huck Subject: [PULL 02/12] hw/s390x/s390-virtio-ccw: Improve the machine description string Date: Fri, 3 Jun 2022 08:58:55 +0200 Message-Id: <20220603065905.23805-3-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240716423100001 Content-Type: text/plain; charset="utf-8" The machine name already contains the words "ccw" and "virtio", so using "VirtIO-ccw" in the description likely does not really help the average user to get an idea what this machine type is about. Thus let's switch to "Virtual s390x machine" now, since "virtual machine" should be a familiar term, and "s390x" signals that this is about 64-bit guests (unlike S390 which could mean that it is 31-bit only). Also expand "v" to "version", since this makes it easier to use this macro also with non-numeric machine names in downstream. Message-Id: <20220506065026.513590-1-thuth@redhat.com> Acked-by: Cornelia Huck Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-ccw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 047cca0487..cc3097bfee 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -768,7 +768,7 @@ bool css_migration_enabled(void) { = \ MachineClass *mc =3D MACHINE_CLASS(oc); = \ ccw_machine_##suffix##_class_options(mc); = \ - mc->desc =3D "VirtIO-ccw based S390 machine v" verstr; = \ + mc->desc =3D "Virtual s390x machine (version " verstr ")"; = \ if (latest) { = \ mc->alias =3D "s390-ccw-virtio"; = \ mc->is_default =3D true; = \ --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240289; cv=none; d=zohomail.com; s=zohoarc; b=KX0S0vX9PQK/vrQtJQ6uzYuOYg5T3k27Phw0L3Dqe5/GRE6/Z6+srao/os5UsAbf6XgtiC4ZV7ll8C9F2H6oWHuq/7KczIsq4wtTlAQy9nmWlPqI5PKfMAQiJkbdK3e4JXXwqcyZ094IqjDy+v0EpsNWiFVI7FdAy8vpQbbDu9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240289; h=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=Sp5P5C2Pj8ss+jhGYxrC9BuR0pTV01u5nsNyhRTfKS0=; b=anZM3ngweqPCH7B+THldWklreSedqK5cX+bGjrdSALrMHwnPZF+yeBP4mbzPvw3YHXNI/LluubnDv4xGuxfy3InXPHHaoKoLM3axYQH7PmRafzjYAFYFXH3FTjfP28/eX5qGpwmKZaugHws8Ul5/Z8te5eVmknMeSTmCmaNtnAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240289294312.2274602445648; Fri, 3 Jun 2022 00:11:29 -0700 (PDT) Received: from localhost ([::1]:44282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1Sx-0005dw-R2 for importer@patchew.org; Fri, 03 Jun 2022 03:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HF-0005e5-9J for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:40501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HC-0003I3-VH for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:21 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-185-lVJIvxOKO3qpCsoqvP93fw-1; Fri, 03 Jun 2022 02:59:16 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9702100DE72; Fri, 3 Jun 2022 06:59:15 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CEB42166B26; Fri, 3 Jun 2022 06:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Sp5P5C2Pj8ss+jhGYxrC9BuR0pTV01u5nsNyhRTfKS0=; b=dhHOE4fEbuj4Sngf57+bqGOpVqzpXBTuci1mVOnWfLpgsWJegWxmRRZg/G8rd1Tq6fx7HU F+nmBk1w1fiNW0FpGAdISmWqinA3LIyNTY2ZXBvnR44soVwPcz6jvH7urg8xmDvCbLOROy UUXVJEgsZhFg/Y4pD3ZoFDug8ExSTt8= X-MC-Unique: lVJIvxOKO3qpCsoqvP93fw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Janis Schoetterl-Glausch Subject: [PULL 03/12] target/s390x: kvm: Honor storage keys during emulation Date: Fri, 3 Jun 2022 08:58:56 +0200 Message-Id: <20220603065905.23805-4-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240289966100001 Content-Type: text/plain; charset="utf-8" From: Janis Schoetterl-Glausch Storage key controlled protection is currently not honored when emulating instructions. If available, enable key protection for the MEM_OP ioctl, thereby enabling it for the s390_cpu_virt_mem_* functions, when using kvm. As a result, the emulation of the following instructions honors storage keys: * CLP The Synch I/O CLP command would need special handling in order to support storage keys, but is currently not supported. * CHSC Performing commands asynchronously would require special handling, but commands are currently always synchronous. * STSI * TSCH Must (and does) not change channel if terminated due to protection. * MSCH Suppressed on protection, works because fetching instruction. * SSCH Suppressed on protection, works because fetching instruction. * STSCH * STCRW Suppressed on protection, this works because no partial store is possible, because the operand cannot span multiple pages. * PCISTB * MPCIFC * STPCIFC Signed-off-by: Janis Schoetterl-Glausch Message-Id: <20220506153956.2217601-3-scgl@linux.ibm.com> Signed-off-by: Thomas Huth --- target/s390x/kvm/kvm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 53098bf541..7bd8db0e7b 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -151,12 +151,15 @@ const KVMCapabilityInfo kvm_arch_required_capabilitie= s[] =3D { static int cap_sync_regs; static int cap_async_pf; static int cap_mem_op; +static int cap_mem_op_extension; static int cap_s390_irq; static int cap_ri; static int cap_hpage_1m; static int cap_vcpu_resets; static int cap_protected; =20 +static bool mem_op_storage_key_support; + static int active_cmma; =20 static int kvm_s390_query_mem_limit(uint64_t *memory_limit) @@ -354,6 +357,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_sync_regs =3D kvm_check_extension(s, KVM_CAP_SYNC_REGS); cap_async_pf =3D kvm_check_extension(s, KVM_CAP_ASYNC_PF); cap_mem_op =3D kvm_check_extension(s, KVM_CAP_S390_MEM_OP); + cap_mem_op_extension =3D kvm_check_extension(s, KVM_CAP_S390_MEM_OP_EX= TENSION); + mem_op_storage_key_support =3D cap_mem_op_extension > 0; cap_s390_irq =3D kvm_check_extension(s, KVM_CAP_S390_INJECT_IRQ); cap_vcpu_resets =3D kvm_check_extension(s, KVM_CAP_S390_VCPU_RESETS); cap_protected =3D kvm_check_extension(s, KVM_CAP_S390_PROTECTED); @@ -842,6 +847,7 @@ int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t a= r, void *hostbuf, : KVM_S390_MEMOP_LOGICAL_READ, .buf =3D (uint64_t)hostbuf, .ar =3D ar, + .key =3D (cpu->env.psw.mask & PSW_MASK_KEY) >> PSW_SHIFT_KEY, }; int ret; =20 @@ -851,6 +857,9 @@ int kvm_s390_mem_op(S390CPU *cpu, vaddr addr, uint8_t a= r, void *hostbuf, if (!hostbuf) { mem_op.flags |=3D KVM_S390_MEMOP_F_CHECK_ONLY; } + if (mem_op_storage_key_support) { + mem_op.flags |=3D KVM_S390_MEMOP_F_SKEY_PROTECTION; + } =20 ret =3D kvm_vcpu_ioctl(CPU(cpu), KVM_S390_MEM_OP, &mem_op); if (ret < 0) { --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240755; cv=none; d=zohomail.com; s=zohoarc; b=YditrfMEVd8t/M7grNg2pF4wzZnnZD39uZfMthmVnMAnQFMLm6qLWYkw0GtWq6snUplVALVD+SdHUgZqC5J6DYVq9O/M0WHLyABFbFzHom/9M60j5ajlaMAgthumlsKP4PEyr1e466mOEhBkQfhLiwxZpTe6tulGl/vo67oe5d0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240755; h=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=Y7pc7qYDrs4ciBs9EJXEeDWtHxOAmKa2lNkD3Gm/0J8=; b=nomkZWxVuSwT0Quee7f1zSBN/+xWVuFDoo5G8wdU9F1FcinYk98OTMUmeCD1glyLX8DWVOEZnxKipuSvCQUx+cRGRRemYHA8OD1UDqfRdEYCLVyihAhYfcggaOuDOc+PvCbuUrKG/bN25ohXGm24jbCw6xDOJO6GH8rZnv7932k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240755319654.2466168437038; Fri, 3 Jun 2022 00:19:15 -0700 (PDT) Received: from localhost ([::1]:54008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1aU-0004Es-Ad for importer@patchew.org; Fri, 03 Jun 2022 03:19:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HH-0005eG-Mt for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HG-0003J6-4s for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:23 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-536-Ndzi96cWNrO19YGPanhBwQ-1; Fri, 03 Jun 2022 02:59:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C20D802809; Fri, 3 Jun 2022 06:59:18 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AE992166B26; Fri, 3 Jun 2022 06:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y7pc7qYDrs4ciBs9EJXEeDWtHxOAmKa2lNkD3Gm/0J8=; b=Eb/Z62W+91Ntym80RKmDcNraLgi/kFrmMUWxjJrLVwH60rXQgSGzMbPx6SEhNnfzSnNTni FPA2tgTm18UBbaM83Nm80uTwc/S5dmYwOp1CTvo4n6T4nh+du8Y9f7JtiGbwjh+n2YG0Vc P5UEICtgokitE/hJ9Au/wSrdMEW/Pfc= X-MC-Unique: Ndzi96cWNrO19YGPanhBwQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Eric Farman , Cornelia Huck Subject: [PULL 04/12] MAINTAINERS: Update s390 vhost entries Date: Fri, 3 Jun 2022 08:58:57 +0200 Message-Id: <20220603065905.23805-5-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240756840100001 Content-Type: text/plain; charset="utf-8" From: Eric Farman Commit 7a523d96a0 ("virtio-ccw: move vhost_ccw_scsi to a separate file") introduced a new file hw/s390x/vhost-scsi-ccw.c, which received a couple comments [1][2] to update MAINTAINERS that were missed. Fix that by making the vhost CCW entries a wildcard. [1] https://lore.kernel.org/r/d8d2bbd5021076bdba444d31a6da74f507baede3.came= l@linux.ibm.com/ [2] https://lore.kernel.org/r/87k0c4gb9f.fsf@redhat.com/ Signed-off-by: Eric Farman Reviewed-by: Cornelia Huck Message-Id: <20220525145814.2750501-1-farman@linux.ibm.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 00dc4a8ecb..7b7d3f9c02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2018,8 +2018,7 @@ M: Halil Pasic M: Eric Farman S: Supported F: hw/s390x/virtio-ccw*.[hc] -F: hw/s390x/vhost-vsock-ccw.c -F: hw/s390x/vhost-user-fs-ccw.c +F: hw/s390x/vhost-*-ccw.c T: git https://gitlab.com/cohuck/qemu.git s390-next T: git https://github.com/borntraeger/qemu.git s390-next L: qemu-s390x@nongnu.org --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240200; cv=none; d=zohomail.com; s=zohoarc; b=bSr9zaphpIQhzqzCFCWBfbXWqBWNhH+TrsKayesfEVbEwcs9j+la7YROAULDVC31XWbUgy+GB57ajk0E7qhmTzBZNST8GBlDYRF4RTw8UJiYZk5AhlR/OYT4B2BPQYMW3/bCcIHy2iO5l+JLxh4+Xlm9WqtpA61rKgK7YZhlU78= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240200; h=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=WiITbjjjR+UhW51YU4h8vWx72oaJ+6kKGI9+cL7Q9VA=; b=iP8ZB3zP+MclcC26aCWI8mwmPKA7uBEisicw+c3fdBp71E5nPPvA+vJrgUnE7qxvl8NVmCwm4jMCEz2PRNSvYgftCtfbR4AelpJPxrk75cMG0YG8qxOyr4Jc1260Umhu6hGIKNSTE4kGGD36Yz6Z2bu2svN9qLXrNS2yvvtutxc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240200830172.4040641380791; Fri, 3 Jun 2022 00:10:00 -0700 (PDT) Received: from localhost ([::1]:42792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1RX-0004a5-FU for importer@patchew.org; Fri, 03 Jun 2022 03:09:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HJ-0005f6-0A for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HG-0003JE-HH for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:24 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-93-XM_BCAW6OIalliKhNKxbJA-1; Fri, 03 Jun 2022 02:59:20 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 44245810BCF; Fri, 3 Jun 2022 06:59:20 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDE8E2166B26; Fri, 3 Jun 2022 06:59:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WiITbjjjR+UhW51YU4h8vWx72oaJ+6kKGI9+cL7Q9VA=; b=H9bfV7Et8Kp4Vr1BaPQszSfuxJXjyrCy8VFd2BxUSZnJtRkGeNEgnJUbRkZTySqTkjLxVI gDwrxPorh8KdXDgu3MWXrimS/ulUqew8pvncLpU6hwRyIgKZgMdH7xDq604Je71Mn5nekJ brsEK2aia9wUkvt0IF9todTveItaPaE= X-MC-Unique: XM_BCAW6OIalliKhNKxbJA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Gautam Agrawal Subject: [PULL 05/12] tests/tcg: Test overflow conditions Date: Fri, 3 Jun 2022 08:58:58 +0200 Message-Id: <20220603065905.23805-6-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240201250100001 Content-Type: text/plain; charset="utf-8" From: Gautam Agrawal Add a test to check for overflow conditions in s390x. This patch is based on the following patches : * https://git.qemu.org/?p=3Dqemu.git;a=3Dcommitdiff;h=3D5a2e67a691501 * https://git.qemu.org/?p=3Dqemu.git;a=3Dcommitdiff;h=3Dfc6e0d0f2db51 Signed-off-by: Gautam Agrawal Message-Id: <20220531183524.40948-1-gautamnagrawal@gmail.com> [thuth: Move overflow.c to tests/tcg/multiarch/ to make it generic] Signed-off-by: Thomas Huth --- tests/tcg/multiarch/overflow.c | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 tests/tcg/multiarch/overflow.c diff --git a/tests/tcg/multiarch/overflow.c b/tests/tcg/multiarch/overflow.c new file mode 100644 index 0000000000..1c59c2cb70 --- /dev/null +++ b/tests/tcg/multiarch/overflow.c @@ -0,0 +1,58 @@ +#include + +int overflow_add_32(int x, int y) +{ + int res; + return __builtin_add_overflow(x, y, &res); +} + +int overflow_add_64(long long x, long long y) +{ + long long res; + return __builtin_add_overflow(x, y, &res); +} + +int overflow_sub_32(int x, int y) +{ + int res; + return __builtin_sub_overflow(x, y, &res); +} + +int overflow_sub_64(long long x, long long y) +{ + long long res; + return __builtin_sub_overflow(x, y, &res); +} + +int a1_add =3D -2147483648; +int b1_add =3D -2147483648; +long long a2_add =3D -9223372036854775808ULL; +long long b2_add =3D -9223372036854775808ULL; + +int a1_sub; +int b1_sub =3D -2147483648; +long long a2_sub =3D 0L; +long long b2_sub =3D -9223372036854775808ULL; + +int main() +{ + int ret =3D 0; + + if (!overflow_add_32(a1_add, b1_add)) { + fprintf(stderr, "data overflow while adding 32 bits\n"); + ret =3D 1; + } + if (!overflow_add_64(a2_add, b2_add)) { + fprintf(stderr, "data overflow while adding 64 bits\n"); + ret =3D 1; + } + if (!overflow_sub_32(a1_sub, b1_sub)) { + fprintf(stderr, "data overflow while subtracting 32 bits\n"); + ret =3D 1; + } + if (!overflow_sub_64(a2_sub, b2_sub)) { + fprintf(stderr, "data overflow while subtracting 64 bits\n"); + ret =3D 1; + } + return ret; +} --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240602; cv=none; d=zohomail.com; s=zohoarc; b=nbfplg7Xe4iDuEEFo6mU7Ali9PJ+oVZfjPYob95AQbrADtiJW+iE/HH+Xc/e4q+zucELG5VqYOXJLd6VeUcQuIiyLo6z0z/pXQGzejo5Kw9yabv2W4fXg3uAeWBYkMhwJRlSnWu0fZ6j5658Els9t+5LAf28IXeLqAy9oKHKxNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240602; h=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=+Cst2KRn5OjQf3Kyz+jgO4MMq3MKO36szn5u0CwQoQw=; b=Xtw9aX8QT//Fap1GltdlAs2W5mWoiM4uLXJWnM/nDQUdfaFV0cuK6fSQJFwNZpXabGWbqL0ZxG3bw3U+BpMzpuSHE/SEK0yOXxiM6fP+zbjrEkfyy+4EimyfPwg2hiCYC+yRVXootMV2FA8eC6hm6040u37EvUzu0+CamfNYvMk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240602501168.48581158177376; Fri, 3 Jun 2022 00:16:42 -0700 (PDT) Received: from localhost ([::1]:51132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1Y1-0002BC-6h for importer@patchew.org; Fri, 03 Jun 2022 03:16:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HL-0005fI-2x for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:38086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HJ-0003Jr-IH for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:26 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-8Uohbwu8M_SGeEiShfGfsA-1; Fri, 03 Jun 2022 02:59:23 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F118180159B; Fri, 3 Jun 2022 06:59:22 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id C900B2166B26; Fri, 3 Jun 2022 06:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+Cst2KRn5OjQf3Kyz+jgO4MMq3MKO36szn5u0CwQoQw=; b=NZ8dz2QMvAEaV2lyT5YS+zQGB4gtXmqBGGULJ5wmOS/ppKu26DbREkXBZBIwCWtY40O08F CKkfKWwSwPL9EVkKSGkilHxir6LOoLpnst6IQ4fMzhVXl5tqauVagwQToHi2GK9pH7900m fQRCxYkWbManc7Q1TrDNU0WH5PsZfHE= X-MC-Unique: 8Uohbwu8M_SGeEiShfGfsA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Hailiang Zhang , Gonglei , Zhang Chen Subject: [PULL 06/12] MAINTAINERS: Change my email address Date: Fri, 3 Jun 2022 08:58:59 +0200 Message-Id: <20220603065905.23805-7-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240603645100001 Content-Type: text/plain; charset="utf-8" From: Hailiang Zhang The zhang.zhanghailiang@huawei.com email address has been stopped. Change it to my new email address. Signed-off-by: Hailiang Zhang Message-Id: <20211214075424.6920-1-zhanghailiang@xfusion.com> Acked-by: Gonglei Acked-by: Zhang Chen Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7b7d3f9c02..ee9693dc3a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3102,7 +3102,7 @@ F: include/qemu/yank.h F: qapi/yank.json =20 COLO Framework -M: zhanghailiang +M: Hailiang Zhang S: Maintained F: migration/colo* F: include/migration/colo.h --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240996; cv=none; d=zohomail.com; s=zohoarc; b=HQplm7ueRRCLGr/NoYyDvR8P5l8HmgGOJIL/EL47gRwPmzIev9Cu3L6O3413BC0anBmLNt3I5N+hxl3eErbQR4gfs5V3PfKCsX8F7BMV2XRN4F/iaNWpcV9MFlVLI3ZUXtVsll5EvBiM9Q9xEhAwlJZ5kFA9u5jV2B/WKn2FMow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240996; h=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=SX0sE1vCpMpI47SmMLm5WvHEkaFNDJfcV/cBwIY/qDI=; b=VmkRVCcL8Xro8CTcsiIVy574M7CcTGrmANa4FzIFgQwGrjQ1nqH/+FGwW2LG47AZmvaDL5IhPc5tYgZoPBjYrFp0/XSTLUxHV4UlOb7Fa+xeZvzrkVVRuxiXPOjImm11ba7JCTqsV5m0wTY6jOvC/rGtFMWriWpZV8S20J4Pe4Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240996137755.1019871072699; Fri, 3 Jun 2022 00:23:16 -0700 (PDT) Received: from localhost ([::1]:58392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1eL-0007oW-Jp for importer@patchew.org; Fri, 03 Jun 2022 03:23:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HM-0005fk-R1 for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HL-0003K2-95 for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:28 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-602-oD0a0b2KO-in9Z1TZ4mMdQ-1; Fri, 03 Jun 2022 02:59:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1EEB8185A794; Fri, 3 Jun 2022 06:59:25 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 571792166B26; Fri, 3 Jun 2022 06:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SX0sE1vCpMpI47SmMLm5WvHEkaFNDJfcV/cBwIY/qDI=; b=g3b2zjWvu+zksfVq2mMNEwyWZmTEy+FU65kgKGByVBbrY9sNZXvrMrzYIa4HInxLKU6/gm dwZYxUIP/vGjjcb89DGcStZoC/E1aw5J9xMrWBtwJpRG6SEzZqi4H1fUbE+qiZTzS/75+7 wb8DX3sBLCJS6K9XONpAmAQQi42uwC0= X-MC-Unique: oD0a0b2KO-in9Z1TZ4mMdQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Wenchao Wang , Hang Yuan Subject: [PULL 07/12] MAINTAINERS: Update maintainers for Guest x86 HAXM CPUs Date: Fri, 3 Jun 2022 08:59:00 +0200 Message-Id: <20220603065905.23805-8-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240998344100001 Content-Type: text/plain; charset="utf-8" From: Wenchao Wang Clean up the maintainer list. Reviewed-by: Hang Yuan Signed-off-by: Wenchao Wang Message-Id: [thuth: Note: Colin Xu's address bounces] Signed-off-by: Thomas Huth --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index ee9693dc3a..5fe8f7eca2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -488,7 +488,6 @@ Guest CPU Cores (HAXM) --------------------- X86 HAXM CPUs M: Wenchao Wang -M: Colin Xu L: haxm-team@intel.com W: https://github.com/intel/haxm/issues S: Maintained --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654241518; cv=none; d=zohomail.com; s=zohoarc; b=MYDJFpVZ9+BKlS9E1/1pZIUu9VgKJzGN//ix7ZWf46EsZnwbtO/vSOJ+Xe2q6Cec2vfHfcw3vKelK5ZBGsALLWKiFvSfp+rEOaRB+PG8sRvs9YrfE+DYawEjKp+r95v310UrPRaAMiQYxKa2/g4n/iKpcgom6Jq3/OMlz1N8fk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654241518; h=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=EU4c4qAlX5b5mWHedXjmwguRtObwdcqZHncJpkJVYGM=; b=ap+0QdkhkCZVjmlrEfRDR1iQfs/GZPLZYPDwDS+WhYbAoNEbMVUbSQPp+cwTocqTzYcgbfshfhDCK8LkTZ+gKiJzoNSo6Eyb6P5TusmhZjmB88Wrfokgzo1loCqjGGqvAZrWGsYcislwvRHVTFoOw1AZM0AVmAUHOUGVcBoAiKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654241518414540.6606520760208; Fri, 3 Jun 2022 00:31:58 -0700 (PDT) Received: from localhost ([::1]:37570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1mm-0004h0-Qe for importer@patchew.org; Fri, 03 Jun 2022 03:31:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HT-0005g5-7h for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45120) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HQ-0003Ki-7n for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:34 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-513-ygheTbZGMbq8gax4FKngmw-1; Fri, 03 Jun 2022 02:59:28 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D9E0101A54E; Fri, 3 Jun 2022 06:59:27 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id B25792166B26; Fri, 3 Jun 2022 06:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EU4c4qAlX5b5mWHedXjmwguRtObwdcqZHncJpkJVYGM=; b=Xn1qR77/qngwZyR2plQqMJxgdXmLiY8VP6luA9qpAnpduKtcU0kK4PhcreqZViaCTLJ4t0 xCusH/0YFw9ICKKjXewKv07lYEzL5PByCubfhnPNZovWwh4o7Sscrcf7zFiSHRHQReaTos G7OwS+7Mm/L68bhmOHdiA5Ie4PjFSu8= X-MC-Unique: ygheTbZGMbq8gax4FKngmw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Miaoqian Lin , Hao Wu Subject: [PULL 08/12] qtest/npcm7xx_pwm-test: Fix memory leak in mft_qom_set Date: Fri, 3 Jun 2022 08:59:01 +0200 Message-Id: <20220603065905.23805-9-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654241519313100001 Content-Type: text/plain; charset="utf-8" From: Miaoqian Lin g_strdup_printf() allocated memory for path, we should free it with g_free() when no longer needed. Signed-off-by: Miaoqian Lin Reviewed-by: Hao Wu Message-Id: <20220531080921.4704-1-linmq006@gmail.com> Signed-off-by: Thomas Huth --- tests/qtest/npcm7xx_pwm-test.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qtest/npcm7xx_pwm-test.c b/tests/qtest/npcm7xx_pwm-test.c index c4a5fdcacd..e320a625c4 100644 --- a/tests/qtest/npcm7xx_pwm-test.c +++ b/tests/qtest/npcm7xx_pwm-test.c @@ -268,6 +268,9 @@ static void mft_qom_set(QTestState *qts, int index, con= st char *name, path, name, value); /* The qom set message returns successfully. */ g_assert_true(qdict_haskey(response, "return")); + + qobject_unref(response); + g_free(path); } =20 static uint32_t get_pll(uint32_t con) --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240030; cv=none; d=zohomail.com; s=zohoarc; b=EgkImYlIYcI6LDPFG7/dV2jFOpzk/mqybRDUKO2JrdrNZd7uwJeKQucmYuDxoLELW9SoJ6u8zu6AC143SkFN7jKe59tNoOGbrvNaycqFXofPsax2cdm4UbS+9O05NpVEPCzIgqk9PLvg8LzcYLr8+RdF6Gx4uxBUWZcGxmz5VvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240030; 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=r5bcGBvLaUmdTRJRcSD2ZBtxrphhpjSjepeJdlSaS3o=; b=Oui46+IECpExvQ28XFy3woxl3xPy8euZyEg4NsECOt6D5tcmbotgluqJWzSRuQl9xOd+QUVZwJHHitGRSz+Q/jtzIYihJHd0JyT+Hc/7Kbmc5yNHlDJbHbqYU1ElH5DbUUeNjk47Wxw1mv3GAiVX5xcSKao31jelKUVnc+4OzCs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165424003006480.75055845915892; Fri, 3 Jun 2022 00:07:10 -0700 (PDT) Received: from localhost ([::1]:38310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1Om-0001RW-Rr for importer@patchew.org; Fri, 03 Jun 2022 03:07:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HU-0005g8-Dr for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HS-0003LM-Vm for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:36 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-380-W0m8mjcmOMOHyAugJWL2KQ-1; Fri, 03 Jun 2022 02:59:30 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF5951C06EDD; Fri, 3 Jun 2022 06:59:29 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C2BB2166B26; Fri, 3 Jun 2022 06:59:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239574; 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=r5bcGBvLaUmdTRJRcSD2ZBtxrphhpjSjepeJdlSaS3o=; b=H40p0OXLT9p6Vw+unRwXtQ3lFLw0wRzdzZatbUfT36r0i8KDjcCb3QJsPfMP8UqMsEK+Uq C1fuaBEgvImBHEffRNVYTNM8uyyA0kridMXxHvTtBUYHU6G+ex7EAO8+63Z0oBNpZwVjjq WVdbCxtLzF5NV0/sFlVYT7uNwX9VIgY= X-MC-Unique: W0m8mjcmOMOHyAugJWL2KQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 09/12] tests/qtest: use g_autofree for test_server_create_chr Date: Fri, 3 Jun 2022 08:59:02 +0200 Message-Id: <20220603065905.23805-10-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240030559100001 From: Alex Benn=C3=A9e Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220524154056.2896913-12-alex.bennee@linaro.org> Signed-off-by: Thomas Huth --- tests/qtest/vhost-user-test.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index a2cec87684..8bf390be20 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -524,14 +524,13 @@ static void chr_event(void *opaque, QEMUChrEvent even= t) =20 static void test_server_create_chr(TestServer *server, const gchar *opt) { - gchar *chr_path; + g_autofree gchar *chr_path =3D g_strdup_printf("unix:%s%s", + server->socket_path, opt); Chardev *chr; =20 - chr_path =3D g_strdup_printf("unix:%s%s", server->socket_path, opt); chr =3D qemu_chr_new(server->chr_name, chr_path, server->context); - g_free(chr_path); + g_assert(chr); =20 - g_assert_nonnull(chr); qemu_chr_fe_init(&server->chr, chr, &error_abort); qemu_chr_fe_set_handlers(&server->chr, chr_can_read, chr_read, chr_event, NULL, server, server->context, tru= e); --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654241168; cv=none; d=zohomail.com; s=zohoarc; b=dgLMcZPI6VYGDSP+DCmvIVFV+GgytrKHBQr+4HsPLKd4YmynWqKfyGzpSkOm7EPUeTxkUvoopQx/kK/Wf9mHhmCwa0NoqfcBRCMC55upGi/ERmrQmqfxaytkFq3QCGklVsX+XEWP/PbV5zirDJsG2+mVEGpEVzw8M/0/LZoitFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654241168; 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=4fC513nknZpChoPx8FUDMYvKuUPSKmQOqHAIZYdILFA=; b=fpf5gldaYVksrN7PZEEc6O6JqLQFZnqtoN/hd7ebcCEk2HRWHA8OaLtoSDQB9HZqSyJH1woMlRT0VowcHd5M8u9X2WCHiakIyAlO0FJc/cWC21x/i8Dxhio0DY8iaWDmkWxF2TvTvur0GhHF8r5J2SqIfkfHXfswypeg/B4rLpA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654241168162204.66010079202852; Fri, 3 Jun 2022 00:26:08 -0700 (PDT) Received: from localhost ([::1]:60624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1h9-00011H-1q for importer@patchew.org; Fri, 03 Jun 2022 03:26:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HV-0005gE-UE for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:60889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HS-0003L0-W3 for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:37 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-557-tERyoox3MbudFVhnxMsNhQ-1; Fri, 03 Jun 2022 02:59:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E8D26811E76; Fri, 3 Jun 2022 06:59:31 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A6F42166B26; Fri, 3 Jun 2022 06:59:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239573; 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=4fC513nknZpChoPx8FUDMYvKuUPSKmQOqHAIZYdILFA=; b=GqW0apfRjhMPrkxgXmNzLoZDXN+EKzycNe8fIV+fu12N8aD+Klw3ojKr1HZVX6OkK372bf m/GoQcR26S+NBAuQYjx8oxz4Fyc6rh8LeY26Oa82trdO9vpDe9ENc1sq65y7f4ab7OTZhg zC9D4S5gMEaLR97R/Krel5ZEgzC+4pM= X-MC-Unique: tERyoox3MbudFVhnxMsNhQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Markus Armbruster Subject: [PULL 10/12] ui: Remove deprecated parameters of the "-display sdl" option Date: Fri, 3 Jun 2022 08:59:03 +0200 Message-Id: <20220603065905.23805-11-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654241168899100001 Dropping these deprecated parameters simplifies further refactoring (e.g. QAPIfication is easier without underscores in the name). Message-Id: <20220519155625.1414365-2-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 16 ------------- docs/about/removed-features.rst | 17 ++++++++++++++ softmmu/vl.c | 41 +-------------------------------- qemu-options.hx | 32 ++----------------------- 4 files changed, 20 insertions(+), 86 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index a92ae0f162..562a133f18 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -81,22 +81,6 @@ the process listing. This is replaced by the new ``passw= ord-secret`` option which lets the password be securely provided on the command line using a ``secret`` object instance. =20 -``-display sdl,window_close=3D...`` (since 6.1) -''''''''''''''''''''''''''''''''''''''''''''' - -Use ``-display sdl,window-close=3D...`` instead (i.e. with a minus instead= of -an underscore between "window" and "close"). - -``-alt-grab`` and ``-display sdl,alt_grab=3Don`` (since 6.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. - -``-ctrl-grab`` and ``-display sdl,ctrl_grab=3Don`` (since 6.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Use ``-display sdl,grab-mod=3Drctrl`` instead. - ``-sdl`` (since 6.2) '''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index eb76974347..4c9e001c35 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -370,6 +370,23 @@ The ``opened=3Don`` option in the command line or QMP = ``object-add`` either had no effect (if ``opened`` was the last option) or caused errors. The prope= rty is therefore useless and should simply be removed. =20 +``-display sdl,window_close=3D...`` (removed in 7.1) +'''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,window-close=3D...`` instead (i.e. with a minus instead= of +an underscore between "window" and "close"). + +``-alt-grab`` and ``-display sdl,alt_grab=3Don`` (removed in 7.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. + +``-ctrl-grab`` and ``-display sdl,ctrl_grab=3Don`` (removed in 7.1) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-display sdl,grab-mod=3Drctrl`` instead. + + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/softmmu/vl.c b/softmmu/vl.c index 84a31eba76..57ab9d5322 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1079,32 +1079,7 @@ static void parse_display(const char *p) } else { goto invalid_sdl_args; } - } else if (strstart(opts, ",alt_grab=3D", &nextopt)) { - opts =3D nextopt; - if (strstart(opts, "on", &nextopt)) { - alt_grab =3D 1; - } else if (strstart(opts, "off", &nextopt)) { - alt_grab =3D 0; - } else { - goto invalid_sdl_args; - } - warn_report("alt_grab is deprecated, use grab-mod instead.= "); - } else if (strstart(opts, ",ctrl_grab=3D", &nextopt)) { - opts =3D nextopt; - if (strstart(opts, "on", &nextopt)) { - ctrl_grab =3D 1; - } else if (strstart(opts, "off", &nextopt)) { - ctrl_grab =3D 0; - } else { - goto invalid_sdl_args; - } - warn_report("ctrl_grab is deprecated, use grab-mod instead= ."); - } else if (strstart(opts, ",window_close=3D", &nextopt) || - strstart(opts, ",window-close=3D", &nextopt)) { - if (strstart(opts, ",window_close=3D", NULL)) { - warn_report("window_close with an underscore is deprec= ated," - " please use window-close instead."); - } + } else if (strstart(opts, ",window-close=3D", &nextopt)) { opts =3D nextopt; dpy.has_window_close =3D true; if (strstart(opts, "on", &nextopt)) { @@ -1962,10 +1937,6 @@ static void qemu_create_early_backends(void) const bool use_gtk =3D false; #endif =20 - if ((alt_grab || ctrl_grab) && !use_sdl) { - error_report("-alt-grab and -ctrl-grab are only valid " - "for SDL, ignoring option"); - } if (dpy.has_window_close && !use_gtk && !use_sdl) { error_report("window-close is only valid for GTK and SDL, " "ignoring option"); @@ -3273,16 +3244,6 @@ void qemu_init(int argc, char **argv, char **envp) dpy.has_full_screen =3D true; dpy.full_screen =3D true; break; - case QEMU_OPTION_alt_grab: - alt_grab =3D 1; - warn_report("-alt-grab is deprecated, please use " - "-display sdl,grab-mod=3Dlshift-lctrl-lalt ins= tead."); - break; - case QEMU_OPTION_ctrl_grab: - ctrl_grab =3D 1; - warn_report("-ctrl-grab is deprecated, please use " - "-display sdl,grab-mod=3Drctrl instead."); - break; case QEMU_OPTION_sdl: warn_report("-sdl is deprecated, use -display sdl instead.= "); #ifdef CONFIG_SDL diff --git a/qemu-options.hx b/qemu-options.hx index a664baaa18..726e437a97 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1938,8 +1938,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, "-display spice-app[,gl=3Don|off]\n" #endif #if defined(CONFIG_SDL) - "-display sdl[,alt_grab=3Don|off][,ctrl_grab=3Don|off][,gl=3Don|core|e= s|off]\n" - " [,grab-mod=3D][,show-cursor=3Don|off][,window-close= =3Don|off]\n" + "-display sdl[,gl=3Don|core|es|off][,grab-mod=3D][,show-cursor=3D= on|off]\n" + " [,window-close=3Don|off]\n" #endif #if defined(CONFIG_GTK) "-display gtk[,full-screen=3Don|off][,gl=3Don|off][,grab-on-hover=3Don= |off]\n" @@ -2012,12 +2012,6 @@ SRST the mouse grabbing in conjunction with the "g" key. ```` can= be either ``lshift-lctrl-lalt`` or ``rctrl``. =20 - ``alt_grab=3Don|off`` : Use Control+Alt+Shift-g to toggle mouse gr= abbing. - This parameter is deprecated - use ``grab-mod`` instead. - - ``ctrl_grab=3Don|off`` : Use Right-Control-g to toggle mouse grabb= ing. - This parameter is deprecated - use ``grab-mod`` instead. - ``gl=3Don|off|core|es`` : Use OpenGL for displaying =20 ``show-cursor=3Don|off`` : Force showing the mouse cursor @@ -2103,28 +2097,6 @@ SRST is displayed in graphical mode. ERST =20 -DEF("alt-grab", 0, QEMU_OPTION_alt_grab, - "-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt= )\n", - QEMU_ARCH_ALL) -SRST -``-alt-grab`` - Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Note that - this also affects the special keys (for fullscreen, monitor-mode - switching, etc). This option is deprecated - please use - ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` instead. -ERST - -DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab, - "-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n", - QEMU_ARCH_ALL) -SRST -``-ctrl-grab`` - Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). Note that this - also affects the special keys (for fullscreen, monitor-mode - switching, etc). This option is deprecated - please use - ``-display sdl,grab-mod=3Drctrl`` instead. -ERST - DEF("sdl", 0, QEMU_OPTION_sdl, "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL) SRST --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654241777; cv=none; d=zohomail.com; s=zohoarc; b=dxEMTiVLOW1sASjEzqMSQ1PHTJoYdq5P2YlNc8Tv9rHHxE0ao71z72m1W1DOi6JQG7V/BLNd61jv2vSUHLaVVf8yb7UE5u0siONEh/K/8avE5Z3mQn7WCvAlNQiUipKu+U9jjJ1OtwEJ3t7YURY9eoMRoKA5Cp5b46YSDL8wZhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654241777; h=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=t1S8TUdRNo29A3avwFpEKKxFjlAgBBzDXkObq3CRQ2E=; b=ndHFCYXpvbz4iYuPsPxti+N7wKtAi0yYSLwVSxc7xt8wKURBIjP44RqHZppSWsmNx7QONBTzG/a65CgYejccy9thmkJ/Q7C/JDa8xMQb+NsLvsMUFcfG1IRbbao4FYPSqdw5rRivyv1iLox4C4TW3U+GsZgHEJyEIZTehHo7QGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654241777166813.7249961000981; Fri, 3 Jun 2022 00:36:17 -0700 (PDT) Received: from localhost ([::1]:42384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1qy-0008E2-4d for importer@patchew.org; Fri, 03 Jun 2022 03:36:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1Ha-0005gt-SS for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HW-0003MT-DQ for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:42 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-256-y8Dr4_QyNFOGsTYJgUZq_Q-1; Fri, 03 Jun 2022 02:59:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AA5273C0F754; Fri, 3 Jun 2022 06:59:33 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 449062166B26; Fri, 3 Jun 2022 06:59:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t1S8TUdRNo29A3avwFpEKKxFjlAgBBzDXkObq3CRQ2E=; b=Uqb5m6HiMWqTkxjPsKWPbtElemG0x+SSME1LV/T3vyB+GEZVXlm08o7WWBNKquH2Ro6uJO axXcFYgwgaOWImgJccIEt/u39bHJ9nT78yUa2oIrtk3L0WMV5DGA7hD2vvUxFjfuaqpvbK iRGNiSVt3asOwXbSXBvkO3rNCQyWTBo= X-MC-Unique: y8Dr4_QyNFOGsTYJgUZq_Q-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Markus Armbruster Subject: [PULL 11/12] ui: Switch "-display sdl" to use the QAPI parser Date: Fri, 3 Jun 2022 08:59:04 +0200 Message-Id: <20220603065905.23805-12-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654241777773100001 Content-Type: text/plain; charset="utf-8" The "-display sdl" option still uses a hand-crafted parser for its parameters since we didn't want to drag an interface we considered somewhat flawed into the QAPI schema. Since the flaws are gone now, it's time to QAPIfy. This introduces the new "DisplaySDL" QAPI struct that is used to hold the parameters that are unique to the SDL display. The only specific parameter is currently "grab-mod" that is used to specify the required modifier keys to escape from the mouse grabbing mode. Message-Id: <20220519155625.1414365-3-thuth@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- qapi/ui.json | 26 ++++++++++++++- include/sysemu/sysemu.h | 2 -- softmmu/globals.c | 2 -- softmmu/vl.c | 70 +---------------------------------------- ui/sdl2.c | 10 ++++++ 5 files changed, 36 insertions(+), 74 deletions(-) diff --git a/qapi/ui.json b/qapi/ui.json index 11a827d10f..413371d5e8 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1295,6 +1295,29 @@ '*swap-opt-cmd': 'bool' } } =20 +## +# @HotKeyMod: +# +# Set of modifier keys that need to be held for shortcut key actions. +# +# Since: 7.1 +## +{ 'enum' : 'HotKeyMod', + 'data' : [ 'lctrl-lalt', 'lshift-lctrl-lalt', 'rctrl' ] } + +## +# @DisplaySDL: +# +# SDL2 display options. +# +# @grab-mod: Modifier keys that should be pressed together with the +# "G" key to release the mouse grab. +# +# Since: 7.1 +## +{ 'struct' : 'DisplaySDL', + 'data' : { '*grab-mod' : 'HotKeyMod' } } + ## # @DisplayType: # @@ -1374,7 +1397,8 @@ 'curses': { 'type': 'DisplayCurses', 'if': 'CONFIG_CURSES' }, 'egl-headless': { 'type': 'DisplayEGLHeadless', 'if': { 'all': ['CONFIG_OPENGL', 'CONFIG_GBM'] } }, - 'dbus': { 'type': 'DisplayDBus', 'if': 'CONFIG_DBUS_DISPLAY' } + 'dbus': { 'type': 'DisplayDBus', 'if': 'CONFIG_DBUS_DISPLAY' }, + 'sdl': { 'type': 'DisplaySDL', 'if': 'CONFIG_SDL' } } } =20 diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index b4030acd74..812f66a31a 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -42,8 +42,6 @@ extern int graphic_depth; extern int display_opengl; extern const char *keyboard_layout; extern int win2k_install_hack; -extern int alt_grab; -extern int ctrl_grab; extern int graphic_rotate; extern int old_param; extern uint8_t *boot_splash_filedata; diff --git a/softmmu/globals.c b/softmmu/globals.c index 916bc12e2b..527edbefdd 100644 --- a/softmmu/globals.c +++ b/softmmu/globals.c @@ -50,8 +50,6 @@ QEMUOptionRom option_rom[MAX_OPTION_ROMS]; int nb_option_roms; int old_param; const char *qemu_name; -int alt_grab; -int ctrl_grab; unsigned int nb_prom_envs; const char *prom_envs[MAX_PROM_ENVS]; uint8_t *boot_splash_filedata; diff --git a/softmmu/vl.c b/softmmu/vl.c index 57ab9d5322..484e9d9921 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1056,75 +1056,7 @@ static void parse_display(const char *p) exit(0); } =20 - if (strstart(p, "sdl", &opts)) { - /* - * sdl DisplayType needs hand-crafted parser instead of - * parse_display_qapi() due to some options not in - * DisplayOptions, specifically: - * - ctrl_grab + alt_grab - * They can't be moved into the QAPI since they use underscore= s, - * thus they will get replaced by "grab-mod" in the long term - */ -#if defined(CONFIG_SDL) - dpy.type =3D DISPLAY_TYPE_SDL; - while (*opts) { - const char *nextopt; - - if (strstart(opts, ",grab-mod=3D", &nextopt)) { - opts =3D nextopt; - if (strstart(opts, "lshift-lctrl-lalt", &nextopt)) { - alt_grab =3D 1; - } else if (strstart(opts, "rctrl", &nextopt)) { - ctrl_grab =3D 1; - } else { - goto invalid_sdl_args; - } - } else if (strstart(opts, ",window-close=3D", &nextopt)) { - opts =3D nextopt; - dpy.has_window_close =3D true; - if (strstart(opts, "on", &nextopt)) { - dpy.window_close =3D true; - } else if (strstart(opts, "off", &nextopt)) { - dpy.window_close =3D false; - } else { - goto invalid_sdl_args; - } - } else if (strstart(opts, ",show-cursor=3D", &nextopt)) { - opts =3D nextopt; - dpy.has_show_cursor =3D true; - if (strstart(opts, "on", &nextopt)) { - dpy.show_cursor =3D true; - } else if (strstart(opts, "off", &nextopt)) { - dpy.show_cursor =3D false; - } else { - goto invalid_sdl_args; - } - } else if (strstart(opts, ",gl=3D", &nextopt)) { - opts =3D nextopt; - dpy.has_gl =3D true; - if (strstart(opts, "on", &nextopt)) { - dpy.gl =3D DISPLAYGL_MODE_ON; - } else if (strstart(opts, "core", &nextopt)) { - dpy.gl =3D DISPLAYGL_MODE_CORE; - } else if (strstart(opts, "es", &nextopt)) { - dpy.gl =3D DISPLAYGL_MODE_ES; - } else if (strstart(opts, "off", &nextopt)) { - dpy.gl =3D DISPLAYGL_MODE_OFF; - } else { - goto invalid_sdl_args; - } - } else { - invalid_sdl_args: - error_report("invalid SDL option string"); - exit(1); - } - opts =3D nextopt; - } -#else - error_report("SDL display supported is not available in this binar= y"); - exit(1); -#endif - } else if (strstart(p, "vnc", &opts)) { + if (strstart(p, "vnc", &opts)) { /* * vnc isn't a (local) DisplayType but a protocol for remote * display access. diff --git a/ui/sdl2.c b/ui/sdl2.c index d3741f9b75..8cb77416af 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -40,6 +40,8 @@ static struct sdl2_console *sdl2_console; =20 static SDL_Surface *guest_sprite_surface; static int gui_grab; /* if true, all keyboard/mouse events are grabbed */ +static bool alt_grab; +static bool ctrl_grab; =20 static int gui_saved_grab; static int gui_fullscreen; @@ -853,6 +855,14 @@ static void sdl2_display_init(DisplayState *ds, Displa= yOptions *o) =20 gui_fullscreen =3D o->has_full_screen && o->full_screen; =20 + if (o->u.sdl.has_grab_mod) { + if (o->u.sdl.grab_mod =3D=3D HOT_KEY_MOD_LSHIFT_LCTRL_LALT) { + alt_grab =3D true; + } else if (o->u.sdl.grab_mod =3D=3D HOT_KEY_MOD_RCTRL) { + ctrl_grab =3D true; + } + } + for (i =3D 0;; i++) { QemuConsole *con =3D qemu_console_lookup_by_index(i); if (!con) { --=20 2.31.1 From nobody Fri May 17 03:39:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654240371; cv=none; d=zohomail.com; s=zohoarc; b=I75flqjeoLJsd/ttazBQTCJ0crx2OswVppGXrWNveXS8ymkboazfcRfV0pa240+e7OWamidvbaqrgNHPvT3wiCUm3xzxjaCEvEe2j1kcZ0MWNjspU0xz8+LGKrdKI7Seg9lZhT3C4MDQRYLGHZAO3CS3piT9cCzeAbHbTUR7zmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654240371; 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=sm2tw0lWch+hYG+yFaY5iSwxWMI2ouNWEd1IQwdV7Mg=; b=XKimAhaKgK5bQVzzFXOdCacEKLDCQdq/8zQH3x9q/8GDSlZ8Z+tZj8Td4g6oUwhCaKelEPb/Iv7rD240D2ZvnQ5EOqO7nrIFSimanVI0VQXHrR9pdPsIZygyYGHkJcfAuTAGlXUWjCKdnAjQU6GYc+oyv/xIrWDg5x9kXSJ2Jos= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654240371410726.7040698310444; Fri, 3 Jun 2022 00:12:51 -0700 (PDT) Received: from localhost ([::1]:47042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nx1UI-0007eO-Cp for importer@patchew.org; Fri, 03 Jun 2022 03:12:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HZ-0005gU-LD for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36769) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nx1HX-0003Ml-HV for qemu-devel@nongnu.org; Fri, 03 Jun 2022 02:59:41 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-275-9M7PUqHfOfuTm7hgjYYFag-1; Fri, 03 Jun 2022 02:59:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6B4B1380670E; Fri, 3 Jun 2022 06:59:35 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 134882166B26; Fri, 3 Jun 2022 06:59:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654239578; 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=sm2tw0lWch+hYG+yFaY5iSwxWMI2ouNWEd1IQwdV7Mg=; b=GdHPKG/RJoBZyEvwwz5b/NhfimEEoZ2+4Qr2wA7B7DinWQXeV5XGJHJrr8KkdXftLRltTb S1RcGiF7JLbPt7dPzcqUVtHjoKdu15Bbq0qr6bTzZbgG0B9sNNNWnh/Q4y0o3jk2vSmJLb CNcH6YTBCWhIIdoZ5Khn36C9atC0bhc= X-MC-Unique: 9M7PUqHfOfuTm7hgjYYFag-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 12/12] ui: Remove deprecated options "-sdl" and "-curses" Date: Fri, 3 Jun 2022 08:59:05 +0200 Message-Id: <20220603065905.23805-13-thuth@redhat.com> In-Reply-To: <20220603065905.23805-1-thuth@redhat.com> References: <20220603065905.23805-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654240372277100001 We have "-sdl" and "-curses", but no "-gtk" and no "-cocoa" ... these old-style options are rather confusing than helpful nowadays. Now that the deprecation period is over, let's remove them, so we get a cleaner interface (where "-display" is the only way to select the user interface). Message-Id: <20220519155625.1414365-4-thuth@redhat.com> Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 10 ---------- docs/about/removed-features.rst | 10 ++++++++++ softmmu/vl.c | 19 ------------------- qemu-options.hx | 24 ++---------------------- 4 files changed, 12 insertions(+), 51 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 562a133f18..e19bcba242 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -81,16 +81,6 @@ the process listing. This is replaced by the new ``passw= ord-secret`` option which lets the password be securely provided on the command line using a ``secret`` object instance. =20 -``-sdl`` (since 6.2) -'''''''''''''''''''' - -Use ``-display sdl`` instead. - -``-curses`` (since 6.2) -''''''''''''''''''''''' - -Use ``-display curses`` instead. - ``-watchdog`` (since 6.2) ''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 4c9e001c35..c7b9dadd5d 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -386,6 +386,16 @@ Use ``-display sdl,grab-mod=3Dlshift-lctrl-lalt`` inst= ead. =20 Use ``-display sdl,grab-mod=3Drctrl`` instead. =20 +``-sdl`` (removed in 7.1) +''''''''''''''''''''''''' + +Use ``-display sdl`` instead. + +``-curses`` (removed in 7.1) +'''''''''''''''''''''''''''' + +Use ``-display curses`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index 484e9d9921..4c1e94b00e 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2800,16 +2800,6 @@ void qemu_init(int argc, char **argv, char **envp) nographic =3D true; dpy.type =3D DISPLAY_TYPE_NONE; break; - case QEMU_OPTION_curses: - warn_report("-curses is deprecated, " - "use -display curses instead."); -#ifdef CONFIG_CURSES - dpy.type =3D DISPLAY_TYPE_CURSES; -#else - error_report("curses or iconv support is disabled"); - exit(1); -#endif - break; case QEMU_OPTION_portrait: graphic_rotate =3D 90; break; @@ -3176,15 +3166,6 @@ void qemu_init(int argc, char **argv, char **envp) dpy.has_full_screen =3D true; dpy.full_screen =3D true; break; - case QEMU_OPTION_sdl: - warn_report("-sdl is deprecated, use -display sdl instead.= "); -#ifdef CONFIG_SDL - dpy.type =3D DISPLAY_TYPE_SDL; - break; -#else - error_report("SDL support is disabled"); - exit(1); -#endif case QEMU_OPTION_pidfile: pid_file =3D optarg; break; diff --git a/qemu-options.hx b/qemu-options.hx index 726e437a97..60cf188da4 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1981,9 +1981,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display, , QEMU_ARCH_ALL) SRST ``-display type`` - Select type of display to use. This option is a replacement for the - old style -sdl/-curses/... options. Use ``-display help`` to list - the available display types. Valid values for type are + Select type of display to use. Use ``-display help`` to list the avail= able + display types. Valid values for type are =20 ``spice-app[,gl=3Don|off]`` Start QEMU as a Spice server and launch the default Spice client @@ -2085,25 +2084,6 @@ SRST Use C-a h for help on switching between the console and monitor. ERST =20 -DEF("curses", 0, QEMU_OPTION_curses, - "-curses shorthand for -display curses\n", - QEMU_ARCH_ALL) -SRST -``-curses`` - Normally, if QEMU is compiled with graphical window support, it - displays output such as guest graphics, guest console, and the QEMU - monitor in a window. With this option, QEMU can display the VGA - output when in text mode using a curses/ncurses interface. Nothing - is displayed in graphical mode. -ERST - -DEF("sdl", 0, QEMU_OPTION_sdl, - "-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL) -SRST -``-sdl`` - Enable SDL. -ERST - #ifdef CONFIG_SPICE DEF("spice", HAS_ARG, QEMU_OPTION_spice, "-spice [port=3Dport][,tls-port=3Dsecured-port][,x509-dir=3D]\n" --=20 2.31.1