From nobody Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467659; cv=none; d=zohomail.com; s=zohoarc; b=NdNGi/Op/ZLGphyGZYOK768Na/1IFvgmePDzKrfVtXWJMNieoNX4AHhaMWO9eCESUDEzPrGhMKXsPcScCEyPeznNzxwMmn62WUSuZB4MmGWKC7AR3WALdJFWTK/RTyqWxI7TblGMetmDFysWdLvadMYThhip/397Ivu73VNZUwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467659; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hznr1enLR5pCymS6G0/T6ANjmCPH0tNvUkpSC3Ehl/E=; b=Jk5ebe1wJXJLH+8blySud4u9HI7RRtyfYxPd5l1WkA1GHBApanAlBiC6TKwnOlfgs6kUxt1cQckBnXG3DjmDcADjSy97vtjKC0c/+g0LP1tUZZPHCUVZlYwd+7DNejLqw6E7wzv7QXz5wpz+8SrPQ6+bBFBT+AVDvksoYiW4SIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1631467659718256.81125648157285; Sun, 12 Sep 2021 10:27:39 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id y132so4955187wmc.1 for ; Sun, 12 Sep 2021 10:27:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id n7sm1430516wms.18.2021.09.12.10.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:27:37 -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=Hznr1enLR5pCymS6G0/T6ANjmCPH0tNvUkpSC3Ehl/E=; b=im7Mnn+qOc9w2X0y+rTgrRRxw3YfVjnoeZDKdxVNqh4fqJArT2dNnBQU49rCYZrBLn JSU5ZFHuu7xeAIAB1+NbpE/EtMlmSDK4lc9C+rd3srntEjM0PHgBH1KiTtbH9UI9zAU3 lMd8KpuIujlBVc7fVTTdJV42GluD9I6dcyC7xxkGcGJxj3AGpDL4aRQw7fHb+5Wc9PkP q/OM40baSuwX85y6NOnbddDF7YVougk76zYchTpAYTia2whaMq6R0UcQOoIJqHbHCQOr h95z3L2RuPF+7AMTPBZDWmw5aX+HakfYDdBCuxRXbrrMqJExeNXAIQU0PDDptSXj30iR t4fA== 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=Hznr1enLR5pCymS6G0/T6ANjmCPH0tNvUkpSC3Ehl/E=; b=xQIc5c60EVoJbFiK4MTdnUwlAhZAoJ+xDzpPranwLhd5sv7AM10c41MMHk7gm5qgl+ oYMZjkme0tKPRF4/65oJ92XmET20rQBE45CXngJlwPhhu5S8z0E+eHPdIsk4h6/0lz1Z Y134/DYMctPV0vSJ009hc3iiDAv7WKRkirhUnHF3bu8h2xqB4yc/Nb3NmEhM+zluKroN jAe9b7HrRnVRFF5Qwys01BY/YuTkTOjWKtEmeFoFpb909riUgdLv/vFHopXc168eONhX AYa5sVOk9fAfwvVVCPWnaeO6W8h32cZNgACBX4bm0Z8QvrENLRBIBQb8UkP3DJTFFrsf lYDA== X-Gm-Message-State: AOAM530j1aCpQ+Wn5f3La7OSgA8SK9JkJwYZokJdWHT0IOLPyUsSPv/G 37RbrWHjooEU8de2s7ZT7k0= X-Google-Smtp-Source: ABdhPJxssmu7BFSNldHZup/ECLEMfAWqoFnDzjEi30v4Uz2DBrgfIpNZ4Sv/X+MQ2jWwelUZDaZFzw== X-Received: by 2002:a1c:a94a:: with SMTP id s71mr3428443wme.32.1631467658043; Sun, 12 Sep 2021 10:27:38 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 01/30] accel/tcg: Restrict cpu_handle_halt() to sysemu Date: Sun, 12 Sep 2021 19:27:02 +0200 Message-Id: <20210912172731.789788-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467661930100001 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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- v4: Reduce ifdef'ry to cpu_handle_halt (rth) --- 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 Wed May 1 21:12:03 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=1631467664; cv=none; d=zohomail.com; s=zohoarc; b=Y+YZrqGeKq/9+7fcUfN2nVRND66hb03jyACd/N36vd86L61+yaHKgK1YR3UUyKJ29SvwiT7H5wkDT5Hj/RTqTQDoXnjjtRHfNiFGVy2cR+TyLEG7jmN3/F/TWv/BFLQDdH4Mehk1LuSmjz5S7/Ir5DImTIq2CoqDY9/0PPCexJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467664; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=I3zG00PPuftr93vEqsoryax2UtjDJnr+ztQ1gV30Dpe/+eWzphyLCC98OvSKRmMPYPACAbGaH6va6MttgPtkt5MJ0kNHA1M/23HXzuUbHBpwvMNg2x4bi8u1xDoHCCRVrwzsJL98YWansN6rLrybYgQSghAvBaKEYde5B0Q14wc= 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 1631467664854733.870543055453; Sun, 12 Sep 2021 10:27:44 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id u15so4871423wru.6 for ; Sun, 12 Sep 2021 10:27:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id z5sm4702133wmf.33.2021.09.12.10.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:27:42 -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=JixNNMDnQWkfEOitzmixTeIfAnZe0sufCngbXzLetQsRYaCAKjzIxRyO31pVI14lKE g7ftKDJ3zu92O2KtDcQgXmrK6RvW8NBihJzT4cB834ZEN+7zEVK+WzWTJssM6yX9g5fz auYyfhL9e0Q4A4gwXIG5tfyP/L6QLt86KsB5msdJlF7iLYhPgNuZvFSRwQuT7rdiTx0D h1vZSVfmexa2eIdD2ZaQvM2fJa8gIcpJRX4SUGs/W+k4KfXIuVQ499JcXYoMXLo34ws3 YAMH9ZeL7j3Rox6kw5srQICVp9Qnyc2AUUP3V8xQkhQRlXePVYVqc4o/kygKhBRnJyou A+wg== 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=fYaCzK4d3irxysGZyKDEy37GP/j16QLm9VzPITkJ/0EExi4feL9Dk1QUx0gbDz0nq7 sQR35jYJIT1oUSVzCJLGYUaxWpiXzF0DlNeoGLbpexu7jHuTJJedgMPG+ft8eRMY1Ge4 Z1f36uMOuFeZKhth8HGTMM/v8fZLgWHUfhdkSmvIRh91WeK4YmKW/egEpTsFG79JLZIK JaD+0gGCx3xG/AaxU40d0AWxga409bMNWpnGReFxbgyD61bBo384Ew8x136OquvrFK5Q 76MvkbKKqThLHHo/EKv6jYrYdF6sXsJJ7symm17ImLWJCcKjWULxNhuhZr0ChnC9H+mq 2izg== X-Gm-Message-State: AOAM533VYRse3KpglGHSCyIfAuNqXtQGZu7c7i0Pusp5340bojv09FDT MvIVzeymV2DjnXV3snkpvCA= X-Google-Smtp-Source: ABdhPJz1t0gM78HeLwEXxugyzTvm6uWuK41P4y8OW7ReirZHWuFzlUAR/q1JSQQRRXmMWfbHdwiolg== X-Received: by 2002:adf:90cc:: with SMTP id i70mr8361547wri.408.1631467663011; Sun, 12 Sep 2021 10:27:43 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 02/30] hw/core: Restrict cpu_has_work() to sysemu Date: Sun, 12 Sep 2021 19:27:03 +0200 Message-Id: <20210912172731.789788-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467666135100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467669; cv=none; d=zohomail.com; s=zohoarc; b=K8BmD34JSrGikEsUDoLyUWZrBuNbC4uvtsEsYOG1tSc4a7xiLp5y0HmGuoAg9K/GVERBHUI5pKSixJ/spmKhjCsr7tzf6fk2ZWOjXf85WnPmGQ9lIfUx/i8Egl2aPfCzF0xE2lpuEfZ6i4hrdAP0iSKBRrnVCtlQ/OkULGj0y9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vx2dmg3HFxd0D29HGrTm+o8SOv+3wRTwCa15ndCgeUM=; b=B6n4KU5p09f1Cp3+nRhfzU7SATHhZGrXvYvWXqct3pqRDAb4kumuTpDuHu+PpPpxstBmFRYy4/0c7joJCNLWsI8wY/KPwFWRZc9oMStKTLVjBd1ipYhjqnHxf7lE8nzcgb/ZUtH56zmNoTtpfGQaksSP1G9jZhKzjbjGWeW06BA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1631467669844661.173412631976; Sun, 12 Sep 2021 10:27:49 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id i23so10925100wrb.2 for ; Sun, 12 Sep 2021 10:27:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id o8sm3181727wrm.9.2021.09.12.10.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:27:47 -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=Vx2dmg3HFxd0D29HGrTm+o8SOv+3wRTwCa15ndCgeUM=; b=CdpGLLLIauIILzY+gDflOxH0zd8W+Y/c1l3T5g4yp+yg/x2QzLuOp1KFHHzzyHzxsu 6wy7y2EPe/KFYFraPRIWj8rWiv/8tCOZ2inzIJ3mHjB9x3269uGsrdTSaQWIfjMAR0J6 KIj1ueOgOQ59PN0qziIK8XTV95TmpOqnX/oMmkpFQCWEqlcOx7stePNme7Gl5RBChZOr jlymxg7fyy5NHye/09IuGoW46ta5TZnD+Bh1glPJaCKLB/cZCXLf0tp1HBTQ6GySTf0x CwvGiIS2BPys+jcyAhVHJNiWdVz6vkgZ1j3F8hJe8Afk4excQOFgXWUuGZLWW6Zey7zD FeYQ== 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=Vx2dmg3HFxd0D29HGrTm+o8SOv+3wRTwCa15ndCgeUM=; b=ifqNQDLbMLWGIkYWmtE2dmhDED7oB6DgJWHeE7gtVP4oKh9iW2X/IYT/jvxXEKNc65 U8eqQQlZ8jFCes75ZrUl14/JYob5NPJYSsNzr96mpiPQtjLDNbWir7tSzqcToQkFeITK tOuFsmCFuyMhqPjgKKwHn5wqAzl0I5PTJAQII4KrTyIDxCTKqQLujNLq5pDgRSC7uWK5 sYIvg5SJdPtTg48nBdvTZECf7wUSaBiitk9qTUc64X7SjHxJhrb0SvBNzH4MljU5opqt aK0VpEYaNqpOKxJ3m9dm7Y0E6kU6Iy3w9qoMFVK3hWGWCtX1ihhfWI80rWVsxjFFKHw6 eMrg== X-Gm-Message-State: AOAM533W8aO1rvrudb44JVMT+fmUUJPkZADPQ0fubAypnU2YH7D3vBtL /lScd8l1aA0m/+4jbKwDrV6P9xFojGk= X-Google-Smtp-Source: ABdhPJxMI5P1nRhl2s2UG4W304VZTmV90blCJfu6rQCk8SxbpEUw0FjwdYEeJwK1sCMnSxuFiUBHsg== X-Received: by 2002:adf:eb81:: with SMTP id t1mr8574084wrn.245.1631467667988; Sun, 12 Sep 2021 10:27:47 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 03/30] hw/core: Un-inline cpu_has_work() Date: Sun, 12 Sep 2021 19:27:04 +0200 Message-Id: <20210912172731.789788-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467670277100001 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 071085f840b..7e2cb2c571b 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467674; cv=none; d=zohomail.com; s=zohoarc; b=b8Q0HdIbm8eWdPC9U5//Vg+QC0MF/5qlCC2sMZAFuuXRv+nah78azWdDAOZrEX3XACp6CXspdPnzvhpa0hwx4AemyLCwMSqCOwD8RD86ELoBFQBksGjLPnzdgEn15n+51PrEZ1b3nnqW5RxP6iPMZf1juwsPnzu/u/QLK7v37xo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467674; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iF+BUQdpUBLOExjcgfnC9NPPhj36bSjul81IxTvt2js=; b=YfApM/1nFnXVEstrZUpBv6DCCN7pVKxL5d1gnGCUprt3l15/7K88Ih2pp0mY28G+VxBF8RXjmvNG9Pjn0VX0enuYMQ6e8/W68KgXnyfGhiIlLdDEP9qGQgKQnB3WAmQMCDKWNTOfMVUczYaSJ/08yOfmLrHDgEsky7DPqI+YU9A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1631467674764897.1711916782502; Sun, 12 Sep 2021 10:27:54 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id n7-20020a05600c3b8700b002f8ca941d89so4971888wms.2 for ; Sun, 12 Sep 2021 10:27:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id s24sm4510797wmh.34.2021.09.12.10.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:27:52 -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=iF+BUQdpUBLOExjcgfnC9NPPhj36bSjul81IxTvt2js=; b=hSZtuSplvRjYXLF1yzhj9cjdxRlSfPrekdGiG09GjIsSKcN3YdbEpDFrE1tIJN1+l3 ABxiRFpNC6E27dVfIqAneQm0C4yuM2V4MHTHdd0RjBuQDOA5GijQ6TLs7Vq16ynq6WMI d2mC2/9jyCsWT3lxn9ZSuLrSw9enT5H/8EA20o8skiHzI754qW1f0QlYqXkjXF26BLaV Ve5IFKKc1TBzRqRXp+tgtyNsigq1xJhCJ3JjkOh0TutaRZ6WBB7qiusrXv7vuohg+KUq ZXQoxu0Xj5oVzX60SjBJAdpOSk6QxAntVX+k2u3QStP7VOc3a/eOHY5tVMvLrqM/YI/G ONuA== 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=iF+BUQdpUBLOExjcgfnC9NPPhj36bSjul81IxTvt2js=; b=CrfSEYmg9zBH7vyWzsyjlvx7NP5uIbGBzoNtuyhS1e3qEGXENn5rGg1v85FKjSldRS BAdb/JuA41to2lAdBNu/Cr0txX8sjPzOurnShDirZCkqVZJPSxu/lpGWf1lmeolHzVeq iWppL3/i5o2ugEop35v9650OMyyIN9ZqCe8qhKKpsPFYoPCdw2W9OuZak1CJwMXrurFu k926jiY5fE+k3UB2jyeqk7Aa9pqEPzKlTE5qPvG2jWi2YJar4bfg6kF/L2OGNtK54fAn qd0lRJzIjMz6DB/Ix7PYp2ZyzYToCLLYCLfIS65aDF+K76BwU9YABEq9uH/U53dlfPq1 GHng== X-Gm-Message-State: AOAM533TdWsoS6K2AnHRLmWXuPr6TIDfGW2cVqmICfHNekhHv088YH2J ntyPY3mTd1r7IOhvto/oYsA= X-Google-Smtp-Source: ABdhPJw09MOwyJfxQabRzE5VdDnCL1hJpIP3tqXjCQYn1TAcIdztxCVmTlKrua2IlA3wqa71AWiP2g== X-Received: by 2002:a7b:cc07:: with SMTP id f7mr7588981wmh.145.1631467673096; Sun, 12 Sep 2021 10:27:53 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 04/30] sysemu: Introduce AccelOpsClass::has_work() Date: Sun, 12 Sep 2021 19:27:05 +0200 Message-Id: <20210912172731.789788-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467676379100001 Introduce an accelerator-specific has_work() handler. Eventually call it from cpu_has_work(). Reviewed-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 7e2cb2c571b..2a61dfd6287 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,6 +255,9 @@ bool cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 + if (cpus_accel->has_work) { + return cpus_accel->has_work(cpu); + } g_assert(cc->has_work); return cc->has_work(cpu); } --=20 2.31.1 From nobody Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467679; cv=none; d=zohomail.com; s=zohoarc; b=Wwy7qJ37e+zBBDrgP50K6cIKDBNvCWh86G7PlJQzlDMuefj+gD00widmDCw8KjFVxuMehO/a52JaE1PLkMkYYMCdPSFDCey/CVYT7eTk+LUsuuCF3a396cCCQTU9wT3ptD1E6BMk5jGj7QC1c6b76vqLLKuKN4Qj+kshhITuTP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467679; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TDL/s5qp2PZchCaLgZDHqquPt+pAQfMwmIRobGZzfuA=; b=VWZ7v8oNveSSkoTzuau1KhliA42cdLK/WJH6bHw0PrsfUyc8DeJcqidoxyS4xWIJ6GTyb2dMLZQjcNQfQKoQ9TkDJeVfXvnirCl1lc345D4DJk9z0H+u0bp48W6BkVbnNgE8OUb8LeBPvyI453D9Adl4/Wd0rz9nwwjKrny7IR8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1631467679578747.5312767295184; Sun, 12 Sep 2021 10:27:59 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id g128so512863wma.5 for ; Sun, 12 Sep 2021 10:27:59 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id i20sm4678954wml.37.2021.09.12.10.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:27:57 -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=TDL/s5qp2PZchCaLgZDHqquPt+pAQfMwmIRobGZzfuA=; b=XFs74/EaPkrJZju9ypeG4+JmS4NDvULBYQfp/czFrtDW1nGjV3dWbktI/OV7gEWT3y MFYWJMb08la+fUfOC6YyazfG2kj3Q2DVUAEYzvN8d4hs72s2ED939Si7bHZ0dA3eQi2u DT1LrA68uQnBfXd3bmqecbCuMmwRl4AsoHXDSh8JsEWg4QrKE1Z+Ypi2xxqzpXBUIb4/ sWqj7qVmDFgQ3+kPDWm6yOkZdfqZnbXJYP3OoDHMNWmhIlQZGcf83wj/16Fg3aVPUoGq 12B3la3pPS/MMv3D4RrIrWQZcXYM2Gyi+FL3lNiWWBTdUPimdJYfaPyuD/2aA/L4+XJ/ MZOQ== 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=TDL/s5qp2PZchCaLgZDHqquPt+pAQfMwmIRobGZzfuA=; b=qloJ7bu2b6w+Tb7h3+y3vtUEofmPuIls4bLji1UyFsx5X2oLdMDqxPvvnc9cqYFOSZ tzW/kyPGBiTN7FYVkw+q3LR7oCPlakOA/YCheFBiITlapHQTjnPS9N1KAxUbWmPxwc0b ju2jY3yxpzesn3OCgY1+T0HaKMhhc0Uq3eO2xIdYVsnuofujAnFCtRaiRPiT8QrKSGMa 94xFwVEBPLFk7kNwWBGMuD5tSFQ1SmWi/HwyOHvgxjUc1k7wxWBsuQ7DVQZY+cwMbnqU oog707DP4tc8gKpBMd9qZU/8o6CQXMHzpo8zrLjqZNlPdOs086IN7JEn3uORgaogfNJx zJSg== X-Gm-Message-State: AOAM532fWKJedEel8vpW+zhX6LKXaxX3/sP5uqifPm0zXVZ6s7m97vDm D0X+wvA3j4GiJlfRT8CymC4= X-Google-Smtp-Source: ABdhPJxpZhfsNSiPeixZlQX7ap3xwv5gY78wg3wxwdMplzd1e+jhv9xiLwqik9gnZf3UeEEXPlY5EA== X-Received: by 2002:a1c:4d7:: with SMTP id 206mr6137563wme.158.1631467677873; Sun, 12 Sep 2021 10:27:57 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 05/30] accel/kvm: Implement AccelOpsClass::has_work() Date: Sun, 12 Sep 2021 19:27:06 +0200 Message-Id: <20210912172731.789788-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467680829100001 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 2a61dfd6287..3db7bd4eb4d 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 Wed May 1 21:12:03 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=1631467684; cv=none; d=zohomail.com; s=zohoarc; b=ZcyTunkEnJwxg4loGR1ad3KlqF0n3o4l1KPINgKkiKxlL8CVeWFUov2kD0XjhzrQkwVi6RQTiFGpx8WL8pww2Sf/Xn5FvYf6ItWBxFzrDgcecLXnCuY0Rj53GNKige6iWUCFaBXi3vv6MRpFkNzzzrT81O2/7ccQBu2g5UeEBvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467684; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WTlRxPmHW1MMBzxLKQbK3V9oXhvEdGh1iTdPd/VuorU=; b=jxvyuKvDd6D8qIelxrgCks61IIV7s5BG6OjWDZpOS4P+r1DX3+mEt34YK6r2w2TF/vLs6yJkx0b87ElojHzQq+QruCOHkaVXmdj79d4Yxw03suB4A5yqNFtOko9CS4kHczYvdapJexTQHBo6hOfGpadMGSWtrsB3GaEyI7jPfSA= 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 1631467684667802.6327943449496; Sun, 12 Sep 2021 10:28:04 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id w29so10161793wra.8 for ; Sun, 12 Sep 2021 10:28:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id n26sm2872141wmi.43.2021.09.12.10.28.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28:02 -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=WTlRxPmHW1MMBzxLKQbK3V9oXhvEdGh1iTdPd/VuorU=; b=DhYgYpEAEWJcnaaKKWlUEGAGFTdtbCfP9xsTmf9HzAfGe5hEtahL57cWM6F8YCBt1f Lu7jrYAL5ZMRxevRYG71IYREH3fzlMDtaZvj42jZZxmqbECY/V2ePRuDRoGUaAK56nFT UW+ecqqg3OV8WoWAPhVJT11Rx8G+TnRAfQGdsUxdOFMpfkImlx8WUM+Lgg+wdg7VraC2 KOkY3FJcfztorlRTkWLqqFO4mFcliVn/W4oVrowA7vz5P5LwQFq6ZIgYgH+nE9S0l1RF fkeNp37IzfvOIPcwM4TwcyRHyYVUPIhFPw+W9/6TpSr1nynwbNVfBbG7Tnp1dFgzOtmB h0fQ== 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=WTlRxPmHW1MMBzxLKQbK3V9oXhvEdGh1iTdPd/VuorU=; b=70AIK1wQsnBX3sqdxhchvJyfMlM6gV2AGGFygXLBczQADXH5Vn6ZOTz4bbIfMKhFGb KYShhXvRz50Gp1PSRRiPjmj/ldPlxhE/YdLAlO46u8uiDuKPpcGfAVs3nAA+6S7fNAH8 xxAiw2Y4CQECEWN99C6aNiPWg4TfCVdRRuNQWGYG+SqXvZft+tzmxm3ybi/Cmp0z1tYP 8ERWTmZe8G/qtHiAozdCk+e/5KUE4EnvN89ZeZL7f022MIaxOYfKp9eS5sUDNnp/Qlmd d6/svgNK1RjvUghvbCzMaQq7fJ/SWR12/SmRG9cRKIi864b5LUmnjCpGvMgalEkrwkjF MHKA== X-Gm-Message-State: AOAM530Xld+ynSOUAZJHDSGXWnMzaG4Q0sZ/4Y5BrFzZNba2f7oyllEx fRSWotIKZ6KUB7wRcxJwoLU= X-Google-Smtp-Source: ABdhPJzV4478kF6HL6N3eMFNnVx/0ZGwoc+WwakP9h3V+WNiSG+Jpd9ENWLBwzg9c1dpGPhqRXFVDw== X-Received: by 2002:adf:fd12:: with SMTP id e18mr4291840wrr.275.1631467682937; Sun, 12 Sep 2021 10:28:02 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 06/30] accel/whpx: Implement AccelOpsClass::has_work() Date: Sun, 12 Sep 2021 19:27:07 +0200 Message-Id: <20210912172731.789788-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467685328100001 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 3db7bd4eb4d..6bce52ce561 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467689; cv=none; d=zohomail.com; s=zohoarc; b=Jsa00j+5nq6TlP6amrDHpuFKeDGhpmcRA2sexPZg8UpBD3ihzdlNENeu6R7p8sH9yR6bOHEN63zhMfRQxnstq/eK8JtWiEsCJyqd7/c2ubF4DVjAZWI+SUtZODRyBJTsFlelz4uIyDy4PUxWe0uwoeIPWWkmGJD7SFu5zraVzmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467689; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=a7Y84GjBIOXaobwPAnyM5v47r6rmRAo5JoQfnDKuPME=; b=Qz+MpN5z0L2UN75ygZq9fq0r034YADmigcaQl8WQ+L5hC6uO0EQHzBtaEi0vAkke2HyJxQOdenA2DWI2IWHs245W6kBOhUR9KKI0w+0qdy2oaUhUwGFEpZnXyLibEoZtnKCMBiZKq2Dk1C/hH5eUV4Mvf0ateMz9Ya/tIkBDCww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1631467689563558.711884482941; Sun, 12 Sep 2021 10:28:09 -0700 (PDT) Received: by mail-wm1-f53.google.com with SMTP id r128-20020a1c4486000000b003065f0bc631so582980wma.0 for ; Sun, 12 Sep 2021 10:28:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id e2sm5101013wra.40.2021.09.12.10.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=a7Y84GjBIOXaobwPAnyM5v47r6rmRAo5JoQfnDKuPME=; b=Hcq3YF+xgLui5Pkp95g4yK1q3VK+LJzsZ5yQ33zO0qAEURBeruHeXbkiza2MH9b3+Y oy5iFfRMuo6a9gl8gMQUrS/BECNwvYIfejNgPleuOUH7CbGNcjtuhlp0S/bL1OYQDc4Y Js2A3GNAMx7qRpC2XLvJh3ncg//tB4eyRIJvVcxthMYsJg07rJUVYxPRmW1zFUWHqR8x Xa1pyYaALHXwykI9Xn48o4Jpkh5g8CJMDf9Sb5nb4HMgAyIPEocEH89J2Qn29nmBX5bE IMTgC+eVlyp7/ZNdo0p4JV0ayzyP+6o3aQX6vizcsaqDsRLPVidhurX5Y8aUv1WqsQwc RJeA== 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=a7Y84GjBIOXaobwPAnyM5v47r6rmRAo5JoQfnDKuPME=; b=ugfXCqu8uQrPvX12AlIuIrDI5YQkGXJzGrf6+bpzHCqnNsrmZIamrOgbjW/DMB9GUU A/ez7eGskjCQW9os23o7e8dhOt53UhOfY754m9eA/1V1SUk50tMoNGwll9qXheuTYh0h Ns8oOgkx07X1vRlmoaCvkULpgVZ+kZVt2eke7wQxr1g4Q2C37LiM79of0AY7reDjeZS0 +XpHDrgRnXcZD8j9HPSvQ8Hhs8kE/qhGILX5iFDe53RNxstun5Gr5kiolTgJwj2FOa+C PiinkZ2Axi72uI9Q62EAROVRZTVY+xgUDB1FM7S5YyY/r5WFDqLYZ0w5uKGWShXGgyp2 SWcA== X-Gm-Message-State: AOAM530kvUhXwg0Y3jY+w8n6JsWTTZFWkbxTovq3obddCogBICBYE1hV 8jub9kL0GDCua1w70eB0BOk= X-Google-Smtp-Source: ABdhPJwemlKqBYaENbh0o+98v3BT0/SKOGAk8a9iN70go86uaMSlpV7ldgOztaipbBAEyVueFzFDAg== X-Received: by 2002:a1c:a505:: with SMTP id o5mr7448404wme.32.1631467687839; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 07/30] accel/tcg: Implement AccelOpsClass::has_work() as stub Date: Sun, 12 Sep 2021 19:27:08 +0200 Message-Id: <20210912172731.789788-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467691063100001 Add TCG target-specific has_work() handler in TCGCPUOps, and add tcg_cpu_has_work() as AccelOpsClass has_work() implementation. Reviewed-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 | 12 ++++++++++++ 2 files changed, 16 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 1a8e8390bd6..ed4ebe735fe 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" @@ -73,6 +74,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->tcg_ops->has_work) { + return false; + } + return cc->tcg_ops->has_work(cpu); +} + /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { @@ -108,6 +119,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) --=20 2.31.1 From nobody Wed May 1 21:12:03 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=1631467694; cv=none; d=zohomail.com; s=zohoarc; b=XC2BTCEPztb6Q4O2mLNCub/YvKagWZigwZf0dFlPZ/QEYgbWm/IgzImrJgEW21NVagFMItKXr+SLEF5LMXLHWTJVJVtyJnk9V9VfgOxA5ACGWWS86KLsfN3HWltMD+FOV2gMMAt9Ta3fHkmhDZiCAtJSTKqW7Jq0xalAz6uBYDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467694; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oPh/K3P8lnOCu8w0iWaCapa14gPkR6lDKFebYBGUl3I=; b=FRWp4ZbNoTBlHBx01SuTtOxpnWZKdNOSpkVJ+haB8J4PCwx2wdmp7yixwzTEjgIGEG+dq8txX6gbI4Mtld2DsfxKShDaPzgFfqOsElBUmj7eONrK9GHWYNfe1ffHIMa+Kbv8zVniSaOqoq8UEw3uiZSCpo8ZPKmgxXqLM8trwjc= 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 1631467694448394.8514435004605; Sun, 12 Sep 2021 10:28:14 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id t8so5893139wrq.4 for ; Sun, 12 Sep 2021 10:28:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id o17sm4980427wrj.96.2021.09.12.10.28.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=oPh/K3P8lnOCu8w0iWaCapa14gPkR6lDKFebYBGUl3I=; b=dXJ4QYAvPZQbdHB4twjNThmx7FnJYGb3ffCVR7wYiISSF8+ue2qj3fRkWyM9ZXSEcQ WAfVNRF6DLFKdDJFJCctnySwM4Pe6QZe4H3nosbypAK+uiU8FxJoZ8qYzHTF/ZLWgMYy wMbEc7wvJZchCB6UDkFFl3t6dTz/newsCar0O6eCWZdAfE+LJPuZ4UMHWAziG/JRJu7E lvduJf5yIlPBtuRen4rgWFSj64Wm75QSaZcEhSEmr9By7CUoT24XrKvMLANN2wwNEAuq FS/GX47ipf++ijIxmfW8mUW5SPXlfFhm6gRxuPLz/XdpwBFc3nRRd+Oqf12byzRnF0q5 FWPg== 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=oPh/K3P8lnOCu8w0iWaCapa14gPkR6lDKFebYBGUl3I=; b=df4+llv95IUBJB0lJLjz4WOWKACmIBiJV3d/j299jBs1Nsx9DucQ+yXoE2ujOuQLSs B+e5p23mu2r3wWYwirB+uc1kE4N5lRe7I9/Kficb/U7Bv0ArZcUr9GhwMwPPhWDoGO+K /7CB9UoUa2mI8C+26hDOhCdFw1r6EfbqIOfbKrGYc3lM0yQbXQy1GR7GmgEru/Owq3ch HkdV2+cifhF2YusUbbDUEpJ0HlcSk0vLI0cRy0TmgyoxnQ3pGw0gZW0arpPsgE50t76S kWkZsXiS8ESdi5Rn1PXCRzAA82lk3yLDBDlT2N2MyI2JUL4E40LLFakUidpdp0WjDFMI nVeA== X-Gm-Message-State: AOAM530eP8PP2TEO1A3FZ9XK3Qxp98DzPrPH/Msvu+zhs2O5HjkNzaRi +UV9aVmDxtaB3tfqo5VeQOJtIXaQrYU= X-Google-Smtp-Source: ABdhPJxNRbH90H0I3CBE9cwVoCPxnsiiq/r935CJfxgwk82/8UcByK7xhi5NGN5U5Jeylo5eFXnzdA== X-Received: by 2002:adf:e408:: with SMTP id g8mr8433095wrm.138.1631467692734; Sun, 12 Sep 2021 10:28:12 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 08/30] target/alpha: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:09 +0200 Message-Id: <20210912172731.789788-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467695263100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 93e16a2ffb4..1ca601cac5b 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -33,6 +33,7 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool alpha_cpu_has_work(CPUState *cs) { /* Here we are checking to see if the CPU should wake up from HALT. @@ -47,6 +48,7 @@ static bool alpha_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_SMP | CPU_INTERRUPT_MCHK); } +#endif /* !CONFIG_USER_ONLY */ =20 static void alpha_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -221,6 +223,7 @@ static const struct TCGCPUOps alpha_tcg_ops =3D { .tlb_fill =3D alpha_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D alpha_cpu_has_work, .cpu_exec_interrupt =3D alpha_cpu_exec_interrupt, .do_interrupt =3D alpha_cpu_do_interrupt, .do_transaction_failed =3D alpha_cpu_do_transaction_failed, @@ -238,7 +241,6 @@ static void alpha_cpu_class_init(ObjectClass *oc, void = *data) &acc->parent_realize); =20 cc->class_by_name =3D alpha_cpu_class_by_name; - cc->has_work =3D alpha_cpu_has_work; cc->dump_state =3D alpha_cpu_dump_state; cc->set_pc =3D alpha_cpu_set_pc; cc->gdb_read_register =3D alpha_cpu_gdb_read_register; --=20 2.31.1 From nobody Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467699; cv=none; d=zohomail.com; s=zohoarc; b=KX2vJhiEN43VBXTiXBo5XyyiQg1dLwaEAYI3BBEwXkI1XG8VyWPtwUXFydYlSra80HeveGLOpx5BAehB4AzHRB9hJlsJkwqu1ncbrTfk+sq+cxE3fnDbBubJh3pKuQRGz4uCSor9o6A3gs0SGPT6A25wBW8snDf0v3s1PBzt+JA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467699; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fA/mjW9p1BsOqouWNrY0vh7vEglYSGEzqkX3xwPHGNg=; b=d8WoAC7fPXao7DVcbteLN/LCZY0xDafGakntcSIQXFW2vxlfmztz6U6ff8abvTTDSelElf4Wf02r4/ZGOLiIqp8lwl6mP9QY/5ZJORbfvLYBb9dqqJeV1mpSPtivBZNvLZ5J7hGD7zVWqwvk86yPd+twSU3dWrzUEQu128GIE5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1631467699364887.5548431597499; Sun, 12 Sep 2021 10:28:19 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id l18-20020a05600c4f1200b002f8cf606262so5253764wmq.1 for ; Sun, 12 Sep 2021 10:28:18 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id x21sm4585351wmi.15.2021.09.12.10.28.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=fA/mjW9p1BsOqouWNrY0vh7vEglYSGEzqkX3xwPHGNg=; b=mlRrzIuLNz51dWahU/z4mI5BUxWsxaWqJ3gP3dSMAiy1GWM1i2WDxXFxIsmkA6LmAj a0SqG0xnzSJ0+v5XykvnjKXh7299hu3YxxqIURc4cetIdAeWyw53raBhTS1gQ/LMcLwN JvtLny/KqpomjlSkt2TM2qfNtGaddVk4qYsTfA6jWrE95D7j308faJBj4cx63HlwvOD5 JpikrR05+ASVXRSeE/PgKC9Mb+K2fsrYdYwHkP1nv37mHRlbdU4Tq9cWpk4J1z1XKVnn KFXxPEaKLtv+phrzlbhHHwc62T9Y34ulgb3qHMRsp8rjg2cTMfJU3M3R46TX8M88TPIB SHTA== 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=fA/mjW9p1BsOqouWNrY0vh7vEglYSGEzqkX3xwPHGNg=; b=Z5/WwYU/JkgcpDH3Lbw6CBM4cbnO/+HaJ52alCZ+B7Zp8YLaPoYHGOMQp/7go4F/zV 6wuCM2b4g4e6Om5ih0x481i4Oyk7dzsrcik3PJ6/ELruvmA8Q7QFk6jTBVpU+gWKJBx+ yLtMfcm3sgA8VlIuGVpH3tetZcgtYyf+fOt7CVm/buCy9fZabDm22qg85tvNWP6PVyRb F1SV43n253rOge+bF5avf41DsY1adxU/em/8LI35qjmzDRTlj4Y0duCx76eEhtG8IN3M DO3qfOByA0uawozliB9wNlqrV3j465hci7WPma3qepkEJK0fPDbkZv0PgOFEtvnZo1OA SJzg== X-Gm-Message-State: AOAM533uA64WV5oqjgjwRlH60vPQIoXHuwII8jga0TPcc29wzBmZvaPj yoB3yYXKEaSlUBpzyMynd3E= X-Google-Smtp-Source: ABdhPJwnnH8LH0YxtV11SpIwd1kxUEoT9XnXdc5QPnibsWsPoxPZGdPHIk9veS9CrZAPu2GQdSSqcQ== X-Received: by 2002:a7b:c5d8:: with SMTP id n24mr7648288wmk.51.1631467697627; Sun, 12 Sep 2021 10:28:17 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 09/30] target/arm: Restrict has_work() handler to sysemu and TCG Date: Sun, 12 Sep 2021 19:27:10 +0200 Message-Id: <20210912172731.789788-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467701555100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ba0741b20e4..e11aa625a5f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -73,8 +73,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, env->regs[15] =3D tb->pc; } } -#endif /* CONFIG_TCG */ =20 +#ifndef CONFIG_USER_ONLY static bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); @@ -85,6 +85,9 @@ static 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) @@ -2017,6 +2020,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, @@ -2041,7 +2045,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; --=20 2.31.1 From nobody Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467704; cv=none; d=zohomail.com; s=zohoarc; b=bzdI8bplzuSktq247sudAffmvoDb8+UYlCmsbQIMOc1WbDKkr42YlEli85GHVYnR1wCqLQd7pkoVbq4gZKUBrVI18Y0QuJuZdIzpVs3QIMbrgxZna8teXvQt0MTvyAtUl6j62Jw9Ble4maIq1+tux718B9Et8N7pUm+lzQzQLs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467704; 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=hFU9a0jbH/8Ighuieu+SAUHOci+Bd8g4N5VNTdMtGIE2bZZYwlV8qxz3Nd+413YLMlT5QPogoFJnLUd34iN/upZZE6N2YId9EH6UKe0mhub2Ot+mZGe74raIC+ZtAY2IiE+blZMNFdQjyTvAwboC+Sfw6imJ+q2Pn1S1SF/A6bE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1631467704119998.9312917989173; Sun, 12 Sep 2021 10:28:24 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id r128-20020a1c4486000000b003065f0bc631so583234wma.0 for ; Sun, 12 Sep 2021 10:28:23 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id 129sm4622080wmz.26.2021.09.12.10.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=fvZ1raDWHNYEPHPuFsOUWYcKnAir3fmbXOYiWoV2B3kcccQ1ox2jIVUVV3yfMyvWyD E9e4T4+vMLesi+nZbYRKofmo+gYAaTGSVrIhAyLwK8VgV7ei1+bMLaf0dbjLgNr7lhAF cFYjyHSbWvKuYlXwE8pDUyxFK5G8qrXIMDxRkFq60AeU1+fnU4IdsDUs9wAWnCH5Rn1E xO7mnCApQun4+ZspwcoMd9Ugf7J7tF1+hsed/qkKx2YK1inl/p7L8pnG38RYt1iuLSo0 cN6Wst7UW0wzxyFfcX0jU0S9Afmz7yiSrtxI+yD4gk5qK95EKvjkTfxEeoZtvtsx+LNB RNFw== 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=IPg4FBjM0lbfzuSBZgFxVhdesncFTrc5sGsW0/zB5vxn4CtJuqK8XAxygZdhZOu9xQ dIMW6fB+5zD6P4Df9yONhsfEpyBaU+JFSncixcpTwHNWIHBI/agNyXd97fVZznbUGxhP FD2PFGEVhH2byCPieg6jEfTQDbcbbArxFt9ACDOMb1dgC2UNzjGt2PqVIIWblFjPJaq+ JHiHCtn8J2fVI39b54S9QbRj1ak9s0r1J4fmvsagG0N6KbZdsXuZoTtYsN/5fhToIw2+ jIQEoQ3sQFBJbm08zRqs/zrE58BzTjpnksTmn0dEPXlXiX+zSpDtLvzoIy3afsZIk7V6 rJNQ== X-Gm-Message-State: AOAM5309xL2vpX0Dho+3pD43og3aqaBdB/kwsTsMoVq/NQcRlccgLV0L hmyKp7mhM0V/2M0XKGALl3s= X-Google-Smtp-Source: ABdhPJxd2m/tBYqLU2IjQq7F1eibLzJWFITygbKLB1jlNJC7iRUjxN22RSZQkDwxFsda6+Yrtccszw== X-Received: by 2002:a1c:c913:: with SMTP id f19mr7478643wmb.86.1631467702370; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 10/30] target/avr: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:11 +0200 Message-Id: <20210912172731.789788-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467705633100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467708; cv=none; d=zohomail.com; s=zohoarc; b=S49IkJ3ZXuZvuiNX+1tITRRhef5teCmnpBGH5Z8Lo+5aEDnCIjGodEMyTEnShJfciierI79Cli7Uw0xQZGip5DmyHSVHt5YtvSUZD0Rj+G/SbWwad2fzmzg3NG/W6wxdL8wvuQ2CSB6JDu4X7xy8d0XTd/LnNP7L5WpX0f+YLfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467708; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o1rGC7I7DdHZjeGxBZmAxhMDDlThtUPhoVzy+nV6/U4=; b=BkywVK0jgj+C23FT+NGUZfmRtwEjg/+03Zt0THR5sJHoMWOPntJlPj0/dWa8s6kRFyOh+krLEaTAPpu3IEjpYfKtWl0/+fNkLqMVIR5qUIJUYkTazCV/gmRRxMZEJfPqpk9RaKsuIcu5qMxjPuguy/VCSkTqlT/XN/53vavlPJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1631467708780557.359386423309; Sun, 12 Sep 2021 10:28:28 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id g128so513378wma.5 for ; Sun, 12 Sep 2021 10:28:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id h16sm4993738wre.52.2021.09.12.10.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=o1rGC7I7DdHZjeGxBZmAxhMDDlThtUPhoVzy+nV6/U4=; b=DbW/WXyLdRj70PYJ7ine47jUWFZn/K0wyT7TuAj4psPMdVlYcfio/xcAzsR2JF5NYl Ff+XIVwzTGVkAq4o8hxbgtJLRqPFOToGVviPLAm96uN+cgc9QpH5KSVCI6FfLKn9Mf5j oDExiXQZwhzD8jsRY7s8yl2htzcZRC/RR+JveYDCmMdutwrSxsNcUOlrZObSo55dIkb9 fYbxqRdEYXKpv5snH1rQTBTi+mmLd6B2N9yhGlZyYyzOZ5vqbETnD9zE1AE6QTMsc5yn 24+g8DV20IPnApnzHEzox03PrfZC8z/1M+Fz1HC8WEwKt92XcybobxofgZIIO9mrOueq U2bA== 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=o1rGC7I7DdHZjeGxBZmAxhMDDlThtUPhoVzy+nV6/U4=; b=b1FmCV0cprskqUxhI6c6g3jQpOqA1PIIFi70CfSmFUtBQDz5gk6jQTFC95H1DLRnok Tu44qHe89oTDi62wrxNMeX2p2xNYrHop96J9kxreZqSWnbtjzK3chIh6m8h8Sd//u63G qjenQHUEXLYAfrC2Z3XdL5V9QjRXwSWliCH3UBwDIgYSZnUtq5l8w7YiwVsZ3PLBh3c4 fED2p1IDpjXjMcHxOwyUzK9p4/ASekl426eEapxIFgWqmln3gIlESjpCEjjs5IvIgHMp JWYjWHTTDV1xPMk5UQW3eultRt5NEPaId6atPhdVSKaOVwGUaC1Wf+Sk/1csVWD+ZK1T oCeA== X-Gm-Message-State: AOAM5314rO5dOqrP9sRSRc0XpqoypUouNdAxFXKW9BAL8qLCFMSPDXxf gBpNitdpzZjG/3iOlw87y4g= X-Google-Smtp-Source: ABdhPJzoXHV76QSRzL6XYqwHM3iMhFPCd1tZaLZoB9ZsePJ9S7+mo06t6qwMkX4vcn/V80YWd77jYQ== X-Received: by 2002:a7b:cc96:: with SMTP id p22mr7561389wma.67.1631467707100; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 11/30] target/cris: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:12 +0200 Message-Id: <20210912172731.789788-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467709739100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/cris/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index c2e7483f5bd..b9f30ba58fa 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 */ @@ -294,7 +297,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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467713; cv=none; d=zohomail.com; s=zohoarc; b=msfpyvApzDwd8/p5NDL4DurJLp3M9eDyaM2j/avbtX0KFU6l3Bfm5E20S/G4IWmlPbRqloiqvxs/05AC7boQdbT5kP/mQNMFIj/IsCtG3ItlCRNb3pzdCYNiK88hFOmgXLxzPkZHjaMCMVPu4rEvWBc2P2jVXpPD19mb5aR0PSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467713; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=LhyAbasK48T0ll+93WcMmSnNIP2wDRCpR4M0f8Xd2rIJK8BdwiuYMbFnQGyXlQWukd+3MRPwkkj2ZOmL/gFulUOAZbycAb/XoRjsO/7QWJ8/iZqvuIkr3q9cP4M2RBaMwa0+rm1TPeLH3FIwnyNrpd9UpC78cw23Qyd2+x5Dy+A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1631467713448789.3710015685683; Sun, 12 Sep 2021 10:28:33 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id e26so4963944wmk.2 for ; Sun, 12 Sep 2021 10:28:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id u8sm4925518wmq.45.2021.09.12.10.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=TgDgAFMxvCGmVWj6gAZvz02snYlfloG0VVtTqcFE9No2+KMF0VLNSSgXWhZNJbJA0V jUw66EgHul1IfP4etBtQnNd6dxo6WI8Li2p9AmfdHwB6mGD9HagLEusevqEHq13zMGon GParFual0zRQQbpv1Uc4DngXmHnpi7ctQ64u3yZXNIPexCRub7fVEOBU2RkK23F2SNVk DbI07RKPN1xUHQ/HcZ4biEVEZ4sBCtuh0bxUAg3wkQ2BV98FcQlaT33uYSOBkLGVdZbt LqwUgg1dQcXWv/1ICTXOvKLTSDpDCDI192c/FfPNpHfrbUCmtfyNSz4KxMqTK4snyvUF 9Rqg== 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=U8DHr1/L6XBAP0HeJyUxStUQwML3/dXYHZkBfi6fp7MptMZRPqZUHNEMpgQA+oreZT NYT7la4/7tWpBRAkdKFHWkUE8pK9TSsdzGWrQ6tzofBkjVyMUw5stViD0+Qlo9G8b+PJ tkjfr/u/Zy8NtiM6I4s0E4F/xQIYIPbE2eQu58uuMesaoZ5PHqGBpzha9jej4/Ex4daK VINnoidbhcYVZd6KZm7AQAqWqoyIT3WIfS4bmKLrGppVHgi7+otFDH2uNwMqI9B4tw/+ ALS+T5hTE9qtskRkbVakFuz5Ub1/nN3kjS0zIen5A8VhnRGRc0m9lHPR/tpZDSBZAcq0 GKEg== X-Gm-Message-State: AOAM530btGxRValB+v/3oeR7QkSH4ScOclaxs1iycX6T5/HGU0a7EJqk ZJg8Q9M6/i7+EZFkIdyePao= X-Google-Smtp-Source: ABdhPJxaM6kK8+YMfXbRgYjIyIenb96IxBorX79OYaWcUsL3USevqsikB4EoIRika8N8trl1/PLMKQ== X-Received: by 2002:a1c:2bc6:: with SMTP id r189mr7597705wmr.183.1631467711726; Sun, 12 Sep 2021 10:28:31 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 12/30] target/hexagon: Remove unused has_work() handler Date: Sun, 12 Sep 2021 19:27:13 +0200 Message-Id: <20210912172731.789788-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467713912100001 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 --- 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467718; cv=none; d=zohomail.com; s=zohoarc; b=G/saf9AGkKGK5TfuxddVOf6G9oiTzCL/98Cpdvjru6mwLfVekDUT3RtV8st3Bul6+oVit3zH7XThPNffp8M8QBS804JwVer7UbVzMeNd9F58ABLqxWWIrbiELJrchsRQybqYL7g+RQuLKF+/h6bwvyoKt47pjUf2SyEZ5LgQ11k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467718; 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=FToqHR4QAoWPy06rzsfsU9UzbA8DuFXWgjK1fkfTUhs0iYQvosC0Ue+GFsvg1tBa4qITGSUCl1QpVZ3aIb5/5QKpPDEF46mvGggkj0FXBATkcLhV5TYuiLXQVY46Tuo1hf+8V5tJfREQsJ/kk+fALW+Bc1zLz1AnDqzMAJVN5lU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 163146771854894.02451006441629; Sun, 12 Sep 2021 10:28:38 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id r128-20020a1c4486000000b003065f0bc631so583520wma.0 for ; Sun, 12 Sep 2021 10:28:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id o14sm5030395wrg.91.2021.09.12.10.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=ikLnu9WG1Vh2fvM+gJ1ulzamXB/rBxE+SdcdLEayPF4qEr09u/cy/K3EKM5qP3Fxa9 tljeX0d20vVwBmvOFvPcczgctxSv8IG4XWyP4Rf2FdZlBZiOARITuX8tDReYkK6caO/D kAQQAKaYvPcmiNP1uzqTPQOCOPiuu2yrFzPvUGkZzIfYSQxRR+PK2xC6FjJeDKMFS8E9 SPG4LxpDfl8+tcf1jvUlzlDUC7OjJBL/ZuvcmWEkqGRnSdSvqGTXrhE48PBqx/vpamxV yHEi+tN4AmzuuMXmEmdylsalbJOREfbLZgdg6vMy65tWW2grtsUVsF6rRq080lXCgBY2 q7MA== 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=XjbD2GKm4xCLQtSHAiy3joDm5bw1Y8BXxhTAh/RSJd5+1l86BUOlki7CCd2RMZLAQg v8tM0+/HO7DcH/prGE5igDwEa93y76oEhyNmIYKIhZyuUNtjixaDmp0yfbxBI6yDz848 tun1HpUhNFopmIc6RVfPqcKecA4i97nIs/6LG56IZ+Uie1COa7UOP+jim5WFliLjkFfI TMSf4xg2FODJ47ldO1YlLs1gFTOf4wtMgK1xlP4OkY5oD28YHdp7kB6hSqjMft2luQyk MiwqbbiHFX5fi6Xj3lvP6NEh4i2wy4ZJNJY+geRzivoyaVrgfP032MW8axj/fzwCgvkK aP5Q== X-Gm-Message-State: AOAM531t3XUQw2wVCBrJ2G4n/ZRTvNxfyckZyh+v2P95c3ZVmrSeN/oT ibkPYIzxwtSmyF/INHZ57mk= X-Google-Smtp-Source: ABdhPJxG3epHPqHVZLmHH2S7Cl1C1D8qxBHm+ZN642KxM1GtAW4UFxMYKe79IEm7jM+L/eDDiwJJSw== X-Received: by 2002:a7b:c097:: with SMTP id r23mr7453449wmh.114.1631467716839; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 13/30] target/hppa: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:14 +0200 Message-Id: <20210912172731.789788-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467720073100001 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 Wed May 1 21:12:03 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=1631467723; cv=none; d=zohomail.com; s=zohoarc; b=GPlYcG2HXPYeLAB8upKSki35k4yLbBOtRpZ1mcmPTtutcs/RfMKS47sjrs4GCHcQpEy9Yf0U9bVU07gNlxrXEATCREdJgyVwxyGLY0OCz79Y5tdxQ2a7XXgYTFwdPjPhq1g8H72QqiF3tKQvAg/ySLdFPw8agLYwn3gfL/j+8a0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GXaRvDEZfehzg2dwPUmloJ/v3Sj8mJXi/7oJdo4QA54=; b=fB8i2GVzZ/tNVcp/JJmfK0LTUm85sGCOfV4Giy9Lq9cFbseJTtFJ2AjEhrpQooSPRoPYousXGth22+x40SIBS6PNEz3TGmpH3BDdld0UfV0IVS7Szd/ALivJxwqj3dKFlddSlMcjYQzQAaCiIErxkFIxx5BY20AqT8GXFwjVXqI= 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 1631467723235287.30705069657745; Sun, 12 Sep 2021 10:28:43 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id u15so4873412wru.6 for ; Sun, 12 Sep 2021 10:28:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id l2sm4733220wmi.1.2021.09.12.10.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=GXaRvDEZfehzg2dwPUmloJ/v3Sj8mJXi/7oJdo4QA54=; b=YTsHfl8xbPHY8fodo5DePZVX1BnTCN3SmEngJ1/Yjet/ndaNfxSqcxXHLZ8sLy8Rim FtfpRGFkpVvSCbxavlR5gq1BV3g4kHYLPJkqPQNeR43yPyLo3i6edqXjpvUjvtgSZlEE GLnHB0l2yEGJB6lom2CAmulu9R/lYCPawHD3IW2FpEoHNLshdzU+w2DBIjWN09CPndbi MHBUz7TT+VDXVecUS5FjTns4Zn7uouabHTmVlM7WvRhljQ/OnkhNXjzSlJqAoSGPApXy UziLrsxU7u7b4n9N7yaUGGO6NFyzWfSDQ1xeasJtCdHa4l2xLqiiqXGg43+23DqKGpdZ 04CQ== 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=GXaRvDEZfehzg2dwPUmloJ/v3Sj8mJXi/7oJdo4QA54=; b=3nd45n9yvoWdKkeGPfuD66egsn+yrOAxTdfjSmCTupoF5jXWjkTO3e3iLVyfFwIYpZ o1EAyqa6eqfg+Q5xWR2dJzG7i5hm+jzIuLtjdylVOqEMt5VV6smD8mqj56KMXLOehFgD +KahtyGNLBHVZiuhBvmj/SaBwgnOZDE4MTo2LFG57oI5RWTTabwkE2I0NL8hyJFHeg3W PV4/bIGzactTFhCU76gE6GmbCYpPghLU6LIsdMKy6WUUjzpaKmUHhchvPKUTpVTJf8Ma iGakNNMW3c0suNQBV8XIycL7RvNzD2pTt/7Eie8fX+NfC94WzQLKnvcjdHe5x6j4AwRe JEdQ== X-Gm-Message-State: AOAM531oPTV8LlNf+4QCOKdxWc200YfY+6f91gj+A4eqL6IW26goFXdn 79xtBg/VGXZoDgOjzBtYfhU= X-Google-Smtp-Source: ABdhPJxtlbhu2LWgwe2onvXUrcgfdQocbF1B8h5COPu9ZgxNGbtZCDp1n9qVwf+SUnBgiddmWjHOOg== X-Received: by 2002:a5d:4591:: with SMTP id p17mr8362608wrq.59.1631467721530; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 14/30] target/i386: Restrict has_work() handler to sysemu and TCG Date: Sun, 12 Sep 2021 19:27:15 +0200 Message-Id: <20210912172731.789788-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467724763100001 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 04f59043804..b7417d29f44 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6548,11 +6548,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); @@ -6757,7 +6752,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 Wed May 1 21:12:03 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=1631467728; cv=none; d=zohomail.com; s=zohoarc; b=ZUM9jgNxrWVwrAKC0nI1wUyOS0k0AvhnDHQDAEuS5sW8TgTScseAcQpr/1/w2oaSB7qI4WInF5EeGK40Fg7aCJIE3oW3ezMxdhbIeMOaolDCtXfHtCR9LWDqwjh5PqJYMaJwLh/rDYLipz+cc1oNSJHh0+2ZTw2hb6j/De3D3J4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467728; 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=m8lgHQNNBQfPt4F1s3Zs1uZtQVumoBdeyOFdAXWPUjjXkN1S9ezCIZBnSVn3wi1ErE0RRauCd66VTXxO3gnYpg9IFjYI5jfUybjES/oO6w/5sHXOlL4iyUbRx81xqHCnuBteaBlJFZsPdsTNqPy9H6dSPBn1mj72Rcl22pSCspg= 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 1631467728083960.506797546193; Sun, 12 Sep 2021 10:28:48 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id i23so10927078wrb.2 for ; Sun, 12 Sep 2021 10:28:47 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id q11sm4731955wmc.41.2021.09.12.10.28.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=fk8js6rljmNl63pwjiyIZJmNlEtO/htODXoB9slo3HLWAN5H0sWg8B0az60bKq8ObU kRJvXK9aSoVVhVCS7hRBs8QStH4lwq6FI4S0AIBTRRgNLF0CPbDzeZIA7WTkcIwupwis 4pkvxgIAQRoIIWye9OjM5HraDPDHcGVCrECSxOOryd+8dHuxzhhbOsWdSRAdunz88clH oCAod/IBTjMkYtHVpqQE74naYT3nFNSjYz6zgyhuDV3Pxz+fk2pIhRZr2xMkzi0mL6YV 74TWIO9cqQtNN2rCEoFhWddwTecFHEyB37ApfqGrnlm5Dtgh5ce9n/EjDmUZPFKeqEjn P1yQ== 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=IXIS4/VYmATE2IbgdTqxji8xs2UEB+accXtM4EzjeEPPPchBlJXUhlY4e2dGVKKjFC t3GiYw+72zCqhkiUNGPIYG7mk5vxvpZfbVBd6tttB/QGh8ID5xSK+rCIrbbjzFNCrOOj UUa7faZy7hc7KEai6nLVXRDUiuinswzD6+9my+akAc5QJ/+oRxW2eJTcVCH3XjthIfeJ CJN2V7QWwnIWa223CR1A7ozoAtaz+0ae9A4uICF6nr3XE8+gyGYidSH01jps1WKpLm7H Fmlp78J7G6oJzDUvg84tTeMJdZAxCoai8jfWIFB+wNPchXWiCIoENps9MDMFCxuRubsl 02qQ== X-Gm-Message-State: AOAM5310asbsV6PqArIVyokue8msJ9qi0tQSlCPAY971y1/mBiyypmHq R8x5GxIhZer69xP4EvgVUY4= X-Google-Smtp-Source: ABdhPJy2CXx8CB75h25X6SOA9jN+WgGOjA6dBm/Pmezc/OJBaQtJzVOtluvffAsMvbDCa4eHv2AM+w== X-Received: by 2002:a5d:6292:: with SMTP id k18mr2986706wru.110.1631467726417; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 15/30] target/m68k: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:16 +0200 Message-Id: <20210912172731.789788-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467728481100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467732; cv=none; d=zohomail.com; s=zohoarc; b=nOTbuSH79Ikj6cs1Xz+StKxhvVIySQqdwMruKqrwy9xJFA5WDoX2c7wRdQL1Vf9HSHMNNhAB5RrAjZ7FKXa2lp5rfmhrQhNtQ2d4I34k/0R8L67LKzCU7cWdAHKtQibQKaV5ihGAviCre4p3W8vStZ2ScLbGa8FLtPMA0ogsBIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467732; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=cCBvo8ffLZnGtRAa3/tkAsz50WgHFo+nDPslR0AN5Z/XcWBL2wv52NPfH5Sij3uDhHxNkA4N0n5hy0ijOCwveBDLc7kFh1n3T1ESG/dt4WBOpntQiyAKZaaqSVq57tF6FF+RPImqmQWv7g2RABPrESf0yo3qV59+QHfFn+zL7G0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 163146773289734.62054931150203; Sun, 12 Sep 2021 10:28:52 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id y132so4956539wmc.1 for ; Sun, 12 Sep 2021 10:28:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id d9sm6278043wrb.36.2021.09.12.10.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=HsbPp59De0sDVgVwTkNKbZEEGoOM9PWhGHxOMEbuyj5XziwyJyzREpXK5dEqVWhfRq Y6nWlr2+uB+uuBHg2hSgh7X6t66pdN28I4zUmMQLKzSpFWomG8XOY3BU1Kpgs28h87MF rQ8tiOyXHPFBvRxlvYMi4C6mq/n9pd/sk+21K6pNx6SEhMqs0xhhJbxxt6aJGOz2KpUf p0CetTNMMnhLU86bFj+PIIIdC6LgpNlud4EHXYDo+Jo0Egwp7ZBPtiWCu2pbPxtrx2fH uccygmC1d+4YOkATG9WwOEq1VHl44J8mhRfmy9YM+61bPX6eepZ4zFIky9rfJkNBu2B9 UOIQ== 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=d/FOvbSoBp7KxwMyeqlg92uV+kASlA4DkEulv8xJbqiV0RvgT20ojlaydh6YJrZVcV 9wArbR0gK3qADUjidYjmqaM0hM3+EJg4yolwi2nGawWJ3ff8Z+m5CcgIBJy8yv4oKnXz gbF2NcDzTLxh0KgC3AIb7BdZpyz2pURRKatkLS80s0CSHwq+VCXNvlbvP/zJxr37YZP7 XsSNVchatoTj100Ib89bM/4/tn0a5jGu80wSC369s0tKIBgLVWIU07GNufpvdEtlggFz Z1uA3iJIHoGalLYWDohgj9PowPBX3tshstaENOWzqYEc+NVwthVwyUbLh6pG3ymSNJ7z 4CWg== X-Gm-Message-State: AOAM532uteZkKHsO31Sxu5pdBK7MdEWup6jt668MeDBP7hWNoEvrm9l5 iQHwEpIQwfvO0ZTcKELBjhI= X-Google-Smtp-Source: ABdhPJwYnpowDOwWzctvni7VJXXdZpkgaaeIkwHRr5JP4yXuG0Pmso1KdGdkOZUMUM6Spv6+67u0Og== X-Received: by 2002:a1c:730a:: with SMTP id d10mr7609000wmb.59.1631467731155; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 16/30] target/microblaze: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:17 +0200 Message-Id: <20210912172731.789788-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467734738100001 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 Wed May 1 21:12:03 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=1631467737; cv=none; d=zohomail.com; s=zohoarc; b=jgg06IuuaTj6bj4sFkR99Wo5JhFgaDEXfxZf9UvCHB5OTsPw3zkcytZ9KcfPj4utxEQNZhnhA4v1ufJMsYHedGCx6K1pDjIlcWEFGyQCTEAuXRUoXnXCqeVErXziaH3NbkaujZd9zGGYWuMSTIVEJDt+zkseYstYEzj91kZf+2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467737; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=YS2aCc5xH/kAM8jMFySQgGDNspJdHZvEtXyXLLJP2bUh7er4ifzKR2kWNyZpmdIiiTnEl2hdH0baPSCIpHb2B+WqR8SBVR3FxeyA+Qp0dguyuzGLtFO1Xm3dQ0P1XBOuNuunpJzJASMM0k3OjFKH+CuhbkxQIjpbsZaoG+Qh71c= 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 1631467737631435.0603503122479; Sun, 12 Sep 2021 10:28:57 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id q11so10906371wrr.9 for ; Sun, 12 Sep 2021 10:28:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id r25sm5063147wra.76.2021.09.12.10.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:28: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=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=Km1MULYmj0Ny5qAgjgiYt0+8985JQFOmfQjMiOZk5aZYFH+qDq/ZcwEFGh2NwJsC6V 83JKTq9wwAvowzEwI6OdFmOzrbT4IjNPqyneJiIm/MZ7BBlnjqTgDe3g6I7EIh2LIEW3 OxGyxtYvKu6pZJ2dZ8f0ycVbt4on/mbF9e6ZOLky6iOQLRHRRZrLRmf/aTZwebE+5b37 VsxTcBMFO+zIObZsa09JX1tP35aXgWi+qfOs1j8rouAYExe04lMGKO7MC7nnkWLs2AYN xC5fAK3JD5HV0/LDOyWKWRsQQ7tb6QZm9uh7HGxv2EcXGxBPE5Yz8rNZBaSndC2FuaAH QwIA== 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=mVWMi+DBEP1hGYWJOKYeHrgAI9h672oZN2f2GOZItLkRwpi1eGdvobTFMtiqnBG9Q9 6LT5utQDZEU+4J0Y1vvlGUXSePlCD3rjEpxZWfoh4yaDS5YxEASMmdH5C1WId0E4c18M xOUlZfu+shrpYGXC8HP6AX3/NqhudpLPAg4D4c5ca6WSYef5v+KdSOTy/iytoHbTNZYY QKcbg9GkTtIHIf0QAgiWP9lJ7hXORO7bTWYeGThPYXwdeQ98poqYhAlZj0fUZ1msJgYH wReb+6ATlXWeA8BB39KULgCtLQsEKgWThhdsmx2FX8xw4Ys2ep+9KHF3yxUupygnPImd SUeQ== X-Gm-Message-State: AOAM532sKVfGq3+qPoKxJDgcZjNtN0PzJsjrjWDcKLBk6otyh3131ox1 cn1XVjCpNDy6wfTZCpZcVYt266BPAr8= X-Google-Smtp-Source: ABdhPJzU7MuXs4at3A+Bk4aHamvvUrBbPUqIgGbly9mnyE+UFtwmNwza5KGFZJ0vRbGBUkbAHXWtiw== X-Received: by 2002:adf:b78d:: with SMTP id s13mr8552857wre.344.1631467735871; Sun, 12 Sep 2021 10:28: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 17/30] target/mips: Restrict has_work() handler to sysemu and TCG Date: Sun, 12 Sep 2021 19:27:18 +0200 Message-Id: <20210912172731.789788-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467738772100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467742; cv=none; d=zohomail.com; s=zohoarc; b=SnNbmijcMb+H1wjpE8bszvJKTThyO0QlqSpowx1TtcqcdlzfcplwljxN6+pyAnMZXJNVrRrldp+rAUUrn2uKn19V+/eaic5/JC0yFH57K14fo6Dl544JHs+2HbSiYrpvOKP5QfMLbERxM7oP01chDAqMU611odYARqzH5km8Ji0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467742; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=Semwb2qrBGGlEiEB5WCJyHljphE2ZPo0ycLgSqW82GwkFsqRvkEONvHn0ct4eTRnGhzN4uKDn1d39SpkIfKKVmZS+ehBaLQEid3w8hZwnCopnTSOOME0Vsa7YJkRNjeIuMojWv3ibj5iy4Ucxl6NfiVu/1cltfmbklV8TiCPFww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1631467742648420.42471521956736; Sun, 12 Sep 2021 10:29:02 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id q11so10906544wrr.9 for ; Sun, 12 Sep 2021 10:29:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id z12sm2404wro.75.2021.09.12.10.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29: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=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=Y3+w31yHrTenzLWkTfrN3luY2rECDEEg/t13NreMfe+1kJl3SbBfwyuCW2l+GAaVGG HGylMB2vfBqFFaeuBzQBhH9RWFVOQn8EJcZKT/mnmYJKIiQj4TewevcqQMkpfEJ4CdS7 53lkNBhAGli4nQ6ltfk+oN7NOpv2/HQv6QFHlzk0eaWErBRZZ3egExFt5Yg/Qa2LVN5a nMFrD3PPw4mZGl40qPmDvlN0mCoER0k/0UD3irS4DsgaSRR+s8HDIZrMjUtIHwRrXDBd ll6JRiPVu2wLoYONBaISBsVL9vptdybgZGl79U2RducWojeOlSxmB8jELbLNKRm377Rv mUsA== 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=4JuON4RVE4u2HufzhNN6iPJEGZ2Y9npCQgBrph9aok4GGWgfNt4F8LDc6UzP06q62U 5Po0F9Y/XjiAUjqHENLiVcY2jfziniQzzAoCLJyNQPLAQT+RyPeWo1vG/eytimsbAxzw ncQgr6UDS1iVkXfEAtzklJeZGUL+eaNJS0F+kwDAn/DpG7wIO+AwCemZDPG6Up3g3Vwn zFjwkX6UJw4/Z2Jg23V3fI6ucDHM9xamjVv9aoQrJ3+kSHz9t6Px+b+Ah60qN7aIjX86 hkjFDdrHxvEqmFcJcrdOeRewWn/rwVncHFzGmc2tR/XT1nI5jr5egg+4GA410UAUTyfg Db4g== X-Gm-Message-State: AOAM531G6FNLpTLuHIxQhYdu6yEwxFlNBGk1L67TCRTEdslQuMME5+cm /dGmJNlK9VS7zp8azKEXQSI= X-Google-Smtp-Source: ABdhPJzejN2PigR55IH52e9DXq8XfcxZok4TpeaB4wUDIQwf7FhtCHMvYc14Ur+plnXWt+5B00AUWg== X-Received: by 2002:adf:914a:: with SMTP id j68mr8503405wrj.73.1631467740908; Sun, 12 Sep 2021 10:29:00 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 18/30] target/nios2: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:19 +0200 Message-Id: <20210912172731.789788-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467742911100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467748; cv=none; d=zohomail.com; s=zohoarc; b=DUPXcBrq13jVY7nlfaREDMPg95R178Tg952qvur9iXBl3Cb4kuI5z1k5nc0BGG5sl0z5qmUYmnAwvn1SDFK5PYPGWFqFIv9l4NZJW8hKv0zhsMmRijycz4Yev0HT8HbwYzXZErtrzkbTFQoAw6qOo1Ug+/sKYHrSGu9mWHJU/Ho= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467748; 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=GcW5aN47+Ro6QaGDEzTMJHNwO7DHx3wglgN3gvvnv3alF1lYKEts6Cbfzs1qLb6oI8+jG3ho6RkvOQomOwfk53PqVbu3nmOP6y/QIQAy7btKgRoLlJA8cyGrzGG97FBKkUEBOPcyLMj0SJ/98jRiikciAZEksyZPhqNg4i3C5PU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1631467748093898.9967620388657; Sun, 12 Sep 2021 10:29:08 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id k5-20020a05600c1c8500b002f76c42214bso5234231wms.3 for ; Sun, 12 Sep 2021 10:29:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id m29sm5259384wrb.89.2021.09.12.10.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:05 -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=mDwvemDqNjnAHuB724c0AejrQuo6kTdlRXE2SqJWLfP0AmCFzXXlSw+mFcVh0tl49D wE76FuNKglfc4l6iAcZ599+iXl4w6I4xQe+e8f40ab1ZCMZTdKU8TnRD2SrgKcZDUQ5S EWYOiSBm3U98SIAiSl3PvcgHmwDCKGFI3YI+FVNKPKYp8ZBzOgYR8lDThZcTHDbGfKZ4 nIvI4rgFCLswt9xIcQnDTr4sZ/7GONdjYTd4fVluE7kKfw6W4Poxi+fu7Ob1+lSD3lt9 E4sBQsXDOGCJe705EQuECDa+aUi9UONArj756pxCxLkaFigUCY/Kgfg/6YT1udx2mf50 UN0g== 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=S3DBk6jY9jZP9W2EFYYCafvm2FlQEAtucGhqlRbSm/tf5vxN9HCr1x4H6V4nLplXU3 SBuFJ/ZxqqsjZWlkpofM9l72QGdhQ8/h1GE8C9KmRCZJ1f3DYAAZ0oKcKLkoPS/XMoq7 uKeBESDRhj8/PMKL9Ehd1lkDKMtzT0vYumNJbKp7+phhpMxjv7gBjuAv8DdW4xrClMcb /UILoj2PSQ7IUPVaEmJB1zNf7coN/R+pJVkKok+8nCSe9y64Q0qyHKUw5dsiWU2Qeuup nVIp8IzCNvOWssCkNHDUR/DBdHYDNZxSyweK5qQJCPmtfBCLv3nQ3+fWCojmdclSyq4q oWqA== X-Gm-Message-State: AOAM531ck1xDshiZJ2/Zs3w/ePR+31qxFrffIe6X/+Ef04clglbdsnDC LVwjCVMrG47WLlHxiSBVu4Y= X-Google-Smtp-Source: ABdhPJzp7/usDBFIJ9Xm+r21I9TtSDFv0PburdBInlCIpVOPo4PLtle4fGZuvkjpSiGeGd+4LnmQhA== X-Received: by 2002:a05:600c:35c4:: with SMTP id r4mr7708165wmq.194.1631467745684; Sun, 12 Sep 2021 10:29:05 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 19/30] target/openrisc: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:20 +0200 Message-Id: <20210912172731.789788-20-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467749189100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467752; cv=none; d=zohomail.com; s=zohoarc; b=hf4o0X0SgUyOWSpZxmvWGRcH7HW0GlzM8S5REqTgNSGgS23vfQliNda3o0PGe9fGwjWtbFWgSo2NfHz3Q1YOKZnnBzggOl/w1j3OHdW6Qw4TNsxLPCd9oPF0NVyntFasG8UJ3+x13ePqymHqhf132qAy79lb1niA7Oc3Rzj2DRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467752; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f3Od9c5FomPD/l72K+Rq1wthBnusWV2dJ1FXDZtawPg=; b=RuB8LAuqvdVkx3sAsElu2nNtox8OEJSnckPcQlNHJEKMEGIgdKXojMTxOjceC7iP5QKEfVyMJBZp1kj6hgAVPpZAgAxSBmr15pz80BMZsK1VM0bm7NpBPXeoI/9jKgGq8yKZsFlZ0tN1hYpqvfeMMxKkLSaBb/OTOAuKdgpLwFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 163146775223826.566915029227744; Sun, 12 Sep 2021 10:29:12 -0700 (PDT) Received: by mail-wm1-f43.google.com with SMTP id v20-20020a1cf714000000b002e71f4d2026so3904841wmh.1 for ; Sun, 12 Sep 2021 10:29:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id u13sm4905814wrt.41.2021.09.12.10.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:10 -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=f3Od9c5FomPD/l72K+Rq1wthBnusWV2dJ1FXDZtawPg=; b=elQ1/G1ehtI76j0ZyXX9EGE+QQpd9gNvhE82pMGe9gPyS038VPssOM/9zuxWo5JyE1 hnmi45UdQh63b+BQY3mO+0rIQAmtXZLEfmOHkJ9xqavBLwM/EE+5p9xF5wr2Gh7wUBv4 5d0jzSDy82yygVi2x8+qdI4gqLEuU4tj6q/UYcFl2lNsLQI+1XReyIvIGu7MNSlAV6FR l6HJuJGJBTUstk3nLFwsskobAr29fMAByYSZL96cQuuc2cE/Q15yOdEYyQhrbVx+r2Qn LuY5qB2pX/NXzUKgkXlf1C7EVOl8nzaQg8B5SmQ4AP7R6fAYVeTLDQVUDaw9tR8hNGUT nujg== 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=f3Od9c5FomPD/l72K+Rq1wthBnusWV2dJ1FXDZtawPg=; b=6OQP60tWDtF4zqK9zH77qU9UdHoNnCYNlzaIPAsuJQDaei0K+/uRFwYpL3rm7+bI+h b3MR4PEr61jFjaIWwnhI1IA66mlVw0F3i8K1HHQk7bTJEJAeKYdvQwD0WD2pboc966Mb Ouvv89T0pi7CN9Ym41QXCq8Bko4lKEc9UwjJbEAclP8dq2PbDu987A38jqc/7kAlKf5V Eyxu4OexleFS4bpzcE5+rR5qc9AYTQE21Cbi+/2FcFH82h88u8Q1dLq1vraE2NaUMpdG U1fG7gxLhmdpUC9Ib9vs50e9cBQcxSVXN7RDdzWWHsgF1cRQdHrdXusWK71olibtrxE+ UrrA== X-Gm-Message-State: AOAM532vaalKdyM0bUPq5nNwUeyDYf3EeQl6fK5JTOdLdyGTAeMCqwD9 D+kzd1u7Gb0oRrDzM8+UemU= X-Google-Smtp-Source: ABdhPJxTFvQxxtCDO0Jny4zT6V2tv/cdbt+uC53R2jrTVSRPJ2zgYfcEv/iNnu8VToS4UmbvT00sLA== X-Received: by 2002:a1c:25c7:: with SMTP id l190mr7441870wml.118.1631467750508; Sun, 12 Sep 2021 10:29:10 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 20/30] target/ppc: Introduce PowerPCCPUClass::has_work() Date: Sun, 12 Sep 2021 19:27:21 +0200 Message-Id: <20210912172731.789788-21-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467753366100001 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. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467756; cv=none; d=zohomail.com; s=zohoarc; b=bUt6XDoS8aZx6F8BAFadADd574tjWM7bC3KhTl5LW4KjpI8+B6nR31w8ZTtPsNhrZS1WRKNseSzfPAn3fEl1bjuUdpIeZTlUFwlLnvU2a88sAEVVajLQeCrajBou027c2EFirbHos3sYMCmSVxXp41vyY/nEneF4UIM6rS3+QmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467756; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+aIhc+q7UsH/ZSd/qrpccF2QVRHNufiq35HZT6vh3Q8=; b=n0XjVZYzFUQ9HYcp+kBQa8CdEM7EzlnpV9DP3PAsT8XIcg2D9dyws2BnZGulC8nOOT+HJxXjiXIfmhyyyPzgnQmZy8b7ApQCU90rVxtq9hzJ4GJwa4vw6PMZ3ayqVRRBmdfD+wCilpqc+z55Kgqt4YHwiSROJjxptStxrTHhcDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1631467756955684.9341712709582; Sun, 12 Sep 2021 10:29:16 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id 140so1528411wma.0 for ; Sun, 12 Sep 2021 10:29:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id m184sm4726696wmm.3.2021.09.12.10.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:14 -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=+aIhc+q7UsH/ZSd/qrpccF2QVRHNufiq35HZT6vh3Q8=; b=jIZO3+k1iLR3ggKxCIHIklmYIwJ2/MZdPLZbDTbGD4gsyYjzAT6sbOM4QHkDUEPfQ3 AQ8W61LQkT2xbfkQelarsEiHSmNy6oAsxDNJndjhHFGUBUtbRFdJJuDJvVxqsS0AMquK MenzeUUYZUZnJuiE5CcSZmfw313U2jXfFas5o1NM9dzMGfNS/TnLgWai3eCWj6E++teR NyXFOU7ii/rMtHp5dAEAJOKZNdOOyyxRozG68zH/uyofJBXw9czO1QXjzDAlQsjEnnx9 nWEQyFxvSHsqnQdGIVYgxzLl7FG6hhcFamxC0EZon0TQFaJ6RmpUxufQhR1DBc8DoBQe gyVA== 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=+aIhc+q7UsH/ZSd/qrpccF2QVRHNufiq35HZT6vh3Q8=; b=h4DOwxwLGVGBYgiVXknEogSeEJRB3X5Bctg7E2y7e7TAZE6/K2yaryaqLH5wEcT9t4 EOOMNvi2NKA5mKFIik4n5RpAorQiTEMmvcRYOBPctaZN8wygIMsFPKvoyBF4SN4B+Snh t74kjjRqdNOD87hpFr2dRuKvXe+B3JxOFVL+qpc8gkFOYjI6+4gfhQeKP5Phl+gCPMKx YBFc4TC2Vv+kk7zf0q0DbfnmWkAELfeFA2CeBg6zVIErGo+vHXwj+m34G/wRl1M2WUJd /535Mc2WdA6LQl5SWDxm4cnFxOhHM4dFrmyPe5Qdxm6LTgnyMHSbucWfYJLjrcfHU6eA hDog== X-Gm-Message-State: AOAM530iC0AdCvkF6L+zksbiGGShPBksveFlflJ3+32+wS035epi+Ade z6Ug+0Q1HWfyyvExSq5dMk9cfYRu48s= X-Google-Smtp-Source: ABdhPJzXaLeBI0h0QrqdChZfXdbJ1S1qhRTnzMYkOHEwjVSmKy3XV6KLV+/YwDUg1iLJcbUzYPJODw== X-Received: by 2002:a1c:f31a:: with SMTP id q26mr7430796wmq.159.1631467755180; Sun, 12 Sep 2021 10:29:15 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 21/30] target/ppc: Restrict has_work() handlers to sysemu and TCG Date: Sun, 12 Sep 2021 19:27:22 +0200 Message-Id: <20210912172731.789788-22-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467757569100001 Restrict PowerPCCPUClass::has_work() and ppc_cpu_has_work() - SysemuCPUOps::has_work() implementation - to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467761; cv=none; d=zohomail.com; s=zohoarc; b=MASic8AWDZNUfoU1G4a5vID1bLZu3XpJWoThbfXgltRcFJSxbRBBXoDdajPuzdQZid2U76TAWwgxCZA6O9ShEjK2kxFzuU8oHeOjP3xkvda5+uDiq8Z5X1nz5VU9UMqJ0sGYAF3ftsiocOkOQ0CDfGStUCL1HSzi0TvbFy7Apx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467761; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FSh6oWLMIgLLqTTqDcEll1Q32OdPIjqXmSpoO2tYnP4=; b=QFd3pppgoslppW6Kj9Wgm/ediLYiXcyscbqCl88293dvQ5Tjsbiw8aq3q2OBcNWKizd1NDFvvdNU8nDCVYZxS45Gp6CaUC1MDqRxMWMSsQIaHWbhKlU5wn+47Ul+gtWbhc1J5WJ7QYz1snmUBq6iuqryPxEE2Dky9HGrzTIHJLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1631467761606946.014647774491; Sun, 12 Sep 2021 10:29:21 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id c8-20020a7bc008000000b002e6e462e95fso5245313wmb.2 for ; Sun, 12 Sep 2021 10:29:21 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id y9sm3461833wmj.36.2021.09.12.10.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:19 -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=FSh6oWLMIgLLqTTqDcEll1Q32OdPIjqXmSpoO2tYnP4=; b=V2rLbxO0Z+PfuBpRw71BHzzdDPoVNfkgBxygXtN+/rkLPf8Kt20McF7g9MZnNhdAfS SzrVeJxogv9c70sun6s2+gNPxA2ttaDTK3zNPPlI8zQgSg7gePaa3BpLIG+M8+tChExG PoMXqcYiSjLjQ6er34FGSpl9tP2ZO9rSg6D10LbgluLh7DrErdrO0eBISkxmYvqNv6VO 74t+w1KchP+Pi31ANhofzXDYwgNIo30N3bkXviCpkJqLP1lCADnvhTJSyFI9lBPO5MD1 +sfoaJ1/HQ4Hcw1zH3DBrc8KDTSEVdJ5nq12wmyeumeb26NDZ7ZocTNKfwSccS87SIlm dPyQ== 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=FSh6oWLMIgLLqTTqDcEll1Q32OdPIjqXmSpoO2tYnP4=; b=eVoXLM1RXwoMSryvvA+1sTrM039rOJqfWJaTKkz8ow7QcTt4bVlFRb2ovVmNGHWJlI MJpUeb7TnlK/IFSP55K0YLGUScGFp2BNAiAKt69t2OkQWWzYznl4CA7jq87C28SSYVrl rGzNB1UVHHROy/a3JCsa35mApu2DCuG31OG5mRe10cIPYY249UpjnOAhqVEcXFuxeVLv aFs4HP+E9yvH6FkA6Nhg2KpjnRVFQGThmulYFQ4h7M/EE1CaUaPhZT3WcorhZeB8haa7 0Ahgn0sMqG+uOFIx8cKdFsPHeDenGqndiUAjwSv/4MD45cEt/yMstKeRsXnCVNNyWIKk yl2A== X-Gm-Message-State: AOAM532sF6Z4C65Pam0Ye3Qv7DeoA/tU1Fvbc9IETuYdLe1KaKjnFpM1 EaK1KtSTtEBUQeXjZchwDAB/P7ZFI00= X-Google-Smtp-Source: ABdhPJzXLItfrFTCGM/xJtMlW1Qugo7VSxhIHafJsNHfj26YfDmZ4eJn49/XLg+fpaU2OqoXV2Apqg== X-Received: by 2002:a1c:a713:: with SMTP id q19mr7507414wme.42.1631467759916; Sun, 12 Sep 2021 10:29:19 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 22/30] target/riscv: Restrict has_work() handler to sysemu and TCG Date: Sun, 12 Sep 2021 19:27:23 +0200 Message-Id: <20210912172731.789788-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467763820100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson 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 13575c14085..abb555a8bdb 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) @@ -647,6 +645,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, @@ -666,7 +665,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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467766; cv=none; d=zohomail.com; s=zohoarc; b=dIe2TZPUxPpO3QkwZIcQB8KalhDb6mc/LWvesNhFprDmO4pbn4glPxNt3KRD792KMOd6jkEto1zLULfLwCIze22DbmWmbMIErXKXJcxrMln9JLKdLZhabYKqIFXWLVSTu9d9RsvPIZdxGAc8OTrB9WYk/1xZIcXxu7YfSFJ1mYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467766; 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=LAafEJThZSAlGmo3Kn/Vs1yNWf8OzCS8qwWoJuTbM/c+r1YWrsneQhMUqjNqZopgUqyJ7yGpU/lHCqqgE6h3p8dOoBof6vmXhXusSiLis4emQT55nM1wQRpZKKnXGYuoWWC7mqmZY3dUhXsIrS652nlGfMBGzi2kQNo3dQ2J/tk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1631467766497843.0992269512008; Sun, 12 Sep 2021 10:29:26 -0700 (PDT) Received: by mail-wm1-f48.google.com with SMTP id g128so514466wma.5 for ; Sun, 12 Sep 2021 10:29:25 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id i27sm4588332wmb.40.2021.09.12.10.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:24 -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=hbDGaydAvhJKRhIHrs1wOE2jFFW8hw1hANVpINkL+wNFSjgGoHVNnPqW8sZpCyB+1D 4FrqoGNasAfj8aySzIi6fLpRBw+0xDwZHhqwEQJABjZC2REAp2J1A6deRf/VjjZzyjfJ NWwZ+euhIOCMAY/P873fCJkqgaGfJ8hn12/9H+p4E0GE2OMlHCVWeF6tiFovasaDDTuA bqeYY4/krIacM3FYz1KvxKaJsYx7LXx3Uvm5bKYkrwFeko8ublNQtsgByAHXeY8qBJjs Amu9j9/OdjmWQX+axj2a2OeHnQS1CV5dOMTrpKGK7RUZpF+B5PzwCuSQjbbIBD7QkE+e poEQ== 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=UNyz+Zp6sOilqIzIpScgNox2hIYa4bvGym9phhYzRRxDIlaQeqiAZx8c2eKz6xgJ8b No2uNSSUUo2w65eRDhBb5uuRiG+vI+cmX2lGek8JwERVg/sTQRIL8SPeWVJkcCb4DCrB XNKgvByih8PHEwlb3zQyyVf78qYrOqrIx1omQ9UN6lytZkHb5GpDkxdI+CYabFwXofnA 85fOm9H0piaXvrvYChDwOCak5kkKIb5BvHXbDGGClNRxClfLwNUI+7ul5I/wHR+oFhdk Mg0uH22j++14YPWybHdBFhEFHC690j49OTtN55Ptb4I8LQTprH2FKPepH5nHXdfyrEXx bmgQ== X-Gm-Message-State: AOAM533WyGSDaSAoAdDh44upLJZ0dqMEW3rshNguxavTlJSg2cdIWk7n z2pKyZkShqTv7M2F+m+uCjo= X-Google-Smtp-Source: ABdhPJyr6YzdSfUIvVCYY4RtQwCmu3xX3QidZMG9CK9wAdcDRJZQ85/ofzLRA6gRYDcmRRs4KNVQ0A== X-Received: by 2002:a1c:80c7:: with SMTP id b190mr7403236wmd.87.1631467764822; Sun, 12 Sep 2021 10:29:24 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 23/30] target/rx: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:24 +0200 Message-Id: <20210912172731.789788-24-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467768027100001 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 Wed May 1 21:12:03 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=1631467771; cv=none; d=zohomail.com; s=zohoarc; b=VtpZXhtRdSK+TWCf5hoP07Cu7SDZLvMIOHke4iFoc07Tr4U794W2d8yXzLIv0l5OILEkpCXLZ03oqJZD8mkhPyML6EJQTjo4rhWDI4fMSojVWBELdDijsJND16JlFtN2LYKuLAnPwF7jGZjmYgG+Jqvjy4OGMjlheJrInWoKjPM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467771; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=m7zfkBwQTGT8ZsBvZYY7BULf/WjN4fcJNwTSslGJXlWzg6QHFph3VfeuYNKb2q/O932zk7vR/jeEdfOJ0xDjBVNLLWVFg9UiE3cOZOXKeCe4AxbwedtW8NNUsF2sel5xmKQcgw4cC8sysxzgTSv2Mh/arM+87411VUtNKSD9rXI= 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 1631467771249195.0267030860249; Sun, 12 Sep 2021 10:29:31 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id m9so10933073wrb.1 for ; Sun, 12 Sep 2021 10:29:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id t126sm4637171wma.4.2021.09.12.10.29.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:29 -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=j3Zw0VmhO28r0SwLdm988TgKKk8+hC6XCQ1H4jW/OJN/UUAUfVEm9rCmvS6faiASe1 HPqFfDPvdq8yNMUsiZy5+nU1l7X7dQgFjPCA5hBbHYLKoON+m9/PhLJfsqwWReCPTNKw g/eHfrif39Pp5befi6QHE7wgh3a6ulcM6fU/LIbY8IP1cmB+GT7V7tJFNpo0Zv0l/xyH Cduhdr7oh/E5AxAjQYZUMcqPldO67FHe42p3QxrJNH75ObATHvk/uAscO5h2AWpKJVdc gf6F9MQpmxnVe1b17gVN+MUATUqkwKJJj2FQ1abAjU3kAJhS4Vgz+p2voR5WP6XxiIca D25A== 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=ssKOH7RdVeSzVyLzFJL3/t+IOWsc1hp6upkspuZbaUD8EqUPEBbik3GGlomg8+xNhP w4zrgIiGHcdTXdJvyzYU9BgTJWP3ZVp6UkOWtoi4FL7IH37pIc+Sdopz9quGkBQ0jdb5 3HUTxBglt1SJmTdQGaWNMraj9NCpUESG0hFHxrH0U02mPoWwdISz3ggPycAbq9DOi6Nn BPKQ3SW/TG7kUxBh/JFLg6D2iVYHCBdNM8b7GSgpvn4slStJvhPBWBwvaRumjK+EPlEp EMDbyjdRXtRq7QJoUvzM8Q1vvvsi1oqgKi61WJfLQTj6j7LnglrGPkbQQNGDVgCYIkZw p2uw== X-Gm-Message-State: AOAM532jwqVJBsGApbQkOebOtRDzbq83cxwJU97xQIc8K4+nk+l7gPVa bqzqt7qLgnFFI/t5srMfcvvom8djuTA= X-Google-Smtp-Source: ABdhPJw59tRy9+G/t5LY2Z2uIjUVsDhXe01mmYrmWTypExF05ov/T1eJbEpcccPlOV9sW3thahr+Vw== X-Received: by 2002:adf:e387:: with SMTP id e7mr8517635wrm.199.1631467769563; Sun, 12 Sep 2021 10:29:29 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 24/30] target/s390x: Restrict has_work() handler to sysemu and TCG Date: Sun, 12 Sep 2021 19:27:25 +0200 Message-Id: <20210912172731.789788-25-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467772362100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467776; cv=none; d=zohomail.com; s=zohoarc; b=ZG7W+MFQix5mc217ZW5F3RjHKiNZnxorrgi8JhWV7S8NLxYD5RDXUwMnrmimdgUL/JfQ/DOeUAcuZgBtjl8DahFGMbCt5RR92xeGjKjJs9pGV5xDi6q6ijkKFojyJmh2R5U/YSi+ZErHVg7KhlNnerhWFkYa3/pf991JXhgs+UQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467776; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=d62Cqlje1silEMwmjKI9EhCe+YlqBpDb7f/JEt+xZuYqWmNDTaiL8qdRLOXifhwuR7i/z2mB5+K/bF7G0BJatL8ebpqHSjMejkArihUgNITKeyVNtD7yuUQv927xANbNHFQL5EYGA5By8L/6kRkF43iR9YkZReAgYi2X+F1HdtE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1631467776206866.7649373487475; Sun, 12 Sep 2021 10:29:36 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id r128-20020a1c4486000000b003065f0bc631so584444wma.0 for ; Sun, 12 Sep 2021 10:29:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id u8sm4928246wmq.45.2021.09.12.10.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:34 -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=Xgr4Kj4xDq8y0tjQ3mHVwbthIVzaLk9rYJUw3tmsjHHo72o2SsjqH/C3gT1Uso9dwd rp7c/NR1v4i9HYQEBqjdOF9FfO9qTUwDXCl9ximOPNMMYPaBmsGLbpwvo8c+lK53PabK VdOy0dE6nTrozHDF1q79FyyKCgIOYHerdG0FX0vcKOU9+EhbvDt1DNVafqpZau5gDM2D RmvdVgyiwfH/YZFbsoM+KypEJSJhmXM6AkfhBI/qlXiHJkOSj4Q2IzyCmZIRwms624ye Yq7bPLny9ytb74TXO4LWG+Z2x5zw3jhqqokzbF8sg/KBa69kMBtUweA+9gBkOPXuf3UF JbZA== 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=q6/UeOlXk6EIrUVCOeezu1WYzXbnTzPFTwImI6xTlu6hQiQ+0C/1T9+2oEW2Kw6W/i pMjO6/I0tRzp8nkZW5O7JxYzIWZMf9pv4Szfv3ckjtVDTbEr2HBopa8xjktrRPzY/0P2 6mSOu+xxR6XxRSN6wqIkyugGS2NLQZiqNkG83wI0r0biVOMJKA7Jm6c391PM5Jo54aXt pgrxxymUZ/F2UjTiwLRFhhvbeWtidbKWGvv3UAF26DNSdY4CRUlT5kaYD/YrhEmsjfc9 Rws0FjRxLHL6eJ6j+iWwFWxe3c++g+4gWq1zhoZTGHhQAnVizTtr5eT8ytwN6cdlqXAc nSkQ== X-Gm-Message-State: AOAM530152RhEL0e1tlc3L5gLD6hGPUkAJnzYacMJEqBriiDocpR/IVn EpuaPU65ZkrIGsk40lExNic= X-Google-Smtp-Source: ABdhPJzvk08I40mRkk3aUdoJAdwPAr/FQNinPP6oTUXh/BRRdLhJ8zuJv1YwEztPPvCjlYLG4dT59Q== X-Received: by 2002:a1c:ac05:: with SMTP id v5mr7772149wme.13.1631467774543; Sun, 12 Sep 2021 10:29:34 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 25/30] target/sh4: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:26 +0200 Message-Id: <20210912172731.789788-26-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467776440100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467780; cv=none; d=zohomail.com; s=zohoarc; b=U9N9OExTlzpkywsGJE+YYPxHhum+jFsy82pY8qlIRwfudpzX191qJZ+IhpZnUnyXoDjk3pACTTbiZn2kMVr8E7mISuHoDRYaon2ShBKW154F7FNJPhSHS7Zs+xpzbRiqJgMC0f1sIMcQsAwxanFwgUBwaUFJehvLU3KWpkYz0Fo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467780; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VemHoIpzCWAjrdpINoZRube8+PIa9Kx0uhyP77PRsf8=; b=YMRXtDnKjoMnCvvPOxJVye/RimRZRw0zifV6kN7W0tYyVfzzxampiMjAtbXllRkm9tDm8e7S4GiKbSGrgOllE7C+RNi2q6Kf1v0nABx1swipZCqLt6B5iiO7Zvhq1adpR2QvvgpmiP6MBO8fRE9UsVIUa7K0/VSD7z2orSWDstI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1631467780918169.79857100714958; Sun, 12 Sep 2021 10:29:40 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id q11so10908213wrr.9 for ; Sun, 12 Sep 2021 10:29:40 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id s10sm5097713wrg.42.2021.09.12.10.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:38 -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=VemHoIpzCWAjrdpINoZRube8+PIa9Kx0uhyP77PRsf8=; b=XJrT0X/V1GA19zTwUJrQMC+XqOiImUQ+8CKwV23cyaUfj6etfBxxOvpejp3cxrrvab yoswblaENikBpWkTCUw/kAVGpBg5jZVI1pkDu+i6YVA9v+TwXA3VF4Orb0cqDRapa13w G6x7gHO1Bh5ljiyirTTWqQudGZODKw6Vp+yuQiIes+N6NLbhS4DuFt6Aj2b9T9CDDCiJ uBV8AaB6+Yf0xdqoYwY3OHDGItf0n2Me+C2WA2S5NF1cr5m3/U+tb37p/VVisRKvxS8Y e94y0BAEVO3tMizgN41q4Q+VhJd7/oyZUU4ghz3ZWfZusALg/kai7PGQ41Xr7Pas2yAc 8CSQ== 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=VemHoIpzCWAjrdpINoZRube8+PIa9Kx0uhyP77PRsf8=; b=rmYwqz1kqq3mvF+aSPXOj26VMKI6ow5vyI9C4hk8CVtvFZJrAv/Pm08q8/hdF0n/+d 6HoY6pnngS8EUpTPMOP3G8ZX18Ns4Dfv7k8mzJLrUKRN4tM+5vGBx/6IQCKAP0WSjEEy feHu4USq0sfOWRROSR3jJ9Dt7sPuWv2uPTsdGkfhNguAANFh1PJPO4zIo+xG6XL+2OfX 73HXP/ziz7+plYqEEn5waVxcI5oxFh5uwLZvgOEcSzCKZbkGf8zXhU7oYR/2pmiIYwtI NofRCk7COfxV+fFp5qo9M8SqsC/jNUjkUkgMpax3SLON+Z1fH3Yf3titxtjXhxJ3p+qa D2jA== X-Gm-Message-State: AOAM530kVpCyTe7pWTPjCgIV3cZr3uCNBCaywMVvz96HA109QfjrwB8K ierc1KYD1NO2BYjFIaC2ick= X-Google-Smtp-Source: ABdhPJye+2OyLZxT56SQP/lToZG28UoS5iGsakOMuQ8thxTbr65Na5Wl1//STr3OJ+nlbNIyUd01nQ== X-Received: by 2002:a5d:5003:: with SMTP id e3mr8538840wrt.118.1631467779246; Sun, 12 Sep 2021 10:29:39 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 26/30] target/sparc: Remove pointless use of CONFIG_TCG definition Date: Sun, 12 Sep 2021 19:27:27 +0200 Message-Id: <20210912172731.789788-27-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467782555100001 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/sparc/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 5a8a4ce7506..e83e305aa9d 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 Wed May 1 21:12:03 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=1631467785; cv=none; d=zohomail.com; s=zohoarc; b=CETBLdzf6RUtwJ5iDKU9SsAzoGEhg4uRuEODMMQBEU6e5bnpN8cMR9FRVfoKJFK28wzhDgvkXqvbzweyQ38gTAmh6jNqvnYZlqYhS2EFWuEzRY9J8YKagveR0jpd7Tna4994Qof4Kd/kKgatjjJUbNe+Mj3uqxPWOC6mpcxZ9S4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467785; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sD6WSo2YHvghifkbZDHrEPR9Egwbzuw6eNNdtPTmG0c=; b=OBz54XoYgabN/VJJMyeh1oLF7WQM+on9KmAsnzS+l0lNbCVwLU16RXA3kWU+UjNlCJwynm9gJgAfkGVvlC+x6zLknzeBDGYzvXcO2Gc5GGygRPerCXNGzDs7saIILImHzVhgAFs1mxsEddcvzhYgqiq57tDxV2giuJA5SEmmtng= 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 1631467785789453.140647559498; Sun, 12 Sep 2021 10:29:45 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id w29so10165731wra.8 for ; Sun, 12 Sep 2021 10:29:45 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id o17sm4983461wrj.96.2021.09.12.10.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:43 -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=sD6WSo2YHvghifkbZDHrEPR9Egwbzuw6eNNdtPTmG0c=; b=BsBTxQcU/49pj9VTjjCAkLGlBgg2zSeoa+hy7wZ2XehsqlHD9qThuik1ib/zDpjPqd Wm8GKQPetX0UPvUvK0M57LdAD+d2gZVGiy4QldY++oRcKyKVfq3S1DrdWUH7/CFF3Q0n s7Oyd1l/FFPWabOj6WskFhaQJh7YfUxlcuqGbh+ph2QLjzPsU7CZloIp7lEGw7odJCYe MQUIhl5TwRgQ95cqrVat5soLKA6OkEfCk8T9oK+HKIulVf9h46WZOMHXKQjoukTR2d7H eiBy41DmUMLM5JoXGKnBJ0q52vTc15iJHYw/1yPWNjK9OWydkGRJu4kNK3izE+LC24lQ uJvA== 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=sD6WSo2YHvghifkbZDHrEPR9Egwbzuw6eNNdtPTmG0c=; b=yuMUg4abst4IMgvVz3fhMUXrzK6upxxXwvvuMy+YOlfIzv9qQDbgopDRFzm20kp5Da 9spDYHoVzZCDal9Aehb9dXW5ouDtb0ac+1/bzvotQ04eolnE7YucIJN54AhyJBuoAKkd TUc1jZqfWtxHHDbC2eD+HvDRd0N9OCt4Qni1HmPpGJkHDxO7ugpZD3XKhbDYcSIz2cjI /OJQJgySYeLOjwsvTdgAHRUAR/Yu9TCcXBh+MchkpTTTgs3YDCJ0mHT5aJm5NaFQKO9X VLm+Jq5KPpv3m+FkDGz9i8BmHLpZIgZG9sZcY/yjs/DT0+fENNBPv6az8Az0+dodp71h Wanw== X-Gm-Message-State: AOAM532ziNTNZ6g7hT1Ds4Tq+p+yrcVoDxrjx3CZN53MukKauy5vYzhn AWR/8IQZfeDE1TEujGzuXkc= X-Google-Smtp-Source: ABdhPJzD7EF/pbpnTmFuc6lAJyG8ZqCRj17AnyCQ7pN/0o80IpCruOiHN4Ayyia5/Um2+qgxi6ML6Q== X-Received: by 2002:a05:6000:18c8:: with SMTP id w8mr8360770wrq.90.1631467784056; Sun, 12 Sep 2021 10:29:44 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 27/30] target/sparc: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:28 +0200 Message-Id: <20210912172731.789788-28-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467786802100001 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 e83e305aa9d..4a63ed12644 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467790; cv=none; d=zohomail.com; s=zohoarc; b=FecGgWuiulhGnUxLmyldWdMfyDhJzSAZWENU0STH6FD7Ya3sJA4KjYmtkh7JiCRL1+C2Gazimj3Rty+NAY64R2XWZKvY3JAse+U8wJWhzIesnCwEtA6ntcJWB1Fu4LibLAZTPOMo1WumpYRM91AXSQgPyOdGme59s7URGP/aEv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467790; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=Ys/VlJZO8aZ+ZSSLQjhHravSvfZEzhXWL0WSAeWl7CsIvptH2eKBZ1Z2I8Ru9bvPbT3jqfyJ3XDTMmPEP3+NoTeZHzFykCchwamDj58CEFIS/94YTSxN8aYtYHsavCrKWwzMMYnjKVOo5z+LGWoCB+5kggCEwlyj52Q6BJih0HU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1631467790379939.719096161751; Sun, 12 Sep 2021 10:29:50 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id l7-20020a1c2507000000b002e6be5d86b3so4965844wml.3 for ; Sun, 12 Sep 2021 10:29:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id o2sm5301135wrh.13.2021.09.12.10.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:48 -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=nDkBx0SE2JWOWic80sIZo+UWrCW+cSKt1Ly1bAzgQtgunxnbZEbKKIBiURMdUiuM/k OZ7Yn1K+Ii6BG7dP1kh0WC5CDmZu+t3NrerEFmbfuO03wDwNPsalCpQuqjzrs4HrpmU/ 0DeAdJWU19kH/zSANj/WEtsG+IQrruIPwj9pPYC9CO52nEuSGAMrh3U4Js8NFNTESluP OaHklBCu71pro5Pwlk+LCE0e9e93vh5HUQLnkpqZFhwxr+RL7YPOovkFhYzxIll3LEyx lXKbVduI4T/Bl2Uz5+yC6lUE0s4l31Jv6t8vvBcQKmpDRc6/uDEgcfiU2kO8wwD4pMeC b78w== 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=obGQA6TGFQeVAmw3WmZjQ+ClUNrA6rOv9N9HSBxCwJPWcLl+nRTlOSEow/Np4eTCzY 8eYJ9U9Lv6dWilXKw/IUyiMSaRair+Cy7RBZE/eCD9ny7bVmOhNdqzir02FT7l0QqXRn 3m82h0/tL6cjW4TpoyJ9MUFi1QE63aeIz/UL7hEAiu6kDqUD/wwiwMqT3L+SAUmJa4qS loO+6pBe6rLloPFexMIG/xIm9HCu5ZVQgwOPov5xUz71X3hPJNBLRhya2acvvDkO9oaY OB/C6wKHElReacg18axD4zB/T/x9DJ+Q/D9WCrGWXnB+lhdzp7tJMl/2jPOuxpTBQQD4 KanQ== X-Gm-Message-State: AOAM532gkQzROITLg3w5WcXUcQTx4Fa7ft19Skst40A0bJoIMMSV4jkc QOAoC1evX1AW2kh39CU3yR0= X-Google-Smtp-Source: ABdhPJwkUbT+jZV9DIoyS1BD13V7X7qv3lQ4N0BUO3k02DmuP5doAX5ZijLrTwTlOELZ8Z9MPLN5QA== X-Received: by 2002:a05:600c:1d0e:: with SMTP id l14mr3618329wms.16.1631467788676; Sun, 12 Sep 2021 10:29:48 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 28/30] target/tricore: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:29 +0200 Message-Id: <20210912172731.789788-29-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467790953100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467795; cv=none; d=zohomail.com; s=zohoarc; b=VLj//HKaj7KzbZ3+AQRr5c2lbnsY3/9UnEEtPVRGupizfpvewUy3mp+K1BlUFtyP6KnMaJTN6jB8CqiQnxK6XRP1tKXJZhzRp6hFtuk8YRIkGl9mm+mwDcJpwGaBlPomQw+pU1x+ktjyoc6Rs6K5WTNgVjGfMr7wU89rYzjNbqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467795; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=HgVKk+cKIZWLTWqMsHRfIhI4r2Tdw0wl505xpEwFhH7/9lqxP77MymF49QJaHwHsGlQBDrDO6NSlne6niGRLa26WOqcHyq0tDM/P6AiuJl6yvqVyWhOczyu54w+J+/XyAlcxMTEg75sNxOyYjln4rVn97TdjvHZCpFwfwlvfC7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 163146779527514.368533826869111; Sun, 12 Sep 2021 10:29:55 -0700 (PDT) Received: by mail-wm1-f42.google.com with SMTP id u15-20020a05600c19cf00b002f6445b8f55so4993592wmq.0 for ; Sun, 12 Sep 2021 10:29:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id l187sm4591213wml.39.2021.09.12.10.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:52 -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=JhLTXoCqn17oNOLyPMo1ml6TixwxjYOBTgo15glCNDXNsRTaCwr+P7P8QBjR/J23HG QWD0k/PG+VV1A925SO0bVdIgs4UnwiHOmlpPYAFryzls6O6fC/1lakKTmez/DbsXWLh8 f0ij+sfeT722cDzxvF+c6nGuwSF34mACoWwXeytiuKO/OCtp7qQf80EvbnFexnLCUfoH HZU9ejpj1UghPyTj4CWDGaGUtHxIOn4P0yZng0psFrLzkNRTqMbeaTfUNcVZwCidstz1 cg38gSk7RyvwxC9caO91u22JLC8CsDu2zQzbSVyR73mymEFjWaFfuT/VMjEh8pCjFYeM FHOA== 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=FifST14eRy4eVSp8bOm4B9KV4wWGXhtSdnpIxirOBVKt3aDb5Z48LIEIZz1FU0mJtQ tTrXIRu09bVjKaGCFclKV3LQDoorqLjOOmFQh1VrUuLUoYTNoU++lOEGEyyL8m8Z1dxs 3AFECXda4Ff/3D3xV4FxPm/d/US9oEfI2VvTUjqHgU0FfMiH6c/JY28MTSlq8Y1WButo gpSbd5y+40esJVYerXCh9DwKn5RlSViIzt9h32EMTM/Flb7sW0YfMTWsjerqq3kEsOwM LTqDNwGmQFiUSpKAwfT0AX7HMnh1jX819YyVduMT7xwFYkXXFBh6qiGcgyWzC+h0DKRg EEiQ== X-Gm-Message-State: AOAM533XTuo2gzFFjih6fSv0ybSdKHYXBgLBIGlaijJV0hvCYwDaumAt p/q32iKliLYgBqw3LvE/C8R08fLoVV4= X-Google-Smtp-Source: ABdhPJzoErEhv2Uj351OA1TWcZDrIFMarqslKLkUplt9vbyRW7yhVuTgIJb0DHAEiBFMWsh+CDmk6w== X-Received: by 2002:a05:600c:35cd:: with SMTP id r13mr7514359wmq.24.1631467793517; Sun, 12 Sep 2021 10:29:53 -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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 29/30] target/xtensa: Restrict has_work() handler to sysemu Date: Sun, 12 Sep 2021 19:27:30 +0200 Message-Id: <20210912172731.789788-30-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467797131100001 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 Wed May 1 21:12:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631467800; cv=none; d=zohomail.com; s=zohoarc; b=ZZazEvx2lnFw8b9o1QnDkzv+hQNY83BmIE1a7xEpi0NbtKHXVNpGkEXBQ8/3TaieIaeKXzylwdxdTup4BxA5bdx2+nC/XTXwMjWovkuOl+vEBogiB7suNcYl+ZwHxmcxjabSlqzlKTHXs5rik25smmC8gH9fH1kwmaQdr/tA4cY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631467800; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ztGq4DmTC/N4m8rtCGcwdKRE7rb6m86fBuF1TdoTzuQ=; b=XYxn6zmHgmdS/qDUX64MHEUoGfKdtcISIGH3XSbCjLvpNN+7E3QEOq8Gy731ibm3V4f1/bNBDMPII/jMNaVKyvfJg1bl2Ycm+N/0cwN9czh3Tv8jqR2aIB7belRAJA37laaFFq7C3NX0Ru4s5NVZJQMmfRHW25/kzmOmAONrK3A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 163146780032437.801919671712994; Sun, 12 Sep 2021 10:30:00 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id u19-20020a7bc053000000b002f8d045b2caso4977904wmc.1 for ; Sun, 12 Sep 2021 10:29:59 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (21.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.21]) by smtp.gmail.com with ESMTPSA id e8sm5107274wrj.48.2021.09.12.10.29.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 10:29:57 -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=ztGq4DmTC/N4m8rtCGcwdKRE7rb6m86fBuF1TdoTzuQ=; b=hDY7X6glJDFWFTdPbJYxzK06mmc1qtTwEo7UV/qZCY8+saYfpHBSsv59sBcJ3ofI4E 14bXxhLKm10FMtor48w2FT6WPNly47YDMDGoe8IEAw/VdTtgBMMEVWmVlFDUPpOog+1G jhcQYg9LpELBIERN+mPEbOj5sdhSbIzRMrmDtFHZ+HEVbYSLfU/e0l+e3iO//nN6vn/S CzpWubQerI+LO1y7hzPGpJLozNcI9WoFsrGr7n3U+yWCH/2xC8mSaSDPkU3PgtoO92L4 iGW+VUaC9TOGDCE9wyJ4Mxjd5lsc3PkNN5xsVMKM/j/OCOUWbtSWnU24Xn2uFVt6OR89 bmEg== 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=ztGq4DmTC/N4m8rtCGcwdKRE7rb6m86fBuF1TdoTzuQ=; b=xJt2zLRMerWO5TBdai6Z7Qcqgzctp9zx5c6AL4j0DXoPIuvV7OvsIkOknU0ZoHy1Jo X+clT8KsJ+j3qAspNAZ3oNEHQNF+GIIY7Y+qS5wbUPVrCHq0+DEA/rCXN3ZeydxmkYpn Fxw+d+rsbS0YF/60mo0oFFeWtkoPS9pyGQBZd7yugpSVpAzzIzPgUdhireYcWG3QkdNB cviJWYnHao13tfFWgJhFThRr7vOV75rK/Y8R6dyvFsInaE0HvCINBhm8EmITxrHpfeVy YKMD0YAJkZqf0kQYLrDzf356fmvN8Ul5M24mPJz7rXf652IySCWVUB5Umt7Snxrk5bMG 0dEw== X-Gm-Message-State: AOAM5336UZbWm4ktItvhnCCnjIYjLTxLwGryIGUtEqBeHZeUzFZfl6rI LVy+46V8Y0Ff75oZfjG7ICBt0HtJTDg= X-Google-Smtp-Source: ABdhPJz8Krl55vx7uCkwYkoEaQFqpCdRfsDStmfrZwjsZ9c1PycgmXckbB/6ut6fqkjIhzah7AnWWw== X-Received: by 2002:a7b:c7cd:: with SMTP id z13mr7684912wmk.51.1631467798526; Sun, 12 Sep 2021 10:29: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: David Gibson , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paul Durrant Subject: [PATCH v4 30/30] accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one Date: Sun, 12 Sep 2021 19:27:31 +0200 Message-Id: <20210912172731.789788-31-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210912172731.789788-1-f4bug@amsat.org> References: <20210912172731.789788-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: 1631467801384100001 cpu_common_has_work() is the default has_work() implementation and returns 'false'. Explicit it for the QTest / HAX / HVF / NVMM / Xen accelerators and remove cpu_common_has_work(). Since there are no more implementations of SysemuCPUOps::has_work, remove it along with the assertion in cpu_has_work(). Reviewed-by: Richard Henderson Acked-by: Paul Durrant Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 2 -- accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/qtest/qtest.c | 6 ++++++ accel/xen/xen-all.c | 6 ++++++ hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 9 ++------- target/i386/hax/hax-accel-ops.c | 6 ++++++ target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 8 files changed, 32 insertions(+), 15 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index e2dd171a13f..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. * @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/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index d1691be9896..53c427ee42e 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -446,6 +446,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); @@ -456,6 +461,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"), diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d52..eb5a17cef18 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) +{ + return false; +} + 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 { 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 { 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 6bce52ce561..e6dad2243c6 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,13 +251,8 @@ void cpu_interrupt(CPUState *cpu, int mask) =20 bool cpu_has_work(CPUState *cpu) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - if (cpus_accel->has_work) { - return cpus_accel->has_work(cpu); - } - g_assert(cc->has_work); - return cc->has_work(cpu); + g_assert(cpus_accel->has_work); + return cpus_accel->has_work(cpu); } =20 static int do_vm_stop(RunState state, bool send_stop) 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 { 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