From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476335; cv=none; d=zohomail.com; s=zohoarc; b=T26K4/Dz9na3GM+ySeO+tkxN4DaJSoBkvfqP7XkUlf6rqFLKDQdL7gDNlEsYjhutr9tZZw2Rp5D5Ck3pAIIz07oFsRGrnc5sJnAMX8I9TSj4kgwO1E/cez1a/1ePCxE+OVTxpb0CB9+ib9+AeXglnAm9L5w1B8fFNLxrv7mmq3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476335; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5Bzxb+cyFW2fTjguo4+D1GgUMJzgo2oIaa6x4dhI9M8=; b=dgRAK3ncsooScPl4R/MupxIgMFRyrF1mruQBcgt2QE3AF3rXp0R3dWny1hAHsbxiJiodrBHxgvHVaZmatD1x/5j2Ct/fXJeIuPUuzOr0oPLdSY5FpJ7to+W6OxFOTwBZJHPa6lBzmosBnVaXmq1chCA8G7AclzoXk0XgiAsjyVs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632476335965903.8979363337378; Fri, 24 Sep 2021 02:38:55 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id g16so25519431wrb.3 for ; Fri, 24 Sep 2021 02:38:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id q126sm11435167wma.10.2021.09.24.02.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:38:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Bzxb+cyFW2fTjguo4+D1GgUMJzgo2oIaa6x4dhI9M8=; b=Z+ZVrJA7B+LRhlph252Bs05w8qRernFAcR0uaW2EqZLIaeL87gO8XvD5r4bZvNkp3+ hX1EJqJbuippSwE2WDYNrROZL+rBetx42PlK+8wrhGeLsOGgUGPblfRoclfGG3tfCD8u eBI9iXodHTu4cufWPSR+WxyXzPIObVXP8ArcVDSr/vlzcvRGCwDLdZr/Wgz90lKfUY2X VYUokkVXMJ0JPMQprbFAppj22boPdVagE8pWBhyciFYNxDEwamnxrhXfsA4rT/riAhY4 bbdYIb6pIWaeV5dgSnR9Q0TviODcmzuX3San6zlU6rCX7RAU8jGc5jtP5o00lXg3s9rh wKbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5Bzxb+cyFW2fTjguo4+D1GgUMJzgo2oIaa6x4dhI9M8=; b=U2HDGBgdo+SMmU03eXrI0PPpalTHGbks3kv8zK9lXHd6di/R7mk0WDYWCCMC9Pep9N /Re2MWNtEmO5s6hVXwnQfr9R24lfXQ4oy9cuWOjaAm+LIyj+e1r0kQR6+/SEEGjR18CC psFfG8MusD7pmpT72krz4v2B24CcR3EtrPEQ63yGHzRMf2S2dsSw3/fkUdrwKYZV+z0N yE7EU2DIPv0ftOMmH8iviurmAcrYpBz4NZJpnfsMEn/0y5XTg8FvTSqTJoyYU7CdA5Vz XG0jsGm3NouPqKl6NpwsMxrS3SsepwTNhEihRQ6QdZvR9MrgvEAD08JlTJtxtg2ruPrB 1Dww== X-Gm-Message-State: AOAM5306Ra2T0111A4GL4J+8S7hHuKy2epIhpiGRvcTpRph528uqQs3m fxnZC//u/ybrpWFXg+kAqKo= X-Google-Smtp-Source: ABdhPJyEXLnBJ5FQO1c2ws6DQTUoRXlRdbtMRIFIWPeSVBvWTRWmUt4mhI0LSmwm06Oty6TGQxjWjg== X-Received: by 2002:adf:e44f:: with SMTP id t15mr10482837wrm.394.1632476334139; Fri, 24 Sep 2021 02:38:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 01/40] accel: Simplify qemu_init_vcpu() Date: Fri, 24 Sep 2021 11:38:08 +0200 Message-Id: <20210924093847.1014331-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476336329100001 cpus_register_accel() already checks for ops->create_vcpu_thread being non-NULL, so it is pointless to re-check for it in qemu_init_vcpu(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/cpus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 071085f840b..646326b24fd 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -604,7 +604,10 @@ void cpu_remove_sync(CPUState *cpu) void cpus_register_accel(const AccelOpsClass *ops) { assert(ops !=3D NULL); - assert(ops->create_vcpu_thread !=3D NULL); /* mandatory */ + + /* Mandatory non-NULL handlers */ + assert(ops->create_vcpu_thread !=3D NULL); + cpus_accel =3D ops; } =20 @@ -626,7 +629,7 @@ void qemu_init_vcpu(CPUState *cpu) } =20 /* accelerators all implement the AccelOpsClass */ - g_assert(cpus_accel !=3D NULL && cpus_accel->create_vcpu_thread !=3D N= ULL); + g_assert(cpus_accel !=3D NULL); cpus_accel->create_vcpu_thread(cpu); =20 while (!cpu->created) { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476340; cv=none; d=zohomail.com; s=zohoarc; b=cOdz3r2Eb8tmdOtoFAhAJjtdsgsXgMFY/JM9ViBkfyWrebd3pxbxPDpUxnlza6EnOCMmeXpL4aPT1zb5pOOclnFCOvDs8WhNMC903RD1O0yKZZa56Z1miRLhQfV1DtautEa99neCU7GEkHeviHSNPx9LNnzLXawRL16/Dj5aBUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476340; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v/6Xo0TImgBm2K/shdcIyB243lN4oaXhrr/liWYNm+w=; b=bvL0cODxYEoEPanVXpTHnnhlkuYzhxfX30CYsiTkN5UShWHrPQ/1dYivH7U5rLRaqntTJF/BT0DKFge7RwO3aIhA17pS5uAl2SKLsS2xrmT7w1p/zFHbFcEPwzYBHehTJkojbd9oC5TZNvor3TXYdtbrzQjZENeC9pHin2a1sUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632476340635138.09987311972884; Fri, 24 Sep 2021 02:39:00 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id r23so151311wra.6 for ; Fri, 24 Sep 2021 02:39:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c14sm7622119wrd.50.2021.09.24.02.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v/6Xo0TImgBm2K/shdcIyB243lN4oaXhrr/liWYNm+w=; b=Pa9TAG3DJJNK60sjEqpoeDmA5Ja/hj8QumRUf3uvdx8KtTwf7Db64hlkgabldj/bgr w6UgkL2fGHrya1aOpmSDbYmhs0nmg1RfYZBuzVEx/l3pxiRslAE93ncb9NQ2owsY2RQV YAI9fUzxrQvJxCEToZvURcG28wKKOUFMXjt5ZycSM6W35BE4NFCIdVn71KZ6hpStsTkg hmjtGORbtz8XrFcfxWw2vkhckEz2pjbRztnT+y4lB1V/MqyRcl9FL4lFia6d5UlRxXBS yT8TkUGFNxvLS0iwxk6MK0yWevpgf4+8RPyykY2PKPeZSyJGK8A36kykXuJtSA32jfJQ OHGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=v/6Xo0TImgBm2K/shdcIyB243lN4oaXhrr/liWYNm+w=; b=NiOXY/ntio4GSGjpRMkIaPQDzX4usZY4FcrTlDdoQ0IPs3te/nc4tQl0WLSbQRwIZU 5pm+02AUGYF5DHHM1Q1sJkNLodObfjX+j0pef+M9KMaf5vH4dIVg55sU7u5soob/ovIa JZ3b+MosIhJ1XSCRSxeZKvYu6A88urY3nhJefe7YUQFPAdcVtwPip5fuBvd8qhTm70Uz K42U+9UTqKoDEcfNS8gH2yDtZtEuZ2feUOsbpKKkrdICTXWgqk4mdVTBuMQP7zmr6ua9 xcj0rifNl7W6C10eUcu7DTGDHRiS6EKUZPm+nNjnqoB+IzGVxINFnZBySngf2y4PIGMm Ty3A== X-Gm-Message-State: AOAM532QfBsOQ9/JnbZqOI6wKU6QKZnDExL7YI2F6OqQMYjCBhzGbsj5 USpWgQDCeaEKJ3TX8yHeFmY= X-Google-Smtp-Source: ABdhPJzhrnXA0uhl2pqV0q5B3dpoBOUbVOmIkvNTuLFX1nY/29IPrGM2JLjn3E6eMtqMs62Y3cpC9g== X-Received: by 2002:adf:ef48:: with SMTP id c8mr10126026wrp.349.1632476338844; Fri, 24 Sep 2021 02:38:58 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 02/40] accel/tcg: Restrict cpu_handle_halt() to sysemu Date: Fri, 24 Sep 2021 11:38:09 +0200 Message-Id: <20210924093847.1014331-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476342531100001 Commit 372579427a5 ("tcg: enable thread-per-vCPU") added the following comment describing EXCP_HALTED in qemu_tcg_cpu_thread_fn(): case EXCP_HALTED: /* during start-up the vCPU is reset and the thread is * kicked several times. If we don't ensure we go back * to sleep in the halted state we won't cleanly * start-up when the vCPU is enabled. * * cpu->halted should ensure we sleep in wait_io_event */ g_assert(cpu->halted); break; qemu_wait_io_event() is sysemu-specific, so we can restrict the cpu_handle_halt() call in cpu_exec() to system emulation. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cpu-exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 75dbc1e4e33..5fd1ed34222 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -588,8 +588,9 @@ static inline void tb_add_jump(TranslationBlock *tb, in= t n, =20 static inline bool cpu_handle_halt(CPUState *cpu) { +#ifndef CONFIG_USER_ONLY if (cpu->halted) { -#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY) +#if defined(TARGET_I386) if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { X86CPU *x86_cpu =3D X86_CPU(cpu); qemu_mutex_lock_iothread(); @@ -597,13 +598,14 @@ static inline bool cpu_handle_halt(CPUState *cpu) cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL); qemu_mutex_unlock_iothread(); } -#endif +#endif /* TARGET_I386 */ if (!cpu_has_work(cpu)) { return true; } =20 cpu->halted =3D 0; } +#endif /* !CONFIG_USER_ONLY */ =20 return false; } --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476345; cv=none; d=zohomail.com; s=zohoarc; b=kXL3xCskmvw5BoC+sPR8v3edFoz6ZeFGIe1u0Kf7a0Tp5tjy/mjwloLAEveYMhDzvsAFQTzj/gWvdqSZtlD+ER6UVyIsf51+LFIB6/YY2a2NFev15V2YzGXa6Qls4/nf0hMWJUKN+ySSzPJqhE6TR1A5AdPkUUGuy0/OYUhHRHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476345; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=BM32qdUjLB5T/hWbxjai8pyh1K/AsZ4NnHDn0kt2hnr4I82Tn1WQaiP3LjbjTH2HOmIhwQl5enThYlXHqR7467aY6mC6+8uErvBtLMufhhpGNrWgs3WM/DRY9yv5iHPO7OVBWS/8IcIEhqgUZs+/ggjrg61zBYKvBpsRHHvFEjg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 163247634537082.12287317374876; Fri, 24 Sep 2021 02:39:05 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id t28so12094088wra.7 for ; Fri, 24 Sep 2021 02:39:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n19sm1325752wms.47.2021.09.24.02.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=WLY7+TOk/x3MxGIBWFNhGUNSBik56JD0m+P7Kt0ZcaeIA9YpEwGM5Qsi+S5zh5nrHr UbpgVVcAgadzYKqxRs/bZ3nHkFfj3jWBRiFSocCVJ0B5kuQEuV3XkfFa0DYCI5qacq9k wejFgzHUtWnGvsj6ZFIp1tt6z1XeFjEWbDrzwFl2PSCDfl6fDVsfq1ow039vvRsRRM5s IhOdjr1dToXzmRu4Eo0i7eW+5wb2Zx1c2uF9YQE4fGdKMNbYihwEMXbWATSE5zH2Ov2t FmuOFunbalKKu6IzesVW2HqbljUPQ5dAsltiq8dqmHq0BBf4UuRx6oDN8Fx7/qo1oFFt iOPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=wB9O1AjJZKJsIoncDLAVOt8UAcofLckRFdgcdIDqqKZVNczCWZeVDrFhsaiKlrZ5NJ APjbExIXrfeZg7dAMH1wAP7A0NXzXkZObdhdFxTYEDjyqEhyNtWXnIdJ0cb63wiNCTPX kXDBoXaDF9eu+6EVNPxOoIsQCZeDgT6W92IBIxV/CgcjRSPZDwpwqrThkY8HApq2wkQr PrfrWiqZlUN0DNPCy7BJ1FttGtDS9NKqLw0FR3rAJ3Z7FyI3sH8EdnL5scJ4MK/NCTt8 dzOFFgDOjNgy2PpRzlnRI1IXO5668X5Cp1VnNJYitr4qtozR4IIdq2aUq7tCBTcx33m8 KgOQ== X-Gm-Message-State: AOAM531SICfsnmeIAYA4MiOoJLd9ZaZ1pq1JpepiS36W6WvYFVxURXWu G0wfVUulooDdkEXp9kBykj0= X-Google-Smtp-Source: ABdhPJxw76TXcxjMtX6av9tiKhPOijBdHW9A/O/opESJjSyXGHgMGLoZ8t4VqmFCpHCnAM53AweWAQ== X-Received: by 2002:a7b:c20f:: with SMTP id x15mr1053776wmi.59.1632476343524; Fri, 24 Sep 2021 02:39:03 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v6 03/40] hw/core: Restrict cpu_has_work() to sysemu Date: Fri, 24 Sep 2021 11:38:10 +0200 Message-Id: <20210924093847.1014331-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476347130100001 cpu_has_work() is only called from system emulation code. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index bc864564cee..2bd563e221f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -538,6 +538,22 @@ enum CPUDumpFlags { void cpu_dump_state(CPUState *cpu, FILE *f, int flags); =20 #ifndef CONFIG_USER_ONLY +/** + * cpu_has_work: + * @cpu: The vCPU to check. + * + * Checks whether the CPU has work to do. + * + * Returns: %true if the CPU has work, %false otherwise. + */ +static inline bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + /** * cpu_get_phys_page_attrs_debug: * @cpu: The CPU to obtain the physical page address for. @@ -636,22 +652,6 @@ CPUState *cpu_create(const char *typename); */ const char *parse_cpu_option(const char *cpu_option); =20 -/** - * cpu_has_work: - * @cpu: The vCPU to check. - * - * Checks whether the CPU has work to do. - * - * Returns: %true if the CPU has work, %false otherwise. - */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} - /** * qemu_cpu_is_self: * @cpu: The vCPU to check against. --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476350; cv=none; d=zohomail.com; s=zohoarc; b=ax4sgLM+EqGHMImU4cNixqSfwkAP+y++6U7WLLPzH/IJrIodrGhwsqUPs6fnwL3oFoCS7lvxY9yHAfh2rGNB+3ffc053cQeQ3Pz3BBKyTIxOSwWte8FM7w8p08U0tV71yvzQE6O6cxv2DWUqWWQithGHc7eag4zesEC/NwnBFHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476350; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=QOuL6EhNvr+ueFrqghAh98m5n9Cu+Qu5wpc3w73ghcqIyC9h/LLfN0OpXK5IOmyo27h6MtwPS5zlYQelSehXxnVPpqTMCqcoPJZ2ZtnBu82BeNLXdjA2QFgv0RmQ024u4LWj8FX8rdW/h8FBQ4dMAMFAZwztWtBFxsqg7im9KIU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1632476350130609.8133317636044; Fri, 24 Sep 2021 02:39:10 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id t8so25620106wri.1 for ; Fri, 24 Sep 2021 02:39:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id s2sm7438491wrn.77.2021.09.24.02.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=X8jSb8nlvy5DUpq4TReP05C74t8DlQTUjC9WZyHg9+N597Hi1Q7xk+7LGFGfJ1rj9q G6pMzt/xI0ZVBxcI7p6dQaCTAchymKCBWOxxR7iyM2HqcKwOnxGYUO7NIQ1fu3H5LbCY +ar/LzCQ+2nnLUAbrSE7G5EjhAvSenY8urSQuT74OFjK5MWL9ZLc//Rgo4PAfIDI6wol Ym3nEke8uC7jWo9iO4+Dtxg0GJsyV+ozUT28S9Q2C0eNxC/S/VhT9ISeTTcbvHSgmUgx acl2iVfvfVdM5ENxLspEl5+THSFKEC60KXHx03yHZRe61bl/yO9OogSbcRu74pQ95zpg Um6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=ZU8zXl84+cfmhVAll3oAnnyU9oXIjO1Y6m68G4mf/MTdMe+aYx4sWxtaiX0lg+ajvC 0J06gcDPwwvV43QavqbUWLYrsHPo0iUQoIEqQqmoeLyScJoBSInDfG3yc6y0ftOqxBju YoRnB/+6fjK3Sa7Ul55rJ2SqCChExpTS27obYt4mI97J5l26NJoJPCy4SZsP1/FQqGcS +dTDcz8qW6uT7BrCu5ROEgR5J1WC3/Vmp9yN18FMP66HVoMMPUvaPnTMg9c+xwPoLNcb NhsAuTCg/UoIiA1CU1CU/ILhVJU8piLMzQnpLWtpYSiIUd7y5y9Idw2jld7hD16rR2Pm zYIg== X-Gm-Message-State: AOAM5331ci6LDs74lmBy0xmRMl9V0PeEHX320Hk3qGOUFKz2Nt1zEFzF cXZGDTzYCoPqBwrCwe+8dFs= X-Google-Smtp-Source: ABdhPJxyM6ks6f/AtXulz0XTwPp/1u7KfSSyfo+XwK0vrDjMgXFmljXnDBube4Y4Mvua0waVnfMNfg== X-Received: by 2002:a1c:9dd2:: with SMTP id g201mr1046586wme.46.1632476348340; Fri, 24 Sep 2021 02:39:08 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum , Paolo Bonzini Subject: [PATCH v6 04/40] hw/core: Un-inline cpu_has_work() Date: Fri, 24 Sep 2021 11:38:11 +0200 Message-Id: <20210924093847.1014331-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476351492100001 We want to make cpu_has_work() per-accelerator. Only declare its prototype and move its definition to softmmu/cpus.c. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 8 +------- softmmu/cpus.c | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 2bd563e221f..e2dd171a13f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -546,13 +546,7 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags); * * Returns: %true if the CPU has work, %false otherwise. */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} +bool cpu_has_work(CPUState *cpu); =20 /** * cpu_get_phys_page_attrs_debug: diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 646326b24fd..6a05860f7fe 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,6 +251,14 @@ void cpu_interrupt(CPUState *cpu, int mask) } } =20 +bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + static int do_vm_stop(RunState state, bool send_stop) { int ret =3D 0; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476355; cv=none; d=zohomail.com; s=zohoarc; b=OQGMQa2Gftroeumd0WAO6Z9u+rVqDSs2Y+V1kpFrL73N6MtPUP5vx3YgU2EPgaF26EdCgcIyovZMBpf0Btr+XCp32+D+20T1kcOg0zgGckzCBKaYQa/fUI3wdT8vjHivgNM6fbcyFptmCtegQTdxRO6SoovSnu4TMY7I6kW3a8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476355; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=f5vtkvmro+6Pdyxra48lfS6oRfdAeG0Gn7Vmd7avzjs3otOYdpt5YGdTh2zi9GlmUr0MHI9jz7kV/yfZXCvPbdM4HF3rmZ0D2M1VfH2ZQ2WWb4XQuY2wxDTKn9IMGmeEVTK6Qr7AziZ1QPbfC/BysQISMw+zB+pLWs5qJcs0AkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632476355207179.85091456106852; Fri, 24 Sep 2021 02:39:15 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id r23so153394wra.6 for ; Fri, 24 Sep 2021 02:39:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id q3sm6362677wmc.25.2021.09.24.02.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=dtaPENSHWgqPCqi+uk96kCR07UH/mqS1ORNhhtTyDM7hhadwpEy6Szr93fFMW0qjEF MVUbQ7hiiWAlWh+x2FJyHgwxu3DxQEOc1CWdWo6xS+oqjuu23Tj84K/2nixMYCXv97I9 NQ41qjmmFdQA3SCCl043i6iA4DqFqTlyPTCqiPzDAX/2fDnFF6MTPoyThhmhFw+9yOmE 9QEDItSxG5RKsUfyTFScLRrYQeYNcQk0YnVa4CRAsJqyMK3dNEQYjlL3EzULFEFVY0Ia 4Akhyp41ZIRPRLfRTi5gEOwWRjdooMOgBxkm58BARyTjnY13OJz5D4Lev9IlsUAoId6r mDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=JzTrtSfbRmjf/bKAJM7vkVv9VoYuz9gRa1ULjbTk44eZ71mbI1KRUgEMUn1xC+sciA NqIidujuIb8DSnl0tKhHczVDDMCfTm9a7DE/cz9mCBfz4p9tm+0c1/VNxUbnLFI7PUBe gNtX6sXrkjXT3frqmaGw4/+IpN2c0qWSdZjwt1/sqW3A1yXuFS3kSfFBU1g/Evx/BAUR W5FIMkE/h4m2b4oPTNcpaVtp4f9NPu6fx7zirkzdx7MxknaUzpYUadgodVsR6PSPzSOv kloR4u26YBbYtoDa4Ld+UOaVH45bbTFOM667rSPd4i2G1UyQH19zaN/o7nMzbGLsiLwM Egbw== X-Gm-Message-State: AOAM530HsJOECdSMF2sCANp5FFRtaPD1ok2KsQbjfcI0+q45T4fGtc5Y KMhcAQStjVm08wfIC7MJwuo= X-Google-Smtp-Source: ABdhPJz9UK14yoXE1B3z9UZMUIsew3qRgZpVt2fmKtsCDzDAOGrjCPlzJrS0FAx9kT0lPHVHEVdVUw== X-Received: by 2002:a7b:c148:: with SMTP id z8mr1012888wmi.160.1632476353468; Fri, 24 Sep 2021 02:39:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 05/40] hw/core: Move cpu_common_has_work() to cpu_has_work() Date: Fri, 24 Sep 2021 11:38:12 +0200 Message-Id: <20210924093847.1014331-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476355838100001 cpu_class_init() always register cpu_common_has_work() as CPUClass::has_work() handler, so the assertion check in cpu_has_work() is pointless. Since cpu_common_has_work() simply returns 'false', we can inline it in cpu_has_work(), improving the function readability. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index e2f5a646046..5ed1ccdfdd5 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } =20 -static bool cpu_common_has_work(CPUState *cs) -{ - return false; -} - ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(typename)); @@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) =20 k->parse_features =3D cpu_common_parse_features; k->get_arch_id =3D cpu_common_get_arch_id; - k->has_work =3D cpu_common_has_work; k->gdb_read_register =3D cpu_common_gdb_read_register; k->gdb_write_register =3D cpu_common_gdb_write_register; set_bit(DEVICE_CATEGORY_CPU, dc->categories); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 6a05860f7fe..accb20f0589 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,8 +255,10 @@ bool cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - g_assert(cc->has_work); - return cc->has_work(cpu); + if (cc->has_work && cc->has_work(cpu)) { + return true; + } + return false; } =20 static int do_vm_stop(RunState state, bool send_stop) --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476359; cv=none; d=zohomail.com; s=zohoarc; b=Z8s49EWDtFA1VxqcEPM6kgaqt2CG5YdNq+pkM8aQPYToM1dAYGECj2slLMZWkLhE6GZGJQYJlqkxJg5SNLkcGuu92St6ZIK49hWulpZqlC+1l0QAsOVbuJm2nK0wx2PBRPh0tlN1rVnmNdXI9ZyqJG11XAbZjphXJDZNl9JHvEQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=GzAfshDSDUALKUoE78MAoWiVpTUDQ2AF1RTzoq3xnU30n6b5vuzdKLm4aqcGwDJYujCyOLF+ZG913dKsfXp7Mkv5edmv3nbKCT3ryp48obCV6lk7/ez7Ryrr+8I05BeisOEC3jGOx6Vhzr9NFL3xHncK/LYj3v815cJRV+IaR1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1632476359866817.4784689406898; Fri, 24 Sep 2021 02:39:19 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id r23so154022wra.6 for ; Fri, 24 Sep 2021 02:39:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id 20sm12861271wme.46.2021.09.24.02.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=EvaFRensYZxh9D5PT9akRhICWZWJ/6eumSUu4f0GcnI+T0iuwWj7HjkXDwIWYVIxnV BrEaCV77i2oFP28AQLSnQSne7lR7ifHy+5iVH++n6XBFSu6A3LlBwtAi5XtAqoab2biu jVN2Q+bIPnlmG5Xpol3pdgCSuK2mafnh8xZvU6A8GTDNPWeF5wW4tkrtuFB+ipMOV0v6 Q48579hx0dSgs4Xn3jqNwaBmmVF8WJWl14W9seoGpztq/Z1sj6gOVSATa7mHEHF/S/q/ L9m4TFLgBOI6XQ2GKTUOoZyF3J9EBirMGMOh5n0Y/VAQSy7VtlKVlIzeaYPCWMTqHqYp MQZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=s5gsLRFPhuiumhUwweiaIYLZpuhGwUwQFgLpe60EZn2qK3nTDqibLP+uJ/I7iB27sF ml3Bz5nJafYcBmNAIoL4mXiQnSyuIQ0qu6bq0HH7q0njt41Co4XzEa+Xqj4Sy8bY1x5h GBoXCswhwKt4O2LUmpn62Ofz8A1CPDR3ftawH+ZyEISZKohMCsbzASHV5I788FjQD5rA R55jkNwuxY64ixRgn9vxCoiZXu5GyzfRkFIrdrnuSOnEd4u79tBgk0rlyRhWBa/tQZnm tzeO5cZ5M0kfrbNAiV6udUYudFc4JIuAqTeYsCaFzB1s2eyvA1GqLsyjK5JUHpUQuM+w AnQg== X-Gm-Message-State: AOAM532PuJ9bYOcEV7R8YrulaUkNC0hTYPxl7eaKrRTgj1Xq4QPFafmP S3sFMa3PXumSTSuO38DiVyM= X-Google-Smtp-Source: ABdhPJxzjmqTC5K7mNYDuSfrC51vDvMquYGGU0SuXIsSr7WzqPVqQy8zk4b1Iq3JxKArB7cgB+AEEw== X-Received: by 2002:adf:e783:: with SMTP id n3mr1369078wrm.37.1632476358111; Fri, 24 Sep 2021 02:39:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 06/40] accel: Introduce AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:13 +0200 Message-Id: <20210924093847.1014331-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476360271100001 Introduce an accelerator-specific has_work() handler. Eventually call it from cpu_has_work(). Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/accel-ops.h | 5 +++++ softmmu/cpus.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 032f6979d76..de83f095f20 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -31,6 +31,11 @@ struct AccelOpsClass { void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); =20 + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); + void (*synchronize_post_reset)(CPUState *cpu); void (*synchronize_post_init)(CPUState *cpu); void (*synchronize_state)(CPUState *cpu); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index accb20f0589..85b06d3e685 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -258,6 +258,9 @@ bool cpu_has_work(CPUState *cpu) if (cc->has_work && cc->has_work(cpu)) { return true; } + if (cpus_accel->has_work && cpus_accel->has_work(cpu)) { + return true; + } return false; } =20 --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476364; cv=none; d=zohomail.com; s=zohoarc; b=YA+VKBWGxKE5Z+AtpmqSHAfUdN7/9u0Hjsplj7QcP8qlMAzzsCiBwHn90/i5nKQwysfjIoUBvob5RKmoPnaV4nmLf74giqwu/dIJnB2srta9zTlfJIBIv8nF9CLLTPxuSv/QwrRjyXPIDOJ6CbgEEamNzU80/rxoDRWdIk1KDZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476364; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=hrDXW3wV0jAGX+9O56bG3bcXJpWEC2N0UWEYEZxj7Yl1PnxG8Tx4M2bM95ByZ1Zra6yedUAMKo0fhkXP+YDqoSeL6bp3TqtGx8iPixzMQMSqI92WKlik/iwO9ON7+gRKIZooMtp4vX+cbexOCuynF/IlksTMbzZ5qfMkY6gZBFU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1632476364583554.9180858813683; Fri, 24 Sep 2021 02:39:24 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id i24so9558008wrc.9 for ; Fri, 24 Sep 2021 02:39:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id m128sm5645595wme.0.2021.09.24.02.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=Ww8e5hZDWqw9JfWpbMGhlqI7pDDqNdcsWrhsNdLDPKqjDZuCT/aOjXMXb3ffPDz4JC q4k8WWznxOI4F1skYyZqEK49yp2FXUcThpTuvaBp4eAAxMqnxHpRgbgShH5w+bK6l+qN 5CbHVj/3aQaStowcB7zyX9sRrzHvahYpMf3OEf1LI3dUTj81LxjmhzocnrQtkABZT4bv pOjNSpXr+tK4BYdzodu+F7O/vsKfVbunl1/0JxhfUws8bpvBn7zud2onCKzhJiPhXEHd X+zYEuybb3KioSVSLtAJeCqSWblWl3MMoMNaTWjoQbL2AQSeoiHPEyH5HYcl/aJsxWDB pFFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=UvEQzlRLOJ97Ju9LNx64cpkpRqefZ+1MIkI1J2DYSJ33hxGmK12WTSV4GVsZhvOV1p hRRd2sRZqqVVqgtZA7/BklosI21J5RiIwvQN06xmYdKmYTZCmvjie/8pXQO2uc0J0d1l Wt4tCDH3e2sHbJpcdoxn2Wd/NthFqqGT2A5wwKnoDJyAqMOgN9Xr9kFWCyL4CiNqE1my luvGLXyN085NV72LT+D0Icsm2/gq+WkR2Jx3GtE8GrLgsryLW5J4EOUsro3zZCOYq8MY uzttNy8HhRmPvvCFOigbMmr5y+ilfqoTcVgQG2FWI+Jn14F2Y6fSLllme0J0Q/6MCoBs 6Jjw== X-Gm-Message-State: AOAM533gFt397VY8IiYsZtAhxY51J+oy6c1t5zdrBYX/dixlreEFkYHD M0JuaRwSUFPHZK8X5sJZKryRED0qB6w= X-Google-Smtp-Source: ABdhPJwoZCGo+hg2kmuMf981/dvpSfGlMLdZmtK66h5QoVdyf/I/omnPIeNLYPXTYxRqHVoRVka+SQ== X-Received: by 2002:a7b:c947:: with SMTP id i7mr1051357wml.136.1632476362750; Fri, 24 Sep 2021 02:39:22 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v6 07/40] accel/kvm: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:14 +0200 Message-Id: <20210924093847.1014331-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476366390100001 Implement KVM has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/kvm/kvm-accel-ops.c | 6 ++++++ softmmu/cpus.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 7516c67a3f5..6f4d5df3a0d 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -74,6 +74,11 @@ static void kvm_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool kvm_cpu_has_work(CPUState *cpu) +{ + return kvm_halt_in_kernel(); +} + static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -83,6 +88,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D kvm_cpu_synchronize_post_init; ops->synchronize_state =3D kvm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D kvm_cpu_synchronize_pre_loadvm; + ops->has_work =3D kvm_cpu_has_work; } =20 static const TypeInfo kvm_accel_ops_type =3D { diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 85b06d3e685..c9f54a09989 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -90,7 +90,7 @@ bool cpu_thread_is_idle(CPUState *cpu) return true; } if (!cpu->halted || cpu_has_work(cpu) || - kvm_halt_in_kernel() || whpx_apic_in_platform()) { + whpx_apic_in_platform()) { return false; } return true; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476369; cv=none; d=zohomail.com; s=zohoarc; b=ERCG0HWjFpRZiXKfA1mDLoTFB9zfTLY6LeajB1nGj6AeCCK/UUynlHmuZDPbO4HRghWKguErtkXZnQb/MrK7BzvFmwNJXYrMhsQwP/9jAelUW6pXV4TlvZznfJRl7H7eJrJ/oioU52KgIQNrESKG/n/2NDEX/AnnsVi8C7or2wA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476369; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=h/pb4Ghdl5PeX78Cz0IbhrPnflt0is/FFluWciK9OalhrOUA2oEoZaQ5KW66CMNOYytlBGSB5eQLbxzbT2uzhnA/JlWZR+md0XJDo8GrlyVpUuBYc0aiK2pIlIJx/sZWES4P03azvPGlFw0pQ1YEnG337ChZAV1nrymOUd80UP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1632476369067644.9150406515381; Fri, 24 Sep 2021 02:39:29 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id w17so25389366wrv.10 for ; Fri, 24 Sep 2021 02:39:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n19sm1326723wms.47.2021.09.24.02.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=NOXtP4tivCAS91rDMAhwcVwUZzXzzbkSv+QjKJ53FeSn9Xi9BrrohzeIoOe083Auhf Rovu2J9tDQUgFTnOnJA0A8JS1Fh/vbSmLlgh8Z6CRoWsxqQF4+8H1ulArWxRhjbzp2RO BQr3FSkNYMVbFsYi+maJfwF0AV6r609/wpE1pmr8/O12OrMonO2p+PPNi1i3/d0RKyfM 8CvbEpYFwGLhhiS/TXF9BgXuMB1W3XMYVD6QgCr6i5t55wCHcvQ59GkoVaTDg7NjiSAk txaVcnhdtpKICqfoPxSdrKU6Cy0xajhMTjXKVO4I3Zj1rA0oKTlfrfRkFZR+Gyw6el64 a/9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=1yxB15PZ2VeEtcvaPZdUc9aP0cPUdDjhFEGYwQN8JnqtbW0DgMB18Nmqz1YaTe7j/b JiZnPwTlptxStGdL6XICD9NPTDdhMxscNkHSKyhUVMIBq2oJC/jzjGlQ7YdJJMDA2Lse M5imWs1BELwVYMFQSQ8JeVKZUo0AgcLBbrVl9GYUVcC/7ZBAwbXbwvKh39XHsysNE9jy qKslVYq10LYqgn7l8wrE5NRh2sufNpQxUNno3fcyKEwddjaYyJ/j1Go3u8v9Kxi1XEuy GavGnbjMpqiBGl0jCMloYaKdoxPoU4g0xHzpORTX/lDTEFCqoOAzeOzD8VNtLJ348z/C itNw== X-Gm-Message-State: AOAM5313utBoTN/h/7+CIpqgL4qwDrM655mYmox6Vxhpvd2Uy25/qlZ9 l+pprU4XI583rMWH3F4xKVY= X-Google-Smtp-Source: ABdhPJxAfed0bikX3dT1RihVvD06PW1q4E6qZ3w02UQIER2y5HHf+TNjB7gg0sCIGuc2E7m2Gcfnug== X-Received: by 2002:a5d:4538:: with SMTP id j24mr10277773wra.348.1632476367315; Fri, 24 Sep 2021 02:39:27 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Sunil Muthuswamy Subject: [PATCH v6 08/40] accel/whpx: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:15 +0200 Message-Id: <20210924093847.1014331-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476370578100001 Implement WHPX has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index c9f54a09989..5ffa02f9cef 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -41,7 +41,6 @@ #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" -#include "sysemu/whpx.h" #include "hw/boards.h" #include "hw/hw.h" #include "trace.h" @@ -89,8 +88,7 @@ bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || - whpx_apic_in_platform()) { + if (!cpu->halted || cpu_has_work(cpu)) { return false; } return true; diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-acce= l-ops.c index 6bc47c53098..1f9c6d52c27 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -83,6 +83,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } =20 +static bool whpx_cpu_has_work(CPUState *cpu) +{ + return whpx_apic_in_platform(); +} + static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D whpx_cpu_synchronize_post_init; ops->synchronize_state =3D whpx_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D whpx_cpu_synchronize_pre_loadvm; + ops->has_work =3D whpx_cpu_has_work; } =20 static const TypeInfo whpx_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476374; cv=none; d=zohomail.com; s=zohoarc; b=ZVhAPldsQVK8CFZImsfs0v6M0644L5zLz/DJWrRV95TnHPQMzfgStK2Rcvwp24EN+GSGOMjtPAQzof9UMvv+uGkaS5+/f0Ynl73d+uUFYqBWFdpsUR9pj9OxhMj7mQp0//+MjvbAYMTXaUIvM7xgY4sHDxmwsCd/lzS1Teu819s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476374; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=UwluhGNCdm97NtUQatwfqpKhC9raxeJmmEvuMDxpX3r1wdSj1SJaEzIgB2H8js5xSklSvU8MeeGXcUge2eqQ/cQdUyLp7BuIvcD/WbUaK2cwJKRUYgfVf0IoqhtlIrPZyjMr9eoFGvDPRj+v9dbyde4BeOl3cs2jlb2mShWRugY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632476374286413.7627040718712; Fri, 24 Sep 2021 02:39:34 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id d6so25370589wrc.11 for ; Fri, 24 Sep 2021 02:39:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id r2sm8364089wrg.31.2021.09.24.02.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=qmujrEu3hn7XgcVz9kAzGT/jAIzF8K/yOgPqjK8Lil7oWfw4w7gZeyRdBPI55MkkwV x2k5P5C8z6aFCWkQh2WPlMW8kf00hsNJFdIWCfXROCoYhO37u+mwQ1io51IzHcGCEtvw 0hhQ1FSqIJlJ9XYE7YcZNktmqkMRyR2hwppSjDfJeB4VFWuJPYxmrxl7+REEe6XvSw3a rY1I0kyRvC2fcyg1lzMt2eRUXkNUnWbpqtAMKDVZrGIrKfD2XWzKX42lTEqSpjPMx4dn P0ND3soSQexG9hZIhVBu/SXapPbhwGrYYkmYy0FXEjTOPSHmxBt7goJdY1DPkhmqmN7W 8rAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=Gd/S30ojmlIFKFAYmPshxkpYOapxvVPZrFKPXdkpKMs1zCJnsrHH5p4zM+5Ki9ApyP yddftnIezvbp0IS2g1txWhTA/ncqe2AyZ5AnTF9YN2A9pa+boSbH1y1dYWBjNWatvGTy ZfQrPBukKbNETfrsVXQDVfBoq8OXA7t/XRIZK91ZRLN3usLX0AvUXxZa+wsfmQ6C1Caa Xdyh9V5E9cUVLgNkKhgweixRfespLNEAEQo9G1mRqtX+LozE4kDGXDmrctqy2TbVRCPa bdEz1//7sZpthwAHo/KZ4mYHBYmlBFn0orhrOMybeCJmtPZqy35SFQKyxo9fATS4Brfk FBqQ== X-Gm-Message-State: AOAM532fZBGvMxgQ/MO0qxKplPwciNLVtxiHRy6tifZ7Kx9ILRJmUEF0 x+Qsj4uT1gwxPkkPdxo96Ks= X-Google-Smtp-Source: ABdhPJwoSWqS8c0rBTbISQPqY0TkK2y2mKEKENvpQ3aFNCqeowBkhiUwo/emexE2feG3h4xscjkCOA== X-Received: by 2002:adf:e806:: with SMTP id o6mr10005295wrm.239.1632476372032; Fri, 24 Sep 2021 02:39:32 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Roman Bolshakov Subject: [PATCH v6 09/40] accel/hvf: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:16 +0200 Message-Id: <20210924093847.1014331-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476375117100001 Since there is no specific HVF handling for cpu_has_work() in cpu_thread_is_idle(), implement HVF has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/hvf/hvf-accel-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 93976f4ecea..ba7d4f20a35 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -454,6 +454,11 @@ static void hvf_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool hvf_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hvf_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -465,6 +470,7 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, v= oid *data) ops->synchronize_post_init =3D hvf_cpu_synchronize_post_init; ops->synchronize_state =3D hvf_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hvf_cpu_synchronize_pre_loadvm; + ops->has_work =3D hvf_cpu_has_work; }; static const TypeInfo hvf_accel_ops_type =3D { .name =3D ACCEL_OPS_NAME("hvf"), --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476378; cv=none; d=zohomail.com; s=zohoarc; b=n+8Pn0OZg8CV85UINrGCRF3hjSuBKuTy/RHrlOxrAeGKNBGFklWkBzhifxgdcHBiCs9TTPJ36xokahmIK814LF1LuZ8AGTkRXRZmULbgHc3yXXEcpPm7ybxjhVqWdx3P+OF5B4S9vW+TlsLQIEt+ci1CXmMd0zn3K+yfU4QnqKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476378; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=gSLcO3qOmaZL3xAzoolplhBRj52r670v+AtRjcqA5Zymg3P3/+dDg4VHW4ITAODF/RC75c7K/0imtKJtkf7g+C6dPwYE2h0W78DAHBY2payrk1nyqDFXZbs1EosadV1vrw238QCqiVqADAbeVbv9/bv3cIudjRklnW9l/ljNOu4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1632476378495244.82976518024395; Fri, 24 Sep 2021 02:39:38 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id t8so25546498wrq.4 for ; Fri, 24 Sep 2021 02:39:37 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c185sm8256519wma.8.2021.09.24.02.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=bfJDRUtHlsDizMGatZPk963VYYfAkBfTjsNmiwj/ymhx0kRc6VMLElf3zBqxnARhDn lgmgbrEhIGHtgHu/8x+tntzdV2SngC2qWF2GAwfvOtMhG+V42rxSWucJiP7xIrIGReXz l5t9jVP65mPF1GmicTiZGk4oLjys78iV6BtOhMY43Z6OA7grVc9JwzvqRzjqVuuxwUkC i1rYTGO8A5FNd3Xng6BsOrIPE1h+jG56FVJbFE/XhtVgUXtuAxE+HmINDUE2vF+hCr/y 7CIfaAlsit+sLqNVs49NVF94QACZCvY/8QbD4Llhgxgoqiw1AsyONwYLBrR6BOTi/Z/H 7hpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=R5gCCwUjXLQWXPbzrcvv5ni/p7STNq3zDEeqo4ak7vsTOQqA2nZEglsClu7EsZ2D/b xXaPyYNRk2lizVg7G+xEcc017yIOvr3EdJyHNI4U83qnoFNJ3wQlnvc8dk+WsRvIh/H8 tt8yc+4pw9EqNvg0APki5v4GTp8CKG9MwI5NhX3GnH0xHjtJqsVRDhWvmS8Pq4iqNDER c2fZSAVaZEjSpFCnLpund8HA715m8Aa0bJdzBxjSgHtUL5W8oSMe3vkA9WijTOQg06zx NEa8NGBgE6kvJrcRrBuOKQ2mPeEqFSW9TX5izr4YeQi+c2Ok4lst//TVjK1Sj4A93rRJ V63A== X-Gm-Message-State: AOAM531UXpRgILSOKxMel5d3Xnp1aHpB+8Loxxd4gQMuSmay6h/Llab/ KNtSsFVVM3vpr4mkr/RfDPmA8Nyz0cs= X-Google-Smtp-Source: ABdhPJzv1Bde65pNl0VvYERfNs+TTxQ5croc4mEh0wp0bxdkKK3MHRcKkC10fZSBqwi13saNHJwzfg== X-Received: by 2002:a7b:c459:: with SMTP id l25mr1077703wmi.60.1632476376611; Fri, 24 Sep 2021 02:39:36 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paul Durrant , Stefano Stabellini , Anthony Perard , xen-devel@lists.xenproject.org (open list:X86 Xen CPUs) Subject: [PATCH v6 10/40] accel/xen: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:17 +0200 Message-Id: <20210924093847.1014331-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476380302100001 Since there is no specific Xen handling for cpu_has_work() in cpu_thread_is_idle(), implement Xen has_work() handler as a simple 'return false' code. Acked-by: Paul Durrant Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/xen/xen-all.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 69aa7d018b2..fe5a37fa2e6 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -215,11 +215,17 @@ static const TypeInfo xen_accel_type =3D { .class_init =3D xen_accel_class_init, }; =20 +static bool xen_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void xen_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; + ops->has_work =3D xen_cpu_has_work; } =20 static const TypeInfo xen_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476383; cv=none; d=zohomail.com; s=zohoarc; b=gJuHEbaUpU6qquddVRk15cFkvoNE8lihBh/cWFaT4OsqNmswOwnA8tUTz9qQj57nGLIgaSkS8p81ICXr89ddixwRq+FjUkxqc0KGIEWscyPJD6uMORFEK3Wh3C59EmR6e6UppdhwWeYJ/Cvg4ULA+Ba2eIZOYQkBz31UhE7XBy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476383; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=PZ6hyxcgu6GOGXD6rZFOiukaL6X6WnJNk1eNtVHRVeRXrb9YCtPJz0Sd0nFvGN4z04rbRGbV1f3qmrVXpQZ2g8UU5888qfaM56J3ugLTso7aSyKQMsAwhbmDMWDahSuL5WPTPcJaXmZEASizjJZKiwNnoYh1e+77HwOZVu+qSMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1632476383032248.49475890940255; Fri, 24 Sep 2021 02:39:43 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id i24so9560530wrc.9 for ; Fri, 24 Sep 2021 02:39:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id x21sm11744898wmc.14.2021.09.24.02.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=IrGQXkW1n5HXVXm8l3rQZkFcWUN3GlQa7CXEGz/UbfUi8EvXCQbYCJ9sO0dgmdN709 SM/jH8+yBDg6sC6/ThbReQvDWwtCGZqALiKVqgaxE/naCXd9Q0/fpS8U3E2GdhO88VA3 hkRZqc35BeK4s3T/yxOFRf11qBqv1ZYbq0zgn3j/SZua9u6G4r0i7boQsWyncihUJLGP rvY0zojKDT0mXSVMzqyxBerdzsE63j3HqYzGIMxng9f0Ufu18FaIKuKLwAzY1V4kyfoG QZXkDV+Bdf2XQFwscX5fwn3C+Cg7lBPzOV8WMtqrmeJEh86OcRdQVSrj8s/vTlCRWPKu osXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=bjtzevBgurVeoBe4ldRVO3JWqoy5v0pvAiou3IzWRtrJW9TkqPACV27Dk8kXkFmkEl yWdPwERAH01C7gJoEAYbiGDHnfXQbBhSnnQb9CyhSChIIGt3EIVn5jyc50+Gsg9QoOJB mrZp09kOBcjl5EKsFxUoQl+tID0ifXGlCj6x0IrHETvRnqGM8XEe4HsDKuMLR7kesX+q mABCC6YWcVJuUDEJeJvxnZf1auwe6V5Wlztjsie4DYEvYoRDnut/5zFqFp1yujgMvcyk +VYf8RB+pCRR1Y9SIn0pGjoKtowb3vm4CRxqZLybMxo0QoMa01rbrNDPasTa+hsWE+8G NWyA== X-Gm-Message-State: AOAM533nZUffL36BmzeAz039KBIhMhhFGwfTnVFoIkjlZOY1eNmmDoeh l/HfrsTrldoVO9psGmq+WTQ= X-Google-Smtp-Source: ABdhPJwDDNnd4J3DU7bH6DJfW2OgZOqw0H9ZdyajHTI5slOWsSAXNc3DrbyWYgWXp+6lzcgzKuLJIQ== X-Received: by 2002:a5d:4b4f:: with SMTP id w15mr10367662wrs.175.1632476381266; Fri, 24 Sep 2021 02:39:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wenchao Wang , Colin Xu , haxm-team@intel.com (open list:X86 HAXM CPUs) Subject: [PATCH v6 11/40] accel/hax: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:18 +0200 Message-Id: <20210924093847.1014331-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476384580100001 Since there is no specific HAX handling for cpu_has_work() in cpu_thread_is_idle(), implement HAX has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/hax/hax-accel-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-op= s.c index 136630e9b23..5407ba17eaf 100644 --- a/target/i386/hax/hax-accel-ops.c +++ b/target/i386/hax/hax-accel-ops.c @@ -74,6 +74,11 @@ static void hax_start_vcpu_thread(CPUState *cpu) #endif } =20 +static bool hax_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hax_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -85,6 +90,7 @@ static void hax_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D hax_cpu_synchronize_post_init; ops->synchronize_state =3D hax_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hax_cpu_synchronize_pre_loadvm; + ops->has_work =3D hax_cpu_has_work; } =20 static const TypeInfo hax_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476387; cv=none; d=zohomail.com; s=zohoarc; b=SpgBIDW/2PRY5hNFQbyzpR4yKeI80az6BnW7pvhtGtSGLTMLwrzbbJRjflRRewresx7FiWyWEGbfrMUos/pSDY4OlvRcPucbT6uFpS1FslG8eOwXUiBPIU266pjLjU2cX2WYbq1vifIiA0tTmdx/cisB2dN5bH9VfcaD+lL/qrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476387; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=LGWUVXZx6ggAJwISj0GERsy1MfsfPImtYA0l07ufNhA1PKUWfMw7fMjZTN2IeTpe9KWg0hYj2ugXUrUZzMx+KWC6NSS/bm5BlBdzDkpQH1Jfn773UwdZ73WjALBlIERli1FKkc0+B9YrGzwT+pBvHFD0DabMYwkZxmM5pYZ1FC8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632476387657666.3943824326888; Fri, 24 Sep 2021 02:39:47 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id i23so25588847wrb.2 for ; Fri, 24 Sep 2021 02:39:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j134sm14310026wmj.27.2021.09.24.02.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=h3tkiY2k0lHeSqtRriwt9QIC83HOiZiAKrcsDl8tQbBwa4WPBlqa1Orwxe9R9O4cs9 CWPEAqw3MPFnJq9fY2NBiOnvT4dsQ2v4zVPT+YobBKMrvS2a4emJ1KD5hPYAePG9QptX OHPUS/NyGTwTw1ArwaM5QcShpmvHmCJVDA6NWhzBJjoqPlFCFMtgIUwy0Wou9XnYrdf/ Vxv7ucrIHbM+lJEjTF74ZwWIGZVF4ZZ7h2OWu9KcZGl/+OuRvFhtlAcCfWXg5tl6mLvA tqvunK7SyObtxVQwIH7w9dYlRJ0LMpCA17thLnWOvdRjBz2awCnV0PYMnzcIzXG2F1o/ U06Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=Y0yxeppipYDayA3vpEmzInUR1oZSfxfgVzyf6qkuvw0iwksRY3MVsgBph99xBxI8Jv Kjk4YGsiWne1LtAD51OyqJknxwLGGfuaqRfAHh7Cs45wa1Mvpevy1QWGXT6o2TJHQRNA LZTbhP3J/x4AjgUf2I7takwsMHUDWTfatclQG0IceSSmcJP018C9tQZZ6IRlIPmiT9fH e1XIE6C4v6U/aN8gVdYuROgaPhSm49wwl5vaX2ToKZW37luGhuX5FxOvgDZegZ2qXlPn CMK4y73ZBXTX9GBTmpBKPtpP3ddFBKrEjMH1IokmHhQgyU0L/J6dvpchwxYKESvo3eYY p9zw== X-Gm-Message-State: AOAM533I9AdgmsBPeiZQtfkm8uOyKhqdMZY4KfDGsdo/+lQAHSLwmC6b E/Vyr0tEv6Ns3coDdDknozo= X-Google-Smtp-Source: ABdhPJxpSFfhBSDIUHhM4X9NLXTfO2llO8y8MDnrDunwT+GB1+QmAcUEuH5WSEM06DTsSFyKa8xDtQ== X-Received: by 2002:a5d:64e2:: with SMTP id g2mr10244900wri.323.1632476385844; Fri, 24 Sep 2021 02:39:45 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , Reinoud Zandijk Subject: [PATCH v6 12/40] accel/nvmm: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:19 +0200 Message-Id: <20210924093847.1014331-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476389036100001 Since there is no specific NVMM handling for cpu_has_work() in cpu_thread_is_idle(), implement NVMM has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Kamil Rytarowski --- target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-acce= l-ops.c index f788f75289f..36296f79ff8 100644 --- a/target/i386/nvmm/nvmm-accel-ops.c +++ b/target/i386/nvmm/nvmm-accel-ops.c @@ -83,6 +83,11 @@ static void nvmm_kick_vcpu_thread(CPUState *cpu) cpus_kick_thread(cpu); } =20 +static bool nvmm_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void nvmm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void nvmm_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D nvmm_cpu_synchronize_post_init; ops->synchronize_state =3D nvmm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D nvmm_cpu_synchronize_pre_loadvm; + ops->has_work =3D nvmm_cpu_has_work; } =20 static const TypeInfo nvmm_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476392; cv=none; d=zohomail.com; s=zohoarc; b=d52gDwjFVXrNxH9J9t/bEjBnqQfba1QBjLu6Wn6lxw2ty0FIgxciTUkEZ1EWCHOmLFtVxLi21k8srx405xqHJPO0phEg4hrfyjORQbaXHCXYAPlaE1mtRA5sfhvMu7F+DWUvKnOFWsrEjqGt/ZQYdfTtGj+frUeIW+ngaYf23z4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476392; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aLzuxgLTjxaUP4zi8sBdv28yd73Nm8j1vjkLU2rmh+g=; b=feb4A9HzvA8uMN5/Rl+JQmUN0deF9EcI8+QrFjb/noUJZYiGDaZPSpwb+Z4F4ARd2FgXmX/r7FyETFYVWmKrSBVbdw5J6uEPgXqgHGrNA0GF2eHHKlTdCmdscr3Iy7KifN22C2UeTCk6g4y60oqPRpLbfQHEBSzqu5ckOM5qDRQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1632476392396202.65940699862415; Fri, 24 Sep 2021 02:39:52 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id i24so9561720wrc.9 for ; Fri, 24 Sep 2021 02:39:51 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y64sm8519500wmc.38.2021.09.24.02.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aLzuxgLTjxaUP4zi8sBdv28yd73Nm8j1vjkLU2rmh+g=; b=f9ZL3EOw/t0ewQ/J3qUr/XDg+2/vLXiO08wfQZMDath/X8ZF2LHytkPE6mXMpEYpPR sh0p3mkeEI1BCzJpnbrBKPhK6Qn6j5h+4WsfFSzaq1X57X2aZRiGrjDYQJBXHHjaf+Lr tZbI86ntZYeIJ9KAo/sIkpgSFo5zBy7QeOP2e+igZI3aNYcai36Z1d1HchBGjb029rlR 0gpAn5OumA47ALj9BFcFSTA6PI94Yk4m0a+WUwvKsVuCYWiDEsfogyG97r+R3zbfIyNY lzDeC/mzWAOWFegP9vBD6i5mnLUwADAs7iY6FrUUzUnIz64lugaagTZUAviIwTI7sPGx CT7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aLzuxgLTjxaUP4zi8sBdv28yd73Nm8j1vjkLU2rmh+g=; b=Hs3h6nLhp99E9JpohCGUUfNC4c2I43NDS6O6/3cC8yITbcovjwQql6NfvIj5dsbq/K TPfkjsRqr1jMIBRUM1KBbswKjlBjWHdT9b0Wcs0kc662Y5s9cNsawu3Ssmfc7e2+XLD1 DeAnWO38dl9Z+ntHlpXbb7BRSUcbMUMqNZfVjicq7PAyNLcxzWoog0QkQC8Tl0+oUip6 zFqN+WN1CuScLjGTBCflK1Edn8LavE+oQIZNmRTsDJilJxGspmhIvWAg1beNIBi/dBtj FaFpo2dho7QnhibcnBAn0p1Jkn/7g3Dumx2igvX/6WNd8H1bxtfk85fph4l+9ICmohmI v6hA== X-Gm-Message-State: AOAM530sgcFjiE+GMInpGoiGnlAc+fnyh8PVRILaSASUcAYylXCVjZhB TdXxgyC0Tb+4Ks+XVpaXQic= X-Google-Smtp-Source: ABdhPJxp/fayYxaCMCK/+TcvLqk2YoBMQJ5PaEhNYsJeXbQWsoZDyzGhocfAOG/2rhLTrLb40Dpdpg== X-Received: by 2002:adf:e404:: with SMTP id g4mr10220699wrm.143.1632476390668; Fri, 24 Sep 2021 02:39:50 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v6 13/40] accel/qtest: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:20 +0200 Message-Id: <20210924093847.1014331-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476393246100001 Implement QTest has_work() handler in AccelOpsClass. Since no CPU are available under QTest accelerator, this function is not reachable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/qtest/qtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d52..903c39ec1bf 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -47,12 +47,18 @@ static const TypeInfo qtest_accel_type =3D { }; module_obj(TYPE_QTEST_ACCEL); =20 +static bool qtest_cpu_has_work(CPUState *cpu) +{ + g_assert_not_reached(); +} + static void qtest_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; ops->get_virtual_clock =3D qtest_get_virtual_clock; + ops->has_work =3D qtest_cpu_has_work; }; =20 static const TypeInfo qtest_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476397; cv=none; d=zohomail.com; s=zohoarc; b=AQNWsxUgRMa4/ax6OhtPCSel1tK2KXD4ApP/gFvG4FHzKzsl1sOZMiHA10b9aXVCKytw3v0V/jMWrtDepj5xXTXSLGfzpYzjj4rB+p4Ac4c0ADkb3rMZYwgPXuW301PqypF3KcmiAoNzp12lO1TkjESmAWftOU4DxBD/v/DkJkg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476397; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=XDX2AkaG7uJg3WDk0UNjhsmWw3qWO2YOfeubn1q8jrrswmpaq39n2XkVtPyYEcWkN2Fllkc31UEKZkleECJ4RSX3wLsxrjIGclCmZyQiO6dXQUDS8HWOuz4nyFNODVDryTGbxpmbverVFWhikl6NWBsDVcrWz4NT4+LIIBUTMdM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632476397222375.57019137881275; Fri, 24 Sep 2021 02:39:57 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id d21so25366583wra.12 for ; Fri, 24 Sep 2021 02:39:56 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y8sm7518713wrh.44.2021.09.24.02.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=piuXccYlN3pEG3QB6KUJxZROq8gtYy7hkcwhGJTm/x2GBBhHfBeMIyKJ4LHCbVCO35 S3VVWTh66mDq7BepwM4Tzu8xVWntL38jfkgKRK3zdUkfnoGp12fv25h6TYw7GVRChCI0 lIz6RgT6x6AxQHYBY3gRv5fV5euyNBg6nUUDp78XLnzOsvabKwg1PD+aYu6ZPJ7ZVFZA pdY2WfRKp2HeQMI3X8K03SCJRqlFVRCAKKFWnSj1TrqR27fZYOP+GEBMS89ISRxTCq0i gsncAXuB/0Pv/6tTPEqpHv+ZIuII6RZrjIj7GyNqM3JjJzzXu1y/J6ghibdd7l+ikGrX RIgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=HckKbE9WzNxdKuXtpODXFSWC1AKKCtFiEHuQBaR7skhCkd8g5n5dZoFlx2gPK0XsBh SuuUesPs+4go6f5SRDnBUdXzlB42AJWEmurBrS71pu3aVY14+1PVT75fVurY8Ml3Hb8S jQvJbednly1lIY7TWn+OrczMZalUbWHlqL1Zi3nQR0uQAigBRc/46iIufUqY/i8SKDGe jDLHG5hYqvIKdoanuML5okMEeZuYCpnxM/mnUessbiqPNuQnZwJQBR5fLynEKdkXl9qA 3y9eCmCYxR4k/R2XnL+Gsa9oFtgTPC84Jq+e6EfedYx/QGJ4DmhRUMw/YhDYMLe7X7dp UiLA== X-Gm-Message-State: AOAM533kaUBsTadZc2VBMiTHOJgU2pWJBG4OV0u5zuMq7Pq6CPdibGyr zZ66TqKFunVu6O/k1b5iN5s= X-Google-Smtp-Source: ABdhPJzxEbLjNXVAhVczmkZLoaNcSxiI1KyrqlrNQ4c9XeN7cFaT/3PSW+YZkjGxd5XD2IVVFvohXA== X-Received: by 2002:a7b:c056:: with SMTP id u22mr1075873wmc.15.1632476395366; Fri, 24 Sep 2021 02:39:55 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v6 14/40] accel/tcg: Implement AccelOpsClass::has_work() Date: Fri, 24 Sep 2021 11:38:21 +0200 Message-Id: <20210924093847.1014331-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476397518100001 All accelerators but TCG implement their AccelOpsClass::has_work() handler, meaning all the remaining CPUClass::has_work() ones are only reachable from TCG accelerator; and these has_work() handlers belong to TCGCPUOps. We will gradually move each target CPUClass::has_work() to TCGCPUOps in the following commits. For now, move the CPUClass::has_work() call to tcg_cpu_has_work(), the TCG AccelOpsClass::has_work() implementation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 2 +- accel/tcg/tcg-accel-ops.c | 11 +++++++++++ softmmu/cpus.c | 5 ----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index e2dd171a13f..114eb3b9b2c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -89,7 +89,7 @@ struct SysemuCPUOps; * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. + * @has_work: Callback for checking if there is work to do. Only used by T= CG. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID. diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 1a8e8390bd6..ebaacff1842 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -73,6 +73,16 @@ int tcg_cpus_exec(CPUState *cpu) return ret; } =20 +static bool tcg_cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + if (cc->has_work) { + return cc->has_work(cpu); + } + return false; +} + /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { @@ -108,6 +118,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->kick_vcpu_thread =3D rr_kick_vcpu_thread; ops->handle_interrupt =3D tcg_handle_interrupt; } + ops->has_work =3D tcg_cpu_has_work; } =20 static void tcg_accel_ops_class_init(ObjectClass *oc, void *data) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 5ffa02f9cef..bb16a25bcef 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,11 +251,6 @@ void cpu_interrupt(CPUState *cpu, int mask) =20 bool cpu_has_work(CPUState *cpu) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - if (cc->has_work && cc->has_work(cpu)) { - return true; - } if (cpus_accel->has_work && cpus_accel->has_work(cpu)) { return true; } --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476401; cv=none; d=zohomail.com; s=zohoarc; b=IWn0iGVs9UlCQpmqYq6e62FHDoUq2BE+YHtkb6LSe8o1DNKtoSTK6RiBXDfL5M1gpgG/vbV+PAlTHf86QrpY9NyTftlIrtHypyCApTjATJPb0vgKb7cBbq5ibLpXkKuolki4nLcyW73DPUYk3iKhFaqkxylU7Y5CRggGuq7OSvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476401; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=FKsEeqvUm8P9u7Wr4emY1IUAMgea9fAL3+2VV9ezvq2WC4NjMP5br5JnF4vv7s1P7pLHwmAwK1UKnCn/5j8L2xW2lRaMBZKrFVLUu9hFRPJSXQerHHi5MA1X/FQSxqoJ74ZwlM35ad93peBEP4u7UMRk7YwnGe7HRDZgvyWhzaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1632476401820222.10408100329073; Fri, 24 Sep 2021 02:40:01 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id i23so25590806wrb.2 for ; Fri, 24 Sep 2021 02:40:01 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k26sm1163062wms.39.2021.09.24.02.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=RE5yOKxUSUjUjzBeY1vl15zYkKv1NHrBTccxFGXGjCS/P8zN3+D0uQ9sIHQVbSsTIt td/0iLjn78mOYgZIc3PdXVrGdDrxmHrfN9GfRv0E5OnWan024I4RpKk5z0hJWGEw1ysq DowOcOy9Degv8AWfT55kpHF4S9G6ztmdPJPbJHzdFVPzyluXiNcbmlX6Thq9sB37LmkJ fishgmrRwg/hBbS8lxrVFpu902Wj4L/bNAavQdrwePCHfa31N+RnN5TKjsvqBXkA07YB Km8Sp0rMXWHLQyFxubHUPYPXn4/Z/X/Evof3TNc/Ti4rX967BPgWGdDz/DR8UGw6vfaY nd5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=1ssgb7hQSw/AINWXpsDgIjB+PJHxuwt2l5y1XcB6ffWFkbQ8vUjlVScsW2otqMhEoJ 6qxpFOyPZWo4foc0uRRvTr4sevd+WyasGgYKgw3qPLXRb6jSBo8063Ost9ySZa+KCfCx PoN38JzNPsoj5YsMb7XciT5xSnr3ajmg0ZPjGfmIhMqJ7+BgoQbVuk3GBD5CzFKlaJW5 TkMINONuXDHXgZVfyzsJyaHsxymN34BAzUUVsq4gtW+jZnrgFcnqK+rXFr3Ns5eePOg8 K3K44JDyN36I+pXeMfExB0DwIC5Ac3EvSPu5FM8nT/FaYcIBLrqvBx8xcUqCLuOOCTvL yrJA== X-Gm-Message-State: AOAM531I3hY6ydUmnT1bHHN+gLolaMcZxDdyHO0fG0OW+nDzsF538mGB U9p+21Qm38SkasAVpEuaOSU= X-Google-Smtp-Source: ABdhPJz2P7KzGgKM/BX5BJYm5dekVepazlfXTWILHEYQqAftVsrNjp4pAZ+F/NQEE521ToO/3fMsiA== X-Received: by 2002:a5d:6ad1:: with SMTP id u17mr10469818wrw.204.1632476399970; Fri, 24 Sep 2021 02:39:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 15/40] accel: Simplify cpu_has_work() Date: Fri, 24 Sep 2021 11:38:22 +0200 Message-Id: <20210924093847.1014331-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476403902100005 Now that all accelerators implement a has_work() handler, we can simplify cpu_has_work() by removing the non-NULL handler check. Add an assertion in cpus_register_accel() for future accelerators. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/cpus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index bb16a25bcef..bbb83d5982a 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,10 +251,7 @@ void cpu_interrupt(CPUState *cpu, int mask) =20 bool cpu_has_work(CPUState *cpu) { - if (cpus_accel->has_work && cpus_accel->has_work(cpu)) { - return true; - } - return false; + return cpus_accel->has_work(cpu); } =20 static int do_vm_stop(RunState state, bool send_stop) @@ -613,6 +610,7 @@ void cpus_register_accel(const AccelOpsClass *ops) =20 /* Mandatory non-NULL handlers */ assert(ops->create_vcpu_thread !=3D NULL); + assert(ops->has_work !=3D NULL); =20 cpus_accel =3D ops; } --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476406; cv=none; d=zohomail.com; s=zohoarc; b=MUQXVivw4n6EG5LAYCxOdPAmWH2MW+FcbSv1s3rduujtZWuOPSpc9jhQX6cC+sEfp6S5sZRPmYNInsr7Cxnxn5jewqxHufIpmIBv6mHhucj5Ni+K2FicZIihETDd/tF3tKRW8/htq+vQUJ+XzizNQbrMleimqmG+zXi7QRPJkrk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476406; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JRKOlLYiSGogxCXK7W1sZhtnHuRe58y47UC3DXkXm/g=; b=VXt1UIW1R9kcVzpk4I9oPaWcSFv8Y+djr6NxodVFdnlnRui+NX6amsU7NBBdxN46V1JM7dVNZuXiIaw3qygAoYHsF0y7zNCwa9y4Fm/7W3+OVSqGAmN/CnwjYSHq99E43sfp01kNIoSNV2WMH9vEXc7ryPAYvOCGD12mNQnpOKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1632476406820249.53401859496546; Fri, 24 Sep 2021 02:40:06 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id w17so25394580wrv.10 for ; Fri, 24 Sep 2021 02:40:06 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id v191sm7786345wme.36.2021.09.24.02.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JRKOlLYiSGogxCXK7W1sZhtnHuRe58y47UC3DXkXm/g=; b=B3in8lo5Ftj1ZWYW4d3iRbT6My7HPS9340+n8jYee0PG6H3f1FWsaxbQ29hBXTsR96 S5ylV6RBV6667ZFItiMgghyH4+172SWd1bkQC0ZmSogm5rJDoGmGmEtK0KHO3f6HuXpn CWPlShK2FnjnqBTgjEbcIMOookkO3/65IbnMHsLm69rTcuGZwidgn+eu7tK8i9PXD5i/ xa8zQz2Lgvh996KoRx0bYi+n52RGzBfxpYHrTJMUO4ubBOddewTjxSEmlm6JUaHE8K05 1LDYPwRVmypRiErPoeyvNS3CjRrF33D6sD0jrp78MXs+wYepXxRQpdY0iHQNYRLnTh3X O0Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JRKOlLYiSGogxCXK7W1sZhtnHuRe58y47UC3DXkXm/g=; b=ADvn976VkPx+PWzTzJHhMxHQOiaME4fcl/Ow0zRZaxVtbjKFpveB8cbq0+NSh5PSGh McISdcSTkijI1rrHU8/hAM5XtEVEdgItsHESEjbWiKbogo/vZ7JQpRjeFBzUPpw1KllV hRVPDVD8Bqftv0wapkMKndY/c37QPOrzIUQwknsYfXsbklc3rL/TQULWUjOgDY4wI6Ht 168BzpeO01+W5qtSEA3Zw7pv2SeZ67qT6LGxRyc0vpBB5j5LkxXYHVl1m3MtNTvWRtCO IsK7xj22yVI3y71p+oCdQz5ytIycay5/BO/e+jq5WCsvWF8UT+ytCtqsuYgVzbd53LkD GgVA== X-Gm-Message-State: AOAM533vxdXXUOGZxGsBq4YhNoFaw4A1Ou6qzXxzzyN5Yk8hdJ3GcR8E fLgZP3LyCS3KAgSvk1tE1ss= X-Google-Smtp-Source: ABdhPJxSsi7GocfHNhpK13aPvafIyRTlD02upQgzK1BlcjNSRQVC4JWnZMwFlNu2os4BXMV9LBa9Wg== X-Received: by 2002:adf:f207:: with SMTP id p7mr10524041wro.166.1632476404945; Fri, 24 Sep 2021 02:40:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 16/40] accel/tcg: Introduce TCGCPUOps::has_work() Date: Fri, 24 Sep 2021 11:38:23 +0200 Message-Id: <20210924093847.1014331-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476408368100001 Introduce a target-specific has_work() handler for TCG. Eventually call it from tcg_cpu_has_work(), our AccelOpsClass::has_work() handler. Inspired-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/tcg-cpu-ops.h | 4 ++++ accel/tcg/tcg-accel-ops.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 55123cb4d22..4a4c4053e3b 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -66,6 +66,10 @@ struct TCGCPUOps { void (*do_interrupt)(CPUState *cpu); #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); /** diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index ebaacff1842..cd44bb6d0d8 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -32,6 +32,7 @@ #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" +#include "hw/core/tcg-cpu-ops.h" =20 #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" @@ -80,6 +81,9 @@ static bool tcg_cpu_has_work(CPUState *cpu) if (cc->has_work) { return cc->has_work(cpu); } + if (cc->tcg_ops->has_work) { + return cc->tcg_ops->has_work(cpu); + } return false; } =20 --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476412; cv=none; d=zohomail.com; s=zohoarc; b=A05XNMigoDEX7B492p0nb/dxn0Xp8xzBGchRuT6iyYPsOgM645+r7CHXqm8rsUvj2W4t0x+zidgbrEFdK/yi7UEJiGqJg74Rc24GaTasKqxFF0qiQ4qADoAQ1vzpYweM5MlON1XDltsOrV6WbfQm3d/UUbDwl++JIYoHC1Sobss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476412; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3jjDpP5pLPewtdopPT9Bv9deCPUCIA2fG6dBKaHxXEg=; b=dPkhKN28YWVaiBgqxZFy7+80py7Sz3OiAxH3kqTonYsERsUyl1qHEtW/UcPNqCyo/VYE6+gu2JM9+HVqRN+czgB3LirGP8hHy1H2q7FIKVBY+iSuaRZsBw+WwE6TjLlV4B/Wkdi3oCsnvpovFSSxS5iUMtSKB8YCd3gPAs5VWSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1632476412148234.69721803528807; Fri, 24 Sep 2021 02:40:12 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id t18so25597956wrb.0 for ; Fri, 24 Sep 2021 02:40:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id f1sm7964722wrc.66.2021.09.24.02.40.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3jjDpP5pLPewtdopPT9Bv9deCPUCIA2fG6dBKaHxXEg=; b=WOIjYrXNXbdh2jL5gRIhbK4TBGocSjPE/HYr5CjsD476vvB12UEKRlCfGDj/7zhFoJ 5OABnVasQCMDkKYYZuvToEsDwXl6IGgxpwjwOnJKCrYrCmXhKLlR7nVtlEEhH/nzLyMx H2Ig2SSLbo71t4LmouRRkSBtEDMFlVbT68nhfRml0pri6Hp+vDTqqa4I3DqbNe/tg4m3 rHsT+9JF6oIYOXSVTjxh6G6opZOrvatb+xlmdwLKResJzYwCZw+hvD7sub/7DfwChsLY atBypv4w1jndbo7cHsf4LimPyqCPL5UJx8ukAk0qx6NwDRZUUpRxMmDoHeRntkP5vje2 VVVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3jjDpP5pLPewtdopPT9Bv9deCPUCIA2fG6dBKaHxXEg=; b=EaPQjiFxHamy+2jeMDgkWIal3ZP+NdgBgekmS85N9436CfcpKUyvx6VBCTc9QSxESl t3L+tFo8TLTTb0UQoZpLn83AMmikpMaJE4VreKNc8M0oXWPoU1yn4nkbGYrsHNTqREY+ Nf+12hDv+nX0h+Ev+fVFMGbtyLPpoOVixJlqDp+MeG0WX4i7j6C0euzfGi3KK+PJowXn 18is8bQ67qApG4osg0VJYEnOxqzAIynfYUN3QSrNpRoHEYYm3fDPwHLpBFGMHFDJ77lX 03LCJ38yeHUpKobv4CpCQAZNjH6x/XtWGfvu2HVSnbdIlOYnrAqtHku6koryQrK5L7s+ ycmQ== X-Gm-Message-State: AOAM532t69vjEIuoSiN/MTkL2BwzU2jo4vJAeRu73n+AOtg3K5QMN+q4 63jaCSXY5ih8SRGbHDj+fCA= X-Google-Smtp-Source: ABdhPJy3+AHIs93McQTzdxLkhMqGCtC9ki5PzV1Ocglawiy+Jokpjoa2rZ1FFQvtFa64D//R3aCBzw== X-Received: by 2002:a05:600c:1d05:: with SMTP id l5mr1016581wms.119.1632476409645; Fri, 24 Sep 2021 02:40:09 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v6 17/40] target/arm: Explicit v7M cores use arm_cpu_has_work as CPUClass:has_work Date: Fri, 24 Sep 2021 11:38:24 +0200 Message-Id: <20210924093847.1014331-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476412737100001 ARM v7M cores inherit TYPE_ARM_CPU, so TYPE_ARM_CPU's class_init runs first and sets up most of the class fields, setting in particular the has_work handler to the generic arm_cpu_has_work(). Thus M-profile and A-profile share the same arm_cpu_has_work() function. Some of the checks the code there does are perhaps unnecessary for M-profile, but they're harmless. Since we want to move the has_work handler from CPUClass to TCGCPUOps, the next commit will be more explicit if we already register this handler in arm_v7m_class_init(). Since arm_cpu_has_work() is static to target/arm/cpu.c, we have to declare it in "internals.h" to be able to use it in target/arm/cpu_tcg.c. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/internals.h | 2 ++ target/arm/cpu.c | 2 +- target/arm/cpu_tcg.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 777f9687648..864b5ad4cdf 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -177,6 +177,8 @@ void arm_translate_init(void); void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); #endif /* CONFIG_TCG */ =20 +bool arm_cpu_has_work(CPUState *cs); + /** * aarch64_sve_zcr_get_valid_len: * @cpu: cpu context diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 641a8c2d3d3..4b08f717f64 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -76,7 +76,7 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, } #endif /* CONFIG_TCG */ =20 -static bool arm_cpu_has_work(CPUState *cs) +bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); =20 diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 0d5adccf1a7..9a0927ad5d0 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -920,6 +920,7 @@ static void arm_v7m_class_init(ObjectClass *oc, void *d= ata) =20 acc->info =3D data; #ifdef CONFIG_TCG + cc->has_work =3D arm_cpu_has_work; cc->tcg_ops =3D &arm_v7m_tcg_ops; #endif /* CONFIG_TCG */ =20 --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476416; cv=none; d=zohomail.com; s=zohoarc; b=OoAJ5DbjFcaXWc+SrI0CnlcuOYUjXGkr7pjuTAD4Q365KwanRtZm+M0xWsXiFGhC2+fUJJLHfbE/gpSXnNGg1p4VI4tIF7Ry3t9EIbbAJJiMuDU9iVV+lZqIhU5xu9kAgpArFI4Hwu6FItSauea4yEnzBLHhQl6GWbRtn7+uq80= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476416; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=138lKCCsDusDobsjTqkgHXFS+q7YngmR9S6d2RdS3Vk=; b=BjXBSKMG0Q56CJ/B7U3TJ9Br5+81RoEicbm1OsataqHE48/nodNqUsESl6W3i/PTlFt3vdlHNUK3zG8fugG9ZQ29xa1ffSo9rzYup6XHNmIb+53j0BhcmRB9Bi/HCugddiqCM4zr0MS1tfyv0RNRwh/7GOmvqUTWLAe9YzyJxeg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1632476416169458.27704321187923; Fri, 24 Sep 2021 02:40:16 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id i23so25593020wrb.2 for ; Fri, 24 Sep 2021 02:40:15 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id o17sm7541189wrj.96.2021.09.24.02.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=138lKCCsDusDobsjTqkgHXFS+q7YngmR9S6d2RdS3Vk=; b=lypblXQgni2MLkl05r8H44c+0FOKn+nARJAdFkzwDpwtIyvHpqTey9VZZuaOGHb5Wf Z7pchjExeKF/vaHiW9+23NWPiIpPcIrWeP9YV8EFz4ujtbg35rog0burb9GK3SuJSPww R4IXwvbpZ6eaamT8wQjtzx4x2+GbRz+oaRgfuZOZ4d/hOTut4sMgFZ2LY2q7fe+G8t/f OqY9Qkt1S6n6AxrLmAkXjN8DO69azDNb8JB+5aSNRQdDySV52uyepCnk9xEHX16C8CfF EbVtowKnr49CuvfvrIJitXWog072b3VL+Xq6Xh+5E//s6+40Ey6P7mMkc2IhhQcycriN L2pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=138lKCCsDusDobsjTqkgHXFS+q7YngmR9S6d2RdS3Vk=; b=hVMsJKYDUnUTuehUhV2ez3mXBpHFSIvBzoEF6NmiY0cAIo9q5hpC/g4n5yxDEkhiCp 4HNSWFOqEiMgiwlgdN6t+386zP2EKbkH3mcI4OR5xI5792j7v8PlDXz/vJLoZndc2E1F FZ6Lizrq/YM3ExmPoJecIdcIKe1UHHGlOQGaika9SUI58mQFmE3Blunlyq3Ey2y7eIJ0 pH0Pv9PXAeyLwcwaTZs3XelCO95bu5pV84gV/3cVGQE333QywatueFt2MBu1aPj5iX9u DADMNu9RSF75COQeZNGbVtZmk++VWC5REaG6Ag04uq8j1VM4agVma6kYuBvRB+iNZJ4Y isdw== X-Gm-Message-State: AOAM531OW7dkT6JJGeMu6BDmEJ70qboBT+gL38G/a6CiSi1Vjgo0RlGB hPDv/k3spr6YcUzbttoWKcY= X-Google-Smtp-Source: ABdhPJz5Mhg4SjIGXAxwlA1P8B7B0hXecgEQQIjmWt5AlgAIp7Yy2d0W3X6wwYFu5Ahjn+dduoigxA== X-Received: by 2002:a05:600c:3209:: with SMTP id r9mr1041690wmp.35.1632476414383; Fri, 24 Sep 2021 02:40:14 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v6 18/40] target/arm: Restrict has_work() handler to sysemu and TCG Date: Fri, 24 Sep 2021 11:38:25 +0200 Message-Id: <20210924093847.1014331-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476417134100001 Restrict arm_cpu_has_work() and has_work() handler to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/internals.h | 4 +++- target/arm/cpu.c | 7 +++++-- target/arm/cpu_tcg.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 864b5ad4cdf..29bb815100d 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -175,9 +175,11 @@ void arm_translate_init(void); =20 #ifdef CONFIG_TCG void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); -#endif /* CONFIG_TCG */ =20 +#if !defined(CONFIG_USER_ONLY) bool arm_cpu_has_work(CPUState *cs); +#endif /* !CONFIG_USER_ONLY */ +#endif /* CONFIG_TCG */ =20 /** * aarch64_sve_zcr_get_valid_len: diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4b08f717f64..53c478171ac 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -74,8 +74,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, env->regs[15] =3D tb->pc; } } -#endif /* CONFIG_TCG */ =20 +#ifndef CONFIG_USER_ONLY bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); @@ -86,6 +86,9 @@ bool arm_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ | CPU_INTERRUPT_EXITTB); } +#endif /* !CONFIG_USER_ONLY */ + +#endif /* CONFIG_TCG */ =20 void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) @@ -2035,6 +2038,7 @@ static const struct TCGCPUOps arm_tcg_ops =3D { .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D arm_cpu_has_work, .cpu_exec_interrupt =3D arm_cpu_exec_interrupt, .do_interrupt =3D arm_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, @@ -2059,7 +2063,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset); =20 cc->class_by_name =3D arm_cpu_class_by_name; - cc->has_work =3D arm_cpu_has_work; cc->dump_state =3D arm_cpu_dump_state; cc->set_pc =3D arm_cpu_set_pc; cc->gdb_read_register =3D arm_cpu_gdb_read_register; diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 9a0927ad5d0..7d0d9fcbc79 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -902,6 +902,7 @@ static const struct TCGCPUOps arm_v7m_tcg_ops =3D { .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D arm_cpu_has_work, .cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt, .do_interrupt =3D arm_v7m_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, @@ -920,7 +921,6 @@ static void arm_v7m_class_init(ObjectClass *oc, void *d= ata) =20 acc->info =3D data; #ifdef CONFIG_TCG - cc->has_work =3D arm_cpu_has_work; cc->tcg_ops =3D &arm_v7m_tcg_ops; #endif /* CONFIG_TCG */ =20 --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476420; cv=none; d=zohomail.com; s=zohoarc; b=ePCPuGf/wJ73ZdBCeLMLScnq3xo3gNx16zd1TgqpYJ2/Qu8XK5X0o2p5C26wNzU+mS7nqMRWCPZbCVtDGN7cq3BM/ZOrPrvM9wVVm6pvAEyDyfjnTTk1p404ibSEWBGNCVc26teDDShQaLV4DcLY7agTULH7J4EkCXoIO4elqVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=KzBQOkxhHbB3dvcIdkbwYj2Qg4TCcWpVCLRLloWxOYEN9lld92VbhzAfTHVFs689QXHU8VWzh3qciBrdq60BG48OzAAmmQbE/8GjrI/QIi4jaDeK43b3PvzunS1DqAE+Qo/MJXgaoCFUsrCngEoWNfNG4FSC0DniZUJ1OpUPcSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1632476420710899.5061170627923; Fri, 24 Sep 2021 02:40:20 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id i23so25593722wrb.2 for ; Fri, 24 Sep 2021 02:40:20 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id d5sm7932898wra.38.2021.09.24.02.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=Vh6th4kwtGT1ClLOlEmkYiqpBcvwQz7Fng3nKOaxYPtsV9/wr1/F7i9kWLO68+3Ij1 TNFjy87wyG3bfRy/BEBbP5pNZluPh71lKPY90szCF7cCvliyVzYC2xsORpcQ+8XOjvTq UQEMxCIbgxMnRAOPeu6G+98edadCo8U6jFX6pMBqiHr7ZMw8AMwJXrEwqHarTg/8MdVD GuPtSxsXsMgGR/TnXhYwm+Ex8IyJtcB/4S+3BrCQW0rfsHJVZ5IqcB6oi5V/twsYGqT9 xz7h4m5LRNUYTBy5celyyQkxEoHHR5Hlil5x+53dYGaZBfcC4USkbpFH7g9sMQc2SHwt WoPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=oWg4XCX0+I4zMJGs/wT3nfgGfDNKtP3ADD/s4u39ixIQt+cluwcPD1PIwZzmJHNiyb UA8bVH8UGZzs6QYv7SmicRvSDK2LWQOm7qxrFYIKP18d55ON5xjE3COtO+iyvzpQA89m W1+LWIYGLa0hgodYVjS7HNSpjjW13oceBaoz/ADSYIqnZeoE/Jqm4s6/BXH5USm/OuuB RKJjum2hOmZOHM3h1HvyMyoJiocosej86VG5myijq48J8meAvWSgoPH+BjEcu8wDKTqH 1n9Fi1D8XTw1zqmvy7u4/dsUxPPqnc6Jp/J+DJ8rYwCjP5O30oY7p7cY1PE8vyAIgXPG MYXw== X-Gm-Message-State: AOAM531/jzWBpndBj4dRdYSJQKngzBKjumICG7cP/fy1efiHyoC+9RVr 75Wtu7imARAhUJHvycyk70GW3UWOpyc= X-Google-Smtp-Source: ABdhPJzS8EO/ffcbUl8Bd+UlNs0/QoNwM838HgPxDoQJzPaTt9z+x+bCyY44QH32FfFAKTQPFv70Iw== X-Received: by 2002:a05:600c:1d18:: with SMTP id l24mr1094046wms.98.1632476418930; Fri, 24 Sep 2021 02:40:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik Subject: [PATCH v6 19/40] target/avr: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:26 +0200 Message-Id: <20210924093847.1014331-20-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476421597100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Michael Rolnik --- target/avr/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 5d70e34dd54..6d51f91ca2c 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -195,6 +195,7 @@ static const struct SysemuCPUOps avr_sysemu_ops =3D { static const struct TCGCPUOps avr_tcg_ops =3D { .initialize =3D avr_cpu_tcg_init, .synchronize_from_tb =3D avr_cpu_synchronize_from_tb, + .has_work =3D avr_cpu_has_work, .cpu_exec_interrupt =3D avr_cpu_exec_interrupt, .tlb_fill =3D avr_cpu_tlb_fill, .do_interrupt =3D avr_cpu_do_interrupt, @@ -211,7 +212,6 @@ static void avr_cpu_class_init(ObjectClass *oc, void *d= ata) =20 cc->class_by_name =3D avr_cpu_class_by_name; =20 - cc->has_work =3D avr_cpu_has_work; cc->dump_state =3D avr_cpu_dump_state; cc->set_pc =3D avr_cpu_set_pc; cc->memory_rw_debug =3D avr_cpu_memory_rw_debug; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476425; cv=none; d=zohomail.com; s=zohoarc; b=RLM/B6Hxx101wTRFDsD4kJXrOZmNw6w5Mc9+lOPPr4tmhW2OiAPhyys7bEL2EJOBoYUXn2x3yXkePOdw29gvq2yowrdgz7rhf4tMfuFzycXUW4OvV86TThZ6YVnNUhVJuy8uz0QV1gneYcsqeklmTY1H9UUJ46YN4TX/E7hrWp0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476425; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=J7xpnJEMmaIhRPQEI2kjxF+B6TmVKGb23TPkaAta4MccFnBxs+G4EJn8bbOcsSBaEgJ1qx+gVsCcpSEEIsyDmSgg4mMxQcSEI2wuCx+fLyhEsRaRme3M8x0goAbFw2/Dy5yGjGPbQJr0VGTZMMkPYKt7IjFuL/EnoLHyUCZh3fo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632476425244441.0410580181825; Fri, 24 Sep 2021 02:40:25 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id w17so25397443wrv.10 for ; Fri, 24 Sep 2021 02:40:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id g1sm14462069wmk.2.2021.09.24.02.40.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=J+sdCw2eapRlTcLHEpQOv0W7qPRU4O8ULFwEPDOEXqlAZtJ+9bKMVpMhx8FYKLYqBO Ag3ypiz+6dwRFzEXeU+8f8p21fwrKlb47/K2OqC+aFHkE9NewoM6lMt1mRwMtUpgm5lP ZUF81W4eFdTBasqFdrrpQJbzyR82HxZZ27v3s+cxm3ME4JoNyFdbz0qsavT55L4mwR3D ZSaNffM8UMeA0b8YaA+lkuaw98gFol269tQw/rD8Ni74i4agAeeXphHzzE+qC8yF8vcE 4EMC1iYA7qoc4df7+ZQvKpIvegYw+zsQAgkT5Ytm+58+62Jvix0HwQr7beJKZ10NCW1K CY8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=0lrzVaOjiTdoJQtl4g620YkNFEPLySrv6ic8JjBAh9/Z0AeY0jid4/jCOHhrlF/17W 0ziDrMIdROAFYtIxApnAs5+QqJrCwj4r7sWX5P+mLGXFd+B3xW2HVwAy3BwMdMM2mVRT lRsoNZMT6YaWAWsw1JuvVEdO5KQMZSbkGdaEU2YyhYgatpPTVVePYOStVln2wFrlPT4G tbtVGmB/4wmldUJz5eMR/qji+WrZp00UoaB/IBOataAxQvXM02f9FDWRDN82/uM95m5y +PStrk/FOxSUL8n7e4K9FhGBwXZDY8pVx9slxK1mHCxnnXGzneHp7lZ2eG1Qubzak0XF 788Q== X-Gm-Message-State: AOAM533Xh4FJyJS3jaGLOVKQ5IsaHWS0EgXoIRNqKZNIHupAmlHNqgGK 3V+B7+mBk4QKBRrBzK0fUTk= X-Google-Smtp-Source: ABdhPJwAbqQzbkiTCAZ1vBq3StIchG3epvimAoPDx5NMYG4x2jIpO60xP2UoKBIObw7uB96NTcDdrg== X-Received: by 2002:adf:dc0d:: with SMTP id t13mr982240wri.158.1632476423514; Fri, 24 Sep 2021 02:40:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v6 20/40] target/cris: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:27 +0200 Message-Id: <20210924093847.1014331-21-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476425985100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/cris/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index c2e7483f5bd..b2761f8b110 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -35,10 +35,12 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool cris_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } +#endif /* !CONFIG_USER_ONLY */ =20 static void cris_cpu_reset(DeviceState *dev) { @@ -208,6 +210,7 @@ static const struct TCGCPUOps crisv10_tcg_ops =3D { .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D cris_cpu_has_work, .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D crisv10_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -218,6 +221,7 @@ static const struct TCGCPUOps crisv32_tcg_ops =3D { .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D cris_cpu_has_work, .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D cris_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -294,7 +298,6 @@ static void cris_cpu_class_init(ObjectClass *oc, void *= data) device_class_set_parent_reset(dc, cris_cpu_reset, &ccc->parent_reset); =20 cc->class_by_name =3D cris_cpu_class_by_name; - cc->has_work =3D cris_cpu_has_work; cc->dump_state =3D cris_cpu_dump_state; cc->set_pc =3D cris_cpu_set_pc; cc->gdb_read_register =3D cris_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476429; cv=none; d=zohomail.com; s=zohoarc; b=PGiJUE7Nz/8/tOlNsdpIzuv2a3Q1drup0eV12c5xRqmFVn8Rgqn14zGYmjbh4LAvogqItbe2Gjy4p+poPtNPS5epHdn4zCXUCMAC33PDfUykWxJMIhDQ1r8s8UgvqS7Anhfioh2bSU0wG/VOr4tuwcpa493Dh1EYbU4CO1pVFdc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476429; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=JRE2BfAmSB0isHWGYCv6NcikTNhADEcDWxNKqQl2EP5ygliEShvh1naGQ6wU+W02OWBVE91q+D/e1FEK+q+hquluX46TLQBcVWZsnKZl8xNvpnCIGCFDERlA1OoDfNagDHhr07fj99Sj42KPJB1vj/dL+NqAUrPCGnvnseFnz3s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1632476429956712.9940499577459; Fri, 24 Sep 2021 02:40:29 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id t7so25377894wrw.13 for ; Fri, 24 Sep 2021 02:40:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id a25sm11606310wmj.34.2021.09.24.02.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=KDCWAGWFJ7upO9THVyMnjHDFpep3f6zTACmCde0ZMovLrlalzOrwlvo0lsOtwv1e9g SNo15gysmGyaSBA/QGdozSsmZ+A1XmwBCOgvUIqWpB4WNSFF27YuSx6lM5yOpNp7h92h LLhywYEi/dmU48cSbtjRRxSiL3J+1yQ0gliA2gqR2BcG4/VvsaGcv4PK/5aGmzTByl8J CepeMYtBlDcLq39aBtzBj4Evzm3zKncqK4CkACkRag5ohrQHiNHioSHZU92f/lwgwVGr gL4sIAWEWtaVlOGir0Q0dcR+9zpwIMho4JOFBCGVQFuj4UuCnpZRxAomOaG/Z4Kxp/WA h/gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=DPfpRQN3z4j7XcBDk3oaJUHKA5D0pU5mptuTe3LfHOWNZTyeewVxUpXgCEWD1iKaiL P34SMyTkRAMpMzeR/DAcNqabCA/OslUXxKEKwQQvIBDc4mYCMK/uUBbByVmeXr11ZTVE S+hZLek1/GjI+bKPsKN/ecaYUT3fTlviZ71GYOKE2Ejq4TaznscA8dYxjVSPZeT+vlvx SE6pdjhEUUWISpVZyYX83GVmlX80QqJH0xUoZNzLugUZYFltGRFL9i401JaD1DGKfWGY p0KZEtmSVhsmqJm1fEI3gHVXX6exaOW+ubqx21h3hsXUyZnW8VZ3sO/tCI+IIvfOpuSz NcTA== X-Gm-Message-State: AOAM532ej6fm/Ex+tM4SQx1VRGCXRSVga7cKqfn7jeCIXZUQoACbUubg lNRHW1BbmyhsbV4mTFGazA/twLy5WTw= X-Google-Smtp-Source: ABdhPJw8GDZW7mDT3/NQPdK7CLRqqVrGF7VJGfXctgRgrFFg8nHO44TSZN+lIdC1lrT85tQ8cLkS2Q== X-Received: by 2002:a5d:63d2:: with SMTP id c18mr9942607wrw.311.1632476428088; Fri, 24 Sep 2021 02:40:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Taylor Simpson Subject: [PATCH v6 21/40] target/hexagon: Remove unused has_work() handler Date: Fri, 24 Sep 2021 11:38:28 +0200 Message-Id: <20210924093847.1014331-22-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476430662100001 has_work() is sysemu specific, and Hexagon target only provides a linux-user implementation. Remove the unused hexagon_cpu_has_work(). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Taylor Simpson --- target/hexagon/cpu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 3338365c16e..aa01974807c 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -189,11 +189,6 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *= cs, env->gpr[HEX_REG_PC] =3D tb->pc; } =20 -static bool hexagon_cpu_has_work(CPUState *cs) -{ - return true; -} - void restore_state_to_opc(CPUHexagonState *env, TranslationBlock *tb, target_ulong *data) { @@ -287,7 +282,6 @@ static void hexagon_cpu_class_init(ObjectClass *c, void= *data) device_class_set_parent_reset(dc, hexagon_cpu_reset, &mcc->parent_rese= t); =20 cc->class_by_name =3D hexagon_cpu_class_by_name; - cc->has_work =3D hexagon_cpu_has_work; cc->dump_state =3D hexagon_dump_state; cc->set_pc =3D hexagon_cpu_set_pc; cc->gdb_read_register =3D hexagon_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476434; cv=none; d=zohomail.com; s=zohoarc; b=OQEVYbUqmR7dl8eZd7qc7grlvmyC+xWlOJdXLR6lazdaEjMD73/sjjj4dngfz5wogzm68Z+fdTwqXODTgX26rAavGm9YkGS3/ymgp7YqMxxciNeOaOD0vHaV6/LO4Uwl4KAlX6fJ7vjcTlMr71XsZ7YDHpoBPxTdkEGptHXbWlw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476434; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=ZfX42zdeADxmf1LmtDbqmSo7RvzWi4po9ADz5zW3cA7tRGa+yFN7VfE+FT6TK6r9jMREogOA8nCnWHPipohZA/0jldssAPPURLgSVyqUjjdnV4MrSLVhxzDyORsGls5b2gz1/EYip1ksoiQDyrDR/ClMXryT5lB+ewm6YVe8g40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1632476434424888.9645136801354; Fri, 24 Sep 2021 02:40:34 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id t18so25601416wrb.0 for ; Fri, 24 Sep 2021 02:40:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id l13sm7734955wrb.11.2021.09.24.02.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=ApShoZYtj9bGnnWC81QPqXgZDeM8jKnDuzTzWs0ugMkG9F60ACuR9+yW0piAHHVnrD dN/Lec8Fpplq83Lw5ehpcru7C+WWl0j6KWW1HCSjClE5DrRjc3gf0Vjd0h72pHaJBwJE dTV6H+ISz6WYDfKRyRFiXkXAd6FT4q+O5QwZ2Hw79Ly8T9b3Hycz8kuMb2rHK/d+lPFw EGM9PMBw7r4WX3RkYRt3dCRV3Umx8xZVo+drk7X5XnkBpz4FMvlzsQmE5KJq+PFFn+r9 XY/eX1v4Kb2bY2tGnijImf4xa8P6DT4NkIzOQeattxuUBny1BkUdrrQYC25k4GG6OwsQ THYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=6P1KyuxEv/4kzUenDp0qc101uMAQ31AJYiaUkVmspADyzfQlJLvKU5o00PmQlgOmn7 1CelyLr1i1qObR4B81NFkqww6SH8pUiHBbUjXO/gYpC4DqElU1C5zLbbWZ+k5BkICc2u edBl1GHCM4pHprWhV/OxqQoOx6jmePbxzcFbyBLzB8uJ7Aw0rpV/9L+qxWzaNA9B1zzB iuLgRuf8F1pEUf/g6Fl/kQUOxirRudm/I+ZUeZK2S3HvjcjHkmgPeHDBxJp0pviuFVlR ExAy5zvXS23HMVhftDgNhkBrwVihpPkpk3uy5lHSEJ31DRA3Y9Rd/LjmRNqRnV223qCk lHzw== X-Gm-Message-State: AOAM530PyznTPRkoi0+1zS5rL/AgG3pz58YLfOajgbcXO9WhNyDgcXZd 2D66OJ7F1oX3O1mG1EDiTzc= X-Google-Smtp-Source: ABdhPJzoqmTsBp+lpAAAfOeG3IfrPQeBmiO6L4KXy4vLYs5VxrvC51jMGmVLPllJ7Ki2tdHRInJtIQ== X-Received: by 2002:a05:6000:18a7:: with SMTP id b7mr10833781wri.13.1632476432583; Fri, 24 Sep 2021 02:40:32 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 22/40] target/hppa: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:29 +0200 Message-Id: <20210924093847.1014331-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476434771100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index e8edd189bfc..be940ae2246 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, cpu->env.psw_n =3D (tb->flags & PSW_N) !=3D 0; } =20 +#if !defined(CONFIG_USER_ONLY) static bool hppa_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* !CONFIG_USER_ONLY */ =20 static void hppa_cpu_disas_set_info(CPUState *cs, disassemble_info *info) { @@ -147,6 +149,7 @@ static const struct TCGCPUOps hppa_tcg_ops =3D { .tlb_fill =3D hppa_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D hppa_cpu_has_work, .cpu_exec_interrupt =3D hppa_cpu_exec_interrupt, .do_interrupt =3D hppa_cpu_do_interrupt, .do_unaligned_access =3D hppa_cpu_do_unaligned_access, @@ -163,7 +166,6 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *= data) &acc->parent_realize); =20 cc->class_by_name =3D hppa_cpu_class_by_name; - cc->has_work =3D hppa_cpu_has_work; cc->dump_state =3D hppa_cpu_dump_state; cc->set_pc =3D hppa_cpu_set_pc; cc->gdb_read_register =3D hppa_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476439; cv=none; d=zohomail.com; s=zohoarc; b=FoIUCdnd/o2EKxKt0lXJMMOPqNR8O1piWMpGebHpGk8UN4Isgv++2k5q0I7AD8324Ype7pMpqXP4gSSL9+ufx4WtimiHnvROp6UFlUNW45+zlgVibCTWqddHtM5xbZmv1dLHhoZRlPyFtkDdHwm2xANiNihOAdFlPYbtUEDRDGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476439; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=KhCNg8+OwBbVROiL1zTsYhclILzRzwn4APtSr2s5JrYcUT1g4KzjUw14w4jcMiOTO6oA490swKHF+qTPFh8jlb5Z7VOQqwbUaF44h3LKraNhQDdjO7sUKiaxKnblgyOIwZLuygESimorleRwmGpJz4ZcsLBo2J7EfXfcyoGr3Ks= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1632476439183683.7032989215298; Fri, 24 Sep 2021 02:40:39 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id t28so12106984wra.7 for ; Fri, 24 Sep 2021 02:40:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id z13sm8769199wrs.90.2021.09.24.02.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=e2rjeBReLlbDcXAeJ/Cb9Yn5v9MGsAeSRheiCavE1hU1Wv+UI1pnvHTj0fZQqwCGQ/ S3xfunAeKPbEm+6rvV48GPUzAgvLd8ZFvNGFwRCbeY88vffmZ50SmpvSxMRU9m9foy2y hoXaSipiwwdgvSq1BYaiM0/VZlGe94i4SrDW3PVAseH9bV2DXtKLNHRcnAAHRj1oskZ1 8KDTjzTxYFiTg7XUhyXrAMEm15JCMC3JSwBmASitL2joxL4fxC85Q6OkDgeIeZCEiUFg K6TJYsiLb+RhsAWG1u9i8NoyMHZXc+bU9sPU/spqF2snZD5kPV9RS6E9AqmKcZICatR7 CJCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=EiJj+KsNUf9xJ5HvjatBEWuiO+or8VW9RNLh01XFWPYMfrU0tKxgDTWZsd6+V+OP/h 8RqmIxJ9Y39DFUyn06gLFjfZ8tHlRURq3whuPJy/ARM58XYSRPnuhK9aHPixyC5xAPWw OIlPOF0LF0d+6+UWHIdPBI/HOJtoOv8jvHmT9rC22yw1rzd9x6rxH4EsBm9pR/essx4m L8Tt81JTSZVXs3ei5NGO085o7er+c53zIxbc2NvfFY06McqWZGLp1tuxjVjT4URBxsZ7 YUbXB9ZKMUVPXfg8xOWIk+rsHIzY5VGzw+4K9ZkerynVbQjigUY/GzDwHmA6YTy1NIV+ 3zbQ== X-Gm-Message-State: AOAM533MmX+KZm1Nmoj1YAzqEUkGo2AQ68VRYh2nHLZP69yvLdl9IEWL 0QAc8FWUTzK/0rS+PS1KjAU= X-Google-Smtp-Source: ABdhPJxWcoBj6SCR5xO0qwLtIk6dqPprv8b3kvSgYvBzRvwxFpS1rYYwFwqP3o2oAip5FjrDfegeRg== X-Received: by 2002:a1c:2246:: with SMTP id i67mr1015259wmi.157.1632476437444; Fri, 24 Sep 2021 02:40:37 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Eduardo Habkost Subject: [PATCH v6 23/40] target/i386: Restrict has_work() handler to sysemu and TCG Date: Fri, 24 Sep 2021 11:38:30 +0200 Message-Id: <20210924093847.1014331-24-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476441001100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.c | 6 ------ target/i386/tcg/tcg-cpu.c | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b029f1bdf1..36a1c5f3fd2 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6554,11 +6554,6 @@ int x86_cpu_pending_interrupt(CPUState *cs, int inte= rrupt_request) return 0; } =20 -static bool x86_cpu_has_work(CPUState *cs) -{ - return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; -} - static void x86_disas_set_info(CPUState *cs, disassemble_info *info) { X86CPU *cpu =3D X86_CPU(cs); @@ -6763,7 +6758,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc= , void *data) =20 cc->class_by_name =3D x86_cpu_class_by_name; cc->parse_features =3D x86_cpu_parse_featurestr; - cc->has_work =3D x86_cpu_has_work; cc->dump_state =3D x86_cpu_dump_state; cc->set_pc =3D x86_cpu_set_pc; cc->gdb_read_register =3D x86_cpu_gdb_read_register; diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 3ecfae34cb5..aef050d0898 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -55,6 +55,11 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, } =20 #ifndef CONFIG_USER_ONLY +static bool x86_cpu_has_work(CPUState *cs) +{ + return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; +} + static bool x86_debug_check_breakpoint(CPUState *cs) { X86CPU *cpu =3D X86_CPU(cs); @@ -63,7 +68,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs) /* RF disables all architectural breakpoints. */ return !(env->eflags & RF_MASK); } -#endif +#endif /* CONFIG_USER_ONLY */ =20 #include "hw/core/tcg-cpu-ops.h" =20 @@ -76,6 +81,7 @@ static const struct TCGCPUOps x86_tcg_ops =3D { #ifdef CONFIG_USER_ONLY .fake_user_interrupt =3D x86_cpu_do_interrupt, #else + .has_work =3D x86_cpu_has_work, .do_interrupt =3D x86_cpu_do_interrupt, .cpu_exec_interrupt =3D x86_cpu_exec_interrupt, .debug_excp_handler =3D breakpoint_handler, --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476443; cv=none; d=zohomail.com; s=zohoarc; b=SbHiTkjV2Vq3iFcdj7g/wqcnp0IS8rIr0kqM24R1Nf8DPt8IJzvqf80Tx9p7HiMB8Bj/83brEWyfbK+GQpelHijIsUCiv6n39DEf7SEPOVf8xolH0ROpDkri9qE3QolkJiiJnC3Hlfe+jF+IUHzvl48o/XMx77HezcO26IG1oz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=GHAhhiQjI2ifAFyRJ/5rQ+XOVyE7C2ZRNj/ceCWwtr2HjiyRHsFF0DBVVYW/AfuF1EUh/f7rQ1f3vhUo7w6K9v4I/Lx9dUF3QGF+4c3+nzYkhr6mLcVdvS5bU3vcrNOyWIQw+gNDh0U/27Kv3TU9YU9IC30VPd5yYdC6m7SXI2I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632476443852375.603998891066; Fri, 24 Sep 2021 02:40:43 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id t7so25379914wrw.13 for ; Fri, 24 Sep 2021 02:40:43 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k6sm11192127wmo.37.2021.09.24.02.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=FgN+bzODD3/vzEgURNAkBOlFqtH0gPJBUL248NhSx2xNQIZYxJbTmst8H0ZzsPi2Si hxo1/lPk+VVUNQkUscAKHO3f0aMaSqCyEwi6EK+nWFD7adZFBiSzzp3lATJxV46Lo9tC TxgEE9ZlfNbjCkbN2c/GGP3XnZesPiTMlUHZ38+IZ3s7vQvt5E3z7HwTVyG+1gkj+IKl BaXGUNKXxWiD1s0oFAjL4zbo+JTciYA/oxxeUUTtYL9x/ZuOPAEifpiGI283VMn1MrEe F5gASGt4MTPjfsvhGsHy4SQWnTO54I7wmjhCunRhBPIj2YCJ7aaffi2HAmBNUdI6RVVV opcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=W1bdogDmQmUNXXUyEgxi0BX6SX57XaEB+qL6yuHq9u49U2vikaaD7vXavl8JR48bpq zk4ab+KeeK4dvUSx5bdI1s0pRpFBz/VMquTb0u8IedssykPyin0LN2AHpBXLfqk0JeJn iLxzeGKKddvWHFYBw/VsmpEbWbpcS7aLrxg8cL8YfLn/kDPwr8X1urZXbQzLVwgPFSkv jQAoHCUnvIA+FepTqImMVi45OOPKEQBpgJg6PJjkCL3eNova8S0qILgnZEqgBnIoVNle 71vrcsxo/OnyA7IKjPFtYIPGq2LwaIozTedrK91dPpkOTG1EJefHOEnQDB9oMHDGWB3B rt8g== X-Gm-Message-State: AOAM531BfGU++2mWPxN031gqQg6ebd2I4SYWWqlI/7OlXtlQb/YDa2qy zw5Z/Iw8pOzHWaQjVcdDGY0= X-Google-Smtp-Source: ABdhPJwoMYy0gpKYQ/1CTpDbgpZ2qrGlFUwIVBPLDcWyjY8RwvmwKJ9g+LFxUJVipkH/eM8ljaSVtg== X-Received: by 2002:a5d:64c1:: with SMTP id f1mr10274123wri.422.1632476442059; Fri, 24 Sep 2021 02:40:42 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PATCH v6 24/40] target/m68k: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:31 +0200 Message-Id: <20210924093847.1014331-25-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476445295100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/m68k/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 66d22d11895..ad5d26b5c9e 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -31,10 +31,12 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool m68k_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* !CONFIG_USER_ONLY */ =20 static void m68k_set_feature(CPUM68KState *env, int feature) { @@ -518,6 +520,7 @@ static const struct TCGCPUOps m68k_tcg_ops =3D { .tlb_fill =3D m68k_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D m68k_cpu_has_work, .cpu_exec_interrupt =3D m68k_cpu_exec_interrupt, .do_interrupt =3D m68k_cpu_do_interrupt, .do_transaction_failed =3D m68k_cpu_transaction_failed, @@ -535,7 +538,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *d= ata) device_class_set_parent_reset(dc, m68k_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D m68k_cpu_class_by_name; - cc->has_work =3D m68k_cpu_has_work; cc->dump_state =3D m68k_cpu_dump_state; cc->set_pc =3D m68k_cpu_set_pc; cc->gdb_read_register =3D m68k_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476448; cv=none; d=zohomail.com; s=zohoarc; b=LUJt0hcDZNk027q29znjrVYj8KcBAesZfrOmTbSRslohsZOTX8SlZ50Gr//YVEqQGdjwZMkUkjEeAd/tAxjwYwM3foObSOSke3+e8rcwACEOs+ABI/Sfo0aK4g0TLbZttlorKKlXXlb6ME3JC8d8OQ3HcFw9prhAkZpt5U3dqdw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476448; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=ajOrhEan2xEKu57ef0NwXIo0UjV02rlOTKK3h8v7rk+K1QKrj1TJNULc6Mz6XIOZIFwT+M8/Zu0aQkhAhQilcluogLN9yLKrhrNx5yv290UlQnM9EzggmobTH+f5pcFvVy0JHcfhFSbxNB2or/scS/nstkFeGahAakfwOO4LBJ4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1632476448614917.1054575933455; Fri, 24 Sep 2021 02:40:48 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id w17so25400701wrv.10 for ; Fri, 24 Sep 2021 02:40:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n14sm6139585wmc.38.2021.09.24.02.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=OM/0dF3NI1YOwFRPIv0JxiIP+CxHF93wyDHkuapIBBYEvQy7/ooid8xn1Zxs7n4ENQ kql2G4sBHl99lz27wGxk3HvSsA+EhgZvJub9L3zcoVPtAi1CIYQY4gNB/5zPKXN4Qc1U 9Ip31zS2beKEShsjqrCd2g6HH1To7ALppRwvJkNiB04GyXr5zp+Au7mvGTkdF09NKADZ j98ug4D/QXmyUvFKwphZUsjUJx6BUggyPP/CagjX0XnJ3IrxJ1ZhuJdG903gqSmQb8gT i0Wne0pPNCTLiyCVseNuGlRL31T0nmt6CmY+N9P9xMXqaDkjPEbEQqHYVcSPWwSEAhQY fxWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=IpKwnDSxgTq9rxz/7WK8Oa9005PB3CyhxaTYqv4/smAcpRn/xedsbWqZqlxtzKA2CA 8BASdeMhAicqrk9SZc6Q3rMr/HA583Yvz/2x3csSDnXMMxAB6cHDpRlx93rZyVxAgUrG HXetPPNehE0U2appmWsT1HChhA/59FBt4Nrb6F6dEXJx9wOEbM1W6kzV610p5Pfu4v3z NNQbP2xZuEkBTEiwBLt/mZDT5iPd7xg5r18pnnA4YJaRkrZ+jrLgsV/ooXOviHL+AbpB C/4E+ml+ldFM1Xv2IyzikUotk75YR7FmCbdBdcVv97VQ1pNRyiGOXAXtzNq1mEK0eRrc H+IQ== X-Gm-Message-State: AOAM533xFfVGIGXPVtoJwV9x8eJImlRnwUgv8cuMkQCT6wMA/WeQfebt QY0XN1H+OYskQGooSMUJN4E= X-Google-Smtp-Source: ABdhPJyBGBgdEd/n8Zi7iyxga5yCoQVwc4ydEor1WSdcRy88clr6yA4QCAXVziHDgny2WZx2w7u+Jw== X-Received: by 2002:a5d:4d91:: with SMTP id b17mr10315790wru.321.1632476446748; Fri, 24 Sep 2021 02:40:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v6 25/40] target/microblaze: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:32 +0200 Message-Id: <20210924093847.1014331-26-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476449644100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/microblaze/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 15db277925f..36e6e540483 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -92,12 +92,13 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs, cpu->env.iflags =3D tb->flags & IFLAGS_TB_MASK; } =20 +#ifndef CONFIG_USER_ONLY + static bool mb_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } =20 -#ifndef CONFIG_USER_ONLY static void mb_cpu_ns_axi_dp(void *opaque, int irq, int level) { MicroBlazeCPU *cpu =3D opaque; @@ -142,7 +143,7 @@ static void microblaze_cpu_set_irq(void *opaque, int ir= q, int level) cpu_reset_interrupt(cs, type); } } -#endif +#endif /* !CONFIG_USER_ONLY */ =20 static void mb_cpu_reset(DeviceState *dev) { @@ -368,6 +369,7 @@ static const struct TCGCPUOps mb_tcg_ops =3D { .tlb_fill =3D mb_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D mb_cpu_has_work, .cpu_exec_interrupt =3D mb_cpu_exec_interrupt, .do_interrupt =3D mb_cpu_do_interrupt, .do_transaction_failed =3D mb_cpu_transaction_failed, @@ -386,8 +388,6 @@ static void mb_cpu_class_init(ObjectClass *oc, void *da= ta) device_class_set_parent_reset(dc, mb_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D mb_cpu_class_by_name; - cc->has_work =3D mb_cpu_has_work; - cc->dump_state =3D mb_cpu_dump_state; cc->set_pc =3D mb_cpu_set_pc; cc->gdb_read_register =3D mb_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476453; cv=none; d=zohomail.com; s=zohoarc; b=fbD3DxvK4jpkCrA7ESlF+6yUnrzx2hD8slWicYR+dCpI9YUvgCqj/ttlm0dwLIz3lK8Rv7cjug7h4tgiNwq1rM9pTt5bU/M55nKSFmvf2f+7sIIhroM46KUNHJwkxMnMKRUqSmzW2n0rXEXbeBnT58S8FnfxYfQxW2Ut4k9uCUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=CtK4mQrC5Y1dJtWhJ9zW7yCWmpVkC+oU4d8cLhzh38WdXXeYWK3lv6pkxGufxQSTIy96qMkYrClPChvYmj0r0HF0hO3j5GXqLg0muMBpg2GyvJpOMWXo54cDMJwcqpOafEuZTdSDb6n9YEpg8jTnI6d5NVev1rwYqSESs3cBgnU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1632476453420981.2488842086258; Fri, 24 Sep 2021 02:40:53 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id d6so25382056wrc.11 for ; Fri, 24 Sep 2021 02:40:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id v17sm5870249wro.62.2021.09.24.02.40.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=poAo8TZVliy9CTJaK1iutNXJ9iF0CPrs8SUol+weLnwShMDjnexGYWQe4XAO/mDEP2 6ClZCATrb9xakVT1TdqgqqIoQAOHeBDDFxkYbXexXRdtFIWUxU9M7KAijVfyOkyPhTHL ulEfk9tTB/oqjy4qHetFVRRR74a+z9e+ZZ4+kLFt5QvyJfJx/5zeXRzZk/FZJ9fojG1l pPhKlExWlh0YSADiq0XYHgZkQLzlsVtxgCUH9CwqXWbWIqJq5hqltaquLoYtW7YYJCCn b5qNwTcDvE9CITU3vQqSLjQusvQm/KtvlopzBSirx6oynTDjuuoBy9C3Vu29JNK4cp8j sovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=HT2pKBr+rZz5ldA9w6fy8jyZcXihuk0jfAWk+GxI2W3y101haAigaea27vYfjkTdlm OWjNK3GbWD+SbZeEbW1DZu26cj/bl/4eOK7Vj5rfLdtQ2yreZ/gxlxiJE3/CnSEBad7N LAoDfaXEsskASCOsXzoXwe1GrNMhgDwUhtP49iFx1HDgZfI7UnFkv+tpw9gZmkZ7JhhQ iW92DS/duZvW9yZ8ZL1qLJOF2suwC5I52vRsMLHu7aFGushN5yo7eHksyx6K/6DpA0wI YuLEyIwW4FaQRm6VrpU0sm2FDBT9IT7GO/kWsQIsot6GhkxfrtM9l/PxLdlTB+TAREN0 e0qA== X-Gm-Message-State: AOAM531btEoJhKzHB5OEHmkeLyviirFxvu/h0x9KRq7bnz+/YwIKOAYg T8WXl4XmbatEPyn15zcYu2cVTueWZEk= X-Google-Smtp-Source: ABdhPJy5HMTxlNXPvYuT0ZCbUAkwbGeY6f1D5UvQG6GdUJlsPaWDT3+c/kxp98Fku5vy3IDY3Q1ymQ== X-Received: by 2002:a5d:6cb1:: with SMTP id a17mr10330856wra.72.1632476451519; Fri, 24 Sep 2021 02:40:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PATCH v6 26/40] target/mips: Restrict has_work() handler to sysemu and TCG Date: Fri, 24 Sep 2021 11:38:33 +0200 Message-Id: <20210924093847.1014331-27-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476454600100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 00e0c55d0e4..3639c03f8ea 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -128,6 +128,7 @@ static void mips_cpu_set_pc(CPUState *cs, vaddr value) mips_env_set_pc(&cpu->env, value); } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool mips_cpu_has_work(CPUState *cs) { MIPSCPU *cpu =3D MIPS_CPU(cs); @@ -172,6 +173,7 @@ static bool mips_cpu_has_work(CPUState *cs) } return has_work; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 #include "cpu-defs.c.inc" =20 @@ -542,6 +544,7 @@ static const struct TCGCPUOps mips_tcg_ops =3D { .tlb_fill =3D mips_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D mips_cpu_has_work, .cpu_exec_interrupt =3D mips_cpu_exec_interrupt, .do_interrupt =3D mips_cpu_do_interrupt, .do_transaction_failed =3D mips_cpu_do_transaction_failed, @@ -563,7 +566,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *d= ata) device_class_set_props(dc, mips_cpu_properties); =20 cc->class_by_name =3D mips_cpu_class_by_name; - cc->has_work =3D mips_cpu_has_work; cc->dump_state =3D mips_cpu_dump_state; cc->set_pc =3D mips_cpu_set_pc; cc->gdb_read_register =3D mips_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476457; cv=none; d=zohomail.com; s=zohoarc; b=BmEgzG/2T9muZa87Sm4qnUNSuS6YSA8KxHKxAoOViWVi8Nz6qYxVlNHq2DCIA9P04RLyDLemqmWO51kG31cEF/mG09M/BUAhTGd8sjww3+MkHTYmb45taOQdb9b9/eVdyEE+E086UFpvyi01JLsUnejoAZOdKGEtrhylTw+MdBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476457; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=QHzxQHHWGf+gpBIm0D8aJPyXlpG8ujfyWKsHacCe3pI6A5OhDpMzRHHz0yJn2CUvjgDeaenIP1ikCtOZFEAxP39CciS0561c0PaswOSx3zor790prZNh5o+eQeywZL1ypqYc00THvB1Iu9dlCXoldSPeIdcPMlSoO/8tS73BPdE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1632476457890667.8384447504502; Fri, 24 Sep 2021 02:40:57 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id r23so167827wra.6 for ; Fri, 24 Sep 2021 02:40:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id v17sm5870485wro.62.2021.09.24.02.40.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=JklFsp/JCJxsM2SvH0dD32pLumT+1IDSWSWwJRMl3mAQbiHB305xm+u/juOH6YJTi7 Agf9Oq2L0ViuHACojTR7AXdF9ot246eJtDkfoaM++eh1M3OyaV3zZXOfkL8y9wABezrE MjxDqYpwx8yCaV1OykjdVvldcjf5PvUsAnB+a71yGVRK20AeSOsr68PHTZ0ILJN5THGD rarInE0OB+BbL+oDj3MZMabqJothzUZSb37xjty+xYfy/F6YEn54S0a3H3xq/W+PWGQg fB5gNRiDDlBz4QUyVYp2Vbl5usFB+rX7RFssC1/PH0IuxiBh3DQoJbnj/W5hwi9QdGys JkSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=TKa+lKUou4m2hmM3DvFHEPNVYZtADTThgS4EJF945w6cUPsPpByg1MhSVGlraBUPeZ qHoOJjtr1gN1duw9ESpO3j/nq9i7ryUda7IvGG9b1ohYOCLZsF/NNjrlTQycOkAN3ZFL Yntz3E7DJ5pnbgjbHYumx2UZA/08/MFxWq9VCNxY1vwyRBB18XwryCaorWc7REJPX2Yo pALZXeTBHQ1cBNAkBoxVafkta4mG2rUzDHI26hIU2g5r91oee9Di9IeVAScS4coReLej FhfnSogxIX5tmCqsi+Z+n87MoCgY9TO8gVPBmZxYMKcaNw6UFfA8LSc1P6LPdol+8RGV aCAg== X-Gm-Message-State: AOAM531AH2BZVRHRHcwzpRliclTfM604MNciydCDY8Jl3yqg+A97iPqS 0OZfbfNn38w/809JD06LN8M= X-Google-Smtp-Source: ABdhPJwrZ6cwL9qLE44d/Idg2E1YkVLY8nqSTXzOzkCYF2RW3k8J+F8+C2gHJTzigunGTsXzExu7cQ== X-Received: by 2002:a7b:cde8:: with SMTP id p8mr1065093wmj.178.1632476456123; Fri, 24 Sep 2021 02:40:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Chris Wulff , Marek Vasut Subject: [PATCH v6 27/40] target/nios2: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:34 +0200 Message-Id: <20210924093847.1014331-28-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476458737100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/nios2/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 947bb09bc1e..9938d7c2919 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -34,10 +34,12 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value) env->regs[R_PC] =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool nios2_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } +#endif /* !CONFIG_USER_ONLY */ =20 static void nios2_cpu_reset(DeviceState *dev) { @@ -223,6 +225,7 @@ static const struct TCGCPUOps nios2_tcg_ops =3D { .tlb_fill =3D nios2_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D nios2_cpu_has_work, .cpu_exec_interrupt =3D nios2_cpu_exec_interrupt, .do_interrupt =3D nios2_cpu_do_interrupt, .do_unaligned_access =3D nios2_cpu_do_unaligned_access, @@ -241,7 +244,6 @@ static void nios2_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, nios2_cpu_reset, &ncc->parent_reset); =20 cc->class_by_name =3D nios2_cpu_class_by_name; - cc->has_work =3D nios2_cpu_has_work; cc->dump_state =3D nios2_cpu_dump_state; cc->set_pc =3D nios2_cpu_set_pc; cc->disas_set_info =3D nios2_cpu_disas_set_info; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476462; cv=none; d=zohomail.com; s=zohoarc; b=LYChFGPiB90nJidJjcNbr3OGwRvKmInTfaQ3/q28lpyRqHhMXBMz/Z0BL8dr4TqJ6B22AOk8Ihy65iP3cmL6et80+sG3G7zilDJB67HWhgdhnrITzB6W/w8bvKuIWfaA1cJLYSkQ/3RjLHOEGVu97x5HZVWPaIRhvkFIr4rZW4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476462; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h26pMLEnUsWrxMoqQtHQ2NCzZkcdqUGqN4k/9eCW+zM=; b=cbksUEFQlXFLcZjlfXw3akfvaM8hq7CEvnhMnPI4xuL/+BwdAtX3kLCVMrnM/WZwvKt4o7AYfZV+KAwdcNw16Csoc04rnVMy5SZQvc4MimGe5C0xZDt51fBT6B2cKVqSqA9qzKUFl7io0GV4VPet07hceAQdVGZ7TdwjOR3s88A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632476462980170.02303227864184; Fri, 24 Sep 2021 02:41:02 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id t28so12110786wra.7 for ; Fri, 24 Sep 2021 02:41:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id h125sm8123691wmh.9.2021.09.24.02.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h26pMLEnUsWrxMoqQtHQ2NCzZkcdqUGqN4k/9eCW+zM=; b=i2jgb4SG15wpDl0VMAQFSr1Uk8/q1R/C2bAbK7nfz1wKoH3oEdUogCeB8kPpkkrFg5 fGwyFShCM54hUtUN5B26AzbrwEYxh+SrxNF7GIfDFAZUihESACkqIFwmKZ+aCxnhm+JN lzIXiK9gfSAVpsM2gX+dktjvdpajJ8HQcMKdeL2vzzOSd2NOQplJ+t379ort07PznYLW RwDcjvroIHR+n2TGnllT1MGz2Hzr2DHyC+dmA2vpUdP0bXnpBBf3RkrogWIEntkfVCNe 4ANDPpecf+ym3d9ID+dg/yzvQTxwq/E+Wnm25Me2GYx4s+Odi3yDZs5CVH9Fd9AcYJOY 3bZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=h26pMLEnUsWrxMoqQtHQ2NCzZkcdqUGqN4k/9eCW+zM=; b=K/lgB3Igk5wjphX/o/kiJEj2SNQoRvTSkO3ohQb7dt8zoqZe2XSIJk0j4/cpdhqal7 +QknjD9X3T8tKKLO9CthA4oxv8oMPG2yRKpT+qVC9pxncxkXxSc70zkpZVNY4zyXQj+f ug2BqjJqpeHsrD+M9W7+jhPyu2jL5lE9fJSqSa1rma+5XaX9jdpCBFnqYxG5f6LJ5DSN VZ8Rimk6fKWMgmA08ibyfdWBW17jidT3u+gM20fdrR0xwvEZ3hGl0XTWcl9NYtwcM2Kw 5EoAr6X+jA8Tgm6iB+GwPDnjH/hyyiPB3MMd0V+PMcgPzmx0hNtTfOtY1W99THSYk9Kt pSag== X-Gm-Message-State: AOAM533LYPZJrrwrtGrWbGvoitsCEO9Uwgxa7Ij/zLyLYb4vUivQITg6 UZLWsXjDE51Dbcxw0KaBtDs= X-Google-Smtp-Source: ABdhPJxPBqdq6C+OkU1AIPNDoICIzsm27N4kVsjTxh+NKpZ4u90T5oKFLdfLyIPpAUxSCCkKYx3Vvw== X-Received: by 2002:adf:e0cc:: with SMTP id m12mr10264279wri.62.1632476461266; Fri, 24 Sep 2021 02:41:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stafford Horne Subject: [PATCH v6 28/40] target/openrisc: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:35 +0200 Message-Id: <20210924093847.1014331-29-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476464838100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 27cb04152f9..3c368a1bde7 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -30,11 +30,13 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr val= ue) cpu->env.dflag =3D 0; } =20 +#if !defined(CONFIG_USER_ONLY) static bool openrisc_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER); } +#endif /* !CONFIG_USER_ONLY */ =20 static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -189,6 +191,7 @@ static const struct TCGCPUOps openrisc_tcg_ops =3D { .tlb_fill =3D openrisc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D openrisc_cpu_has_work, .cpu_exec_interrupt =3D openrisc_cpu_exec_interrupt, .do_interrupt =3D openrisc_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -205,7 +208,6 @@ static void openrisc_cpu_class_init(ObjectClass *oc, vo= id *data) device_class_set_parent_reset(dc, openrisc_cpu_reset, &occ->parent_res= et); =20 cc->class_by_name =3D openrisc_cpu_class_by_name; - cc->has_work =3D openrisc_cpu_has_work; cc->dump_state =3D openrisc_cpu_dump_state; cc->set_pc =3D openrisc_cpu_set_pc; cc->gdb_read_register =3D openrisc_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476468; cv=none; d=zohomail.com; s=zohoarc; b=TqOeiCRo2MOwX8QzwQ5acbFebEkaNnhm5V2mnjFXXFSkZgxtav+2vQyQIXLm+8pEWbFEV2N1qGeU7bX4La5SULimTro44TPRVb85LoU1MjDKvs+gIE+WmT0NzDKgwcKL8kR6iKLT1E2QXWdUenYXyzjWeBV70SQd6EEBMiihjkg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476468; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=kPKbWg59cX0CexRR1l524RCVpBa/DdFX45p/k6i5EPBUK1DIF6hjoPFB5EVEP2BSOZrxnujfhH3RQZn67Ln+SH0XxQeniJJJ+pYW0tCtE0ng47Yd1xH+W4ei58E3W4hkolJxJUGktt6Eq+7pLOvJGG84ATFpfqlwxgkDP3Lp29E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1632476468980355.5632598896383; Fri, 24 Sep 2021 02:41:08 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id w29so25427893wra.8 for ; Fri, 24 Sep 2021 02:41:08 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id a25sm11607839wmj.34.2021.09.24.02.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=DW3g0HBgSm72NyIUZ0l1AL3YPBRXrik2Fg9obkT6cJiYKQfvtQ2s3flA/ahT+eiRi+ WVxQX6nJyrImw7Gp35wLXIa792GtJmNYqosTL5mWwiuN8sPgRr0IFQmxvww5mlCnNKwU 3Xj40Hy95be6qLgJym6m9CPDeZegIviYdMrvoQv9quZ+7F6sBw3oVrch0XBC/Lt41TmU xPJrvk7bbBirlCLt/DzqIPtz7i5JgfIGNHzUYBXUQOSbCQxFj7TR38INRT/qge7J6JBi ljzyB/t66cbNiqnEA+wspbJdbfHrvSiKrRSHKhuZS2caE6thtVxhKjOwkKkFZbVT70OX NG9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=TC73Ola01sFt1efag1U7IUA5Ac3syBMhSs6+AqF/UYZ7X1hgjWOaRXljwXzisMZA3S 1NCM3KUPrv9ONyS8ZIxgpd0zlIbngUxm2KcREAJC+l2O0lHQ7QPwUOHKE2g4CJ0V/9R0 j2YiVsVSvkRcDbHMK8FJtNE3+Yw5D6LgZd89EplpiSJXkp/3SK8GbnuP8DWBgEqp9Ybh 7Q3cV4/MfMsxTqUxlgXzCrI0BUST3bv6D2K+z/XiGaa4TU5ysEPEH4Ms+Lg+tH1pBSjB /MTZx7CzJUs/SSu7/FMPeo788oW1J8yb9akWS9CY8aVzC18Jaw6tRrZuj+ereFSNnxGO ReQg== X-Gm-Message-State: AOAM530vV83c6SSPUMwXmcVd4JQtJPNftLv/7kgOtVnGdJ9dBH2J3mm5 QuRGzkCEuN4G2XJcQFJYEqs= X-Google-Smtp-Source: ABdhPJyaws8sCJKrNNBWGp1d3cdvHkyeaFu9gNjCXvGQA0cMCiJ4pKeVLqHYFIj8iTedfDDf/XxWxw== X-Received: by 2002:a5d:64ab:: with SMTP id m11mr10182168wrp.343.1632476467094; Fri, 24 Sep 2021 02:41:07 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PATCH v6 29/40] target/ppc: Introduce PowerPCCPUClass::has_work() Date: Fri, 24 Sep 2021 11:38:36 +0200 Message-Id: <20210924093847.1014331-30-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476471258100001 We're moving the hook from CPUState to TCGCPUOps. TCGCPUOps is a const structure, so to avoid creating multiple versions of the same structure, simply changing the has_work() handler, introduce yet another indirection with a has_work() handler in PowerPCCPUClass, and ppc_cpu_has_work() method which dispatch to it. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu-qom.h | 1 + target/ppc/cpu_init.c | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 5800fa324e8..36110112506 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -188,6 +188,7 @@ struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; + bool (*has_work)(CPUState *cpu); #ifndef CONFIG_USER_ONLY unsigned int gdb_num_sprs; const char *gdb_spr_xml; diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 6aad01d1d3a..2f7d262b176 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7621,7 +7621,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER7"; dc->desc =3D "POWER7"; @@ -7630,7 +7629,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER7; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER7; + pcc->has_work =3D cpu_has_work_POWER7; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7789,7 +7788,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER8"; dc->desc =3D "POWER8"; @@ -7798,7 +7796,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_= 2_05; pcc->init_proc =3D init_proc_POWER8; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER8; + pcc->has_work =3D cpu_has_work_POWER8; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8003,7 +8001,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER9"; dc->desc =3D "POWER9"; @@ -8013,7 +8010,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER9; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER9; + pcc->has_work =3D cpu_has_work_POWER9; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8212,7 +8209,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER10"; dc->desc =3D "POWER10"; @@ -8223,7 +8219,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER10; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER10; + pcc->has_work =3D cpu_has_work_POWER10; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8790,7 +8786,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip =3D value; } =20 -static bool ppc_cpu_has_work(CPUState *cs) +static bool cpu_has_work_default(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; @@ -8798,6 +8794,14 @@ static bool ppc_cpu_has_work(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } =20 +static bool ppc_cpu_has_work(CPUState *cs) +{ + PowerPCCPU *cpu =3D POWERPC_CPU(cs); + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + + return pcc->has_work(cs); +} + static void ppc_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); @@ -9037,6 +9041,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; + pcc->has_work =3D cpu_has_work_default; device_class_set_props(dc, ppc_cpu_properties); =20 device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476473; cv=none; d=zohomail.com; s=zohoarc; b=V+91oPV+NzAscxht4rJnLvCGKXV8CVIK0UHJIicF0a9gGnjQ+jkOCYSPFBTTP45kYSaPjzCMP5vyLzhgEi6j76xHLm/4Bnj30+pQ1AhNoUXUF4ElNI0FzPa6a3/2eQg5wYIXdjfgz/FISTW8M8tTER/49uqNZvy0qKyC1T62ZQs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476473; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=DM1wqyQnZ5hqsJ2lPGrog/GMWhKIgWYZdcu1McwGc5tz4BqlkZfjsOiUHnwXA+Cv3Je5GYyxC1SqRgKlYWYR9hjSdqGZBmaIilSOxGrTMJskkPl2jk2KRUH18KIB6i2iYRsClE+k/UOEq2/qaEQlQPmD//yvsCF4/D+pyEWV1VY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1632476473639929.772958788504; Fri, 24 Sep 2021 02:41:13 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id t18so25607033wrb.0 for ; Fri, 24 Sep 2021 02:41:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id e2sm7640133wra.40.2021.09.24.02.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=AXO4gF+qgSWRA2JKjultQ78BzHu76xnUUkZiG16W7yPgFFryIvmaJq+DUHgRLD+BTh V/Kh5qZWGDxYbJyxpbPagrupYUXFmt7N1wUNxgxw9Ocjx8fZZIbNSRm7s/D085tgZCi+ q7ZU4rERW2XOmqXufzMiCiyoas/cvjab7SnTfp88AlZvzun7xDONmYrysKNuKFsU7Jlm /TScukXOyPoAXW9HwQUcvdh8dgMxhsx9JpdQfKxlTnh9lowfKpPIMYlx0Hs2hMQawZ58 18R/lIUQKKCBVpQ8XbNm7QmTrXH65o8Qg23FGR6QsQfHghi0ugjMAwVAjL73n6BMcMkf oKgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=2CzUSgjwGgRFdRZBQdsJKQlAPSK+KiIn4TPPeuq0ciKKMgMAiZCBeS2nYJjbgqLTtN JGBB9W81I7tB6QUTgQhXqm0RwYAn1tSpbSzMWi94KqndW50pk1gNIyO5Cp2yVZI+jN3Z JuZ4sbB4ZHXqad/KxEg1DoX4SnXGSBdWtfOPdCyxbnzjBPxT8o4swK7CibIaiZ7GVC+8 Zzc/cYxRNuYK1bKViVQuPQDEbNatzE2ptIyILkeesOoe27FxbGwAUwI5KMJHI2uq6Tiw kxeJwSmBO9D8VcqRcYx1QWTpupatvcdJyJLPimXvMgKve8kMNnAPn/Q5BGbRF2mRsihS zaBw== X-Gm-Message-State: AOAM531oZFZGvWxMFVkDAK6L4um/9j8mqRI286iswFpZDhAu2653jcyK 0VhL7Q7RRacl4frDpU4EVxw= X-Google-Smtp-Source: ABdhPJwLoPEL9lNPWHYn4AgUdgkW7nURAVDCGaqEwjYE+NEHlda7Fnwa9n+rPU36kEj+hulZIjELxw== X-Received: by 2002:a5d:630a:: with SMTP id i10mr10568591wru.178.1632476471823; Fri, 24 Sep 2021 02:41:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PATCH v6 30/40] target/ppc: Restrict has_work() handlers to sysemu and TCG Date: Fri, 24 Sep 2021 11:38:37 +0200 Message-Id: <20210924093847.1014331-31-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476475421100001 Restrict PowerPCCPUClass::has_work() and ppc_cpu_has_work() - SysemuCPUOps::has_work() implementation - to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu-qom.h | 4 +++- target/ppc/cpu_init.c | 24 ++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 36110112506..ff2bafcde6f 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -188,8 +188,10 @@ struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; - bool (*has_work)(CPUState *cpu); #ifndef CONFIG_USER_ONLY +#ifdef CONFIG_TCG + bool (*has_work)(CPUState *cpu); +#endif /* CONFIG_TCG */ unsigned int gdb_num_sprs; const char *gdb_spr_xml; #endif diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 2f7d262b176..5c134adeea9 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7583,6 +7583,7 @@ static bool ppc_pvr_match_power7(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER7(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7616,6 +7617,7 @@ static bool cpu_has_work_POWER7(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) { @@ -7629,7 +7631,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER7; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER7; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7672,6 +7673,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2; pcc->mmu_model =3D POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER7; pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =3D 32; #endif @@ -7742,6 +7744,7 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER8(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7783,6 +7786,7 @@ static bool cpu_has_work_POWER8(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) { @@ -7796,7 +7800,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_= 2_05; pcc->init_proc =3D init_proc_POWER8; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER8; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7846,6 +7849,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) LPCR_P8_PECE3 | LPCR_P8_PECE4; pcc->mmu_model =3D POWERPC_MMU_2_07; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER8; pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =3D 32; pcc->n_host_threads =3D 8; @@ -7939,6 +7943,7 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER9(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7996,6 +8001,7 @@ static bool cpu_has_work_POWER9(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) { @@ -8010,7 +8016,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER9; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER9; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8059,6 +8064,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OE= E; pcc->mmu_model =3D POWERPC_MMU_3_00; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER9; /* segment page size remain the same */ pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->radix_page_info =3D &POWER9_radix_page_info; @@ -8147,6 +8153,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pc= c, uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER10(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -8204,6 +8211,7 @@ static bool cpu_has_work_POWER10(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) { @@ -8219,7 +8227,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER10; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER10; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8271,6 +8278,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OE= E; pcc->mmu_model =3D POWERPC_MMU_3_00; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER10; /* segment page size remain the same */ pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->radix_page_info =3D &POWER10_radix_page_info; @@ -8786,6 +8794,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_default(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -8801,6 +8810,7 @@ static bool ppc_cpu_has_work(CPUState *cs) =20 return pcc->has_work(cs); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 static void ppc_cpu_reset(DeviceState *dev) { @@ -9021,6 +9031,7 @@ static const struct TCGCPUOps ppc_tcg_ops =3D { .tlb_fill =3D ppc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D ppc_cpu_has_work, .cpu_exec_interrupt =3D ppc_cpu_exec_interrupt, .do_interrupt =3D ppc_cpu_do_interrupt, .cpu_exec_enter =3D ppc_cpu_exec_enter, @@ -9041,13 +9052,11 @@ static void ppc_cpu_class_init(ObjectClass *oc, voi= d *data) device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; - pcc->has_work =3D cpu_has_work_default; device_class_set_props(dc, ppc_cpu_properties); =20 device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); =20 cc->class_by_name =3D ppc_cpu_class_by_name; - cc->has_work =3D ppc_cpu_has_work; cc->dump_state =3D ppc_cpu_dump_state; cc->set_pc =3D ppc_cpu_set_pc; cc->gdb_read_register =3D ppc_cpu_gdb_read_register; @@ -9078,6 +9087,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) =20 #ifdef CONFIG_TCG cc->tcg_ops =3D &ppc_tcg_ops; +#ifndef CONFIG_USER_ONLY + pcc->has_work =3D cpu_has_work_default; +#endif #endif /* CONFIG_TCG */ } =20 --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476478; cv=none; d=zohomail.com; s=zohoarc; b=MvusbsYn0U/I2ulblzh5CsBQN39Oqb19eN00lo4/5Lysj7iNhao6webY2+O6DL9eGilhsuRJyPMMx4TkJLLYv1IM7KY8661NYfbNXv/5nx8iNOs/TN7W/h+HVVHTOmqUlE6EpxpHMgiOeCBIMjHn3m8hQuDe5TNnHDsLxoNbYmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476478; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=M3pLKSzG/SAOeF2YuW7UKgL8wAsZx6d3EeGBIA6RzXum8dUb/79Qukj6vjgHTs0pKt5e9ySmvXaPwwlwZJEVcEAWIet7QSMlKOdFyhx8lfgfaBd6UqgKEixOIAG1pqL07a0tsKQpa9EvJnOvmCx+p6hWFb9nxVDxQywze158o8c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632476478434949.4335740798757; Fri, 24 Sep 2021 02:41:18 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id t18so25607703wrb.0 for ; Fri, 24 Sep 2021 02:41:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c9sm5920723wmb.41.2021.09.24.02.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=YqJ30iDwZEN/xhsXgxnYpc93mFkXRjF4UhDX3Vc+hz2vW1BAo7amyqQkjeIFvAjR+n 1PsjfDm3VqDrYES0v0Atca54m2nY3jCt8dgosT5EOWmNg7BwT/AVpcUvb4RZ+mgQrTCs cePk37LXsnYYer+eEE40CfoKLtN6yaz2l5HsWko381LwMUG/XW72lLVLb87DXR3xjxx0 yuzfUzHR06owl7RwVzkg/8XWnkxNOp/GZWr46tXevq/ngwN8bXdv0F6+aUBoAIt7aiAt v43E5rAcm4Jf/qkXUNSfM/XjFiwpGQIjnDOcjinNHBsTDp3ZVhwpD7ZQH7vRAA1Et0Zm pQlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=TRnna9vAovwGxsrrpfHQWL13ihU/rvcsf7MVYNXuzdO8FJ3lduYYXulDGy2I/NE6wp TLfdA6MCBboxT4EXZLhzUZ3OxyTrL2DshmDXvFE4zZmJ7bMGHU18nwrTNPY3OhgzEHZC Nq25y/8uXJ/mwxEBT5ZLTBwMEknpO8SwYtgv/obw8cp6AgycFq7HAGUK4lo72we098RQ TAm/kdoqiDN5TTp4hz5isABPmdGvlzwO0LJemQMH5i2CLzae9WQ7fj+YqrHBT7C3u00F ZHnSFWHp7hc7F6r5i1XIDIs1WcpdS2UAbWB0oRUhdKORPuPFQ4zTz1p/DZbdqIrbsd+a 4pyg== X-Gm-Message-State: AOAM533slMuhJW7c6khblSBdPXbZ8/xFO4D8lRKimc4BdRMhkCezYB2+ UDc4azF7bu1pAch8XPk0Qjk= X-Google-Smtp-Source: ABdhPJxA6MYtETK8+xbt66HYrfahWpY3+jiZaFuwAPT25Ut26aEOy7LLe9ax+5EBscg5761cQV6YcA== X-Received: by 2002:a5d:4522:: with SMTP id j2mr9959802wra.212.1632476476662; Fri, 24 Sep 2021 02:41:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Palmer Dabbelt , Bin Meng , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs) Subject: [PATCH v6 31/40] target/riscv: Restrict has_work() handler to sysemu and TCG Date: Fri, 24 Sep 2021 11:38:38 +0200 Message-Id: <20210924093847.1014331-32-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476479916100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Acked-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 7c626d89cd7..ca76bc34d9b 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -335,9 +335,9 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, env->pc =3D tb->pc; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool riscv_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; /* @@ -345,10 +345,8 @@ static bool riscv_cpu_has_work(CPUState *cs) * mode and delegation registers, but respect individual enables */ return (env->mip & env->mie) !=3D 0; -#else - return true; -#endif } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, target_ulong *data) @@ -678,6 +676,7 @@ static const struct TCGCPUOps riscv_tcg_ops =3D { .tlb_fill =3D riscv_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D riscv_cpu_has_work, .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .do_interrupt =3D riscv_cpu_do_interrupt, .do_transaction_failed =3D riscv_cpu_do_transaction_failed, @@ -697,7 +696,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) device_class_set_parent_reset(dc, riscv_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D riscv_cpu_class_by_name; - cc->has_work =3D riscv_cpu_has_work; cc->dump_state =3D riscv_cpu_dump_state; cc->set_pc =3D riscv_cpu_set_pc; cc->gdb_read_register =3D riscv_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476483; cv=none; d=zohomail.com; s=zohoarc; b=V0CxxXMgAK4/4aRUd4+vCGXRvE2o83skA4B6TZjE1rco9G1+jlAqdTKHXfBjzk5KR20mLk87C2FVHZqTcwgZ8GIv4AiNUaQpREGDI+uiRIcBuGIGFQKYbMkz63ZKDPSLrPbfZ+P4H621ZMg9OXpY/Ge73qnjtckXrkoPpztHR/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476483; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o/vqGSMOnhzvKGrld2aIeHhcVaK006Y9gzP+FF74z+I=; b=kNLaOXz/mwsK8UAkmIpPM+gEtEE4M2t5PHUnSmJ/FBT5CA9nl0+7sOp9UlXYBUQxJTMVHOrnhW65hBqlEQPRIpucQdI3S7XGg2I9PAEryxAoIhQSI33weo+olRhDQ2ClruJYn74z3OZ+7Yz113NLQgGzsVdS2d5ino6gGoleBV4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1632476483059358.0509253586679; Fri, 24 Sep 2021 02:41:23 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id w17so25405728wrv.10 for ; Fri, 24 Sep 2021 02:41:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j2sm7682289wrq.35.2021.09.24.02.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o/vqGSMOnhzvKGrld2aIeHhcVaK006Y9gzP+FF74z+I=; b=goNme+ilDkeL3ibbjtqRoaro9BqqE8qFef8w0FI182No1FhVxN71i2lnSQHCbOScHj LW2K94puGJzd7/juZXCS1GH1yaMrGZuYR4XzyLSoLjkjJK5N/1sTcLmVzELSWyja/+0C WUIAGzhWVuJhFzVQivmywnobh1hRcOA7QKyYzzqai0ufKWLc5wXk06UysAOCg799M0++ MfMpzcCrR4sp3yoyjq5Qj6Iw1ZZWMvuMqlOnZOokEPodSZCunCJ5MYbe8MacF69k+pmh JX9vceFAbVQBgZjVA5xcpZfb1QPQlj7CwRvZGwDKIza5c9CrwT/wjSaLGzS4ylZhG7Em NONg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=o/vqGSMOnhzvKGrld2aIeHhcVaK006Y9gzP+FF74z+I=; b=0iyYi/CkzKD2/BhxLKYlWGIS64FLo6WShsJLmssmzDxxsaIrtVN3TsB4b9teROJwpi TGtwtMslqQy9EhvjplQOmzK2N1R7abOSxywVJUBP/W46Ohu4MkcmsZVwXfY6ZhlgE7YQ K1gvVJCRIYyBq46M8jfewNBFVn3mKMBgo/t7tV6QhF3EvNtq6pSSM48IU53IYUZbHO5e Ncm00eOmMwaDxtnQhiTg5VQEgy15k26YaHD+PKs84LRLBe38xCMCGBbcW1lt9QwzV1wh KDcJF/+yBynTmzQqAZwTNowRieqXKtPX7qjtgFHZJ0EgcSQvMmAXIOwEn4LksnhYWohf DGpw== X-Gm-Message-State: AOAM530Q9h8K65oEOWrulfKCU6Ua6TtZQ94bENgg5e0Nsb8ETV/3RokZ XT7CpShtrdJkB+6Ffq6x0j60TPXwBx0= X-Google-Smtp-Source: ABdhPJyQ5Tyx8zX9LNARuketEA99kO/96w2sjS8/Po8E7AmaPexyGY+KGhcXjkUaF9qRx5vYYYTNGg== X-Received: by 2002:a1c:a94a:: with SMTP id s71mr1075179wme.32.1632476481344; Fri, 24 Sep 2021 02:41:21 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yoshinori Sato Subject: [PATCH v6 32/40] target/rx: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:39 +0200 Message-Id: <20210924093847.1014331-33-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476484261100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/rx/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 25a4aa2976d..ac6b40b2716 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -41,11 +41,13 @@ static void rx_cpu_synchronize_from_tb(CPUState *cs, cpu->env.pc =3D tb->pc; } =20 +#if !defined(CONFIG_USER_ONLY) static bool rx_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIR); } +#endif /* !CONFIG_USER_ONLY */ =20 static void rx_cpu_reset(DeviceState *dev) { @@ -189,6 +191,7 @@ static const struct TCGCPUOps rx_tcg_ops =3D { .tlb_fill =3D rx_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D rx_cpu_has_work, .cpu_exec_interrupt =3D rx_cpu_exec_interrupt, .do_interrupt =3D rx_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -206,7 +209,6 @@ static void rx_cpu_class_init(ObjectClass *klass, void = *data) &rcc->parent_reset); =20 cc->class_by_name =3D rx_cpu_class_by_name; - cc->has_work =3D rx_cpu_has_work; cc->dump_state =3D rx_cpu_dump_state; cc->set_pc =3D rx_cpu_set_pc; =20 --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476488; cv=none; d=zohomail.com; s=zohoarc; b=EYbimVL7ur+Qyg+Z3PGKBumPe/ggdqRJnTiNYNyyLEmmb8/6QODubiX7kxHkiwUGdNGvzYpl95ddn5t/hOzriBozperNpYyEZiJLETqbh8zb3sjs93Y50ZQlbH/cCI3mzC2uDJaFDB4yItnW0BcwADxbNWnIDhc1A4D216aYUD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476488; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=I3SIP3RfkRBedTQh8gNksPpyKHs0wDtojVBhdafynFo3XUm76zwTm8xlV05GVWabynSAqSQkH/i61ZGcwbvvaNGLzOshR56D94eBgPXV6elDVOhHeALb+Ms3BDrgQfiMd9F5IvyN9S0xzsu5Y9743I845gvB9QkneQwx4m1sDLg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632476488013669.8725216649566; Fri, 24 Sep 2021 02:41:28 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id t7so25386104wrw.13 for ; Fri, 24 Sep 2021 02:41:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n14sm6141369wmc.38.2021.09.24.02.41.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=TRbCXATlimzfFn3xJILPImXwRPAEdONDFO7iEG7mXCPKW8VvkvvaQHGfk9cFP4vJff xXgaC3VM+jC0KyJLV1wCa67d0QDExIEI5aBqVi4FD+zfTsE3upWxOrCEhlwv6i9cfILw h9SBDMf7eZhTPMD+WplXb02QO2GAhPcedE2u8h+xjXBx9WkawcQkixMoT/j92wLfe+UE /JV227kiO4kMS5RwJv3VdxojqaLEjMdEe3xkxWUcEseZiPSsJAB9E2t2lJ7uVTOlVP46 0yQ1KQC6LrYiNDton2yFfnrmmrqyLlQ/SlaapnV28wpf1uX7YnN7mtvp4KZq2ESpEK2/ DIVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=G0mJX5ZMYLNXVp2b7NxmhW1kircNEdFiV04ouN7elsD8QnXAtd16CLpAcnSbpP1XOr bJy8azjsVkugQtdy39W3fXf1iYQ9u/GZ6PmIGgP4I92OOoc2hFXi04B9NKbPWKk0xLl5 tvioQvu+VztycTpBwgu+WIqtnunv66WrNBeVssArv1xLlkcsfvFIH5YQ1/TszEyvjZn6 sVHuDm4i9dCbMfHCquTU6aCgMuzwS2wGeUwAY0sleVvaaeHEweDzrD3+8AW0XMAG6/Q8 /VllOaIFxH9xip0av6PmtPfuFvsv6iTpRDA4nsYaq7znJlrBlOrUHxcvLNMNhlzgh8WS 7NSQ== X-Gm-Message-State: AOAM530ZTaOgAKfIp86NwAmj2lC8YcT5x0WOvOeMlGx7RtjkYCT968aO p9H/MvUvcjsIQYpgAXV3pvw= X-Google-Smtp-Source: ABdhPJz+7nyxHF1nrxxG5t8WS9urjYReQYkBJ39tztYmgXsQ5JxMIjUgkRvK9B/q+rwq8Pq8lQIQuA== X-Received: by 2002:a05:600c:510a:: with SMTP id o10mr1042384wms.81.1632476486188; Fri, 24 Sep 2021 02:41:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Thomas Huth , David Hildenbrand , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v6 33/40] target/s390x: Restrict has_work() handler to sysemu and TCG Date: Fri, 24 Sep 2021 11:38:40 +0200 Message-Id: <20210924093847.1014331-34-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476488514100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7b7b05f1d3a..df8ade9021d 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -88,6 +88,7 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.psw.addr =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool s390_cpu_has_work(CPUState *cs) { S390CPU *cpu =3D S390_CPU(cs); @@ -104,6 +105,7 @@ static bool s390_cpu_has_work(CPUState *cs) =20 return s390_cpu_has_int(cpu); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 /* S390CPUClass::reset() */ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) @@ -269,6 +271,7 @@ static const struct TCGCPUOps s390_tcg_ops =3D { .tlb_fill =3D s390_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D s390_cpu_has_work, .cpu_exec_interrupt =3D s390_cpu_exec_interrupt, .do_interrupt =3D s390_cpu_do_interrupt, .debug_excp_handler =3D s390x_cpu_debug_excp_handler, @@ -292,7 +295,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) =20 scc->reset =3D s390_cpu_reset; cc->class_by_name =3D s390_cpu_class_by_name, - cc->has_work =3D s390_cpu_has_work; cc->dump_state =3D s390_cpu_dump_state; cc->set_pc =3D s390_cpu_set_pc; cc->gdb_read_register =3D s390_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476492; cv=none; d=zohomail.com; s=zohoarc; b=ddMGFfiq77PwhT9nkISvDYjNb0/iVWKA5a40oxYuvcvCRd/8J2tpZ+wv2hA6wbdi8Q1qc4iAcCL+ZBbxLhTS0jmqNX+EIWi2iG9OpkAB/ldzWlMhM9e1U4I0Lchd1vDjlRPESmJi1mH75hk3tSFewRLYOq6qmvfJ28JZ7WFxLjg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476492; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=KxB+GoqN+hbmN6HCM6ehqa7cJRvC+icp5nV5lw8HO6EFYJ18LkTTfHXKosNkISoqa7HZDBvRPpQuXAMJxiLM02YQJPe6Y6RLPwYZp3Bt8vTB93qUFc8RHWcwbhYOnBr+B14NaDPdi5nj4+NkyF7b2UxOhG/eWgI03aXP58ui+SU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1632476492664446.16603651765035; Fri, 24 Sep 2021 02:41:32 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id w29so25431505wra.8 for ; Fri, 24 Sep 2021 02:41:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id l26sm11746319wmi.25.2021.09.24.02.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=O8O/BuCtEOsRv3EG/MV5m6RRBeFHeb/zYurn9WXZihmzcNZ/iE62/N7pPNJ2z6y/Lp OvR1k1hCbBL5obm6ba4zlW1+3Cvz4ACffwltL/w16wY0ZoK5wGt4EM6izo6H4JF0MkwV ebRDReS4A4kgKKnEUqU3eOvimx4hRDui1MNQQ5qimmzc+RLvkTNggbFqIuoobriBNotX xj0RzmC1/7Qe4zGicC9f21Wo+OBWaolvCwXuZDDvk/2/oKJ5T1KO4adVDfmomeSVee3w 5MMzvGNETaB001uuaZneUr4f5XlK2PHq9+VQeCr+g+OE5qj+N+5sLj+bMgN8/7itb5WW SQPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=Q8YxcHr5DpXq7fScQCowhTvjW/i0gK9+wFJUl69X0GUPUY2fq2OsORJUr8gGPqvLMw yd7RcO6B6RXw4YQbcx9RC2D4Moz66gTt4cbbg5V1CslsDqSwmJyIwKuhD1o+vyerbbr5 NQFr3haORmA5fNm0pverNHtnTHysUg/nALJkcn4MpKj/tzAoSzC/0Fh0vcECQaLOOAj3 J2aQkW7Wx8ApLUQ+THbGBwTHTN6DuKos7LT9+lXcjDhjKbKyaz0we8ewZuvMWAeHDWIr NQldaiDHRIChpgw9xNKPuiPypBn6mqAFyldTyzj5ckfNOeUe0AGG8f11aOQQ2jyMmtDf DBpA== X-Gm-Message-State: AOAM533ZGT/kUwVHsNsm5czzQBzoQfw0Ncs/LW6FT/igZOZXTEL3EWYe FfA07PDzsnpn8ZNNrBZ69HY= X-Google-Smtp-Source: ABdhPJzNrU7LHvpCwWrtC7PGQEwHa0fyXmkhMcJnN4oz9SYBg7CWOoOkQE4RE77NglLogY3xpike3w== X-Received: by 2002:a1c:f713:: with SMTP id v19mr1035859wmh.188.1632476490917; Fri, 24 Sep 2021 02:41:30 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yoshinori Sato Subject: [PATCH v6 34/40] target/sh4: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:41 +0200 Message-Id: <20210924093847.1014331-35-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476492906100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sh4/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 2047742d03c..fb2116dc52e 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -58,13 +58,14 @@ static bool superh_io_recompile_replay_branch(CPUState = *cs, } return false; } -#endif =20 static bool superh_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } =20 +#endif /* !CONFIG_USER_ONLY */ + static void superh_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); @@ -239,6 +240,7 @@ static const struct TCGCPUOps superh_tcg_ops =3D { .tlb_fill =3D superh_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D superh_cpu_has_work, .cpu_exec_interrupt =3D superh_cpu_exec_interrupt, .do_interrupt =3D superh_cpu_do_interrupt, .do_unaligned_access =3D superh_cpu_do_unaligned_access, @@ -258,7 +260,6 @@ static void superh_cpu_class_init(ObjectClass *oc, void= *data) device_class_set_parent_reset(dc, superh_cpu_reset, &scc->parent_reset= ); =20 cc->class_by_name =3D superh_cpu_class_by_name; - cc->has_work =3D superh_cpu_has_work; cc->dump_state =3D superh_cpu_dump_state; cc->set_pc =3D superh_cpu_set_pc; cc->gdb_read_register =3D superh_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476497; cv=none; d=zohomail.com; s=zohoarc; b=P8yX8pZ3L3IBUGlHQJ5Uf37LUpCSmzTfRvzlNh2o7Wood/bqSPd3wcg8mWgIl5Fj1KQ9RpWbTlt5nxMbh0/pOOoSvniHPJHe12tfy6Ew3yX9DKvQDyFS55/HzxbkAY4MU2LTLYHHbROEmy4TMmPQIh3KBrsbp6bxG1XclVt52wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=Xbu+34Ljqsds9aruopfZMFpOU0IBC1Iotp039av/u8DgWdZhrTqJ/njx8a85iCz5V6fBTyCOXXKAvifdKMmR6r6Y/iCEz3TQW+tG2++br1lv8sr8aSklBF4Yk58myZLHUJ3T0ZBDI4wl1SluW4dO/WXti6hFCQEDBoqCBy4xaYg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 163247649759040.92294717742459; Fri, 24 Sep 2021 02:41:37 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id w17so25407817wrv.10 for ; Fri, 24 Sep 2021 02:41:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k26sm1170670wms.39.2021.09.24.02.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=gqbZD1QYHG/V+4FRZ+RsPkcPC6mtNJKoVwY8DNaJAY1Oo3Gmwh3hN0swaNYldC6mtE 2I2dcbFS35V7W3vN+iBxxuIxo75qc/jEn5dvYkRMsGj3hNBcKtR3OgBmv5jgu4pRSBjf pk+OClhKQq7bdH68FYVQXgygBIURTlnfitexMnylKUfu74Hvx0QEbhf7jbLEO2Sea0DN FNfro3QQnMLosH4I/97qVvLkTiCmOaXW6r/QhojFwEf9jutZ8brRKv9tchkp9CO0rTSH 0ooy8q1R5sn6Xc7JF5AyBmdxH7UkCSUKGDUCtzXeAFJUze/N3J+LkDUQC7UvhKG83eEL wDRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=jLSR3Og1A8nClEsYeorhG/2cFTmJxdKSXPfD7jPGWiIUDORlB1mGx3ZQ9JhUwqJLjD N6Ojxl5XlhD/P2VZ5HkQ+2O7OImld9tDo+hv4hxdBV+Cr9Mzzw11PT2HFLt+5y9ppH8Q RXGPVhYlWgysfXtnbGHzgkuAejUO8rZERYlnc4oW/W8VUxZZ+qo8tmb4vPimsvm5b/ZR An4JCZzjBW3HQDN4UgGiLi2yPp8QBDB0PAol0717yBFOTFWxnVfgcKvb15EU319rtPz4 r7vQQ3unGR8iJ+kVPuqtjz47p0g0ArRn92G3FhUB0Sf447egP8A8DrQzixd6cTfA6CdN ft6g== X-Gm-Message-State: AOAM530it9AjXbU87fZnoIKNdsi0WmeEtqTg7NJMhOeBTHDuZk4hB6q7 znJxkxuNUZMIfNS5xHZZxgU= X-Google-Smtp-Source: ABdhPJxTSOKRlGhxmppefEI6DDkH8tPZRl4LsiMD887WvwAqOCLsCo9OR2eguLu9mFjC0C/DOHXQ/Q== X-Received: by 2002:adf:f890:: with SMTP id u16mr10175704wrp.388.1632476495755; Fri, 24 Sep 2021 02:41:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v6 35/40] target/sparc: Remove pointless use of CONFIG_TCG definition Date: Fri, 24 Sep 2021 11:38:42 +0200 Message-Id: <20210924093847.1014331-36-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476499149100001 The SPARC target only support TCG acceleration. Remove the CONFIG_TCG definition introduced by mistake in commit 78271684719 ("cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"). Reported-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 21dd27796d0..0d252cb5bdc 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -859,7 +859,6 @@ static const struct SysemuCPUOps sparc_sysemu_ops =3D { }; #endif =20 -#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" =20 static const struct TCGCPUOps sparc_tcg_ops =3D { @@ -874,7 +873,6 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .do_unaligned_access =3D sparc_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ }; -#endif /* CONFIG_TCG */ =20 static void sparc_cpu_class_init(ObjectClass *oc, void *data) { --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476502; cv=none; d=zohomail.com; s=zohoarc; b=iE5+FXQd2hHFLTHGSZZUZX0sfL0WJBm0KXncDjdZ77+E9uCw5A15ichvgLoKwypQJciSZ261ZCwb7hTEE3rFVISkHj0x8A9CAKYU5dG58HAC8Dc75qaFuBwwk7jEAGS2swPGGeSaXjK5kcz94C+3bEEkCs4Fla2lyx557KESnFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476502; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=ZzHpTuiEvYq+th7vgpVYpOMSvUact75MAd2FeV089cX2vxAKdNPIoo+lWnNRwiLIBUMisuHaW2daYnX3DAVHRocpyAvoxlOM0siamOpXukeuqeRTBV9h0lpgIIJqGmqF6boNy7osmUVbSZ1i1Z0cgNvxbUR+bM4jufXDbiBbOfk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1632476502402432.09447780502614; Fri, 24 Sep 2021 02:41:42 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id t18so25611070wrb.0 for ; Fri, 24 Sep 2021 02:41:41 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id t18sm6364162wrv.39.2021.09.24.02.41.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=dFTz6tKuqmjjhqyqNuCPczxGOwYdFlakFGou/jw4A3SDzLuyuFs1RB3axWLxZdMrxy EzdKAW1dlBWzshmaypU5tnJgPjFePz//avo8Wi1KJr/nppdWmK1evhVvTar7ASbHaBso x18I2QuHitrDhbtyTl329UIV31qU2Q8Ba97L+FhHeFa+ClTizP0fwvxBpUuQKI63dbNr bWfm1GHkbvl4M4RFwHafLuU9xzHBTx/AqORSfQyLqzgCdWhW7JZ5U0xl8E6li5hVMPvO xAuJofjZN59msYjrRXTK8tSU6ZW5twtxpXpRsbVc1rLLBAJIBN8q7UguEdWgLWJ7sBuN pubQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=XpWGH9yUXTtgCTcYEl93TQKRNIMBtXreoCDuMdoB4XEHhdoQ2oik4NMhv57ab0S7Y9 OVK7yM3L9/31gslNl6JQic1C/hLIf4XLcBoJkyLPMQG3eoHrZJk9DQNAwBvnjEnJCSTI 9JRzWqt5OBMUHcrzonFcFAmchlCsW4T5riB+7pPJGQPIrOfCPv1J6kewaTS9OMFe9WAd pn3xcUPtr1CGrFHkkMnne07SFzBD4b6FTU0k/l54ll243V6UOHM591Dp73EhwdwXYrQ/ pXlaBpnWUCBSiqezWNfsgE+oLu+FWLenVQLjaL8G4AyyGGhjDDIZmvUawUxPrNKTBS19 1wzg== X-Gm-Message-State: AOAM531plk3UkHojZ975qF/G1H5tqlPNMSdXTlubD+EkU3+JkW+51uMl hNyYuWHYaU1cj5tN72uoP0c= X-Google-Smtp-Source: ABdhPJyhS/QR5fQzSy/c/qDhU3aoEvlxwAHNMtjhmWfeeh/9WdVeH7tonNo+YTDHjIlZwoGeFO1IZQ== X-Received: by 2002:a7b:c184:: with SMTP id y4mr1075809wmi.128.1632476500498; Fri, 24 Sep 2021 02:41:40 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v6 36/40] target/sparc: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:43 +0200 Message-Id: <20210924093847.1014331-37-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476503400100011 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 0d252cb5bdc..8d61bf15f6c 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -702,6 +702,7 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.npc =3D tb->cs_base; } =20 +#if !defined(CONFIG_USER_ONLY) static bool sparc_cpu_has_work(CPUState *cs) { SPARCCPU *cpu =3D SPARC_CPU(cs); @@ -710,6 +711,7 @@ static bool sparc_cpu_has_work(CPUState *cs) return (cs->interrupt_request & CPU_INTERRUPT_HARD) && cpu_interrupts_enabled(env); } +#endif /* !CONFIG_USER_ONLY */ =20 static char *sparc_cpu_type_name(const char *cpu_model) { @@ -867,6 +869,7 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .tlb_fill =3D sparc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D sparc_cpu_has_work, .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .do_interrupt =3D sparc_cpu_do_interrupt, .do_transaction_failed =3D sparc_cpu_do_transaction_failed, @@ -888,7 +891,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void = *data) =20 cc->class_by_name =3D sparc_cpu_class_by_name; cc->parse_features =3D sparc_cpu_parse_features; - cc->has_work =3D sparc_cpu_has_work; cc->dump_state =3D sparc_cpu_dump_state; #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) cc->memory_rw_debug =3D sparc_cpu_memory_rw_debug; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476507; cv=none; d=zohomail.com; s=zohoarc; b=aQ4Us/WcXhk7G8+3mlENYfpC+82F/XivtH5TOx5Ms8+rwjrG8DceWnZeRoRLmciY2BQSMmFQMVusLG65sTVhicdViB+vfBmdW9mUTRjBiSkeWoSwd8dBUnzZwFRreJKXwVsGXxQa48RGeO9Kr+u7sYRZfGUAhQS+hWCYuAicJ5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476507; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=JDdXyYgNiwYYeyDkApZlBeuE9fM9WjchmiPNHIF13/76KMADoAiY8yp1o9f3alvEz5jZLdkwf7GBCf8Nak+lDjC6kwffVvWNzYoZ7aZsDYxCknX30vr1zJIa7kt1QfVftYaSm1b2kfq0p/WlTNTZdbx3YmWcdvFs5sueSE0mEPU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1632476507217198.05629006397612; Fri, 24 Sep 2021 02:41:47 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id d21so25382513wra.12 for ; Fri, 24 Sep 2021 02:41:46 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id 20sm12868821wme.46.2021.09.24.02.41.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=chUbqeJV+99AjzZ2+mWb6PHXxL7KV1IoRNF/wC+uVUh4JMDQ6+DrfIgieceLBCNV0y gRqWvQIdoPnmkPC0MjNEbNq3HhLsffeDQXOvgFY7IW9qPPAJ5P8/FXSzead+XE7v2V4Z VnLh3NUaBnMf+uJjcgBZKDE+SCLVZERmOu0K+yLqD3UqhUq5a0F72qut3HXWHqsQiBaV nK9AurxeUFi8cPgqTWj8I2UPUYFzwNCoBg9UvMLfHpuLCAvvclenYdIwTLaT5ajZuA63 GxxWbz3l+JKgmLmSA/evbleZwvOyrs9GMRCVt7jKiLA9GW32275/qgsVi5BhBfZx40bh NybQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=cCfj8FcqxPS4xtCFpQW3G+KbNzINkJr0aRYI1W/4vF36wx+fyjdKAY7gqlPHYYV4J8 eoZtdj0r1ocHLKTIC5HSjvDW1kuCpZhVAX6i2pXXCBKjaIauqzHb9FohBLpN5qutMkDw KqDkhEvenqSk4dxlylxyOG5dMx68JcGdQkq3m+dmkqCyUm+twlQ2G9m7zTJNRdRqIOh7 Wb0OB2nJWcHhBUMD9WtNnVeiUJvwdh4Yq+SLklsvhQXF5II4EKxDA5JLiHqpLkoxuDUM /rMMxwPf/z2hyAn1MGra8vQaTn3h1GfBTa+/Dwz8sjzI/hy65fZV6Opu/oqNezUnJilj hFlA== X-Gm-Message-State: AOAM533EMzSwtznX9QstwFAjepl1oEp02wlGVlror8wHxpV5z9zzmfRH MZl/16+CzWT0cZWOqAEzmthfz6kMrKU= X-Google-Smtp-Source: ABdhPJy1UoZIAFxZw7dsk5UXIWVHWrGa0sr0xKDp49LL/Sd1laHKtSJCf1n0E7mSfIOzxvMsWdDKgQ== X-Received: by 2002:a7b:cc18:: with SMTP id f24mr1091089wmh.8.1632476505294; Fri, 24 Sep 2021 02:41:45 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bastian Koppelmann Subject: [PATCH v6 37/40] target/tricore: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:44 +0200 Message-Id: <20210924093847.1014331-38-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476507927100015 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Bastian Koppelmann --- target/tricore/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index b95682b7f04..419fa624bd5 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -62,10 +62,12 @@ static void tricore_cpu_reset(DeviceState *dev) cpu_state_reset(env); } =20 +#if !defined(CONFIG_USER_ONLY) static bool tricore_cpu_has_work(CPUState *cs) { return true; } +#endif /* !CONFIG_USER_ONLY */ =20 static void tricore_cpu_realizefn(DeviceState *dev, Error **errp) { @@ -154,6 +156,9 @@ static const struct TCGCPUOps tricore_tcg_ops =3D { .initialize =3D tricore_tcg_init, .synchronize_from_tb =3D tricore_cpu_synchronize_from_tb, .tlb_fill =3D tricore_cpu_tlb_fill, +#if !defined(CONFIG_USER_ONLY) + .has_work =3D tricore_cpu_has_work, +#endif }; =20 static void tricore_cpu_class_init(ObjectClass *c, void *data) @@ -167,7 +172,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void= *data) =20 device_class_set_parent_reset(dc, tricore_cpu_reset, &mcc->parent_rese= t); cc->class_by_name =3D tricore_cpu_class_by_name; - cc->has_work =3D tricore_cpu_has_work; =20 cc->gdb_read_register =3D tricore_cpu_gdb_read_register; cc->gdb_write_register =3D tricore_cpu_gdb_write_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476511; cv=none; d=zohomail.com; s=zohoarc; b=WkIXV6D9WqfELFTRodFGif3LIVozGISQwVQc5/zQg3oZZ4AnrT5kf6wtPovoJfxto0TQQSyHwhnZYC20Kzjx04fPj15OC1ABwu1uOGUHlB0Y5/zutOzva+lG0lbjGUUv3PD0f4U8QONp6ECsJNvWN9Vf7aTB4sUhICEAwqqQGao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476511; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=WDGrvWBQnpuk5c4N7jLyNcLKKiDUIAdsNFeNV1VS5LtZxShYR2DgS6IXIg0Xw+AqcnIqi5TGZitgJfIoUJV5jAsRzrSIXsoiRd2l8UXg4SYxa9dekAenHHcnHiRcatIIQjUliWAaAff5AGa+7ZO5HPLeKWPl5nLS2xRtXEYZbEw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1632476511904563.1076985822907; Fri, 24 Sep 2021 02:41:51 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id t8so25566001wrq.4 for ; Fri, 24 Sep 2021 02:41:51 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n11sm5838101wmq.19.2021.09.24.02.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=dBDB86fZ4I+6YhlSnKFCUyV+E5I6CESO2Yhb3VsTCnU7ynWh2R3KYq00/dZswqNkc4 M0AZw7/0xpkuU32voGkSc++8bRVap7yzKqbCYzXPcIKQHYddwxN+aWPqPex8Rc+7e29R XTH0PTbzai2JRmUclzWVFHtf183LuB5MneiTvtzLhLRjyPL6jubA+1NhK4UD05KRzqO6 1qSZ2m8iEYbyMUO7NNypGAIdMOJ9miAV6BwSNVTxECplIa4KIf2MFp2ijy57g8vbYi3U Y+tb90dGbeYblJphJkfFPmzyUYdSGAJzXDVoHoLFxhefsll+ssqWWhMSxUjrXMQ3+UMn D7lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=QZBBYz7frMbZ0pOumfQFgqMbtBu/PYeTiKMZl7Egvam686ccf4Nz8T1A04lEColxCd wY6AggfR/R2OoB9IvazUNIQxe3aeqpmzBxw73F5UVcXRKbq4YQrlZ1tRi38+rlTY3EUK QPQjIa9b6NkRhwphak7cn2gFKxPaYWes56N2dsGD763u5sgiy9WLRNkBs2eXFktdUtn7 wddeC/rPzL7cV1bj9kcl0V0kuWgJ6DuYE7d+S8d39FxyjmERwz6nRuIswcAErtY185h8 K7/MEbDAyRef4MoNHl3+iRE+1KkCTAJUkolJO67oYeSGn7HJv86P/XOb2o3Igi+ao+lU unuA== X-Gm-Message-State: AOAM530ngOkSET8YmIXEcAsWkInwcGDHclcPENuWyMgGzrO8h9CyCDYe DKdAOxeW4lk1d3mvb447pnY= X-Google-Smtp-Source: ABdhPJwnkTVr3Q5tfhwJAThC97GfrX/zgjVO/4WH4iNbP6APdWExLamuKJQNfVdce6hy6ShO5G9pOQ== X-Received: by 2002:a1c:e915:: with SMTP id q21mr1062231wmc.180.1632476509956; Fri, 24 Sep 2021 02:41:49 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov Subject: [PATCH v6 38/40] target/xtensa: Restrict has_work() handler to sysemu Date: Fri, 24 Sep 2021 11:38:45 +0200 Message-Id: <20210924093847.1014331-39-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476512196100002 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/xtensa/cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index c1cbd03595e..5cb19a88819 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -43,18 +43,17 @@ static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#ifndef CONFIG_USER_ONLY + static bool xtensa_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY XtensaCPU *cpu =3D XTENSA_CPU(cs); =20 return !cpu->env.runstall && cpu->env.pending_irq_level; -#else - return true; -#endif } =20 -#ifdef CONFIG_USER_ONLY +#else /* CONFIG_USER_ONLY*/ + static bool abi_call0; =20 void xtensa_set_abi_call0(void) @@ -66,7 +65,8 @@ bool xtensa_abi_call0(void) { return abi_call0; } -#endif + +#endif /* CONFIG_USER_ONLY */ =20 static void xtensa_cpu_reset(DeviceState *dev) { @@ -196,6 +196,7 @@ static const struct TCGCPUOps xtensa_tcg_ops =3D { .debug_excp_handler =3D xtensa_breakpoint_handler, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D xtensa_cpu_has_work, .cpu_exec_interrupt =3D xtensa_cpu_exec_interrupt, .do_interrupt =3D xtensa_cpu_do_interrupt, .do_transaction_failed =3D xtensa_cpu_do_transaction_failed, @@ -215,7 +216,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void= *data) device_class_set_parent_reset(dc, xtensa_cpu_reset, &xcc->parent_reset= ); =20 cc->class_by_name =3D xtensa_cpu_class_by_name; - cc->has_work =3D xtensa_cpu_has_work; cc->dump_state =3D xtensa_cpu_dump_state; cc->set_pc =3D xtensa_cpu_set_pc; cc->gdb_read_register =3D xtensa_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476516; cv=none; d=zohomail.com; s=zohoarc; b=EWgsC8DcfcABHfyrAHWRiyNtVHadfz43aAj4cTh1peop48NisqOzt33Y0ls94JHY7oAJsAl3pTK/zDTxbp9BjkUTFdjIbiN5UrgTGTH2tIs8FN2Tb9MayRgRf3iRvZk2m0XDAZjSxn1cobW22tod9791xvUiPLO0QgK1c8zf93E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476516; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=dA6VrNH6b+sIdkRkxuZtyKxn1xfbiOqi5Od0ehzWmamcw8IU+K0lcMNMh57WUYprxQuIZAesF5zpx/1cjac38Vdaz/k4mxV75eGAoWDnmU3augle0lr72/4Zcdk+9gm4VHwhyos5WPEuG3t9UmVtc1zRPw/Co0FMUqm/akd/H0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1632476516525349.2745997263238; Fri, 24 Sep 2021 02:41:56 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id d6so25391591wrc.11 for ; Fri, 24 Sep 2021 02:41:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i67sm9220524wmi.41.2021.09.24.02.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=nrI+Wi5nhIdxAJ3i1HND91Xx//nMUpPaDkD4GsfEPgEfTnS4R+MN/5em3jlcTu4ohY iqJqzOrQxR9VcbhxYjd06ihV9qy0EoGep35c0ayMsWLTAjyDS2K8prE1ZZvME9lFhdU4 /wI1iQ0zKnVU0Vv9Wy0y0WmHNjCeKNpdYlxaDad/vp6kyJKOmkccNlRWPB/toN50NvMm r8sxxJrh5Qdq61qpGTJZkk/V8/bNtdtHd0v8jJdivkrioOu1A6y2wfnttH8onFJ2dK7k Xc2kROnMVzDSHa/KQ+B36fFMDDE/7GlPu4SAiSHtGb8dRI9eliy6T1PCKkBO/sNNme39 t3Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=xFLUsG71NCpT+aSzNKo+c59Vc7Fj6tZZg7YnMK/dOB0T+c/ZlsO9q0/Hu5DYmvJkih m3YHd1QlxZByua9fbQcy3zG55dJkdOQ8VMb+YcI/L1enI8YolJjq2zzzOwchIil2bymI KagP4bA7ux87u91J1r76DUxEJQMZO7Nm08s6Myz5KtEGIXc3Lflyj6KQYWcXgFS103M7 LaKjBTTulGfR9WqWclht7cbCKEa6C0XWF5i0IgmsBtIJ+Kfd0OPU9EwL3VJ1KR2G93dS 0/6Phkl8ncqR73G7mFzkO8+CgjpsFSDXXpEKYW3Xa5naxs5VVe2pQeUx/PamYhwGh0dr 8ftQ== X-Gm-Message-State: AOAM533mH/3OFfnREsehL9bkus95vw14Oq6C68STp05/IshWALH+eRGJ i4Wf/REcDjgVh08LuzEPMcw= X-Google-Smtp-Source: ABdhPJz9tKPYztfReNR/f4qcvNF3lXMz5l1eh+YRosHTqsiiXY9RK89YXOnvDDVKxyzsvjrI3kAVXw== X-Received: by 2002:a1c:23cb:: with SMTP id j194mr1049741wmj.1.1632476514649; Fri, 24 Sep 2021 02:41:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v6 39/40] accel/tcg: Remove CPUClass::has_work() Date: Fri, 24 Sep 2021 11:38:46 +0200 Message-Id: <20210924093847.1014331-40-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476518549100003 Now that all TCG targets converted their CPUClass::has_work() handler to a TCGCPUOps::has_work() one, we can remove has_work from CPUClass. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 2 -- accel/tcg/tcg-accel-ops.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 114eb3b9b2c..c64709b898c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -89,7 +89,6 @@ struct SysemuCPUOps; * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. Only used by T= CG. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID. @@ -132,7 +131,6 @@ struct CPUClass { void (*parse_features)(const char *typename, char *str, Error **errp); =20 int reset_dump_flags; - bool (*has_work)(CPUState *cpu); int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); void (*dump_state)(CPUState *cpu, FILE *, int flags); diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index cd44bb6d0d8..3c75ed2cccc 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -78,9 +78,6 @@ static bool tcg_cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - if (cc->has_work) { - return cc->has_work(cpu); - } if (cc->tcg_ops->has_work) { return cc->tcg_ops->has_work(cpu); } --=20 2.31.1 From nobody Fri May 17 10:34:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632476521; cv=none; d=zohomail.com; s=zohoarc; b=kJjlOFLtIZ/0A4Ix8l4SbDcNXJiFw8ae3X5+sjKjXurkummUWVWLa2fl43debGbJbCdNtwusqERKE3JbvGwyV8XRlHE7Wh7WApIvliVNrk+VItsvTCmsEQLeru15DTMxiIg26zzykGL6W/IG5VFcCEZ0UGeSEDDymxYDIzuZqXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476521; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lsD8NWGZdgfbGQhaRvFJOuKgMHvFJkt23n3sZARQWU8=; b=nOYpDxmq4m2V4g7DLoiq8TZTapNHPz1MjSdqxkvsD95EMC1HYEo9EbmOw+E5jDBqdKkVVpPGATvYfcSVb0eIZjvhxZTGwVtUfypbUwxulaCasX+vtau1ZD8ZgJ5417iiMQYfseHop9lznOlc6xvTZ6DC26q1jGLzcXBSSflHrfQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1632476521146261.82238485927655; Fri, 24 Sep 2021 02:42:01 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id t7so25390700wrw.13 for ; Fri, 24 Sep 2021 02:42:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y7sm5082791wrs.95.2021.09.24.02.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:41:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lsD8NWGZdgfbGQhaRvFJOuKgMHvFJkt23n3sZARQWU8=; b=UwDdJkXdPu+UwIOLG7cF1DpN08NOVjUXh5QxZO3b8BlxRdAye0OJz2hLqKgxw0ZKDG PzPuRnVN0Hcwvs9ZnlPJBOVuyUiE5Wibc1gFbRerxlFnnfoCR6m5gcEaRGIRw6flshnx eKifOQnMKcSSPap9xcmf4wa0TYhT3HsYptzq8553VGvUn4ZHNZlKA4MnxYoP9K5hQV7R lLE/TCBgRrYvCvnP6+FbiCLac7cjuVYnGRwe7QyKDzOhYCfBflTL06U6GT3YPkIwozTj Kp3qDVZS0fvkxnYKCFUI2Ya3nOV56tP3mPcK8INiJEdk+MEH85+SQXa14dlfdHNGLro3 Fycg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lsD8NWGZdgfbGQhaRvFJOuKgMHvFJkt23n3sZARQWU8=; b=Q64iuuFzTHdbfQGlfIpTNIl5zLg56oxIwhrF7IQtT49ah3ku/yV+dyOxqqXjFkfm/d w6hs9Zwa3Uql9kUYoVUhISGMvk56GdrVeBMG/Gq973vP+FZjBDK0bpqhcnLb+BPcDeXs pCB93OpwliMR1ETmJhr9nUxODFxBh47BtucrHhRDKsBRqbtu2g8CNrZoK+DGlTPTbZLC YlIIgeFIfjl/QlmDOeoxqLcf+kaJM3XPrbbUVahbzvrm9zMHz3kstiQSjY2/hwzj4l+3 54lnO6frBgaEF2972PLudPhZXq9CqbO6awIPBgJdn40VEE9vdMTCcu+hTMUiKjAK2268 tT4A== X-Gm-Message-State: AOAM530QszyOVgmnHXCwQizdWIt5CASkfyo9wRXvfskwJ5K89YECQHbM GPaIO8RiPtf+ZSTgJ2xyNJA= X-Google-Smtp-Source: ABdhPJwRCbd+wpqeirpoZIHuJdD3JA83d7V/aSnH6KC/kwAqhcT7iG/DayNhWUkLO3DFjrX2xrvT/A== X-Received: by 2002:adf:ecd2:: with SMTP id s18mr10164901wro.99.1632476519278; Fri, 24 Sep 2021 02:41:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 40/40] accel/tcg: Simplify tcg_cpu_has_work() Date: Fri, 24 Sep 2021 11:38:47 +0200 Message-Id: <20210924093847.1014331-41-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476522821100001 All TCG targets implement the TCGCPUOps::has_work() handler. We can remove the non-NULL handler check in tcg_cpu_has_work(). Add an assertion in tcg_exec_realizefn() for future TCG targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cpu-exec.c | 4 ++++ accel/tcg/tcg-accel-ops.c | 5 +---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 5fd1ed34222..18c20e5759b 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -993,6 +993,10 @@ void tcg_exec_realizefn(CPUState *cpu, Error **errp) CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 if (!tcg_target_initialized) { + /* Mandatory non-NULL handlers */ + g_assert(cc->tcg_ops->initialize); + g_assert(cc->tcg_ops->has_work); + cc->tcg_ops->initialize(); tcg_target_initialized =3D true; } diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 3c75ed2cccc..6cd32f04cb9 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -78,10 +78,7 @@ static bool tcg_cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - if (cc->tcg_ops->has_work) { - return cc->tcg_ops->has_work(cpu); - } - return false; + return cc->tcg_ops->has_work(cpu); } =20 /* mask must never be zero, except for A20 change call */ --=20 2.31.1