Received: by 2002:a19:5205:0:0:0:0:0 with SMTP id m5csp4975794lfb; Tue, 31 Aug 2021 05:19:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySbEOHQy9hUP9FmKqEJn/wStqkK8Qv1oJO7D4TIgW/tn/08Bky1lK3hkC/iQKJSf6IkvjC X-Received: by 2002:a05:6402:3190:: with SMTP id di16mr10728407edb.211.1630412353552; Tue, 31 Aug 2021 05:19:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630412353; cv=none; d=google.com; s=arc-20160816; b=Hdw3V7w8JQz4iDlElizvfIkFEkYLFlIiasSNrU1siuX+4mVFC0iaZQY8NHdVlZ2jdJ XkbzZ3Gc5zHTAW9at5Gr+r9eZT281R4vuZpMKcvyUjOhx9mvNHW2RNzGPE84lHUx4KAC dIrjMh7I5wsTmNxxr9uH2xMUkA8mKhqFV6hWwMJ69OlV1CHJT2/tPl1ike+UUuERXDTX xwmdK0U/facfhax696mOjqqdOAE83452WthrvvRPZfsxnLvKCiA6QZ/61oLWmFMH72D2 NXwCHpZ36V146rHMMntzdeXG++lf4iekA0/o7Bwo/GToSzdjlRPECbzwgPhaqrsZXRiS T80w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=uUA7IgeB5RYl+qZYzoL+znUhF73/ifVtnM5Z3ysYhdM=; b=IuZwn44T7Gk7H1vv5jDQ9WoMZ4b2ly4JPacnxBTzStyRitxJtKGmv7904AbXlekUBb CDBjR/tKq6CU2HLk54m6HhL/C/qlM8r6P/HJ4nEehstr/f5kTMyhIEmY4UtiKZVLEFuP tkfGZYikbuyIski7SG4BeglZ4FSKFXBytEeJiqNY5dCmiEG5amH9Tm/MJV1vQfaJZLbv SplsId8BhWiaeuDkN8n3FvpK959nb+wHqzwK8lGV03ZcJcXkx+dq/GKnGlzNPNGVVpy2 bWvI9lHnzRkFsrKTiRnrfFj3b2j80r3l8aenAgj0SR+G+BNkckZ3nxN3YbLvzN0prlGs cA3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ADzQdwDY; spf=pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=kraxel@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [216.205.24.124]) by mx.google.com with ESMTPS id i6si1974215ejo.484.2021.08.31.05.19.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Aug 2021 05:19:13 -0700 (PDT) Received-SPF: pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ADzQdwDY; spf=pass (google.com: domain of kraxel@redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=kraxel@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630412352; 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=uUA7IgeB5RYl+qZYzoL+znUhF73/ifVtnM5Z3ysYhdM=; b=ADzQdwDY/wI/ZUn0Pybfp2poPw4T3ynBiD8zd8Z5GWC2ayyUlrkehhZusERKKbVmXEgXIo 1Ak9JheyucjneGa2Npztf/3TIGj0jAQr/fhguuVDtK/f1CZhH/pCi6a1zoqT1nZ+CZHM2E O0drsfOShUlY+fMPnzI8wxF5rj0IZns= 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-191-7eZEGYkOOtOWjAYionviwA-1; Tue, 31 Aug 2021 08:19:11 -0400 X-MC-Unique: 7eZEGYkOOtOWjAYionviwA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 071D918C9F49; Tue, 31 Aug 2021 12:19:08 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B25B104B51C; Tue, 31 Aug 2021 12:18:52 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1937F18009EC; Tue, 31 Aug 2021 14:15:47 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Laurent Vivier , Peter Xu , Peter Maydell , Marcel Apfelbaum , Cornelia Huck , qemu-ppc@nongnu.org, Bastian Koppelmann , Thomas Huth , Eduardo Habkost , qemu-riscv@nongnu.org, David Gibson , Aleksandar Rikalo , Stafford Horne , Huacai Chen , Halil Pasic , Palmer Dabbelt , Bin Meng , Mahmoud Mandour , Max Filippov , Alexandre Iooss , Greg Kurz , "Edgar E. Iglesias" , Richard Henderson , qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , "Michael S. Tsirkin" , Paolo Bonzini , Alistair Francis , qemu-s390x@nongnu.org, Christian Borntraeger , Jiaxun Yang , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann Subject: [PATCH 25/29] tcg_i386_funcs: Add x86_register_ferr_irq to TCGI386ModuleOps Date: Tue, 31 Aug 2021 14:15:41 +0200 Message-Id: <20210831121545.2874233-26-kraxel@redhat.com> In-Reply-To: <20210831121545.2874233-1-kraxel@redhat.com> References: <20210831121545.2874233-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-TUID: DVuE8RQmvFNI Signed-off-by: Gerd Hoffmann --- include/tcg/tcg-module-i386.h | 2 +- target/i386/cpu.h | 1 - accel/tcg/tcg-module-i386.c | 5 +++++ hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- target/i386/tcg/sysemu/fpu_helper.c | 9 ++++++++- 6 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/tcg/tcg-module-i386.h b/include/tcg/tcg-module-i386.h index 576e0a63f01f..7b99b9836a20 100644 --- a/include/tcg/tcg-module-i386.h +++ b/include/tcg/tcg-module-i386.h @@ -5,7 +5,7 @@ struct TCGI386ModuleOps { void (*update_fp_status)(CPUX86State *env); void (*update_mxcsr_status)(CPUX86State *env); void (*update_mxcsr_from_sse_status)(CPUX86State *env); - + void (*x86_register_ferr_irq)(qemu_irq irq); }; extern struct TCGI386ModuleOps tcg_i386; diff --git a/target/i386/cpu.h b/target/i386/cpu.h index deba8eb04d1f..d1819166ae11 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1835,7 +1835,6 @@ int cpu_x86_support_mca_broadcast(CPUX86State *env); int cpu_get_pic_interrupt(CPUX86State *s); /* MSDOS compatibility mode FPU exception support */ -void x86_register_ferr_irq(qemu_irq irq); void fpu_check_raise_ferr_irq(CPUX86State *s); void cpu_set_ignne(void); void cpu_clear_ignne(void); diff --git a/accel/tcg/tcg-module-i386.c b/accel/tcg/tcg-module-i386.c index 6908fe34cef6..f6d367912c17 100644 --- a/accel/tcg/tcg-module-i386.c +++ b/accel/tcg/tcg-module-i386.c @@ -5,8 +5,13 @@ static void i386_update_cpu_stub(CPUX86State *cpu) { } +static void x86_register_ferr_irq_stub(qemu_irq irq) +{ +} + struct TCGI386ModuleOps tcg_i386 = { .update_fp_status = i386_update_cpu_stub, .update_mxcsr_status = i386_update_cpu_stub, .update_mxcsr_from_sse_status = i386_update_cpu_stub, + .x86_register_ferr_irq = x86_register_ferr_irq_stub, }; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 1bc30167acc0..d02edaa7e611 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -224,7 +224,7 @@ static void pc_init1(MachineState *machine, } if (tcg_enabled()) { - x86_register_ferr_irq(x86ms->gsi[13]); + tcg_i386.x86_register_ferr_irq(x86ms->gsi[13]); } pc_vga_init(isa_bus, pcmc->pci_enabled ? pci_bus : NULL); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index eeb0b185b118..9c2623fe61e0 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -266,7 +266,7 @@ static void pc_q35_init(MachineState *machine) } if (tcg_enabled()) { - x86_register_ferr_irq(x86ms->gsi[13]); + tcg_i386.x86_register_ferr_irq(x86ms->gsi[13]); } assert(pcms->vmport != ON_OFF_AUTO__MAX); diff --git a/target/i386/tcg/sysemu/fpu_helper.c b/target/i386/tcg/sysemu/fpu_helper.c index 1c3610da3b91..9caf164a7269 100644 --- a/target/i386/tcg/sysemu/fpu_helper.c +++ b/target/i386/tcg/sysemu/fpu_helper.c @@ -23,7 +23,7 @@ static qemu_irq ferr_irq; -void x86_register_ferr_irq(qemu_irq irq) +static void x86_register_ferr_irq(qemu_irq irq) { ferr_irq = irq; } @@ -55,3 +55,10 @@ void cpu_set_ignne(void) */ qemu_irq_lower(ferr_irq); } + +static void tcgi386_module_ops_fpu_sys(void) +{ + tcg_i386.x86_register_ferr_irq = x86_register_ferr_irq; +} + +type_init(tcgi386_module_ops_fpu_sys); -- 2.31.1