From nobody Mon Feb 9 13:59:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513792959585686.9921553913932; Wed, 20 Dec 2017 10:02:39 -0800 (PST) Received: from localhost ([::1]:60950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRihQ-0002LT-Hi for importer@patchew.org; Wed, 20 Dec 2017 13:02:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhye-0004vh-2X for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyd-0007NM-2U for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:20 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:44485) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyc-0007Mu-QE for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:18 -0500 Received: by mail-wm0-x242.google.com with SMTP id t8so11244009wmc.3 for ; Wed, 20 Dec 2017 09:16:18 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.16.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:16:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vDf1QhuXXpJWzoEX9BFR92wec5y3d+xkbXbXzZzAJKY=; b=EVOwKvAb52LNhUj0r664DwSfpOmIEdjsCiPqlf/5Q5472Y3xBCo+rkR+XrmbHJAn0u fFpYi7l5JyFXYm4yUE8zuTLqGGg+CGldOVeA8r/C3QXjcTcj01GzpaPYCV+4+BQ8V1iE oCZ/DzmC1mdQucHf7wQjb182uJjpLUg3ntE0zOiU376TdoRScFLhKFYXNtJxc1lbQIjN Ar+TXQnQs926CwW4MrnYCrjFvPN1BAXWchYjuLDWP1xJWMVlkEra69tmXnIveh9F3+h9 kNvFmDZO52Vfn1Uilwa1m8LU0LhwO0SoZ+IWQxRGOxt+4dQb8torXUuUgCLT63NIr5Wm 1yBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vDf1QhuXXpJWzoEX9BFR92wec5y3d+xkbXbXzZzAJKY=; b=k+tpbcSrneB/OmF5ow0sTEBthN9yNoCaMxPz4ytniyQgSvpA0v7AwMhs+yrMMjqP2U xJSXuaGj/D6j0VSFf2f3yQjY147S7knC8YaI9BY7tgpPgM4Dwtdd78ICx2X6kdLeacud bBIrmcRFji4v5saBMi07iaEEKQ44Fhh4fJSMsKPhq9FTT+JR//dr8HYKsIAZyQeZm+jS g555IM+lVr4lgUsytVoLekCXjRIQrfGmaW7mxw031/+FoMwmMsd1/Jds5qAlXAcFOkrG iTm2WeoXYSTYheAPh0LmOy7eSZ9aDjmCA+chajKo/wdzpGuxa3b+R4r5sHsX/F0FTvzv 0E5Q== X-Gm-Message-State: AKGB3mIlbqp3kkOu0Z8qCPVAMvQ3z6rSkrE2Ha++2jZfRngp7BTkjo04 qUHEkANAIHacnurke0WdC8kIG7iZ X-Google-Smtp-Source: ACJfBouVC/lvuoof9ckZrSi6NS8lGKiSiejDNYem3dY7nCf8WdJYculGLsAnX8FaymMNyl1zrfz+tA== X-Received: by 10.28.29.130 with SMTP id d124mr7753577wmd.73.1513790177291; Wed, 20 Dec 2017 09:16:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:51 +0100 Message-Id: <1513790098-9815-40-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 39/46] i8259: move TYPE_INTERRUPT_STATS_PROVIDER upper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Peter Xu Now both classes (i8259, i8259-kvm) support this. Move this upper to the common class code. Signed-off-by: Peter Xu Message-Id: <20171210063819.14892-6-peterx@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/i386/kvm/i8259.c | 7 ------- hw/intc/i8259.c | 7 ------- hw/intc/i8259_common.c | 7 +++++++ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 57abe09..b91e980 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -140,15 +140,12 @@ static void kvm_i8259_class_init(ObjectClass *klass, = void *data) KVMPICClass *kpc =3D KVM_PIC_CLASS(klass); PICCommonClass *k =3D PIC_COMMON_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); - InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(kla= ss); =20 dc->reset =3D kvm_pic_reset; kpc->parent_realize =3D dc->realize; dc->realize =3D kvm_pic_realize; k->pre_save =3D kvm_pic_get; k->post_load =3D kvm_pic_put; - ic->get_statistics =3D pic_get_statistics; - ic->print_info =3D pic_print_info; } =20 static const TypeInfo kvm_i8259_info =3D { @@ -157,10 +154,6 @@ static const TypeInfo kvm_i8259_info =3D { .instance_size =3D sizeof(PICCommonState), .class_init =3D kvm_i8259_class_init, .class_size =3D sizeof(KVMPICClass), - .interfaces =3D (InterfaceInfo[]) { - { TYPE_INTERRUPT_STATS_PROVIDER }, - { } - }, }; =20 static void kvm_pic_register_types(void) diff --git a/hw/intc/i8259.c b/hw/intc/i8259.c index d9b9666..1602255 100644 --- a/hw/intc/i8259.c +++ b/hw/intc/i8259.c @@ -442,13 +442,10 @@ static void i8259_class_init(ObjectClass *klass, void= *data) { PICClass *k =3D PIC_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); - InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(kla= ss); =20 k->parent_realize =3D dc->realize; dc->realize =3D pic_realize; dc->reset =3D pic_reset; - ic->get_statistics =3D pic_get_statistics; - ic->print_info =3D pic_print_info; } =20 static const TypeInfo i8259_info =3D { @@ -457,10 +454,6 @@ static const TypeInfo i8259_info =3D { .parent =3D TYPE_PIC_COMMON, .class_init =3D i8259_class_init, .class_size =3D sizeof(PICClass), - .interfaces =3D (InterfaceInfo[]) { - { TYPE_INTERRUPT_STATS_PROVIDER }, - { } - }, }; =20 static void pic_register_types(void) diff --git a/hw/intc/i8259_common.c b/hw/intc/i8259_common.c index 7efd2e8..c75c880 100644 --- a/hw/intc/i8259_common.c +++ b/hw/intc/i8259_common.c @@ -178,6 +178,7 @@ static Property pic_properties_common[] =3D { static void pic_common_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + InterruptStatsProviderClass *ic =3D INTERRUPT_STATS_PROVIDER_CLASS(kla= ss); =20 dc->vmsd =3D &vmstate_pic_common; dc->props =3D pic_properties_common; @@ -189,6 +190,8 @@ static void pic_common_class_init(ObjectClass *klass, v= oid *data) * code. */ dc->user_creatable =3D false; + ic->get_statistics =3D pic_get_statistics; + ic->print_info =3D pic_print_info; } =20 static const TypeInfo pic_common_type =3D { @@ -198,6 +201,10 @@ static const TypeInfo pic_common_type =3D { .class_size =3D sizeof(PICCommonClass), .class_init =3D pic_common_class_init, .abstract =3D true, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_INTERRUPT_STATS_PROVIDER }, + { } + }, }; =20 static void pic_common_register_types(void) --=20 1.8.3.1