From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6FBA9C3DA4A for ; Mon, 29 Jul 2024 15:25:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sYSFB-0002ql-4U; Mon, 29 Jul 2024 11:25:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sYSF8-0002fH-E8 for qemu-devel@nongnu.org; Mon, 29 Jul 2024 11:24:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sYSF5-0007iC-Ub for qemu-devel@nongnu.org; Mon, 29 Jul 2024 11:24:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722266694; 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:autocrypt:autocrypt; bh=6zxXExFxLiFpv8LmL4bIzYyd96k5eTbqKTeJ2i6LrOw=; b=e4Ru9KjPUPrYKouGIaNIzfYzX4Fdsbk/JJdU9vIndHbawRhNxEJ0QDcofYelr8fn7RcdTI IIoO5sQVRGpg232dDjxRYzkMj/taK1YVubeWX4Je30Q7YkeMWQxoFSdthLSPQav/heuAvv HI2jir7n08k27CybIl1KZduXw9DGpSk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-226-Y9OA_TTqMt2DjiYv57Oo6g-1; Mon, 29 Jul 2024 11:24:52 -0400 X-MC-Unique: Y9OA_TTqMt2DjiYv57Oo6g-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-36871eb0a8eso1549954f8f.3 for ; Mon, 29 Jul 2024 08:24:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722266691; x=1722871491; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=6zxXExFxLiFpv8LmL4bIzYyd96k5eTbqKTeJ2i6LrOw=; b=mivtqFO/j3mAmfPznYXsYSeCgY7HE18wyJP3QEctOp/JM/u1HD8INvkMWrylq2G9XB mtmOdcp8u9SGCtRZx9r1htNpsTLnB3d5QP7H3iRjH/yN9zzyaLQAKKhwfy9467GLcuX7 Khr5mrowfcD7yLRqg5/sgyxVPLtb8zVOhGC6HWvTuj4IPLXH3JAoWIVlReNj5w7l2F7V Qhn8gz69sdzopV+Z9OS8BxIg37VU8vQnQDAK1/IcBw8Za7syGuxxrQ/tKnQqDVI49qTP 6BE5mAVXX4bS3ENLV1x84cuT4BS0G41mt9SHRq2Y5bWepi8eqH2JHfdV7uhxGBi56Nef pjsg== X-Forwarded-Encrypted: i=1; AJvYcCVq3+WowkgD9XMPVSi3obNfHmisDQFDAWCen+7h8RPKjt0QIpeVPuzZ6nct71dej24h6bHYK0jDStWFqWykNxX18yxxKgU= X-Gm-Message-State: AOJu0Yxdh9CG3qe+zzWCGkOEk7+9cQG+09YcPUMC2OPXRWt+s6fOHnQD 03kBlOLPGXwaxZZHN9Jlfi0gaAr8TFrjfKlN2xqkxO8v3WTUt8yVMk4bBWW+u9gDzItl35hdKKU RZpdDJeLM0Zd1VcOLs2y2gfDUoLnCuKFSERMx/+xbxtUpwRx/lxdn X-Received: by 2002:a5d:6d09:0:b0:367:9621:6fa with SMTP id ffacd0b85a97d-36b5d2cbd69mr6532235f8f.37.1722266691635; Mon, 29 Jul 2024 08:24:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+a+qGzoI/uM2YIJYHooN100PQI1bwa/PnC1UiV0VjR3hi88U9+kOQHZUBgn7kkkNKXAZhaA== X-Received: by 2002:a5d:6d09:0:b0:367:9621:6fa with SMTP id ffacd0b85a97d-36b5d2cbd69mr6532224f8f.37.1722266691243; Mon, 29 Jul 2024 08:24:51 -0700 (PDT) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36b3686227csm12507398f8f.99.2024.07.29.08.24.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 Jul 2024 08:24:50 -0700 (PDT) Message-ID: <18b67679-55e7-4f2b-b169-25c4ce8c48d4@redhat.com> Date: Mon, 29 Jul 2024 17:24:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1] target/s390x: move @deprecated-props to CpuModelExpansion Info To: Collin Walling , Markus Armbruster Cc: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, thuth@redhat.com, wangyanan55@huawei.com, philmd@linaro.org, marcel.apfelbaum@gmail.com, eduardo@habkost.net References: <20240726203646.20279-1-walling@linux.ibm.com> <877cd7qsnj.fsf@pond.sub.org> <00bc2317-dbba-43b3-b355-ddce45b5dfc6@redhat.com> <87a5i0cmht.fsf@pond.sub.org> <87msm0b6zj.fsf@pond.sub.org> <63774cce-d8f6-4cfd-9e0b-0a8244653fab@linux.ibm.com> From: David Hildenbrand Content-Language: en-US Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <63774cce-d8f6-4cfd-9e0b-0a8244653fab@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=david@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.125, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 29.07.24 16:49, Collin Walling wrote: > On 7/29/24 10:36 AM, Markus Armbruster wrote: >> David Hildenbrand writes: >> >>>>>> The simplest way to address 4 is to tack 'if': 'TARGET_S390X' to >>>>>> @deprecated-props. >>>>>> >>>>> >>>>> diff --git a/qapi/machine-target.json b/qapi/machine-target.json >>>>> index 09dec2b9bb..0be95d559c 100644 >>>>> --- a/qapi/machine-target.json >>>>> +++ b/qapi/machine-target.json >>>>> @@ -253,7 +253,7 @@ >>>>> ## >>>>> { 'struct': 'CpuModelExpansionInfo', >>>>> 'data': { 'model': 'CpuModelInfo', >>>>> - '*deprecated-props': ['str'] }, >>>>> + '*deprecated-props' : { 'type': ['str'], 'if': 'TARGET_S390X' } }, >>>>> 'if': { 'any': [ 'TARGET_S390X', >>>>> 'TARGET_I386', >>>>> 'TARGET_ARM', >>>>> >>>>> >>>>> Should do the trick, right? >>>> >>>> Yes. Break the line before 'if', please. >>> >>> Ack >>> >>> [...] >>> >>>> >>>> Questions? >>> >>> As clear as it can get, thanks! :) >>> >>> That would leave us with: >> >> Looks good to me! >> >> > > Fine by me as well. Thanks you both for taking care of this. Okay, I'll let it sit like that in s390x-next for 1 day and then send a PR. Thanks! -- Cheers, David / dhildenb