From nobody Tue Feb 10 02:48:50 2026 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=1654697089; cv=none; d=zohomail.com; s=zohoarc; b=m7R9rOsDKmxGVkGj9/EceQIUC17ilVdS3IYWnxxpfTBL/5ibJz9o3qw7xIaoTJYi3AaVrnrIJ/fbP3kr7ba5VhjcqoJGsxVwGtCHg2wZpOl+TAvAFtyIMNcRpr5Fl4GEH57LceGY8dkrMyNyAuh1LPNb3AW3yaoXvsbSjCQYnSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654697089; 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=0XkZO7uaBlbx9MZzqOkyN3x8VWS8FQPTFN5euAlz18g=; b=IOJJojidEhsvjF6Nu5WlKmZZeqAN1zzJ4xlBrZbcmIO0THMP0+SsrqFQ4bWd8Co2RIcy8sJtc6mcNEqlt7XWNl3gb8ba0Sxeo3V5JVsokUPi+5wSw/0pEgIkS0cA5+2rUQAdRYCnjJElng16aelKkOZnMDqxsED2BLsv7Q+AAuE= 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 1654697089623522.3935525377804; Wed, 8 Jun 2022 07:04:49 -0700 (PDT) Received: from localhost ([::1]:36336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nywIi-0007cF-IY for importer@patchew.org; Wed, 08 Jun 2022 10:04:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyw88-00012l-Se for qemu-devel@nongnu.org; Wed, 08 Jun 2022 09:53:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyw87-0004Jn-6k for qemu-devel@nongnu.org; Wed, 08 Jun 2022 09:53:52 -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-414-CoIDRCsnOOiPLULnp_n1ww-1; Wed, 08 Jun 2022 09:53:49 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2A167185A79C for ; Wed, 8 Jun 2022 13:53:49 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88E29C2811A; Wed, 8 Jun 2022 13:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654696430; 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=0XkZO7uaBlbx9MZzqOkyN3x8VWS8FQPTFN5euAlz18g=; b=H3VVHtVjNP8Onm2W0GsgelcTwpFX4h1Kz8aeEBtKq3NW6B+NldHZzx4viUt1e0xrgakqyG 2hslI08rxYOmlvtCFfWJiTweeTkov2DZA6b5W3/IcEsOB6sxHWZhlIam55z/yv3aBIvoLD f5hnXVtcESJ+tjwAf6xU6E5+WPuQ/tI= X-MC-Unique: CoIDRCsnOOiPLULnp_n1ww-1 From: Igor Mammedov To: qemu-devel@nongnu.org Cc: mst@redhat.com, Gerd Hoffmann Subject: [PATCH v2 07/35] acpi: pckbd: replace ISADeviceClass::build_aml with AcpiDevAmlIfClass:build_dev_aml Date: Wed, 8 Jun 2022 09:53:12 -0400 Message-Id: <20220608135340.3304695-8-imammedo@redhat.com> In-Reply-To: <20220608135340.3304695-1-imammedo@redhat.com> References: <20220608135340.3304695-1-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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=imammedo@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: 1654697090520100001 Signed-off-by: Igor Mammedov Acked-by: Gerd Hoffmann --- hw/input/pckbd.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 4efdf75620..45c40fe3f3 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" -#include "hw/acpi/aml-build.h" +#include "hw/acpi/acpi_aml_interface.h" #include "hw/input/ps2.h" #include "hw/irq.h" #include "hw/input/i8042.h" @@ -767,9 +767,9 @@ static void i8042_realizefn(DeviceState *dev, Error **e= rrp) qemu_register_reset(kbd_reset, s); } =20 -static void i8042_build_aml(ISADevice *isadev, Aml *scope) +static void i8042_build_aml(AcpiDevAmlIf *adev, Aml *scope) { - ISAKBDState *isa_s =3D I8042(isadev); + ISAKBDState *isa_s =3D I8042(adev); Aml *kbd; Aml *mou; Aml *crs; @@ -807,12 +807,12 @@ static Property i8042_properties[] =3D { static void i8042_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); - ISADeviceClass *isa =3D ISA_DEVICE_CLASS(klass); + AcpiDevAmlIfClass *adevc =3D ACPI_DEV_AML_IF_CLASS(klass); =20 device_class_set_props(dc, i8042_properties); dc->realize =3D i8042_realizefn; dc->vmsd =3D &vmstate_kbd_isa; - isa->build_aml =3D i8042_build_aml; + adevc->build_dev_aml =3D i8042_build_aml; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } =20 @@ -822,6 +822,10 @@ static const TypeInfo i8042_info =3D { .instance_size =3D sizeof(ISAKBDState), .instance_init =3D i8042_initfn, .class_init =3D i8042_class_initfn, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_ACPI_DEV_AML_IF }, + { }, + }, }; =20 static void i8042_register_types(void) --=20 2.31.1