From nobody Sun Nov 16 05:54:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598557713; cv=none; d=zohomail.com; s=zohoarc; b=DWkNMEbtEa52V35OHtCDbXlsk9d7ATPJgMRXmOX0AMc7p4grew1NXc1o61DlM8DPLfSqOJJ63DLMuXY2hj5PixKMEOfHcp7nX8+N2pdpmR6qNtTOTYN+kFiSXOetnHJuj81UOBQZGm+4+B/uGtjSFwl95SKoCTTv5Rm8mAhzxCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598557713; 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=K7jRXu7XdKNIirLlu0zE2pj0pztITiAtglPfvGYOcoc=; b=AHxTWKVf+o+pItvV8xXtk+MUAbJ3ji2tl7/2xB446HEXCX7IhMwERhZwMLCgLJoECDklsTzlGVUMgmAnuEVRuoqZ4d0z/I8ov70n6wObDY+66D+57z/XXShXEx7wWiCLHz/ENCdhUYCFAQGZbh0TDRHAmWlUtPeGxrwSFD80F/w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598557713731353.1567662315488; Thu, 27 Aug 2020 12:48:33 -0700 (PDT) Received: from localhost ([::1]:41390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBNsu-0005Hn-BB for importer@patchew.org; Thu, 27 Aug 2020 15:48:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBNUH-000058-06 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:05 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:43005 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBNUF-0000X6-58 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 15:23:04 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-wQUOmdK5Mzyni35WgFxS3g-1; Thu, 27 Aug 2020 15:22:59 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DABEC344F3; Thu, 27 Aug 2020 19:22:58 +0000 (UTC) Received: from localhost (unknown [10.10.67.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 990DE19D61; Thu, 27 Aug 2020 19:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598556182; 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=K7jRXu7XdKNIirLlu0zE2pj0pztITiAtglPfvGYOcoc=; b=YXTBEQD3BX5jAjEP+Gn28BqLYAsZtCJ1ABuLHa3kqfqpTrQADxZ7fiHWxDvbWauExlYXn2 jbKJilXVm9mECqnNtoHAzWeX7YcTNvGSD7YOgq+mKdmJVCNMMgPGL2DPBMh7ZUGjP9PkHB hlZH9pK6EGVeZpkg5wpqnoxhk2me/dM= X-MC-Unique: wQUOmdK5Mzyni35WgFxS3g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 43/53] s390-virtio-ccw: Rename S390_MACHINE_CLASS macro Date: Thu, 27 Aug 2020 15:21:12 -0400 Message-Id: <20200827192122.658035-44-ehabkost@redhat.com> In-Reply-To: <20200827192122.658035-1-ehabkost@redhat.com> References: <20200827192122.658035-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=205.139.110.61; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cornelia Huck , Roman Bolshakov , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Rename it to be consistent with S390_CCW_MACHINE and TYPE_S390_CCW_MACHINE. This will make future conversion to OBJECT_DECLARE* easier. Signed-off-by: Eduardo Habkost Acked-by: Cornelia Huck Tested-By: Roman Bolshakov Message-Id: <20200825192110.3528606-49-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/hw/s390x/s390-virtio-ccw.h | 2 +- hw/s390x/s390-virtio-ccw.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-vir= tio-ccw.h index cd1dccc6e3..caf4962d29 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -18,7 +18,7 @@ #define S390_CCW_MACHINE(obj) \ OBJECT_CHECK(S390CcwMachineState, (obj), TYPE_S390_CCW_MACHINE) =20 -#define S390_MACHINE_CLASS(klass) \ +#define S390_CCW_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(S390CcwMachineClass, (klass), TYPE_S390_CCW_MACHINE) =20 typedef struct S390CcwMachineState { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index f4ea6a9545..3106bbea33 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -596,7 +596,7 @@ static void ccw_machine_class_init(ObjectClass *oc, voi= d *data) MachineClass *mc =3D MACHINE_CLASS(oc); NMIClass *nc =3D NMI_CLASS(oc); HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); =20 s390mc->ri_allowed =3D true; s390mc->cpu_model_allowed =3D true; @@ -677,7 +677,7 @@ static S390CcwMachineClass *get_machine_class(void) * be called for the 'none' machine. The properties will * have their after-initialization values. */ - current_mc =3D S390_MACHINE_CLASS( + current_mc =3D S390_CCW_MACHINE_CLASS( object_class_by_name(TYPE_S390_CCW_MACHINE)); } return current_mc; @@ -786,7 +786,7 @@ bool css_migration_enabled(void) static void ccw_machine_##suffix##_instance_init(Object *obj) = \ { = \ MachineState *machine =3D MACHINE(obj); = \ - current_mc =3D S390_MACHINE_CLASS(MACHINE_GET_CLASS(machine)); = \ + current_mc =3D S390_CCW_MACHINE_CLASS(MACHINE_GET_CLASS(machine));= \ ccw_machine_##suffix##_instance_options(machine); = \ } = \ static const TypeInfo ccw_machine_##suffix##_info =3D { = \ @@ -898,7 +898,7 @@ static void ccw_machine_3_0_instance_options(MachineSta= te *machine) =20 static void ccw_machine_3_0_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); =20 s390mc->hpage_1m_allowed =3D false; ccw_machine_3_1_class_options(mc); @@ -965,7 +965,7 @@ static void ccw_machine_2_9_instance_options(MachineSta= te *machine) =20 static void ccw_machine_2_9_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { { TYPE_S390_STATTRIB, "migration-enabled", "off", }, }; @@ -1001,7 +1001,7 @@ static void ccw_machine_2_7_instance_options(MachineS= tate *machine) =20 static void ccw_machine_2_7_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); =20 s390mc->cpu_model_allowed =3D false; ccw_machine_2_8_class_options(mc); @@ -1016,7 +1016,7 @@ static void ccw_machine_2_6_instance_options(MachineS= tate *machine) =20 static void ccw_machine_2_6_class_options(MachineClass *mc) { - S390CcwMachineClass *s390mc =3D S390_MACHINE_CLASS(mc); + S390CcwMachineClass *s390mc =3D S390_CCW_MACHINE_CLASS(mc); static GlobalProperty compat[] =3D { { TYPE_S390_IPL, "iplbext_migration", "off", }, { TYPE_VIRTUAL_CSS_BRIDGE, "css_dev_path", "off", }, --=20 2.26.2