From nobody Fri May 17 09:01:29 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=1632581486; cv=none; d=zohomail.com; s=zohoarc; b=YVZXbweKAMHyAAOWSp7aFGr9+BmnWhPWQPpbN0dWPOK9mvPTwj8SIf+2KS8u/q0Tfzt7vpt5CsMSmxzoSgN6x2dyrZ5uOLwmnBEKc2Zewdm3o8eRZ2ZzCFexju46PYRC1vKg+BJB72ouODN4NpowpMFbVq4CokEbNLu0MaTPqXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581486; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5Bzxb+cyFW2fTjguo4+D1GgUMJzgo2oIaa6x4dhI9M8=; b=nE2Ugw8Ti6aZF+yb6Xrdb+y3kP2YzQU7vIgXrBWnL2//UUUTOU7LjC/3Y8H/xMqcNPFkkh70ee+oEP3kbDRiVPOWYU7im9sjq05QvR5SboWTZpwT6Ubpiby38gxcaJiie4zd53H2DluwnIWaFQFAbTtS+tZtr24GHtIYAZvzfrY= 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 1632581486100583.1784730083101; Sat, 25 Sep 2021 07:51:26 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id g16so36511764wrb.3 for ; Sat, 25 Sep 2021 07:51:25 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j21sm11103624wrd.48.2021.09.25.07.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Bzxb+cyFW2fTjguo4+D1GgUMJzgo2oIaa6x4dhI9M8=; b=OXTzlc0l5v/r8uLvsReuOKdN3lsOY9J7V5T3b1v/C2sV26LnTKMFGdwfhFT/8vxdHS 0Go9INDMsXeMhAECUBjGHlV+KmHKaTRG3whAnRlP340XS5kD21J6RsxmCHDxoJ0xpd0z 62r8N2JZyHVq7NJ9YGL4ikGLjBRehYLzA4fdxms+0JLckSlv7SzCyGazecRWFfb1ZQq8 tp/8FyPVL+MvsuUtRHqveeae4+hW3drsKgbfJkAq/StOvPKmhPMePCJG4khmwgPW2K+j NNCtNQQG/7l88ca2Z27fPncaDZUz8L+ltujFdzRfBiOn7FAXP/U9CPfg7ndWnEwQ2Cam LHNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5Bzxb+cyFW2fTjguo4+D1GgUMJzgo2oIaa6x4dhI9M8=; b=T9CPYc24oy9q2/lWtJ7UskG7CSbh+4/Ar5n/XNDANmL38Pw2sOKbUFUNq3j2ULRsrM YOqrJWqBoeYb2/PXxabdfaOZExEixjQDpsGg+5H5Y3VGDOZSv6JviejTU5deYv5NoPII DXqK9f0d2ulzrIZAQKYWpgWOwwOjm5Ur7YMQBdeGGZrNj0d1lt7kEM6KwYh6VohXUkl3 8hegfLmNU4Q8uJKpx2FkzL/FpRQo2X2rcqLD8adI9biIUX+o9YVBD12z4mZCglvBYAkJ F/rrIxF9k4lA6TYCL0vEybOciTOgujpSOHcjinugM56OZDtARc5CxRh/UQl5cG33YA1C oVIw== X-Gm-Message-State: AOAM531KfuDNjmcxAtPSOY6Pf2oxd/2un+HnHfTs6VpdM3d7V5PG3Lg7 Y5G9tdUWvmzFVPIHB23X4nE= X-Google-Smtp-Source: ABdhPJzq85pYyiQEMby/nqs+kxyz8pcpHVsgN5LX6GqmttvViHhfZs4diirSV8lBDozrvbI7Ug+nYA== X-Received: by 2002:a5d:6d81:: with SMTP id l1mr17809354wrs.404.1632581484389; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 01/40] accel: Simplify qemu_init_vcpu() Date: Sat, 25 Sep 2021 16:50:39 +0200 Message-Id: <20210925145118.1361230-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581487398100001 cpus_register_accel() already checks for ops->create_vcpu_thread being non-NULL, so it is pointless to re-check for it in qemu_init_vcpu(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- softmmu/cpus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 071085f840b..646326b24fd 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -604,7 +604,10 @@ void cpu_remove_sync(CPUState *cpu) void cpus_register_accel(const AccelOpsClass *ops) { assert(ops !=3D NULL); - assert(ops->create_vcpu_thread !=3D NULL); /* mandatory */ + + /* Mandatory non-NULL handlers */ + assert(ops->create_vcpu_thread !=3D NULL); + cpus_accel =3D ops; } =20 @@ -626,7 +629,7 @@ void qemu_init_vcpu(CPUState *cpu) } =20 /* accelerators all implement the AccelOpsClass */ - g_assert(cpus_accel !=3D NULL && cpus_accel->create_vcpu_thread !=3D N= ULL); + g_assert(cpus_accel !=3D NULL); cpus_accel->create_vcpu_thread(cpu); =20 while (!cpu->created) { --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581491; cv=none; d=zohomail.com; s=zohoarc; b=Tnj4SQB2vmrJmjdwfxXVde4/e7FGoIdkDZ8XMV/nhMdGWWi6HVk5eySZTnuKxkiCIYVRXxpnARM4E8HBpz338inTs/1svKtcphjEWXbgyQnNXVGWSCY+l/i+v59h7SrwKmLSTghyH5TEl5NGi+h/ceRNUhPqnT6QouHzyCg+ENQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581491; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=DhxzCHKUTDfcO8Y/ATrdolA2oWmFpAgB59t2htOa+fC5smIFKuDg8fRszjlxVhTpmu97DUHGdj0y13ZZ2/lL5z8GYCInsWb4XZRWM24lMWIJpBPftvrbkh5KC+1OhE1sDQpm16Gt3EMkYoVeEozS7RJ8GjFCEs1CUasE3Ywfa/M= 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 1632581491043296.71699774829835; Sat, 25 Sep 2021 07:51:31 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id w17so36386866wrv.10 for ; Sat, 25 Sep 2021 07:51:30 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i67sm13683401wmi.41.2021.09.25.07.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51:28 -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=esE+aOjTLvFOR1pvVPn5Xd+dAbb4C2cXAr8kclKegqI/M9HwJTImfDcMx3CtJ98vYz xgYZmjlH1XsjuDYVIOPTrv8OFDzv77ubVJfdlrS6KX/Ta6/Hxa+MXt2tw1Qr7UHEVIw4 R/BmdqXFv6k6Cm8jd/FVJR2gXionuasqrd4Z+H+6Ymm71q2O4aB29klkNYDJsIIIGeAE akdkIYwHCp9bc7gimgaOfP8OO1jSGMc7YftPVfFbigVlHQ7ZGQEs2wO3QjnoNsZ/GybN gNRlac83LvG0JG7+FQ3AgVTg71P3duUiBTZfQIE6QicWs9wJHJxQDnMrSRIz7s2NjGcK u9jA== 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=2OrmRcGQwdMjWvmwu5F+GxpAzGZxkWUOJQFn+pxRPXgOwYYn8Zqv6A70KOEQUI1Trz ei45fcXFSyOiF+0QVm4nSWK7tk/UhMy1DIXrdaamhU7z8u/Ejnw07idpdF4Sy7KMLPuC 0RQCkmwWx7IPgiZhyE513pXyns08nZuY4iREu4Rp2E+DyP13plNdqBsOhRHRnOVjwthw mPVfwHSInN9+R8bd8AnN6la09CChyQpO5Bk2Wf9URq553vFZcAo89WT8PrVbfuAgmnJI 3DoVTG/m0dnONtRicdykwBVKpLNSXZ74LimI5h1scQrnwWUhvJDoAq79Iu0D44Uyd240 Q9HA== X-Gm-Message-State: AOAM532s1Rk3D0q4lf6osKjRgnj68+FXotdLwZhheNreRJQu9RLgo90g ziCNeV/0TJnWasDxnvmoM2Q= X-Google-Smtp-Source: ABdhPJwrkJLVpF0GLIvMlPUAzZyE7HWCRtyIDcUjP87AjuIzpUJXDvac+99KVK3C8GDsbK1W0hznBg== X-Received: by 2002:a7b:cb49:: with SMTP id v9mr7146092wmj.76.1632581489243; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v7 02/40] hw/core: Restrict cpu_has_work() to sysemu Date: Sat, 25 Sep 2021 16:50:40 +0200 Message-Id: <20210925145118.1361230-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581491939100001 cpu_has_work() is only called from system emulation code. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index bc864564cee..2bd563e221f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -538,6 +538,22 @@ enum CPUDumpFlags { void cpu_dump_state(CPUState *cpu, FILE *f, int flags); =20 #ifndef CONFIG_USER_ONLY +/** + * cpu_has_work: + * @cpu: The vCPU to check. + * + * Checks whether the CPU has work to do. + * + * Returns: %true if the CPU has work, %false otherwise. + */ +static inline bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + /** * cpu_get_phys_page_attrs_debug: * @cpu: The CPU to obtain the physical page address for. @@ -636,22 +652,6 @@ CPUState *cpu_create(const char *typename); */ const char *parse_cpu_option(const char *cpu_option); =20 -/** - * cpu_has_work: - * @cpu: The vCPU to check. - * - * Checks whether the CPU has work to do. - * - * Returns: %true if the CPU has work, %false otherwise. - */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} - /** * qemu_cpu_is_self: * @cpu: The vCPU to check against. --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581495; cv=none; d=zohomail.com; s=zohoarc; b=Q3OQQI/LlCISe6N70xra4QzC7SQDatibNDrO6yEgO49633ooIXGaijh8WWN7pIeHpmDS6FvXQINK3EjsMMVsr8VP51n1aInGiOvGuckvBpPpF8NWJxjsxPcOlnNSGxjmlZvkuBEIFbah32FZv6NU2JKYoejZiFtKL1qU/cVFSm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581495; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=NpgsT8FeyrtenUtlghRiDOOU5sxXYghxDjYy4TjgtzkpEAbM5SKNANs6qlt7AmNosjw+E0raG+pPWlHrUDX5b9HmYEZCteCORWuDBoZclgNEZPaQiCLc5AeHHT0F1WTDaO0ISWcHz4u2aQN3QBFPQztIqBKleawPQX6t+6DXobU= 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 1632581495957308.92005051571107; Sat, 25 Sep 2021 07:51:35 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id d6so36332433wrc.11 for ; Sat, 25 Sep 2021 07:51:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id z5sm17831428wmp.26.2021.09.25.07.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=K165AtI6L5PwQLpWjUgAWiQ96IxBA3jAdkl7OsVzbu9c0tekwJvDBKvzqSrhHpqIiT 7G/lNrsC/MOUrZJr89jZUULetjLuPlol3FRXjdFVtrJT/qZ1TpQpIevD2fEhE+7KtOEs TjGBuEKzF2gTkzQf6zOOToEPYMo7ex1sBUDeNdBmoI6FMo0WgT0549JpdJYdSn7KzK1E THs7nob9bzgh4v+d2iF1XP/zjFHCsBrcVH1YCcra3GkHtx5Cn78kchA9xHS2j9QuSSnl VRCHNfICLFz35lLgaGgB0hpGsNSWJObzOPFHmazVZ2cHjxnQlbRCajxi5SO9B6oCETyY vZKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=iCYRO/SCilm53CqMF9NO4ZS8gyJiXM6lPv5eqvo+cemdYZQ5+XOWSg9lqoGbjdc42g /SE1P9ocNu0u62LQQPf9ivkuJhSQQXv3V5L4qYoi6bfgi77kW+4MqaQxPtaH04kXfoDA JHLbckpnr5Q4gt3IZhVaEbm5uzxd4ADjF2aag+kkIqVf7vxMP2sAgNMOtpRerVJAQieT 4ufQo8S0IqsIbUXdLSk8Hqc0uedLoBzyE0gQlrjON82mloOQ4EgWzgHuP0GMKs0Fb+Gq /m6aagAGJvgfNdlaiTYxpvLUtpGHZpjkOxVsm0cwMHlDo68NfqKrbYMBHCiEEvdNh0q5 333w== X-Gm-Message-State: AOAM530sBMdrUQHKhqQuV6SlNW2jFUyo5etKd4HV9qwn9G94Y42fMbkq va25QxwfPU/a0ZV2XzTBiSvnNl3D0hY= X-Google-Smtp-Source: ABdhPJwoNo0yr9Xl5/g8pF7M2b4u7LMVRITjZFPwthVFeGjok2eci4VSyd/+f27acfMsyZXEgs3tfw== X-Received: by 2002:adf:f486:: with SMTP id l6mr16934537wro.375.1632581494184; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum , Paolo Bonzini Subject: [PATCH v7 03/40] hw/core: Un-inline cpu_has_work() Date: Sat, 25 Sep 2021 16:50:41 +0200 Message-Id: <20210925145118.1361230-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581498032100001 We want to make cpu_has_work() per-accelerator. Only declare its prototype and move its definition to softmmu/cpus.c. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 8 +------- softmmu/cpus.c | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 2bd563e221f..e2dd171a13f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -546,13 +546,7 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags); * * Returns: %true if the CPU has work, %false otherwise. */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} +bool cpu_has_work(CPUState *cpu); =20 /** * cpu_get_phys_page_attrs_debug: diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 646326b24fd..6a05860f7fe 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,6 +251,14 @@ void cpu_interrupt(CPUState *cpu, int mask) } } =20 +bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + static int do_vm_stop(RunState state, bool send_stop) { int ret =3D 0; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581500; cv=none; d=zohomail.com; s=zohoarc; b=YuP0sAn5owc2iwp9AiIAzWkxUlYyx3XeSDoFchw5OvIzYxpZqrRN1XW09BOrz++x8gvDaee7qFCVW1qjsHwpOByK2hEvRtPpgx2PGihZR/tiCxs3BpywKg6PAfZwcHgVwGJ4mwZttBx2cf6u/L5IrXGAfkcqBaCW0Ea1MpTXMGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581500; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=Jw6K3QCSA4RUakV6FN0YQnwnMWnQlXse2nnPeeKrUEDb/fAV1sqdd7irYrVKE6GdYQCAccoyYICQIlDHOp4ufe69DuI86jO98/WxVIqRNZnEA9WSW+x7Fhh8OwCxwn6onxBrqcu1NqeldlKjVYSoJSvU369I/BHWtrApGMEy2sI= 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 1632581500572593.1462779240676; Sat, 25 Sep 2021 07:51:40 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id d6so36332781wrc.11 for ; Sat, 25 Sep 2021 07:51:40 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y11sm13690765wrg.18.2021.09.25.07.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51: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=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=VgGbYvr0zOUZ11vJzkJlKMILzL55l6ZQpg9wz0vVALAo+YpQSBtyttLYk4uZLw70K6 QFRzS1pjSxMpxKpmbF7efFCe88zrYnUdS4WePbe1p6td3Z8bJUHoarUxaccx8uHQZ6Zk emsGumLandXTuwIhRbt2x3eE/YN/a3daJg/Gv9wzyrVKVNMmossnMdFNJbYHd8xaeAWj Us/qadeN0jVSrocrs7WRWBSdDnredCI47pwoxpR3YdFBO2PAUvd/MegerPvrl14vbTPf slpQ1SKMCRXKYCOe9Tg0Bx9LYVZtYkWTHlKqajNVqQ03NrNAMAEJ13qxaz9YPZmNGKLV x2RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=zFNLLsCg1CM0VxUTYbSpWttP0Q5Q6ybPCDRRBYOylXZlbimOWnrR3pTxOQ09I+jyhj eI0uIlRcngzBpXriK/2PLqGOHms/ZQ4F1iQtOdL4+Ht+h+Ys8TLvkKeWS0cmpJ3dfqXv qboZtmtdDyVVa5VPJ5EqcaREDv/soytwThsEDVcD+9tavDfLGfy+KUf4yspmImitrD+/ /ew+7LlLhTwWk7vxp0017AmNzy2JfntDpf0wZk0UM/caifeUyv+eoLP1T4J5QHobC1up 3iG3WHFznrcbtSgaKI/HPq4nYfWXxucpj9A9LdHkZrqPHA8O91bePw1nKoQHCwFAo6xu JN+g== X-Gm-Message-State: AOAM532UjEgQh7dHcKRf3ziBzJVgA9H1aZOHjlezxjCEllN7Sb9dGJgx sfBqtr3yZyNn5qpsK8wOdW4= X-Google-Smtp-Source: ABdhPJynwAAYE6uZr6+Ls3W+qh141dZhbxfysqzxFkctP0T3IxaM6Un9nQ8j/5Zrpt4YlEbojogeXg== X-Received: by 2002:a5d:440d:: with SMTP id z13mr17596133wrq.433.1632581498856; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 04/40] hw/core: Move cpu_common_has_work() to cpu_has_work() Date: Sat, 25 Sep 2021 16:50:42 +0200 Message-Id: <20210925145118.1361230-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581502221100001 cpu_class_init() always register cpu_common_has_work() as CPUClass::has_work() handler, so the assertion check in cpu_has_work() is pointless. Since cpu_common_has_work() simply returns 'false', we can inline it in cpu_has_work(), improving the function readability. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index e2f5a646046..5ed1ccdfdd5 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } =20 -static bool cpu_common_has_work(CPUState *cs) -{ - return false; -} - ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(typename)); @@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) =20 k->parse_features =3D cpu_common_parse_features; k->get_arch_id =3D cpu_common_get_arch_id; - k->has_work =3D cpu_common_has_work; k->gdb_read_register =3D cpu_common_gdb_read_register; k->gdb_write_register =3D cpu_common_gdb_write_register; set_bit(DEVICE_CATEGORY_CPU, dc->categories); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 6a05860f7fe..accb20f0589 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,8 +255,10 @@ bool cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - g_assert(cc->has_work); - return cc->has_work(cpu); + if (cc->has_work && cc->has_work(cpu)) { + return true; + } + return false; } =20 static int do_vm_stop(RunState state, bool send_stop) --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581505; cv=none; d=zohomail.com; s=zohoarc; b=MOwv/8s92Ep0l6kH9cXM1NHZ4tqB2qoZGIciJQAd4j2xsPPBDE2w8WzT51hb/Pcj/mDDUkVBjmwUnoOK9ijRf2RT8S4lAz9ApyPYTB6QgYBOwm29DPRYvaIrmA6t/bas/YFNJjCG2imrbNocCHFX514j655wTpUhvz0PREYpAew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581505; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=fWCrb2hfirvD8wnPA/iInZBDSL90KbOucT35g/r7jCQ4E7l6nOMHUo86BsdZ/pQSQHQkFwcZ26ZHa4CSV3BzIBz4hlYJUSF79jREDO4SckEdtr6tMB0/SZdbv1SCPHq32+RNr+NTOF+4f4u9tbycbnZAwXhX/dfLImKe/bhFaBo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632581505290841.2031328321434; Sat, 25 Sep 2021 07:51:45 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id r23so11137699wra.6 for ; Sat, 25 Sep 2021 07:51:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y6sm11342833wrp.46.2021.09.25.07.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51: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=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=buwpCuSSrgxmyCmmy7Xc7YQ0frby/3qBlNtyt2vmvtKTRBLv2D7XCYfmpxeABvUIHP wTWGKy8tmfncTEOsoD04c2mIkSWGa601Sj6PlSSUnXrmdcKLOLdVfRxcK2k6efZEjtmH sYGJ0h1dBt1khjd6gVdl5Qo5nDyIjJ/jdcYSayT25q3AAYFB0UXH+yWOmrS2S8fy3YTh 5hX9F10NmnoEMhXTqf2GuzM3rizARP9iXOAWhCvmIejmJD3VhWu7kQI3xm3pYY8gyIPY 4dXnJYI3YzSmE4keg/1QyKxFogm8yatnO39X690QJsQ57OXRwlHbCm10nK4gDwlv/+6c QPiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=2zsBKitoXUoS5PW0jpYX+ZXn/EG6NaQh9XfKcdMfVK1rkQMwf0USPKsiIMtz5z4O2p FXpXZlgSLZgg6mm8OO8aHsRwNq9fHMgSRSi/4fVoy0y6DVAC0PdEhfil9vZ0KkKu3EcR TMhSVceFLqfxKYuvtoypr/VQYwTekhwNPwliWcmfJu4HvS/OwH2JDP3brRgROPiiDCNn atkE8VI6uLuSLvjppkp6kzwf+VFcboNNDGAiS8wNPf7zlL/vvKAKNlANybG59QnzERaM I4G3grs/UDpPyQyojrFf3dB4CzzAosZFLZZG3Tmy3YyvTicJUG5gIl8dwRcVB/kmPodX ILGA== X-Gm-Message-State: AOAM531UKds4MjiuUTQuKViXocO7R/OgS94cpVovDfVvzdyfe6s/ullE PIMiCVvpwHmEZzbsOU4/Qqg= X-Google-Smtp-Source: ABdhPJyXRFwftRt+YBP8GlkHAiE6MH6iYZvm1+kXOgMvicF1vO9EMvcFJp6L2CbbquQZuUQEFPenKQ== X-Received: by 2002:a5d:4006:: with SMTP id n6mr8654106wrp.224.1632581503541; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 05/40] accel: Introduce AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:43 +0200 Message-Id: <20210925145118.1361230-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581506551100001 Introduce an accelerator-specific has_work() handler. Eventually call it from cpu_has_work(). Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/accel-ops.h | 5 +++++ softmmu/cpus.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 032f6979d76..de83f095f20 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -31,6 +31,11 @@ struct AccelOpsClass { void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); =20 + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); + void (*synchronize_post_reset)(CPUState *cpu); void (*synchronize_post_init)(CPUState *cpu); void (*synchronize_state)(CPUState *cpu); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index accb20f0589..85b06d3e685 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -258,6 +258,9 @@ bool cpu_has_work(CPUState *cpu) if (cc->has_work && cc->has_work(cpu)) { return true; } + if (cpus_accel->has_work && cpus_accel->has_work(cpu)) { + return true; + } return false; } =20 --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581510; cv=none; d=zohomail.com; s=zohoarc; b=Pmwwg14sMAk2b7pfvzhzvCEyFVSvA4TTkpxcKF2EvFWHat1RIGN5YDZHgzt7pMwiSIFCynNqJvNFeYtGPzJa11qa2LiAT+uRKSIlCXAev8RPvqb+tXGuN5gfCNAt29JMJfclYCejWcJa6CSvtwq0vJltbJMITSd4BtIunBkOMKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581510; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=Prlum+cIvbQzjop3xvzoQAgyaGK+X7dswfGTaogDP0F+J+SMWi3FRFnJQPGGGVUlDlSRXbK6dhVv8w+MEBb6vjK1e9SV7oDd8s4dqZSqlRiYxRiwgZjbGZzOj7IG6M4gchCZ2r6pMTtqPa90blAV8DUMUXE8UjKNtDTeSB7LvfI= 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 1632581509996125.53426024509304; Sat, 25 Sep 2021 07:51:49 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id t8so36606900wri.1 for ; Sat, 25 Sep 2021 07:51:49 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id m4sm13326459wrx.81.2021.09.25.07.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51: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=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=YOw2pv9ebkj+SD6dyN66r1sz5ImWnhuE1/NU5zJ+fIQcn+D4ncRESVjKU58DS+dE9G UJAdGB+y1u1H7jg+2+BcMVUMovD1pwb/9xNI8oHPh4cnl1fJPGMoluC63jOLulGNIHzx Vgl/Ok6wivXRNjSWDIrJfQV+/UUS1WrTz0NVni3AYqZj8Qkxd1729D6ihq+OO/SP5Xrn k1ekZ8Kh4vaKb2IGL4F9TduJeD6bHWCC6atssDqBIDbJZ3sfA3YaWSO+Glb5LGVUNRDg dt2Nb6l4U0v1o4A4lFERu7AV0sYz9AYrtJ1vf3YskPLWVcMAJ0q+I1akov2isqhIxo+5 pZQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=KGYdxM4SdintSpbCxbE1mMWbd/lTAvN1Bw9J0iz8U6J3wZIDqqsFriaEJ3Q2x9C7f8 KNil2uXz02P8IFGqTuT1T7N6SmZ8LOOrfWiLyKslBmQZXChNvkG+aa9+iUQmd5qlBxDp yqnS5eY2A/0yR7/7c/T9QDt4GSn7QdMBAo1PJT4+JX2hBPWrNV2PNP5bU6QieFHQo7FL 4Ne//qNsZT0mOKnyRzSUXgdJT5t1lL5+x6CYHJbsAckdyCuybYn4smBNbJ647u+fdA2t bLI1oq8Uw2nd+Yta3+Xm1il5CZ5Hov9FdHLPw4UmMEe+Knzt4KsUlGVHWHJxXPpOvUY2 VojQ== X-Gm-Message-State: AOAM530veM+gYfFuPT3whWFxaUc9TeguFeKT2+a1L2JsRtRUDD6N177R uV3mfgRpi1Ue9H97yaRt0SA= X-Google-Smtp-Source: ABdhPJwPXRuJQaR6gpTRqV/YE5q1tGhHLUEN8yWUd/qyt7m3JhVHHlWnvVf5F5l/T3Ktxkn3CgFDrA== X-Received: by 2002:a05:600c:2e46:: with SMTP id q6mr7286713wmf.182.1632581508227; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , kvm@vger.kernel.org (open list:Overall KVM CPUs) Subject: [PATCH v7 06/40] accel/kvm: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:44 +0200 Message-Id: <20210925145118.1361230-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581510884100001 Implement KVM has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/kvm/kvm-accel-ops.c | 6 ++++++ softmmu/cpus.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 7516c67a3f5..6f4d5df3a0d 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -74,6 +74,11 @@ static void kvm_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool kvm_cpu_has_work(CPUState *cpu) +{ + return kvm_halt_in_kernel(); +} + static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -83,6 +88,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D kvm_cpu_synchronize_post_init; ops->synchronize_state =3D kvm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D kvm_cpu_synchronize_pre_loadvm; + ops->has_work =3D kvm_cpu_has_work; } =20 static const TypeInfo kvm_accel_ops_type =3D { diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 85b06d3e685..c9f54a09989 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -90,7 +90,7 @@ bool cpu_thread_is_idle(CPUState *cpu) return true; } if (!cpu->halted || cpu_has_work(cpu) || - kvm_halt_in_kernel() || whpx_apic_in_platform()) { + whpx_apic_in_platform()) { return false; } return true; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581514; cv=none; d=zohomail.com; s=zohoarc; b=cL6YqOn4Hajt9xeLXSXHDNju/Pg674lyLwzzeEYtHib/Ht72VcMB9MKv31g74b5mOcjSL/b7hnabMqazckO2QJjZSKMR8z2EQt65fXnKt9bHRLBnmj80Pms0zgapGEzhC66imBuoPVSKwjyXSMBaI9lC5Q1S0Ake7mQzS1Q9ATQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581514; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=A0U1JFboFt97TEU3ZPyuwQNOvQRtqmGYG0poAdJoVkmcQ3RSxsYxon9vhGqUZTO5vWwa0f6E7RceHsZbrD849XfsNiVH8ga7Phr4S9k1q4td/O76RxIijjXRpHNGDCPD8weCC81btXNWsoBMFvDC9+t3Aj2bUUNPIjuyf4CZx7E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632581514643733.0077801634192; Sat, 25 Sep 2021 07:51:54 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id t8so36535146wrq.4 for ; Sat, 25 Sep 2021 07:51:54 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id z5sm17832274wmp.26.2021.09.25.07.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51: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=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=cFTB3ESmBa5g++Km+6ljTw3n59qd039s9/U8dSV75WKTWjWrlSBq/wvuxMw0Xh11e2 D7297Z5rdev4+PL3pACGaECHoHpiHCjTADkvK7CfHisYMAkMiCkz/pBO2c5Q9oHeCoIo 8DP+r+l0f+DrUHNrLsKVf6ZQHh7vhRgVn1Nldc7Iqta3XOK4Vw/QoPvBQ6vwbF3u1cFD umR4MtQYqwNjBinnZUaMK9U2A3FaWmDLWZyqBifbu/Nq9uzIRQzhbvXJ18YEEnHUWP6o zEpKsVmoui9pfiOjJssVoJ/8USPU9q/IWX41rP9DuzeOuz96GN/ZwGbZaxFU8XwYHvZ6 OE/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=FIxh+J1s3r1KMi9E5v95fv0anuHWCMpVRPgIwzpXOB9kWkYdcvXOArAeRKan1iPM4L LpR2C5VUkzPofwaWTvENd9Y6PknISzBwzV+xhe59iKMngAWh9lBsCdP1lTX9EAwylFvz b3jSZOB4Ya0oP/ZLSdfDwDO5GUQV2yEsZ/ND8ENgHFIml5/E2rYgum0Yl5sx9nSGhloV JGNsm2B7I5wrKGRN72KLHSuA45dfsW1jgrVeJPf2n86zd2x1EkV1v9fzzxF1nQpsxMd8 FwmE2kgjk2f0IDdj93vHyu5YI+diVDhI4vKIZ+hEI+F6gw3rY8lwFeGBYn6c5UNii3Kj dvew== X-Gm-Message-State: AOAM531PMjYzT6Iwy0cwjzdYEiEhVmkwCZSwEsL0tnOUeH2xy9RgANMb UkbJwNUURGVu46SHpuhailY= X-Google-Smtp-Source: ABdhPJxxzqfA7U9gvO6Wda5hURrjK93Ypdbdqy38aYqWnFSE9un1DgeSJk1R2QB8av3101pB1lxjtA== X-Received: by 2002:adf:fb44:: with SMTP id c4mr17630544wrs.179.1632581512924; Sat, 25 Sep 2021 07:51:52 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Sunil Muthuswamy Subject: [PATCH v7 07/40] accel/whpx: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:45 +0200 Message-Id: <20210925145118.1361230-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581514987100003 Implement WHPX has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index c9f54a09989..5ffa02f9cef 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -41,7 +41,6 @@ #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" -#include "sysemu/whpx.h" #include "hw/boards.h" #include "hw/hw.h" #include "trace.h" @@ -89,8 +88,7 @@ bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || - whpx_apic_in_platform()) { + if (!cpu->halted || cpu_has_work(cpu)) { return false; } return true; diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-acce= l-ops.c index 6bc47c53098..1f9c6d52c27 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -83,6 +83,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } =20 +static bool whpx_cpu_has_work(CPUState *cpu) +{ + return whpx_apic_in_platform(); +} + static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D whpx_cpu_synchronize_post_init; ops->synchronize_state =3D whpx_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D whpx_cpu_synchronize_pre_loadvm; + ops->has_work =3D whpx_cpu_has_work; } =20 static const TypeInfo whpx_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581519; cv=none; d=zohomail.com; s=zohoarc; b=llYo9YRvae2sXophHHR5BUn1fqyrytyMGGZSkznX6GtEOemkt2NhO+XdQqcNjBG++pXwcEwDAv+6n8rF4YjoXOh+eUAF44xzCfgbJDiZPKZgZAuJdQ706Q0tvPEq80D3QFShX6In3psTzrEbUAQaExJ7E/+GjySa/IQE2R1lEl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581519; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=EtMV8EH7C2Rr708t1rvP6dSIY7gnHDXhRbdFhyuOKZF/42JPzTZNwxOQWHqbwLp1rmMDzusefyLjyfpMcYvSYibtziWxi2CGpqV9W06NqpvYoIZW8ekFjgxCxRuSMi9Txmf8Aauq5Bnrgzod7pcTuupLiOaDnMazJOqpiIdFnZY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1632581519375176.1718121894378; Sat, 25 Sep 2021 07:51:59 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id t8so36535585wrq.4 for ; Sat, 25 Sep 2021 07:51:58 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j4sm11674264wrt.67.2021.09.25.07.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51: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=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=ft5GFZkKb5tuEPokb9Ek+0+A5ZgW2VFhekYV1f7EE5hq2yE+YvyVJNYcjFhCCZhbGb ILxRW22fWR3cQnXIfg97FgLHiIYGMDEZD1+JImhwKDkKzyjKcMLR6whiGRI0JQL6TrYp VA9hgIckq6e5QJkggO/8sAt66IIgHcRqHnk09tsRq83KqsKc+AFl5koPUgYactaRZC++ +/rn0as6gk/TfatH0G0BsBZxzvE1rBoun5bN95Wm4z6FFfbr+M5GUoPXL/GFMgD5UvUn cEResTSkuvhTw33Jwp0PpVNnLd0EDWznpltde6l+CZxvbt4/gkbZxypApyNtrjOzW7Dj XVzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=6aQo+gFlmXjxxhToHrPvgxEI7TURE1DEM2xAg8YeIhSVt9h9w+LVg7/oQoDcVOBnr3 OG7P3cQWxN1lt9a2tvWnj+oFbRIqDjM0Lfl8VQqDScah550ms3hffyR5YQ9oJn9fLr+s jkRFpo22DJfCeXCj58DMZlCNqXUM1zCuQ3yJf/5fYtUh8cvJGoyqIfzFs0ZU8dh6mXEY 6uVdghFtcO7Kz445QIS7GWXB9B4Y8MyRFUzJFM0oCwocseTlTERarZH06Lqhuac/w7+V MaBlIwR46gPzNsjLecgYkfJ+lCe5U9D9cDSWLSkZf9EGd3HUGLz1QaaUgUrUNPpq19De e5jQ== X-Gm-Message-State: AOAM530M/A/LyrPbPI6tCZQHcZ78Ebu8L24YQjp7e8xRgZSAgYuTsf01 Io8fvTXKfieclk5+vEpFKwM= X-Google-Smtp-Source: ABdhPJxzi+tBxAEnmGk1ZVdKghIl6UcNQLPCNwNpmo9CizTuHSUS8CyrIdM5H+T9qEmC0rgw3A/umA== X-Received: by 2002:a05:6000:1379:: with SMTP id q25mr17140276wrz.280.1632581517631; Sat, 25 Sep 2021 07:51: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Roman Bolshakov Subject: [PATCH v7 08/40] accel/hvf: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:46 +0200 Message-Id: <20210925145118.1361230-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581521224100001 Since there is no specific HVF handling for cpu_has_work() in cpu_thread_is_idle(), implement HVF has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/hvf/hvf-accel-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 93976f4ecea..ba7d4f20a35 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -454,6 +454,11 @@ static void hvf_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool hvf_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hvf_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -465,6 +470,7 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, v= oid *data) ops->synchronize_post_init =3D hvf_cpu_synchronize_post_init; ops->synchronize_state =3D hvf_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hvf_cpu_synchronize_pre_loadvm; + ops->has_work =3D hvf_cpu_has_work; }; static const TypeInfo hvf_accel_ops_type =3D { .name =3D ACCEL_OPS_NAME("hvf"), --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581523; cv=none; d=zohomail.com; s=zohoarc; b=KbpQNdVWxk/ORN05K9rTN0EXjQA5tucY1FpUU/wBeWNR7CD5m++2kp6D2DjGT/AVGaYL3t6Z5JYKB5iWDOG9elM47hF+8qlo2dLmsxm82K2akGoYwukJ0hpqJiNQck522l7JVtCeBp+E8vSkunQo5WATJcQJZntLeLWb5+Js6VQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581523; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=csyLd+rlG6cqwduc3cLqc6hQ4oEf5qBN9lx/65Fni4xp9qBKTofooEP0NNidZKC+C5saGwxcAYuSpXrC67NxsNXDi09h+SNuFCs8lFTnQcSpwvFWjbS4w2Y1FZIM+27g42mGcqDWIe3kV01GrUeMROwaSPAfhKgeRBkkKlHuRsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1632581523981575.5826130173967; Sat, 25 Sep 2021 07:52:03 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id t8so36608203wri.1 for ; Sat, 25 Sep 2021 07:52:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id 20sm16920479wme.46.2021.09.25.07.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=G+GmU72zjpBNcQjaJkUxR7Hm9Y3LE8KiQt/SI3NeS6OLKULhwLAVtEcL4ZDR0Jag3I 9Iqu7RniWGbPuunBaeHSb4uaOW1HdC2SIyhodow0oCFW0XZoRHzN/zJPKDXAUsrTJYbM o0tDzvkIczPzHnDbHc0znNPAZVEXTt+qBGmRo4pyGYCa3HQJ83meRkO9SVxoKlo9UeJ1 nIqgFF+VvYvmGPzkpUox87plIThC0qe8NZE+3Q2d5FskCrFpydmZtE6Xb6AqInYZwrDa YbNDzLTFdcU1ZqZ6fDRMfqsaJAvDTGh4DXeDd8S8Htmyi/O/u1OIGLRJSsN5WaOPH7nW CM7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=Yj9+nSGlPpKbhp9s7JY97It7DoYisRJsxO9np32Cq/qNzBE00kVgnwhxF6zpwWShzt efArdPOMgBiKmcDkX7Ky+Mxjbq1xWqXSB1WYhT3f2lIijDoQs5Roz9+QlcC7xZwhuEEH kzKoXyADT6VDfFEMdpawnuJxWmW135T7wOYppO5Z7PlpNzhReZFphzsZxm8f8abpyREr sVhOHzI9PcKxnbbgtu62Spunsfgsv6a23EtflPgsyWsaE1Pndz4S4waVySCbrcn7A5vl DZIEssFwSFtKkIyr9nGQwVQA3npFDc8HzWwvaoUtfmAd6VF1+Ix6TS+W1AjKq0vejMmu 0/pw== X-Gm-Message-State: AOAM532WypqYyf/AnoMUs/X8Os1NfC3kljm2G4/zlP0AlZ/1UE3cCm7P fCnpk2vt5i1+TRhXi7FZjVY= X-Google-Smtp-Source: ABdhPJzkjnLgo6lRvy/ft690imOHBkl2yBKGxN4EX4PM++nl4LReYCioSoopkYZjVGMaG0ouAce+jg== X-Received: by 2002:a5d:6741:: with SMTP id l1mr17319095wrw.289.1632581522279; Sat, 25 Sep 2021 07:52: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paul Durrant , Stefano Stabellini , Anthony Perard , xen-devel@lists.xenproject.org (open list:X86 Xen CPUs) Subject: [PATCH v7 09/40] accel/xen: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:47 +0200 Message-Id: <20210925145118.1361230-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581525414100001 Since there is no specific Xen handling for cpu_has_work() in cpu_thread_is_idle(), implement Xen has_work() handler as a simple 'return false' code. Acked-by: Paul Durrant Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/xen/xen-all.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 69aa7d018b2..fe5a37fa2e6 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -215,11 +215,17 @@ static const TypeInfo xen_accel_type =3D { .class_init =3D xen_accel_class_init, }; =20 +static bool xen_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void xen_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; + ops->has_work =3D xen_cpu_has_work; } =20 static const TypeInfo xen_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581528; cv=none; d=zohomail.com; s=zohoarc; b=GtTERXd5AUyJerR4OIF1quDj1vahk7oUHPb8mZiJZOYb5n2BlLf4ZK0tPWmAxoLmKCqtL4q5BHIx1bUa/jPCwuLBtPhpULMRAoCmvtwP/IFl1S+C9vQRvI3nZnR7s8snavyabEK2ku/raWCmdO6Xy+7R5X3Mt0iWf8XQD3NMgPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581528; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=ecHAJJIxtXxzuqGSFqF7LvPeTtp9YImEATq/KLflzLtuyxj1r9FwW88UgTQjYcunP7gA5gOz+Zio2QhCNA3WlbGAZFm+E2dBFm6Fl6K3d7h6GJ1Og2aqt0ZDWyA5FjRkIlbuaQtDJLq38lnw6Tc1ArG4lqOxZWp5L4VYFPXJV9g= 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 1632581528790524.2931996590526; Sat, 25 Sep 2021 07:52:08 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id w17so36390166wrv.10 for ; Sat, 25 Sep 2021 07:52:08 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id z12sm3461932wmf.21.2021.09.25.07.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=bkeg32cm1g1cDL5Hz840hC10GacR3HaUV+H3qtoTwYs4zn0RAwCScYriOnXvHon0U9 0gp34aCY/s4IUS8T3dkVsSu2XXJMBM2RxiapTZHNYlo7EIT3anGmf+Wpx/rsWySC8ZLR 8YAWxrQoob8Xsioze1bPGrD5rNSRzJfkvHLwKx7rtHkGP4GPpO9voHXxgACghPuAlPkm KKRglJ3zqDfktRjl95CbDkAHKlJdREjHpw4SVnMb8kI8rHeZvNKqeabKEZxFwI3Yxov6 AYoMHujrVoPyqGYpNbkEAsWRviqZZ94wwstJKPuTAL9RrJXjOGm4CdvGKfc/M+F4+a9D UagA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=7VdAHlKWR8mQZYYg5Ud8orGA9W6DMBzUjqSbcpXDSiA4yfBZWFtqxOTiJ/FvJQxSQt dtWCxuHzwwdr1cJ5pyTqr9MyfxjKq+B8UlWhgedr90VcXZ88NbAD0178iSvRu7XU0ska obVSAmYaUgCXr5VBfpfPkcZcDooamnXwyC5l2Y9dcdUI4kcFiEPUAuhJRyxA80IuXaH4 BBm6xbkmWnQC8md+rKIYGaHF9C+/YtnXglyHzp6cORRviKLkoRizFsGRGZ9L55OCrVB1 xvlxUAyHdaltxHjlHyAPjYPxBPdDotxHP+3qZRtQMA5gQmpzulC5lnO7vderNvej/Bkx jpWQ== X-Gm-Message-State: AOAM531daRV5LQsf3t4/GVBhfSVywVsbQuikeUKUbbCBLfHxrlURjOLH c1j3dMuqPe9VDSuBH3zAgUffEwDCczU= X-Google-Smtp-Source: ABdhPJxLYejp8XydnQh03LskQRhp0++Hb69luky+TD2y7l4giH1o7MRjrlRABmmwsTGuVS6G+W36+A== X-Received: by 2002:a5d:6392:: with SMTP id p18mr17068385wru.372.1632581527063; Sat, 25 Sep 2021 07:52:07 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wenchao Wang , Colin Xu , haxm-team@intel.com (open list:X86 HAXM CPUs) Subject: [PATCH v7 10/40] accel/hax: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:48 +0200 Message-Id: <20210925145118.1361230-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581529733100001 Since there is no specific HAX handling for cpu_has_work() in cpu_thread_is_idle(), implement HAX has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/hax/hax-accel-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-op= s.c index 136630e9b23..5407ba17eaf 100644 --- a/target/i386/hax/hax-accel-ops.c +++ b/target/i386/hax/hax-accel-ops.c @@ -74,6 +74,11 @@ static void hax_start_vcpu_thread(CPUState *cpu) #endif } =20 +static bool hax_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hax_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -85,6 +90,7 @@ static void hax_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D hax_cpu_synchronize_post_init; ops->synchronize_state =3D hax_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hax_cpu_synchronize_pre_loadvm; + ops->has_work =3D hax_cpu_has_work; } =20 static const TypeInfo hax_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581533; cv=none; d=zohomail.com; s=zohoarc; b=fjohcnWHln9qLJDCuhzFs8lYkt+i8tqj4p/t3g2/JAVoq4UTtWrUlX+gKkBxBO7RMzTa3g2BAslPVmIFKVQF/a0A4EAPrsVA3Y7A2/B8thybRiJl1dTEkTfsSVUAidzyA/0V+3PAqe65oqVQTzu9RBB2gm2+HLj0uRQEcAgjrcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581533; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=iId/xGK+peImS8adkJvbB2fh9am1Icwem34kG+QULquCc5pVN/EiSiTXobvd1HAyP517/dIS++IJe/6cgTf0N7FLrXPmyKzpqCVw2HETeLHpiP3hM2xBHpWlr5w8AdCpWDXD7RALHNSytCvoUPyVsEAFfdU1hdWVkKjKE1WbSFg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1632581533543320.18210309223457; Sat, 25 Sep 2021 07:52:13 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id t18so36545659wrb.0 for ; Sat, 25 Sep 2021 07:52:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n26sm15815610wmi.43.2021.09.25.07.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=MwgJW+yc7cOusjtImkFrJ2gnNtX5tK9JtKttyALTt8MXdcgv5cew7qYCTAX+CotMag 1Ycbd5OTbO4hGdzinmZqax6dLZ0tgTssaA50jntUbIYxpr5feKiQ4DBCmsySC0HpguCh pMv3OyKKAgvWp/BFIjUBrNc8b1/DDuzXa8oxru0Vc8CmZMtONai9SfAzJv3PohPruCBX SlSnAex8v33qbEq5isQKK/SvwU9aQJeoI/lxQ4L8banpVypRjQkd8CE6dR/XSgP47Zzx anfUH0Y8gRs6BYkdl2k7RY4KosRaZrZE86aNrpJp/Rfq2MLXtlJFxLGfJs9ijIrQOVIh QMiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=c+aigoDx6gwDQ1In93kRnRnbIJMLn2GPfkpdxO3XM/LP3nGAROVi5a9kt0HCeBz8N9 4GsPEW+/6bwT0OdaUndjaK+n7EjrB889/CHquUwYhnqdabT8YUEPj+c5ugSRHmHlBQGJ nB8+9QYaiWICNDdgyt+zdnEh7Jru2BWVH0bK/vQ3wSHgrSWSsISQUa5BFBaclpqOuq/y 7410Ih9AWM2Ut2R7NalDcrPMFE3R47kXZQpa4ORTnKsU7qTz1dDA/Drcv4AAUvQqQvMj WTI87NwcxtH9gUgpc559BWqCsdROrYj5iSF6kY8FLClHQzo4obppNj9CXnyhM4+QUGC9 Xs4g== X-Gm-Message-State: AOAM530SR9gtErrOpbMgF8R99dODW6V5euu6p03qIdU6Rlg31Qf2rfHW i6F+pCPZSQp9Z1supyn4uIw= X-Google-Smtp-Source: ABdhPJz++mxK0aLTrnAeo5+QdatxDLpyJgp9NJ9xzEfzSXd8t8Q7OcH6swtbzrZOARYj20kiuxwI2w== X-Received: by 2002:a1c:1c7:: with SMTP id 190mr7147880wmb.158.1632581531737; Sat, 25 Sep 2021 07:52:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kamil Rytarowski , Reinoud Zandijk Subject: [PATCH v7 11/40] accel/nvmm: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:49 +0200 Message-Id: <20210925145118.1361230-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581533866100001 Since there is no specific NVMM handling for cpu_has_work() in cpu_thread_is_idle(), implement NVMM has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-acce= l-ops.c index f788f75289f..36296f79ff8 100644 --- a/target/i386/nvmm/nvmm-accel-ops.c +++ b/target/i386/nvmm/nvmm-accel-ops.c @@ -83,6 +83,11 @@ static void nvmm_kick_vcpu_thread(CPUState *cpu) cpus_kick_thread(cpu); } =20 +static bool nvmm_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void nvmm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void nvmm_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D nvmm_cpu_synchronize_post_init; ops->synchronize_state =3D nvmm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D nvmm_cpu_synchronize_pre_loadvm; + ops->has_work =3D nvmm_cpu_has_work; } =20 static const TypeInfo nvmm_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581538; cv=none; d=zohomail.com; s=zohoarc; b=fIE3vcIXnFsr8UfZV8YUYktqL0xt5/0B/T45+JRJ3Co4YJ0PDm1n+RbwsQZnecKcFcAOeOVozZssxMEnM5s0jHuicTXTmgfHc0i6v5bEnUaqYflGRedC1U/AuBOQMMA3w0xKCe4c1O6VpBIwANWjzBWP9pLwBenPDpefbx6TL30= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581538; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aLzuxgLTjxaUP4zi8sBdv28yd73Nm8j1vjkLU2rmh+g=; b=dZSEUWNhICj2/fVi5tGikn/gZYeNV48G6jYnPlAbGWLe9zyo2MS2B8y2h2+Y5dAHd29NNXTCaasVG1ByL17k2p9OLDftq0Dfyq5O9GsxNqKEWM4guXkuGbi30i3RnL/X4Bc8VEHCCBCHECPPc4HG4m+ut8emIfyh9BfhLY7KD9s= 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 1632581538155447.00399243852394; Sat, 25 Sep 2021 07:52:18 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id d6so36335971wrc.11 for ; Sat, 25 Sep 2021 07:52:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c14sm11255196wrd.50.2021.09.25.07.52.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aLzuxgLTjxaUP4zi8sBdv28yd73Nm8j1vjkLU2rmh+g=; b=SaZX5+axWdoNAEqaVs6F8TD8N7AxIfwQMcVy+pxC7HPXxx/qpTmFNIS8cXDA5Pjkog QFSskgw9znaSWXpRbTcv75DFTxQm7oHnNvLyeuf8Xi1lf2hhlsGm9i/T2EW6XIB2pov+ 9eHNIR2LGkzGROfbBUquu/TePfTejG4R2FkG/Eujb++9lO9YQ2cHMOXtUxbWBBXHo04u khfjO6apBgrXhYn9uhYhRaLxaL88B/iJvV5wxP7j7wvepaOmqmSJIr+RR9VIwavB+jCA jxAtkacEp2dkZUd8OSKTISEe8b3v+wxGnTxzQ4d0M6lDuGXng4D7z/FWPGMssfqnIKjJ 4VOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aLzuxgLTjxaUP4zi8sBdv28yd73Nm8j1vjkLU2rmh+g=; b=G5mPyWBJANO0JtzfDH7uokNrJGQWvO0dD5RT3VZW9QzSlKCfYZnaOC8bbT59iZWYyb S0Rg7YvYuvTfLBX0MsswtcBWjPmIn4vtMhBhq/e2hsEfYVEDAe4PvkwueKoYv6GT2pRs mABFbYkUXaG9eCz6ahGYuAupsPdYz4xV25OUSr1yzpSjyDMLFvHaPsyLTkSknOq5yFWM KheHQ96gydaZzbcwXrVvIKUaYFyFZJS/NE4AKfnjS7ZNceOZzAwxBNzxKg7A21U4D/KC 9cMEBAunLRW5yTzG4ouZIrzcmZAVLs8b7xlx9Cywr3wByRExiNOSZ0WAROcFIujkRt1u f78A== X-Gm-Message-State: AOAM530uBFuTvpZKBV/AnOHTQnCVhBe/i9vCt3GFBzjjG9Bjx7Sb4e1v 9sBGfIs5JxPxW4eTB/fpSS0= X-Google-Smtp-Source: ABdhPJzYPpUggr8HAA3tolud8uCGmSfmGWRHb6x82DTDa6g/c+WwUa8Abhdu1ikeiMFhIIjnDV6leA== X-Received: by 2002:a05:600c:4fd2:: with SMTP id o18mr7448821wmq.126.1632581536473; Sat, 25 Sep 2021 07:52:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH v7 12/40] accel/qtest: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:50 +0200 Message-Id: <20210925145118.1361230-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581540023100001 Implement QTest has_work() handler in AccelOpsClass. Since no CPU are available under QTest accelerator, this function is not reachable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/qtest/qtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d52..903c39ec1bf 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -47,12 +47,18 @@ static const TypeInfo qtest_accel_type =3D { }; module_obj(TYPE_QTEST_ACCEL); =20 +static bool qtest_cpu_has_work(CPUState *cpu) +{ + g_assert_not_reached(); +} + static void qtest_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; ops->get_virtual_clock =3D qtest_get_virtual_clock; + ops->has_work =3D qtest_cpu_has_work; }; =20 static const TypeInfo qtest_accel_ops_type =3D { --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581543; cv=none; d=zohomail.com; s=zohoarc; b=Uvf7vxpqzGFhASzFVIaGmoiq5RbEC/Ohfb4hvx65ScLfQOsTvuYTl4fTFyos5O5WjiZstXbb6706u9jNtcchDTxoQDCqdRlHlZSbJKpDB0wTDK5pivmSBndVEr0QMSPsjh3sD3GMcHUJFzXJXmn1o+X3fCxuRqtnpqfHWZXRl+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581543; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=QwnM+WaMNAVOCtyEGhcH6wqHdXSlGV9H5PHAaSzo9VLpZjAfP7kG/847DxCCGQRk4yTz0FLkT2h6VeyfAJKeQ3B127gz77dK7sLSoADnPUAb1fNlcpm377VNI7ZK5sraer4gTsdjTa4oloRhx7j78oXExEOspwXDGUknRAXssuU= 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 1632581543099557.6235423898772; Sat, 25 Sep 2021 07:52:23 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id t8so36609810wri.1 for ; Sat, 25 Sep 2021 07:52:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id q79sm538855wme.44.2021.09.25.07.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=j68C4eLX1ptTj7zfQFd+u5oWMMNmJjuwubIgPVg3jgvU+Jx7iFlxiSIckGd+XilbqJ dwhBoiyDb6TTRq6TwSG+UHVEgsFG91LomPTCdZoL7gFGRVadsFB3dixEDW8vWZ4KdIFr QCrQt1kAUJCCnp3lWxEQ/bAjmbLb7jdDbGbT6lLd4BIKlu4t/ugkbpB8AGxXuQu4KAPy HW+e8GsKlaaF/mm3FUd0mByab7IKFUc1MNIn0KXnOZlYWlMPoxtsDOFSn4emvdObpVkp xXF+pw71zj8cEagjeJA3mTNgn28/dBmmXUr/CmarcEKEjxVnbTss2BVlamPRTgHkKUSR dbvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=njNiv8a+pE7awLPSHJK5aMCHmIe+3Zn743JFQqcGrjv4xj5pkGtqs8qazEbvy91Frp m/LXiMAFPc1c/D6oU2oJHKsc41VHwSp0HJ1lXI+cquOXxZXFdRAL9M/FMHxB9zORF/+I wppQvUlsPdhTswKyfwp8jisplDzyngDDlVgneuNThxHll01c4ZzsVNNkPD/4s0okVe9Q QmxTIEbDegVQo7Q7/N9ta8GqI3apk9iy4Vi7QnO1CZheOIKyGiyU3i3HNRPopthmpzNA 6MabEjth7PKh/UYKRb2kwoSj0CxK8CUlZGZtv/QtJE3jxjwB/s8HYwTBeXuKAJoOmKnA eDUw== X-Gm-Message-State: AOAM531J4n1+yGPhiXTNlAsefU5/f47paTTWHhHG3Eq9npLCwuwhsNbH FJL5HdVU6DuR7dG+/H+F3CU= X-Google-Smtp-Source: ABdhPJxKyaVifthI1g+m2oBAHRf5qkbeZ8vgKdV+UdodAIvdER+BrwwztYMxteSYTLcVkkwrUK/dPw== X-Received: by 2002:a5d:6450:: with SMTP id d16mr16980503wrw.40.1632581541369; Sat, 25 Sep 2021 07:52:21 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v7 13/40] accel/tcg: Implement AccelOpsClass::has_work() Date: Sat, 25 Sep 2021 16:50:51 +0200 Message-Id: <20210925145118.1361230-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581544260100001 All accelerators but TCG implement their AccelOpsClass::has_work() handler, meaning all the remaining CPUClass::has_work() ones are only reachable from TCG accelerator; and these has_work() handlers belong to TCGCPUOps. We will gradually move each target CPUClass::has_work() to TCGCPUOps in the following commits. For now, move the CPUClass::has_work() call to tcg_cpu_has_work(), the TCG AccelOpsClass::has_work() implementation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 2 +- accel/tcg/tcg-accel-ops.c | 11 +++++++++++ softmmu/cpus.c | 5 ----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index e2dd171a13f..114eb3b9b2c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -89,7 +89,7 @@ struct SysemuCPUOps; * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. + * @has_work: Callback for checking if there is work to do. Only used by T= CG. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID. diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 1a8e8390bd6..ebaacff1842 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -73,6 +73,16 @@ int tcg_cpus_exec(CPUState *cpu) return ret; } =20 +static bool tcg_cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + if (cc->has_work) { + return cc->has_work(cpu); + } + return false; +} + /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { @@ -108,6 +118,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->kick_vcpu_thread =3D rr_kick_vcpu_thread; ops->handle_interrupt =3D tcg_handle_interrupt; } + ops->has_work =3D tcg_cpu_has_work; } =20 static void tcg_accel_ops_class_init(ObjectClass *oc, void *data) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 5ffa02f9cef..bb16a25bcef 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,11 +251,6 @@ void cpu_interrupt(CPUState *cpu, int mask) =20 bool cpu_has_work(CPUState *cpu) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - if (cc->has_work && cc->has_work(cpu)) { - return true; - } if (cpus_accel->has_work && cpus_accel->has_work(cpu)) { return true; } --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581547; cv=none; d=zohomail.com; s=zohoarc; b=Em6rCv8Y0SeZf7PskQJmAg/OQ/SRMRIFrPP8oibaUMBmL66HpVD/jOPs/fGJOVKlnkWi/TU1Z4U8VV2HbO/hWEBA40if5rpndYYYKun97TSp6M4V+d2qCpyvXbkgHXqFh40ys5HaU0klhu9W3wD03B5uqmiQlgTt6TIyDvKX75A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581547; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=jbiv/1J5zYw/EA1OUorL+jJVFMcfWP1y6b1QtfWl1GFDTrQvcKXMQpTuKGcbS6Z10DgvsVyF6Qt8MrESvyme/zGC1Jq/wWjUMV8FX6Bt3/3Nlm1yRP4/oqt7SOJ8hTrlKTWkm0CEe3KCm+IwLK146ENcugjIB2aOqXlEFkmVBnA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632581547850927.2711422021168; Sat, 25 Sep 2021 07:52:27 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id d6so36336875wrc.11 for ; Sat, 25 Sep 2021 07:52:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y9sm18217307wmj.36.2021.09.25.07.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=DE4w4ld7rRT7nzqPQAZUdpnJI44nhsZM71vrw8kOMxoZ8cl5cWTG7GT3dCZTJQI2Rc uTNuoWGJZ3rXMzIl8yN8R4ECnf7RjByaiQYYsgKXzCkdZ1IyO8sq5++hWSFJl2LmzSx5 oilHTxhb2G4xR2mZ/S+WIZQ1bSSwDMQ7yXdvdfkcyh3caUR8CQDGTzwiFNPlkHEr1YUt D2aUy3mCuVUAG9G6Ui02jmyeq8nqWmINtM29b33AgmjZz7kEEPAe+2wC3C0nmGDnaFvM uIWVu1rQ8A20JNKHZceqigRu++aqgfMAe5nlo8sl7upfZdYpCqHevl98gm+drF1dDk2U tE+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=0qGCjeA4bO7isZkOWIEP5RVUrGIHJ8hzh4hyX7FwgBNxDDmRfhhmoJRCoC19Ag36OD JcFFcEDCg9E3+25hDuiUOYma11sJdCDlmPwJsooC9nirDWS5Apmbx06faLnTGsOT6T81 mMeyVQE1CvpHdF6+bZJNz2Sal5QQTiyg1IjYmB4F7bWF2BL7SFQc7uhh3z8iOjwJ/6CS tY6USCs+XNaUvFUtv5N0c8HQkG6sdOUvpu/ZVk3J/1qoCCs6JqjpGfNeVHh51COzWBMV Kt7tLFhkfgvSjoNIb+cFVmb6SaCaogat7wYFAFDKS1r6XdLCG4OM6MhcrSrg1ei9Te+W CBhA== X-Gm-Message-State: AOAM533H3dwvJRHfImvOiADZyT/+X0dNzftqePzEw5edldvtSzkkT/O/ OTZgHUHMWNImh7rL0yDiOto= X-Google-Smtp-Source: ABdhPJy/iQ6OqFZmRhbqPntWlhkYLyd9pw0x7+xi5UREpf7hFJFp9o6UHhlQgrYBYEYq1EkI/VjBhQ== X-Received: by 2002:a5d:59ae:: with SMTP id p14mr17862480wrr.278.1632581546133; Sat, 25 Sep 2021 07:52:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 14/40] accel: Simplify cpu_has_work() Date: Sat, 25 Sep 2021 16:50:52 +0200 Message-Id: <20210925145118.1361230-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581548547100001 Now that all accelerators implement a has_work() handler, we can simplify cpu_has_work() by removing the non-NULL handler check. Add an assertion in cpus_register_accel() for future accelerators. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/cpus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index bb16a25bcef..bbb83d5982a 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,10 +251,7 @@ void cpu_interrupt(CPUState *cpu, int mask) =20 bool cpu_has_work(CPUState *cpu) { - if (cpus_accel->has_work && cpus_accel->has_work(cpu)) { - return true; - } - return false; + return cpus_accel->has_work(cpu); } =20 static int do_vm_stop(RunState state, bool send_stop) @@ -613,6 +610,7 @@ void cpus_register_accel(const AccelOpsClass *ops) =20 /* Mandatory non-NULL handlers */ assert(ops->create_vcpu_thread !=3D NULL); + assert(ops->has_work !=3D NULL); =20 cpus_accel =3D ops; } --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581552; cv=none; d=zohomail.com; s=zohoarc; b=RoUYJ9Hy5Fr3v1N167jWEj/AGIkHjx+CkRsokj4uYV1bzweTtRlQXvXLrP47b8Qwdrc4NcrOfNEawaKbicOIxHRK48x9gV+q2VtBUGj/7eQMP7Hh+il/0jjCsfIEJ0mZIDtCuqO9cDh76MG9Nn5inNQWwUo+di/gIKTHKFqb8JQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581552; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zpMC5xjCsBbH9RpT6gPVCF+edgca48PVAQbhvKWBiG4=; b=gw3SlkQwdOiWT+YbaziVH8B/Zo7z2deviEgs1XARGcRCFAxQFndrOLBRBz9MR6j//VastEnBmpLLRo+D23Rah8CFpavwC4g7wizOgBTxWWz72qruIwi/dx+43FfRIwunePxB6pqs9PbaZhyjkpkSR6y0r/BlW0JnJCZ78BChou0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632581552373970.3536110720395; Sat, 25 Sep 2021 07:52:32 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id i24so20533636wrc.9 for ; Sat, 25 Sep 2021 07:52:31 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id s2sm10977263wrn.77.2021.09.25.07.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zpMC5xjCsBbH9RpT6gPVCF+edgca48PVAQbhvKWBiG4=; b=pro94nGaKjAJepwvuSNNOkQ5pBuLVB9iPlyaiginNHAUm6f+4oCWrtpNSa86Qs6DXL 6xSZW5+MxFw0istcKTqb3+cG/0il7na3bU8fvLvRMW7kI4sGQpggaAsUE6QcXD7yP2Ar zS7L0raKHyIm8KBz6QzRI6rTwQQOHcqoFCF7RiTZg1qf8ZM5paDtp7O1W855Qd3+ubp7 zwv2ricM1JWAtfN3X1CoSO5CR84/3QsIUdZCZfN6QbNE2VJ4HaBF7DAK5Q5Ez9o0yK7Z TMRVTv3XpB3dknzLvGCmxKlTL+k/tKvEKk6+ALA5N7BzSZZRDsgOIVuVfysr06XNe3v9 Lgww== 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=zpMC5xjCsBbH9RpT6gPVCF+edgca48PVAQbhvKWBiG4=; b=XgFUpjK/92+waJrzHBUKHOftoTQOfDJKaRkmaEQ0LXFgnrX7CJ5SPHlFHNy6kovfaP 69wHsVpEIOXlX2w5Vp9CcajJawDGqa3Pc4PqRQJjcW3y+wlOr+zI5h+wuQmZrDPKB0ST rlP/E9foBKDHJOaGgwcNi9FHsN8AWY9nGWZrBV0yX5c8RvtZAlXfAd9vKUoicthIdtKi WVR9ZF1WP5/ryh2hJ0mDGmJh1PDPwG3MghqqKH98wu11Veg5Koy7AdknSEIPfFmFYn46 cuXCI5vJZbhIiqzjpe490/c9/KXYOdgSPZYySx8NjLXy7oT428sclnbl8uJiplwnB8zE xSuw== X-Gm-Message-State: AOAM5339d3fKidvUINtjKdJPeX781hWsZdXWQSFhUoSj96fX8e0rO3Yq sY+cG66AR4zQDYn2l4OCRTM= X-Google-Smtp-Source: ABdhPJzgMSfnxXTcl9fy1mYuun+HkpZUdYaw/FGUCNXrtjVJjuXvkvfPuquQ52GiOu8b/0xZHcs6tA== X-Received: by 2002:a05:600c:350f:: with SMTP id h15mr7347895wmq.144.1632581550685; Sat, 25 Sep 2021 07:52:30 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 15/40] accel/tcg: Introduce TCGCPUOps::has_work() Date: Sat, 25 Sep 2021 16:50:53 +0200 Message-Id: <20210925145118.1361230-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581552690100003 Introduce a target-specific has_work() handler for TCG. Eventually call it from tcg_cpu_has_work(), our AccelOpsClass::has_work() handler. Inspired-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/tcg-cpu-ops.h | 4 ++++ accel/tcg/tcg-accel-ops.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 6cbe17f2e6d..c19c507b23c 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -66,6 +66,10 @@ struct TCGCPUOps { void (*do_interrupt)(CPUState *cpu); #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); /** diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index ebaacff1842..cd44bb6d0d8 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -32,6 +32,7 @@ #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" +#include "hw/core/tcg-cpu-ops.h" =20 #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" @@ -80,6 +81,9 @@ static bool tcg_cpu_has_work(CPUState *cpu) if (cc->has_work) { return cc->has_work(cpu); } + if (cc->tcg_ops->has_work) { + return cc->tcg_ops->has_work(cpu); + } return false; } =20 --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581557; cv=none; d=zohomail.com; s=zohoarc; b=g91ZkHgaL7RFEvFYIH0/Kk9Lqj3JutA3RjV466WmqqcbP1JFFNGi1uaK6qL9Bm0K+mjioZ/tOxY6SljKkX8GeYOGC81JPW+R6Adam1UaxqtNB4UzBJ30O6VGNNwlPHV9JcoC5TQSga9lCYLHd7IrZknuH6Ndkbk5hAauzA+Q2og= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581557; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UE09P3+95R7azQiB3uAxKhFAUsJxXecPBFCz3ofDdJY=; b=I0fZmiPJ8AMQ2izdBOktGciqK4QHUuzPEkobhfXepbP/nlH1a3WDhdAGs56FBEgb9XEvuyTCnMoeeDBSyBQNUW768Uki3gRTv5Nkw8/yGLFJw6F6c0OpKLngfWsvk/yd3JvjCfvc+F4odzktKW14X0zqW0T2K1hd2afhcMRzT0s= 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 1632581557226692.1974490617253; Sat, 25 Sep 2021 07:52:37 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id c21so6788257wrb.13 for ; Sat, 25 Sep 2021 07:52:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i2sm11055407wrq.78.2021.09.25.07.52.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52: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=UE09P3+95R7azQiB3uAxKhFAUsJxXecPBFCz3ofDdJY=; b=m8uSzJJW5RbcD9v9b60DsxXyfZ8QYa5zKCrKDSbEKmRpjpjCykjDR1iOwS025VCpI5 dvKNxMPoyGFGX1l6OQkuho7vDjhsD8N/+605Br3KKhh7JVh4iYRvAlmYhvl8aXx0+rEq KqArJgcaa2rUbO0jIM1Re+vP0yW7aEr7gRn3nQJ26UwV/slNVSVT+U+PmahlhvEnOAPy zXeozL9OsjqENrKfiX1rozhV32LX/ehCc2SJniHaqQQ0XeHk75F9qKhRQo63smQxQihB 8AK2qb53yI6Qn37olIzRB+J+RiDG52jGE/2XLAhPXfXL+fdoL85OygikxHVjDmgcliE6 MnQw== 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=UE09P3+95R7azQiB3uAxKhFAUsJxXecPBFCz3ofDdJY=; b=hiriz8W6Dv98JwSOjaeF3F4KPTJDQvXHth4H4z17iEhS+4NhBMj9Ynvo4lJrNdZjIt HBnZFOZ8EglY3lvvZDqhm4VtU0DbQ/pRh+kJ44hLBuBSqJp6TOAHRAFOF+IXfNByCij9 ffw+55ho0NjkWAP1biRwn9XesowCKGnAX+kMDMc3MlfgiIAPsgczfRqeXi3EyQtOkXCL TKPrxDDli/EKE3ojk/umd1CG3KWoumpuF5WgQ3MoP7nBCDR6E+NcPblKKw66LwXT0a6X XOIji4gqZG1oq3hTGQDbqGhPhQIFzmUSRMqyl9jjmwIQ8KOCUillI7jO8jx67V64aGtH 6EKg== X-Gm-Message-State: AOAM531zMvGM+YAkUIPVvEpKvd9ZR4WXmcCn3FUyx9cQ1lLu/ANNh17w urROGeRASy7aFDLCgsSdIYyk4tMCGAg= X-Google-Smtp-Source: ABdhPJyOLg57AmHUcQNdi7KECrCqsQlmtqA6jqOtdUamLcrKxYhFA3ap/TRSZNYmaVF75G8uOcY0FA== X-Received: by 2002:a5d:4d02:: with SMTP id z2mr18010911wrt.8.1632581555396; Sat, 25 Sep 2021 07:52:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v7 16/40] target/arm: Explicit v7M cores use arm_cpu_has_work as CPUClass:has_work Date: Sat, 25 Sep 2021 16:50:54 +0200 Message-Id: <20210925145118.1361230-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581558842100001 ARM v7M cores inherit TYPE_ARM_CPU, so TYPE_ARM_CPU's class_init runs first and sets up most of the class fields, setting in particular the has_work handler to the generic arm_cpu_has_work(). Thus M-profile and A-profile share the same arm_cpu_has_work() function. Some of the checks the code there does are perhaps unnecessary for M-profile, but they're harmless. Since we want to move the has_work handler from CPUClass to TCGCPUOps, the next commit will be more explicit if we already register this handler in arm_v7m_class_init(). Since arm_cpu_has_work() is static to target/arm/cpu.c, we have to declare it in "internals.h" to be able to use it in target/arm/cpu_tcg.c. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/internals.h | 2 ++ target/arm/cpu.c | 2 +- target/arm/cpu_tcg.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 9fbb3649682..f20aeb97fa0 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -177,6 +177,8 @@ void arm_translate_init(void); void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); #endif /* CONFIG_TCG */ =20 +bool arm_cpu_has_work(CPUState *cs); + /** * aarch64_sve_zcr_get_valid_len: * @cpu: cpu context diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 641a8c2d3d3..4b08f717f64 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -76,7 +76,7 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, } #endif /* CONFIG_TCG */ =20 -static bool arm_cpu_has_work(CPUState *cs) +bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); =20 diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 0d5adccf1a7..9a0927ad5d0 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -920,6 +920,7 @@ static void arm_v7m_class_init(ObjectClass *oc, void *d= ata) =20 acc->info =3D data; #ifdef CONFIG_TCG + cc->has_work =3D arm_cpu_has_work; cc->tcg_ops =3D &arm_v7m_tcg_ops; #endif /* CONFIG_TCG */ =20 --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581562; cv=none; d=zohomail.com; s=zohoarc; b=HSx72I8tlT/VmyvYy9Ld9x2RCP1w62O1ZyVE/qpRKUA16BxHjDjkb/3LU/nsCq3TNem9y/usanZtro5MLSBn5Jcm9V8pZOBGx84Uxl7/pouFS1QhX4fMAydZlE5pMfnm0M2Oaw/OzsE8Z19jo2URJOk1DP1NnOtePKK9F+PfBwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581562; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r6ZxEtcTtXMZRq7+nFZf7Av8uL6lok+sSg0IbMh7PU4=; b=fXEabDS4+MtKfsOIZeDi0E78X7TX+XdlgdCOF/i9DNeAA81Qx32vGcYyBYDDWmqcXpbMmjVz37WRHiSv1w1PRnIfLPGXChbeq3IqbLQlwjpgMnNxlRTlCXv+gof2WLDDMotrXYDOH6afvlrJiZtco/EyLMVN3FzYGUOvD7vp6UM= 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 1632581562257134.0497632671179; Sat, 25 Sep 2021 07:52:42 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id i24so20534551wrc.9 for ; Sat, 25 Sep 2021 07:52:41 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id n14sm9892246wmc.38.2021.09.25.07.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r6ZxEtcTtXMZRq7+nFZf7Av8uL6lok+sSg0IbMh7PU4=; b=eRQPfiwWBh8RHz/e2lyK8HgBHPIhG4W7iyEyn99sxIUf3zjaVHQWh12xeOHwYv36d3 RSSBrR2plnhJOJ9Zhzfan4tmSoIB2r5E1GXOEiAmbzGkjKcZILjxPG+lW5Zilns/hUWd W4JuO6KRmNqMqPc7R3zegPEMNXXWuqP0FZNWo9VNJiC8iSRJOMd4sxhLdU7ixcgOBVU6 UqZY5igpdYzrFTK727RTisOiisK6bBPKBfy2NGxX/nOIUa92636UY868tnoaXztnJHLa fALFfGs/bTDDgXg3g8k7/BfEA6XXtE2TWTvNHttNBIrs6HnfYV3Yp7HHTh5/XQawtlDf ln/w== 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=r6ZxEtcTtXMZRq7+nFZf7Av8uL6lok+sSg0IbMh7PU4=; b=leSzwNVoHKFB1AfkXeRirS9i9KwQqJVm7EtpmXc5gNLHMnHLwCb6zVTnbCn8XU3Wnq KI9YfRehggXuNn5DiE1IRqDGyNT7uf41OLCZLLlMfDnxjL3Q1sdfDin2UBMKpipC0ZE3 Tt2UtnirsP5It1oZp1ui/L1Kuq2vd/sW/MlHox5urOk/XUf7FaGX1jDLmBJZCRUzvan6 J1Rz9N5aXeRMeJjo3Mrua72FFCulpkUvyzSHcmeGXBoTGZY47RP7DOdRgLuevZJMLYOq 0gUrIyEh/3nOnDNvZByP1TF3skbwTEWSvpnwmYHc4kKTzJfWIZGTBabIGAiKvYuecZGI W9+A== X-Gm-Message-State: AOAM532Rpg7UHB6qeoih3HC5h8CA4LyFsCYQREZ6tTkXPsC2yGXYqF51 UfiXP9pW19+/dHS7IFcQksM= X-Google-Smtp-Source: ABdhPJx1nS+ppyymlTbINjfjJVfbUMM8bAm7q2FIDb6yL5V/SbVPkIyMe4fEikpqd51MtBmMx77oIA== X-Received: by 2002:a7b:c442:: with SMTP id l2mr7593370wmi.131.1632581560483; Sat, 25 Sep 2021 07:52:40 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org (open list:ARM TCG CPUs) Subject: [PATCH v7 17/40] target/arm: Restrict has_work() handler to sysemu and TCG Date: Sat, 25 Sep 2021 16:50:55 +0200 Message-Id: <20210925145118.1361230-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581563118100001 Restrict arm_cpu_has_work() and has_work() handler to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/internals.h | 4 +++- target/arm/cpu.c | 7 +++++-- target/arm/cpu_tcg.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index f20aeb97fa0..18b3c2bf1ea 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -175,9 +175,11 @@ void arm_translate_init(void); =20 #ifdef CONFIG_TCG void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb); -#endif /* CONFIG_TCG */ =20 +#if !defined(CONFIG_USER_ONLY) bool arm_cpu_has_work(CPUState *cs); +#endif /* !CONFIG_USER_ONLY */ +#endif /* CONFIG_TCG */ =20 /** * aarch64_sve_zcr_get_valid_len: diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4b08f717f64..53c478171ac 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -74,8 +74,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, env->regs[15] =3D tb->pc; } } -#endif /* CONFIG_TCG */ =20 +#ifndef CONFIG_USER_ONLY bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); @@ -86,6 +86,9 @@ bool arm_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ | CPU_INTERRUPT_EXITTB); } +#endif /* !CONFIG_USER_ONLY */ + +#endif /* CONFIG_TCG */ =20 void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) @@ -2035,6 +2038,7 @@ static const struct TCGCPUOps arm_tcg_ops =3D { .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D arm_cpu_has_work, .cpu_exec_interrupt =3D arm_cpu_exec_interrupt, .do_interrupt =3D arm_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, @@ -2059,7 +2063,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset); =20 cc->class_by_name =3D arm_cpu_class_by_name; - cc->has_work =3D arm_cpu_has_work; cc->dump_state =3D arm_cpu_dump_state; cc->set_pc =3D arm_cpu_set_pc; cc->gdb_read_register =3D arm_cpu_gdb_read_register; diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 9a0927ad5d0..7d0d9fcbc79 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -902,6 +902,7 @@ static const struct TCGCPUOps arm_v7m_tcg_ops =3D { .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D arm_cpu_has_work, .cpu_exec_interrupt =3D arm_v7m_cpu_exec_interrupt, .do_interrupt =3D arm_v7m_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, @@ -920,7 +921,6 @@ static void arm_v7m_class_init(ObjectClass *oc, void *d= ata) =20 acc->info =3D data; #ifdef CONFIG_TCG - cc->has_work =3D arm_cpu_has_work; cc->tcg_ops =3D &arm_v7m_tcg_ops; #endif /* CONFIG_TCG */ =20 --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581567; cv=none; d=zohomail.com; s=zohoarc; b=ApNAjOkvggrnf3yIlrB44KDp65hUjhK8+jk+tAPcrYbT+Rhl1z5N0V8bJy/MWNXUXrZKpIAanNokCmmicbard+o6MmYES1pHa+8hfyJYHUhPKvKmjow9h+TibUWrtMq589AsTkPSpuU/U+jlve/41VdlQvXuLknYWlLBTjb4o4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581567; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bWsdPZ7x9Zv9ulmzVLDInqOVNAhrwd+vJJnOs6jG4pU=; b=UJ9aMWZF7UoOD45bmMvp8GK+wCVhYSg+GkhNc00YsW2Sw2Or9ugBVb40GTKrMhoApybGb7u0gbrGeV2tF5Bgtvcq/Si2kmFD7TO9onRsFekBVeVm1l7f4ZIrZxo73VFngX40+LM29BOyHwx/5atlJ6jVLldHHvYuHISdnFWXeW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632581567188838.0527443631588; Sat, 25 Sep 2021 07:52:47 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id i24so20534968wrc.9 for ; Sat, 25 Sep 2021 07:52:46 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id 135sm16635464wma.32.2021.09.25.07.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bWsdPZ7x9Zv9ulmzVLDInqOVNAhrwd+vJJnOs6jG4pU=; b=Cksq2yuCp6td/OuLyG8ccivNvp1+E6LGgQDMV3lBxOCaAt4FiO8W/XTKzPZF2RHCIL kKACF6W0ZBRZ82yi6vgoWIgbn2nsQucr/Gp9wHgBbHA++KvqT+1WdaMctbl0syEkoA/K GNQWvGOGAZtZiC1E38gA0StwFfTga/mKHQGqtuobXN17ICje1mNw/xt8eTq3FphG4I6z IrigtgQ8uKy4koexICQwVktxIoSB5q2l2xUUBK8dtSw6YT2xOBMghKum3h7PtrjvisXe oLjBNL5py6MlAtezv1xzSW+Nb+xx6uVq83absR6Y+jUiQ6RLyvxG7/zEIbxbxnZ2GVXp 5k7Q== 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=bWsdPZ7x9Zv9ulmzVLDInqOVNAhrwd+vJJnOs6jG4pU=; b=J3GE30F0G3pHP+XHWQVSR9sTX67+nMXVIzP49hZPIhOiTuKHuArwbYmji47jDE5wqb KhjQaxETVWN6FvVBvhWQeMUrQvZmqEbWLZaKCZdOpy2LTZyBw8YZmjG9CFRAb0fQPiEn ixmrLXY+NTFuvsw2UTFBydCnQFJqf6kyJHHK0Pn9OpUPI6gPQhmYRx16SybliInNAoDx tTyTXuZ0NvRB8Xo7HIEKiR79y0xtxe8wbcGeZUQVLWwtmdattBtDyxcOD78BxuhPGAAX 42Nvk9NuopCtPzz7MKdV5QxN6JQmYigWrEG2RSLbJXdLGaAq4GxiYvYmKHbFV9zwJ/U+ 83VQ== X-Gm-Message-State: AOAM530fmDmkaEspuqY0IVh/o2gbc3oM5+jZnBzNA68SoMivfp/ZOnka kcNrDJcMArJHvLYcpkLasrg= X-Google-Smtp-Source: ABdhPJz9lINzrUuspP9ImzmXh+Qif2eKXDfMUELYDmGVulvpCpqzY/hh9drkQpcYHEER3qwNtueWvQ== X-Received: by 2002:adf:ce89:: with SMTP id r9mr17367551wrn.238.1632581565365; Sat, 25 Sep 2021 07:52:45 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v7 18/40] target/alpha: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:50:56 +0200 Message-Id: <20210925145118.1361230-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581569459100001 Restrict has_work() to sysemu. 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 Fri May 17 09:01:29 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=1632581571; cv=none; d=zohomail.com; s=zohoarc; b=lJG8dEsO2j7Eoz3qEHS/OOjLOtwwoF1it94QNwxcqGSOcfldlOfU9rCbOX9WpF2vnRGS0Drb8/F+ATXT4pybVow9eSodCMciKLYPFMWBUENDfPR/xg//Fnt4dBetrgciU1BBvVqAQAFMfj7U76vMkMDpALhUf0uF/2++BSsQ6jA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581571; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=esdj4T8w87yQQx5q0gedYQmjf/1Q5yjrjrc7iKp6hio=; b=IQb88rABfOsloqt77r5YsTxNpt9DpCQTltKXJT6uYVjaq6iFsYDoP/NVXaoVDMPXzNg7A4YFHFOCqme1w29ldsgqb59bfVxFl42Ry2cd5jfi7yQuKEYiuXv6v0ppMaRNrf/dbIe4fiS6X0kDlE9V9LnLVI70x+lKAxvrJW53LMs= 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 1632581571737545.2067114113884; Sat, 25 Sep 2021 07:52:51 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id w17so36393660wrv.10 for ; Sat, 25 Sep 2021 07:52:51 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id u25sm13134530wmm.5.2021.09.25.07.52.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=esdj4T8w87yQQx5q0gedYQmjf/1Q5yjrjrc7iKp6hio=; b=K7jLxmvqCN/iAR6NLt94tpMsCjtkZvoHmGq9pcXL4GqwBoQHtBOQI1FwtJbG30OegV 1xinWCbteDUwK8SgPK7No59Q6v2LuHugRmPs+Zm6y406qZMUS2MSsTNXaWCGB+Sebp7U Oo5+iZg8FIEuCHkKugLO51HwK5n+YjuKEKrT/anJL/7HIMtJTVXtT3h7H4qnl6Z9yYxc TtTPVEhSO1bleiZ3DVKDoXUJkmtKh6kYgn6GonNKy2TGUskEeCf6aJjWEGv7UyUPJmfB AAlH9n1cMXrDUd+3WEQFQaVpBjTycU7WnGxHbpolz82Kl2hlGBj9TdG/ihhbehMgY84b yCZw== 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=esdj4T8w87yQQx5q0gedYQmjf/1Q5yjrjrc7iKp6hio=; b=fuo0kXtAWNRBRhBCHVdBZr2BBMXp0sed12bP5c3898QF0lHkCO1cFo6CnptjGSLGU6 4kXlEvYq9VlqWZAkXHwWwUs1BsKxXWwExvB9pVVs2ci+WTrt2zwo0rtcRn6f6Maa5fMX eMpW4zxE4oSJRmiKV3c61U2hofZ/kWkCkCxWKVy+pjFeDWx9qA5AgHizfTVqV/CSUnrC 0xMuQDHoE8TfU+T0LtWsCN4X8ZpeFgI+V+ZRHqhnRaPFFHZb8XspTMoPAogPPCjs+Fi2 KU5esYpYe7YUwC7oWCr5Zhg4wNE298j9Krd7oJvEck1f2nHdk9ioSx5AbrIq3+azX7I0 ZmsQ== X-Gm-Message-State: AOAM532ph28ctRj7y7T1VtuHJkRhVm1e/HWWbnIcOTXr1FIyEui+LCWt PzhbKPbMohPc3JMsLiqKECg= X-Google-Smtp-Source: ABdhPJy6rXV6+Wx3AZinkQiHkZ25/DaFQLwtVD5S/9zSsTwHY41sBHZUnMmz6j93cw90jyigXPWNeQ== X-Received: by 2002:a5d:4d0d:: with SMTP id z13mr17721352wrt.267.1632581570054; Sat, 25 Sep 2021 07:52:50 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik Subject: [PATCH v7 19/40] target/avr: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:50:57 +0200 Message-Id: <20210925145118.1361230-20-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581573443100003 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Reviewed-by: Michael Rolnik 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 Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581576; cv=none; d=zohomail.com; s=zohoarc; b=dSzwnbkl1/E4R3gjPLc8fX6+zVScIyaSObmsChnAazA7rBXsAZFlOgTid66uF65OgzGb18M9FphQzKGtzJHNYzcMXJo5j96IsjgK2omJKkm13FjIrtdwyaxJnCzgo0bNvTGtNA37BRuYeX/pprUVkiBCW9SOmxlWIIwFxf8SSoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581576; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=HXebG7sJPctNkFGA2dAWZR1i9TANff+c9Wk13E27OR9bZUIojMRJu2xkonElCavrKES1AwpDqNHKkPfnW8Ovb72k9PrMxWJnbdY87lhaGBi0EOff6OLZTbAUgOEvIf/93oO3/dNyQNekpoJXB4cpSHIh2VL+OLchTwOjMpXl8gg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632581576320741.5665207238281; Sat, 25 Sep 2021 07:52:56 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id t8so36612539wri.1 for ; Sat, 25 Sep 2021 07:52:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id u14sm9934967wml.24.2021.09.25.07.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=nRJyglE7MxPyYLAE9RgIeaNBzNAySVw9An1ehiscKltjFimxzjvIx+FFF4j4mRLgDG A/EYpf3MVbx1P8DjNXaErJMVFnffuW4uhaM0ZRjnAxHHDLNQAkGsuMImc6yxSEtl6JKC vZ0QDWIe9q81gVMKkSYvKy9dF5c1eEeDYefmya6XakcmPTuP2YTwXj++xtAloZsqUV0t ADMFUgiiMHrOq74dIGz+pqpfCFO5BdT97hL5n0OuVLHaMQ4mi2ed0Wi3uhC/xYhQHacY 6jCGYN4g8Jro9CA5qWIJnCi0xvVLpYzXsvR1/YmrfK5smNN/10SgbYQFfCIYcIR+BGFp 5sEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=4ssiMCyzdRg6ifMU5nOXbguSrH2ZKlZG2EwXXtOLSMFbnBGNNPjwX7IJnjwEr+n1qd xbQiBpwsJnQQWPEB8ekQ0CSFuL4bBtjOc+LuJhs23SjRyqOrr1VhsYZtu0D7G9uOuJgt NeYO1KzY0bBVt6Vv6V1gxYwOBD5BUytZLGdV9IbWUlQ2a2yXx9KbuJTtPeLKTy+uXBTA PJ580/UIXRQ7xk5k/fnRJ5mmBvC9h7Af0kN6VhhJy+9yOLe4LUH7HGLCvlj85gdHs+C2 MmZ0eQteqzLEa4O/5rawlpSwW8/InKUJ/iRK6ETI1/vARXckSid+PwxowpA3lgGZcbA5 ce3Q== X-Gm-Message-State: AOAM530g04oI0C3gZttvOmWWNXVl7Bb2LN9kfiC4bF8463enCsSsPt/r 7v8Uw0hythpckKU8I3lKbSVV8etvLeo= X-Google-Smtp-Source: ABdhPJyzcavtFgwBCx0p9CkoHw+pX2ipfNLSkjlq82zfonYFb9v0G6WcKIfYP/RNnsAXL+xKqjUeaw== X-Received: by 2002:a5d:6590:: with SMTP id q16mr17959271wru.52.1632581574600; Sat, 25 Sep 2021 07:52:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v7 20/40] target/cris: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:50:58 +0200 Message-Id: <20210925145118.1361230-21-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581577697100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/cris/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index c2e7483f5bd..b2761f8b110 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -35,10 +35,12 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool cris_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } +#endif /* !CONFIG_USER_ONLY */ =20 static void cris_cpu_reset(DeviceState *dev) { @@ -208,6 +210,7 @@ static const struct TCGCPUOps crisv10_tcg_ops =3D { .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D cris_cpu_has_work, .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D crisv10_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -218,6 +221,7 @@ static const struct TCGCPUOps crisv32_tcg_ops =3D { .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D cris_cpu_has_work, .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D cris_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -294,7 +298,6 @@ static void cris_cpu_class_init(ObjectClass *oc, void *= data) device_class_set_parent_reset(dc, cris_cpu_reset, &ccc->parent_reset); =20 cc->class_by_name =3D cris_cpu_class_by_name; - cc->has_work =3D cris_cpu_has_work; cc->dump_state =3D cris_cpu_dump_state; cc->set_pc =3D cris_cpu_set_pc; cc->gdb_read_register =3D cris_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581581; cv=none; d=zohomail.com; s=zohoarc; b=cAjavyX6vSAuqwOudE1PotJiwttIXF19dYVOYbSDLPDFfAalQ1/2M7ul1CKgF9XbJoUV9M+TBganfR/1liwat1ESe/gihFM+Nv9Y5ExW3cxTi3jc2MPcvBvmMcho1d4/sx46qC7QvQOgD7tap/5V+WyS19c0rFnzDPmfp61GhCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581581; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0ZgxjKAzE6UdfxxfzQvSE8AG7aSTa5UtgwXRgJWAVhA=; b=cimhSQ4AGrjKJ4zXDeHwya1aSwt40Q4U0aAz1U9sSP/RgYnK56wWcXM+eMaGGH3lICHo3a0lEySX+w0udGac45K4XDHX98KmwCg+e8cX9xeQfb9v0lmv0M4KMcIL8cMSMItzKlW9WmBsz+KuZAIzhAGcEpnYtNxit1C0v9H9Dew= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1632581581017590.9190715760697; Sat, 25 Sep 2021 07:53:01 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id t28so23087400wra.7 for ; Sat, 25 Sep 2021 07:53:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i203sm15757710wma.7.2021.09.25.07.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0ZgxjKAzE6UdfxxfzQvSE8AG7aSTa5UtgwXRgJWAVhA=; b=Xv+ym7tFfUBtgVA+01md7SX15qw7/TVE7TjaHK21gsp2KKRGntBjyGOLGxPGPkrdK2 uxme/6nVrD8Sp9NGxnGmC6dNVSl3ov35WUpHIwrE4QTUKbF1SID3UCNgRwrslwW2yKAH XNt5yXhaEdepuGTJQp6o8JpbTtzj+p3PU7TTRHTz0b5r4qsGVRyrW4gj1yq9C1wgvEMS YdCAoVbBM9kSAd9hEcQ4YwomxHhs7obAFsVIn5MpSFQLsfL6lv0xVEVWe5DycAM7bpfZ d58T0KK8RtEiIQ8uGmbF7Pzo0UoH/DjlTCb5+sKkeEfgrOO6uMuvaeQeCs8Pth+ucaJi 0H4w== 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=0ZgxjKAzE6UdfxxfzQvSE8AG7aSTa5UtgwXRgJWAVhA=; b=N3yBLLTAv0YrqdTJ681u8unZSg467+LjyrGaA2mb0Py4hUxxTA7QXIsdY6O7u99BLk GOBdqakbhbn8bt3SIqJoYNNtg7izOSflagJjlPWmeDN8c1cgwClOP/9UKFQLfX/VjkhR zAuSJbmKlwPtGQDy768vyBTFoRuJO5ENCWJ3acUtBtzu32qle389bwWeDMGqww0XmYez IizI6HgsamrItCrSfC+/Kg5ljNDb55MaOlOCQgfIqzfGWhJpuhoA+1ROBofWwUVQPDYm nZmE7XR89kyDQqtlMsGCnfMgGQWSSg/xDrGW9ytf4PeISS2xeKpAj0mtuveE7XZDFbhs NpJw== X-Gm-Message-State: AOAM53380c4RFi5wPLjNHkOSmDo5qg6e1MDDfQgxjLta9QF5BZdH2n9O U6ruhOAct6+e2trizsxPPjU= X-Google-Smtp-Source: ABdhPJz2f5tvfPyLDrCk7fzOlQAPXv0QRy4UqWF+B/SQYSlVQEZ0UtpAi9sdsGmNhq6dHGQe1I3ysA== X-Received: by 2002:a05:600c:350f:: with SMTP id h15mr7337102wmq.123.1632581579296; Sat, 25 Sep 2021 07:52:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Taylor Simpson Subject: [PATCH v7 21/40] target/hexagon: Remove unused has_work() handler Date: Sat, 25 Sep 2021 16:50:59 +0200 Message-Id: <20210925145118.1361230-22-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581581927100001 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 Reviewed-by: Taylor Simpson 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 Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581585; cv=none; d=zohomail.com; s=zohoarc; b=mW9P5pvPsLNlC9pC2UODbTWu1ttQBUohTW9SMItQSPowI3xoqT7IvMN86OGeGHcPnvmMFenL0Ql1IYHMPEd8ESfqZs02HnXhvvS4T9Scfyl7XUidYbpb1+wLaA8X1hm56CWqRMdqRT+r/S8VKsC0FKtZg2MKSnbD1Kz53s88gLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581585; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HfPpeCahj5vQJxNuN5USHRZi30oEK/WxNT5N2Z+0tUI=; b=QejYgpmk3pLwYWfeBE8Z+YpQhIGTiCSrPksb0Y/R6RWjY0iaYMCurt+FL7BI1fPqROkWvarwvIzpY8L8rUEmfA67Cg3Vkk7ORGbncrOjqzinUqIhlonexchJ6D3YgtwBkTv2NcVzl5rUF3uE3FRqVY9hLhdagt2vROVDLlYcTfM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1632581585789329.0378476797232; Sat, 25 Sep 2021 07:53:05 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id t18so36550108wrb.0 for ; Sat, 25 Sep 2021 07:53:05 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id g143sm15704856wme.16.2021.09.25.07.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HfPpeCahj5vQJxNuN5USHRZi30oEK/WxNT5N2Z+0tUI=; b=JxGUQMuetfSaBGKeLlcIL3OZlRzoaJ5FHGBSikdTTBoEephC3U754ToB95sJpG4ruG kG0JLXZAr5Fyc5rqrMgNYWbuX4Ws7KX6+RyyTIO1prsNE5RDEK1IReFPf6hiBmbYrmya +a54Q4HQf6JIF2RWXXo+VqJGigMde2qiiMZH5tHyAQQ1ECvD+75EIUg5PcfIY3B0nWQQ q2qCjEYn9LScruiBYG6nOfu/NP+7mohNzZE2fC2xGixXu2AwJvUqAQFW5Ygc4IhhGL9a hTMs8/trR2d6gSUn710JTfdPkM6zin/QVn5J6ehcBKsHM884eUdPERUXzEa+nwAl5qwO Pt9Q== 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=HfPpeCahj5vQJxNuN5USHRZi30oEK/WxNT5N2Z+0tUI=; b=pApUrRDb1lNyeJ5w8daHcJ2drbNnL16h5KZDTV9ir7ZHnZ+eJuvjD2TT7AodSL+1dI eE25Trzk7FC2DM/fSnibR9Dy3cFnLINL2SCuveU6Fb0PwK/V9GQMXA9tOIyqlLMgUsPz dE1p46wir+16TXGbOr0D3RMiAbixTFUC9Z00nZK+qwLe0XgXPuXP4/pjabK1q6RaWE89 5tD0O3IIQiVgL2/WjlaFi3/7idrk/U40/fDSRzTwwME8xfJoEuYR9Y6ZM8uFJuiZXTb8 DTSQVgos3/2u4om9DtzY4XTKleGe9YnePNKVvwQNP1zahkpqOJ5JtbwEmkd95376WCHp in9Q== X-Gm-Message-State: AOAM5315wbOBLP42gq9eqhRwihs5m1MIzBRLn21TdIXwbnjIrzrkHVd6 bZyBIXBXkuW5TXPIbZPNcsM= X-Google-Smtp-Source: ABdhPJy7FcwzuOUvnrrRfyu1LGONJrvvqjyzB5HU65iDPMQPtEWBk6Vf/T6YdKvAk7Crz8GliXpjYw== X-Received: by 2002:adf:e783:: with SMTP id n3mr8741836wrm.37.1632581584055; Sat, 25 Sep 2021 07:53:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v7 22/40] target/hppa: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:00 +0200 Message-Id: <20210925145118.1361230-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581586038100001 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 89cba9d7a2c..000c2e7793a 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) { @@ -148,6 +150,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, @@ -164,7 +167,6 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *= data) &acc->parent_realize); =20 cc->class_by_name =3D hppa_cpu_class_by_name; - cc->has_work =3D hppa_cpu_has_work; cc->dump_state =3D hppa_cpu_dump_state; cc->set_pc =3D hppa_cpu_set_pc; cc->gdb_read_register =3D hppa_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581590; cv=none; d=zohomail.com; s=zohoarc; b=LHl2eQlUYhoM27MaYPuOzOuiMVlo1vTNSLneFkiQ+CSAZEFgUqEuFxE1R6/xpQEhMyL9bc56Eb+2YRYuxT/o/OBKR5KSM94ZXixwwDn3ysqHnY8UsXrhw3CTQ5YJCwbx5loef1zRRXRdJbQxQIUxvxRhJjmK9+Hush8fTcSxbF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581590; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=jTWYgoFO0MSl9VMrk2Far2u1aHZMs+NbJO4YsySzmOaO2ZjlO74lcGuG/raFCEo69N7Zj39AEZ+7PEuOJaFFMBueBs9NdPRTMbEj0yWZ57ATyF7yhbEvXSt4fm/AiMnPBN8X8B+WhRBY7kX7ce2gfBqDpyU7ym2kkx/ig5CxaX4= 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 1632581590525510.0058750103816; Sat, 25 Sep 2021 07:53:10 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id u18so36544586wrg.5 for ; Sat, 25 Sep 2021 07:53:09 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i7sm4301335wrp.5.2021.09.25.07.53.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=Rl/Yl18A4Zx6SpjTQGdOwjzsPYqEpDhRthDsAYY0zMbIqb/iKWcxDK9QURA9EJTMMz 4JA9JkLWKDI1dK8/IxhV/fcKAJk+8zCTuDy6r7gOQphNp04ZSqPpggT2MLUyPjm2NJ8m IKm4dXNNRRLwRo/oIu0BoJ+Vf2vmrYlS85QuiYG8qE2O4rcnxUrCdPKX0OUvc2SxvSxa +d9ibA2IuBDGTsBa3ugZje3NDKnO6rUjU9phRlPYs4ER+XAkG0UmRidSJyHa9pO2k9Kt hudo6wFE4f8p5xdN+jMu+oA0XbOdAVR52SjKKwN4tIj1GzeO9nFCwcNmOhmd6f2HCW1g 0xJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=vGAALv642sX8SQF1yNHtw421pJrsHEevqVLJw3oNOnTRYfZyzXWMvQaWBSaaY2hCuo fqvxb5CoVqGmZn0ptITLFXOVlbpAQfyc/UmPJCOx8zwGF05hQR7jD0VwOov836YtiObR F2Iz/xHnMARXCsP86FDyHk+slPq7YtFZMEjRgtrCu4YsX+ey0wM8i0dxXivmJ84j2nwh DMi8xOb3+ippKGHbIwQQZP4uY7DZSPUhsL/d0CgyUyDiR4U89/hjtc7kodN/uQMuHTNh Trn2JiynFO55SspWcYIh1y2Zl/dFhxzJapR/YQc42Z2bCBL1jQVP/kXCP0Fa6UPoTzH7 av4g== X-Gm-Message-State: AOAM531I4O+2sbzD8lKYwCSfucUwuk/+X9kXJyUmY0He+r4WRv1tfd0L LGffCJ6rUO7oWwhf8e6HUm4= X-Google-Smtp-Source: ABdhPJzCqAbyKnOrT06dUXGEJagRVoY5PAMLcP598ID1Vl+lu20zEv7JWnE5erwmkax7Snuk3aacbA== X-Received: by 2002:adf:de86:: with SMTP id w6mr5874287wrl.287.1632581588807; Sat, 25 Sep 2021 07:53:08 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Eduardo Habkost Subject: [PATCH v7 23/40] target/i386: Restrict has_work() handler to sysemu and TCG Date: Sat, 25 Sep 2021 16:51:01 +0200 Message-Id: <20210925145118.1361230-24-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581592311100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/cpu.c | 6 ------ target/i386/tcg/tcg-cpu.c | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b029f1bdf1..36a1c5f3fd2 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6554,11 +6554,6 @@ int x86_cpu_pending_interrupt(CPUState *cs, int inte= rrupt_request) return 0; } =20 -static bool x86_cpu_has_work(CPUState *cs) -{ - return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; -} - static void x86_disas_set_info(CPUState *cs, disassemble_info *info) { X86CPU *cpu =3D X86_CPU(cs); @@ -6763,7 +6758,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc= , void *data) =20 cc->class_by_name =3D x86_cpu_class_by_name; cc->parse_features =3D x86_cpu_parse_featurestr; - cc->has_work =3D x86_cpu_has_work; cc->dump_state =3D x86_cpu_dump_state; cc->set_pc =3D x86_cpu_set_pc; cc->gdb_read_register =3D x86_cpu_gdb_read_register; diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 3ecfae34cb5..aef050d0898 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -55,6 +55,11 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, } =20 #ifndef CONFIG_USER_ONLY +static bool x86_cpu_has_work(CPUState *cs) +{ + return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; +} + static bool x86_debug_check_breakpoint(CPUState *cs) { X86CPU *cpu =3D X86_CPU(cs); @@ -63,7 +68,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs) /* RF disables all architectural breakpoints. */ return !(env->eflags & RF_MASK); } -#endif +#endif /* CONFIG_USER_ONLY */ =20 #include "hw/core/tcg-cpu-ops.h" =20 @@ -76,6 +81,7 @@ static const struct TCGCPUOps x86_tcg_ops =3D { #ifdef CONFIG_USER_ONLY .fake_user_interrupt =3D x86_cpu_do_interrupt, #else + .has_work =3D x86_cpu_has_work, .do_interrupt =3D x86_cpu_do_interrupt, .cpu_exec_interrupt =3D x86_cpu_exec_interrupt, .debug_excp_handler =3D breakpoint_handler, --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581595; cv=none; d=zohomail.com; s=zohoarc; b=S+YD7NVwXI82RINhnS3wQpOqgHh9W5RVZLeNSq+axA0vaWZqx9OK0HeEk+fHWjHUlPNl5thO+jpuBe0oMiX3H6rE672DF/0shzF7DhDp9uL8+S5cu7jMmnDTC8qDlYO0Qj+PMxD821zid9a1Jx/nZTT9pifThCMBki4uHQfiUtg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581595; 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=dnlWKR+PITJdu3yeVin6X20HDc3q42806r1ZQ5c2+pjh79VE9PN7v2aKVQpcWNTTDzRZgyRv0JRUcnOKN0F/w7cnu7WfYCASboxMcRZsSWCPAe+/H6QL1kSF2/ox3m8SOZpmAC4p0HAqkbBPgfgs3m2WvmOVPy8DK8FQ4o+oZg0= 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 1632581595198569.7914988756644; Sat, 25 Sep 2021 07:53:15 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id r23so11145371wra.6 for ; Sat, 25 Sep 2021 07:53:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c7sm14015808wmq.13.2021.09.25.07.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=WdHaR98bEECTXPeNHifBn24cJqP5BxPwwYe6O1Yb0kTfnNMomo4cb3UeEQsUm+OTXt 3gcQ4Z3txzbSkJYBClC+yfLTJuggmlAHo9Qc9e8jlm4cBa4jLhkXKHYVWoZ4Zz5iAQHS GrtNf4Ot7/BGJeMjQtzWbaJe0Bzj0rcDCydp7sBd/o7/5ud+Osm7T9f0d4znwTcXTI8+ +OPzDQTYQgbEsiZwUhRouUABxppgeUV8puKI5NRRquhDejC3Xtc0svmkmjqCx6Dt/7iI R9pzgVli5D0ivFJkFtNL6TNt3Y/zByXSP3WXR78v5dyhnv7CQqn9BzeMqUSQIP9gi3x+ P5pQ== 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=CpTDNck45ScWY2V4S3TJf2mjaxDuGBWTsoDm68qQJLYBkZnpu3aWSd/ZiW6rqdIZzW mGssVQ1V1hsp9eTMDAQZGblBRT1SJtFmaRBRAm/Cs48XloFn9MgZT7YUxGpDxDhVzxSS rfqkKpff2+Outxt7ODMsEsUMtq9rzDxBFdAZIhRYFXp4jQziH+6FeNjpIojDhQhoVUGX dOEMZM3aHoCPAzPeZJMnB0LFPG+nydNUZQbHHXz9nqxzgwZ+43xiqUTYW5uGhx+Vbr1G /jtoWpo0O86zQof5Z1kUGfUWK8xsMaAT1co1cHJ+CRpRFAUJjXECLIzVxLEy1AgTmPMO xsug== X-Gm-Message-State: AOAM532mFxJIlc7QyQkQP7zNzN89j2zZc2d8uPFmdflUjjVRYh0vqnVA +h9Oqb77XAjROtuh1buFeVh/7y3iiZE= X-Google-Smtp-Source: ABdhPJza9hyoTFHpoxhPwICXd2Y/7LrhGe/W93GuOg2NVL8wN4K+ZeH9tBA4jIlKT0mPnAYV0vZHYw== X-Received: by 2002:a5d:64e5:: with SMTP id g5mr17400439wri.282.1632581593499; Sat, 25 Sep 2021 07:53:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier Subject: [PATCH v7 24/40] target/m68k: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:02 +0200 Message-Id: <20210925145118.1361230-25-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581596523100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/m68k/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 66d22d11895..ad5d26b5c9e 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -31,10 +31,12 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool m68k_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* !CONFIG_USER_ONLY */ =20 static void m68k_set_feature(CPUM68KState *env, int feature) { @@ -518,6 +520,7 @@ static const struct TCGCPUOps m68k_tcg_ops =3D { .tlb_fill =3D m68k_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D m68k_cpu_has_work, .cpu_exec_interrupt =3D m68k_cpu_exec_interrupt, .do_interrupt =3D m68k_cpu_do_interrupt, .do_transaction_failed =3D m68k_cpu_transaction_failed, @@ -535,7 +538,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *d= ata) device_class_set_parent_reset(dc, m68k_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D m68k_cpu_class_by_name; - cc->has_work =3D m68k_cpu_has_work; cc->dump_state =3D m68k_cpu_dump_state; cc->set_pc =3D m68k_cpu_set_pc; cc->gdb_read_register =3D m68k_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581600; cv=none; d=zohomail.com; s=zohoarc; b=gOZMvzcX7MVZ/Ws4aWm260dYc3U/Qaqn/tTHxP5N+fFTmCbuG9wSf/WeWTe1RW4MJS/l/Cf5JpO69+8DqxvubVjQtXuJ/9JZsIm92RYzxvOyfLid7CvdpVTORHCraPnU8LobO7q5WfFR15fHl7Q3WGnieC3PkaNPGXBXTLM09Lw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581600; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=Vix2N8Sd1J5+IhFZ70WdN0RLoEneV5laqGOp1TJh3TcAIn6qmI9feYoaYMr+aewcRGIREQaAzboN7quDwvoJ+1ypDsW1/BI8Xfud2RYCdLAk+xgZAeE2dLKK8cLx+V7o6QSqfqO41qAtc9WjWVm5TtT9IoNakJqjV/G0w7t0VOA= 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 1632581600234311.065769128543; Sat, 25 Sep 2021 07:53:20 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id t18so36551415wrb.0 for ; Sat, 25 Sep 2021 07:53:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id b7sm13979439wrm.9.2021.09.25.07.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=dLLQ9jqesSCiqaSohDdyIjtjEFP1BnRBr7sh6EQCAtO2UiR5d2olJpH46gocRuvKzQ fjQjGDngvQNOBB2SxyTNdwoNehKpSArDBjnvZqR/ZiaT9bwJafH6BwoxjwmoJCZASmuD twFjXwwKK9eJ8ilnZDlnlAnq9JiiEroAeyuOE5+FaTRALZmLYXcGkX1tXijfxdfcESts KE37YUgikhZNeErFR07Y85WyJWsJ9fEWUPvjGKnw3sohQsj92ilTiJw8VYHVTsLjRjL/ yoMzeUFhkiuvpHVljnYyxrrChh0JVmnpFy3wCVjnCKjjdIKSBi9L0gjGdy9zfUN9wQWu kvKQ== 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=ZXE5lH4XQJZt+qvuA+xwGH/V54K6VhrbNE4SvfhJPgKAWyREKle1Rg7xcXJcK+ptoQ lrRwwcTOEvyCaulUWcgymOiKV0fGAOh+lOStLJkrZPRdwGbiaOtKLYcwvnEafz+/6IeF qvONxKkdIlXyOv+hZMGG1xwlri26rfmGq7Wt+jBZ+s7WAtf83GatH5ZpiAOBF8yYXAHN XdkYt8p3ALdjfa/Pve2RvGV7pLX55Mk9dKMhZM+/SVrHC1m8/BtUvuV5eSQDSmYXppmJ OnFDzLxJ+gzUOZFCdTWF9qHBCiI9ynByTkjUyQUc6raU7icM/IZgpFysCRhXwYfUfEIA pcyg== X-Gm-Message-State: AOAM531VS9aQJYrHesAWNLYqZCBL2jIXZsZYMjqDXL2sbr6gYP57S+y3 9aCGvSPWUen6TUS2/BHhJkixkJcDQV4= X-Google-Smtp-Source: ABdhPJxDf6bBJ6gtOR94BUA81N2bzDzutMbqGYGGp6xNiVAJT5uB+NEI+tRuBK0YV9P7obkWFW/klA== X-Received: by 2002:a05:600c:198e:: with SMTP id t14mr7555032wmq.124.1632581598440; Sat, 25 Sep 2021 07:53:18 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E. Iglesias" Subject: [PATCH v7 25/40] target/microblaze: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:03 +0200 Message-Id: <20210925145118.1361230-26-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581600797100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/microblaze/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 15db277925f..36e6e540483 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -92,12 +92,13 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs, cpu->env.iflags =3D tb->flags & IFLAGS_TB_MASK; } =20 +#ifndef CONFIG_USER_ONLY + static bool mb_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } =20 -#ifndef CONFIG_USER_ONLY static void mb_cpu_ns_axi_dp(void *opaque, int irq, int level) { MicroBlazeCPU *cpu =3D opaque; @@ -142,7 +143,7 @@ static void microblaze_cpu_set_irq(void *opaque, int ir= q, int level) cpu_reset_interrupt(cs, type); } } -#endif +#endif /* !CONFIG_USER_ONLY */ =20 static void mb_cpu_reset(DeviceState *dev) { @@ -368,6 +369,7 @@ static const struct TCGCPUOps mb_tcg_ops =3D { .tlb_fill =3D mb_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D mb_cpu_has_work, .cpu_exec_interrupt =3D mb_cpu_exec_interrupt, .do_interrupt =3D mb_cpu_do_interrupt, .do_transaction_failed =3D mb_cpu_transaction_failed, @@ -386,8 +388,6 @@ static void mb_cpu_class_init(ObjectClass *oc, void *da= ta) device_class_set_parent_reset(dc, mb_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D mb_cpu_class_by_name; - cc->has_work =3D mb_cpu_has_work; - cc->dump_state =3D mb_cpu_dump_state; cc->set_pc =3D mb_cpu_set_pc; cc->gdb_read_register =3D mb_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581604; cv=none; d=zohomail.com; s=zohoarc; b=J/rFbMsAn45lLvfAvES58Cbefd33x0bLtS9TiuoMMAr+2aNRQeZdwjslo3l7dpzoDeGzO15UmFgZdwcUxD2YFwueM860kTvrkPUNvS115eEZBbqMrLxVNIMJoWIjkPg7MKCY4dDFeOsIvRpZUuj9S5EKPms8UD3M+fHGw3JIfNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581604; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=VxSOGeL5NQwi16w8hVc4AUODSJXsbvFVyTLmfC/2LS/6bCwdimLukRJezXHs8XUgd92JRimH142gUXhssbe3XxNPBRUhtbC7hxKwu1GF7K3MMzKsHQvHkSYRIsAeZmQye/8CY2/W4zJv1uyPzzvIwr3QGldjcISeU0uR6ySSoUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1632581604706436.3855993126874; Sat, 25 Sep 2021 07:53:24 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id c21so6792189wrb.13 for ; Sat, 25 Sep 2021 07:53:24 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id x17sm11722568wrc.51.2021.09.25.07.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=HNAlGShUBaXIHHNJ1tvDQ76+jvimHjnU+l1JquArWaP7lDWkPvlRPusz84wT9kIUhi tW/VEQgYTq3trLFG3vYk4EekXUfyN7v9aVZptCX5jEhMOHbLg8DbZu55eI7uLwX+T3an Ad5xEMjgSQfaI7NNL8ca9R8bvmI2OGXHILsFQJQ12L7DYS53ruI2sagNx46owkIDnyi2 dJomFVxgfYIyJt5bzBWa6Jnsk2j+oyVQVY6TCVT0KvzCSxECaqo/GUYiG/wmPiDxjemu nifwqS+njyavNuLabIanhfKTj5ckxzR8iDqCqUx1gcsrMBBtwoJzO8pSZ2SyA14aig7G 6S+A== 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=pvJJlMrFiAL6B6Tn4H2NnkNlK+sYzENTD48CDNcAh3cD/5XSWGZopR2bG/kHmv0gl0 Jf99EiU2OBS+5iP4lkP56jQsi5QB/WXxJjuX7pzQgyjFNj5++yUgo3sqUFInk54yNOJm aI+b7XfYcy72Qdl90pHmfKvOJ8kepVnW6I6xo8WQEYSukBC5F5OaqrdF8ESXmS8kYPCT 7QA1LpzYzyvKcjqBIs+fi5MBMXEbv6zQyUMlYyNFiJ75/KNceBP0AAto71bjDELGGzgD LcjukX9bHuMfZETOKe2G5OqJs5dEJTODS8mS7X7YGcwQY3XlCxghba+5nELDjZRESkSx 2ScQ== X-Gm-Message-State: AOAM5316ypSOYSiaRMK1zfuQSltO1qhONiMPPDHfx4qoQ1mHmx0ZGtFj R8ggAh2DheoTvqdHKU8qg/Q= X-Google-Smtp-Source: ABdhPJxi2Q3mMbzzfO0gtkBajSb+mnjc07GQQOja/IL0tLlvFzUvACr4d4LcesVmyPUVgv6qatOpwQ== X-Received: by 2002:a1c:48c:: with SMTP id 134mr6289159wme.137.1632581602985; Sat, 25 Sep 2021 07:53:22 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PATCH v7 26/40] target/mips: Restrict has_work() handler to sysemu and TCG Date: Sat, 25 Sep 2021 16:51:04 +0200 Message-Id: <20210925145118.1361230-27-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581605244100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 00e0c55d0e4..3639c03f8ea 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -128,6 +128,7 @@ static void mips_cpu_set_pc(CPUState *cs, vaddr value) mips_env_set_pc(&cpu->env, value); } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool mips_cpu_has_work(CPUState *cs) { MIPSCPU *cpu =3D MIPS_CPU(cs); @@ -172,6 +173,7 @@ static bool mips_cpu_has_work(CPUState *cs) } return has_work; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 #include "cpu-defs.c.inc" =20 @@ -542,6 +544,7 @@ static const struct TCGCPUOps mips_tcg_ops =3D { .tlb_fill =3D mips_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D mips_cpu_has_work, .cpu_exec_interrupt =3D mips_cpu_exec_interrupt, .do_interrupt =3D mips_cpu_do_interrupt, .do_transaction_failed =3D mips_cpu_do_transaction_failed, @@ -563,7 +566,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *d= ata) device_class_set_props(dc, mips_cpu_properties); =20 cc->class_by_name =3D mips_cpu_class_by_name; - cc->has_work =3D mips_cpu_has_work; cc->dump_state =3D mips_cpu_dump_state; cc->set_pc =3D mips_cpu_set_pc; cc->gdb_read_register =3D mips_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581609; cv=none; d=zohomail.com; s=zohoarc; b=lhpjK+AWY6KAXkOusF1NyqJ2V90Obtz7Z2wCywY2OLC77tQZK5HsPjY6txX/mj+O9TdfdLkk88LXP82enzrvM+SiWufL04Y4pQ2rlWyyh3RexkzLBa1Vut6bgKBwy1h2R9F+Hn8T53T+BW+OUbO3Ix9NOphkoBEcsI/pCHxwVPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581609; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=SMr2TMgDEESP6NnXh/AyzdEEqj1p4nl/dtiHe0cbwhJIVC/HOnMRikqO2TmiPv0EOHq4tpXNquOwywsmEaxcaZnMJx70Snd5Yc+Xl8AlQ5S2J111Pm8j7CW3xRbcYLdIgxigTxbyZb4bJY31OkBlZxjMZN0u/WU1AVtdqhiqmiY= 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 1632581609489321.7721463286448; Sat, 25 Sep 2021 07:53:29 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id t8so36615221wri.1 for ; Sat, 25 Sep 2021 07:53:28 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k18sm11115199wrh.68.2021.09.25.07.53.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=RNIa0bGaEJmEjGxl2dcNE/eVPbU3L76Uljp1NtWy2tc8CVcv79owBmiDLaFArNy+IT oaWjnr+mR3GkoG4qVkP7x0WnCLPTAM2gf1aiB1ngS4B40L4yAvV5GDYv5ud/z8subW7q E97atOnU4c1/ZzBXOXJ/x5O2pDqlPg2S5FrLWt8N+RXIVf5eXlBwO6UT7VnFOZIy5kq+ Ad+iM1zi7gKATutqN9p0KmyyKSDasqC5yddVz7ZAwC9dp6k4pVi3IEKLpPZZazHKTXFU UA7hwMtHfkZEItuDuzJ5mGYdv1QItPRHzZdHHqjOIvLoOPlcGO01vG6SeSeMwhdPw7UA MFuQ== 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=R4PJx6jLfH9TDxojFeDxA7Dt3uWip81L3OgtQBZIeWl8cAbWc36EguEQh805EZ9Ibt XKZBmDF/rOuAhxy97WKAQx/EvajEMpx5SBml+yHopEiDSQrA6ZLkKNdms8pJsPN5uN9s WSBTOYyyUhIpH12SluRM1taKQaFQbcvp4oW0z4L8hdmhHd1uvj1vANI7Pjsx0DIinDtZ +e/3emaa1H2xzDJH4RlLHAGjfFGAhi6gc/Nhhp8W1UtBaZwk5F28rmvEfiPwNHe1ROxI uxRO6134P9l4LOMdY5b7gyeWiygCOyQwx9tzB19LUMbSLeE/tUDJ6cf5qWyGfQLdT4ck 6dvA== X-Gm-Message-State: AOAM533qDCabQ5AkVow8KXP+m65dkpfeF4h+bMw8sD6KgpHXyxTMhQNf oCsgpptwjuWZO/bVg0Gcc5U= X-Google-Smtp-Source: ABdhPJz+So68TfvwENaaWg/o7/POth9+1B31X/38kUY4LqXICEmW58Gw0apG4INgAKcu96JMDcy4EA== X-Received: by 2002:adf:e643:: with SMTP id b3mr17427521wrn.299.1632581607691; Sat, 25 Sep 2021 07:53:27 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Chris Wulff , Marek Vasut Subject: [PATCH v7 27/40] target/nios2: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:05 +0200 Message-Id: <20210925145118.1361230-28-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581611462100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/nios2/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 947bb09bc1e..9938d7c2919 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -34,10 +34,12 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value) env->regs[R_PC] =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool nios2_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } +#endif /* !CONFIG_USER_ONLY */ =20 static void nios2_cpu_reset(DeviceState *dev) { @@ -223,6 +225,7 @@ static const struct TCGCPUOps nios2_tcg_ops =3D { .tlb_fill =3D nios2_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D nios2_cpu_has_work, .cpu_exec_interrupt =3D nios2_cpu_exec_interrupt, .do_interrupt =3D nios2_cpu_do_interrupt, .do_unaligned_access =3D nios2_cpu_do_unaligned_access, @@ -241,7 +244,6 @@ static void nios2_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, nios2_cpu_reset, &ncc->parent_reset); =20 cc->class_by_name =3D nios2_cpu_class_by_name; - cc->has_work =3D nios2_cpu_has_work; cc->dump_state =3D nios2_cpu_dump_state; cc->set_pc =3D nios2_cpu_set_pc; cc->disas_set_info =3D nios2_cpu_disas_set_info; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581614; cv=none; d=zohomail.com; s=zohoarc; b=F6FyUdmuIOL5IWhMJhwX3d09oi+hc9XrCKfoeevHq+oOcpwHeDSJ4SbUFlsJ+z9E49kWBNf1cNUZPJPXF0uKQUfXTTQDTYoG0Dve8Og8PilA6+kMxSoWkca1H2asUEWuYuW+y9yCWiAEKE0u8u2SuxfVYvD5v+8Fb9suGwP4Zac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581614; 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=iJRCHe61kvtc1rRhiGS+o1KnL9E9h9+WQluxQrfgjKb9FVpS9i/4G7MRMhcEvx6jFpHUDt9aJdZ9oizMBn2Py7T+XghAn8IEZb9+z5uydPDitA38/ucQ1LZ77FMLO5PtlTwjvssfk9KJoM9AiKjUEf9HOy6maMlKUP0Mzc1JL64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 163258161487656.04335840759745; Sat, 25 Sep 2021 07:53:34 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id r23so11146883wra.6 for ; Sat, 25 Sep 2021 07:53:34 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id l21sm11545300wmh.31.2021.09.25.07.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=h26pMLEnUsWrxMoqQtHQ2NCzZkcdqUGqN4k/9eCW+zM=; b=jKfdvjWAZz0YCnsbrfN09vqrq3pNkI2lrUpS40//xHnxIw/oYbiBuR1M+ezk0ZCc0C 586MjJQktIZHXqCtPCy42bO/ufoZ/J5wFywRm3cLM4VHJjXB64GY98hJeprHffsCMWlC VCsnqJk+JNHxHi4LG6QJ1kLcHUjslZjsudv0ZLKYGDLmr+qjcNrinIVe2BkgQosSeo0t +Buj3V7D2Wvp7eu9suCLinRtPFmWKtqJkybR7FLyQSnmOEGPZMpfu3Aa2M0ee7TDXyS4 9suaBetq1lwOV3jhI3dF3jCjgljGUU9M2xBYp2U0ZLwPW3Ng1iNSZmACdn8E+IWHjlF+ Neow== 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=6xdv7BLwFaA/NxBGUyJCDSwzymEdqltX0TfTXNhE8GIZcAakt7l8b9yuB2x3MosaaR 6Tp9rCKZhKaCoqOXWLIbXZLjHTu8zAH82p4RAB/8xLcesGoXcEGGnd30UfKDYF6ca10y E5S/U9a4DPURsjK/U1gU0G6kLXDzZCTSUOtww28OLsGut8hZCAZN5zkiNFAzxhLUwT29 7J48WNxmtrsWuTC77EmgMsFVITAdr1RpK+CjTzudwi7bcLi/oOr9Qc/L5dNf1QVcrIwg Wmsfp9Yds7L6gOAOSnn5cD/zEY10wmBHyRhJeCzyMpOOxVben8St9YTgAh3kSE8VbeJX eayQ== X-Gm-Message-State: AOAM532lAXMxuL8xM5NgMYTxdVL1nGUzD3tmnIVdK52qiOYhubuREhVh 035Z4c27dQD5cUTaUK5evx0= X-Google-Smtp-Source: ABdhPJyi1xKJNp4X7lK8oP1DM1CyKIcblnLaMjCrR54fTG1lHkX0B1qvrju/5R6HDlGFj10SD7ei1A== X-Received: by 2002:adf:db4a:: with SMTP id f10mr4007202wrj.140.1632581613184; Sat, 25 Sep 2021 07:53:33 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stafford Horne Subject: [PATCH v7 28/40] target/openrisc: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:06 +0200 Message-Id: <20210925145118.1361230-29-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581615597100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 27cb04152f9..3c368a1bde7 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -30,11 +30,13 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr val= ue) cpu->env.dflag =3D 0; } =20 +#if !defined(CONFIG_USER_ONLY) static bool openrisc_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER); } +#endif /* !CONFIG_USER_ONLY */ =20 static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -189,6 +191,7 @@ static const struct TCGCPUOps openrisc_tcg_ops =3D { .tlb_fill =3D openrisc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D openrisc_cpu_has_work, .cpu_exec_interrupt =3D openrisc_cpu_exec_interrupt, .do_interrupt =3D openrisc_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -205,7 +208,6 @@ static void openrisc_cpu_class_init(ObjectClass *oc, vo= id *data) device_class_set_parent_reset(dc, openrisc_cpu_reset, &occ->parent_res= et); =20 cc->class_by_name =3D openrisc_cpu_class_by_name; - cc->has_work =3D openrisc_cpu_has_work; cc->dump_state =3D openrisc_cpu_dump_state; cc->set_pc =3D openrisc_cpu_set_pc; cc->gdb_read_register =3D openrisc_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581619; cv=none; d=zohomail.com; s=zohoarc; b=EW8meVD2SyHmWf6JovN3H1jbJINhDfUNQljVWvyYRJmXjgvdYbyVqQKSUm0bpfI4sOWyO5mCRHvBD3Qx75F97HqEAivuHJRKq0k3hSXO50KT5BQi/MBr58B4nrNBg5yeeZJhgr8QVVOr5vmf4qyqAC2Z38Fzb+iU7Ozt3XkGjXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581619; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=M6Q9gUBZotYnLpA+b1F+eJ3xPqS+VWVaOfVITd3pPZpOKXLcxpvDMdv/alzwoZYuwk9kAzn7hEW05Pfk//FvBhDXJs9d4CiobTKBp0Ut/5DJZyFGu9jf3OuBMiuem70d9c1i6CnM5WhFiDwpSwI8o+91y8sfuviyUZyb/t9jdOY= 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 1632581619851461.17769631245733; Sat, 25 Sep 2021 07:53:39 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id u18so36547333wrg.5 for ; Sat, 25 Sep 2021 07:53:39 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id f1sm11616153wrc.66.2021.09.25.07.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=Iiz4vQh/m+lhAO95wYxFN05EsZO6PTARpNzm5HlbcZlCXv0zBbPgjlpBKW0i9tOyNE RP0WY4YnokBM7SAof7fDjLljH00iGViqaacNbPQy0Y5hVdLF1oT0ft8+9ozkynQoMZd4 9g8c4Tpzo/SynMpBFQCpozVssqbSXgAKuxr3CF1JqNAI828s/PrQJNP7bWCXaBDyPI5o bulQrLTpygOUIBrsvBMO/QyidZfigzYHK1DU+ezAt/tmW03g1iJpDhVVP7z54uzo/Kdm BaBtb+hbqa8cD8af8tdAG7itWbrphK/OykAJUwqtbidndv8LygfmyDlwq1Os0Pl/VwVa wh6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=33zqEzWAOSb3TdrtFkD3iGhydKWZpty0oUJqhyIq09gc/CTWz1UESwRwFDwEyJ9D39 a0jHRp0CCgl85NjbG1AXyfoNzRXm6pWt4zkPfLVOuelh/Hkk4noFYv4CtwJsv9FNh1YG 77ug5vyGPSk+FqeAZbrzJSNvss/JFq0bvgCjhbCIHW/ZfeHWB9IaiYP132UpxjbF6Jzv TNKc4usbChqJRbqxPG6adw6FilLmxrBYKhIhORPENgVCQwOWt1f87ojvqJre3C/UHrNd /nPCkqb3k4mdLrMiQQN3D4lRPaPoTC+7ZsNAoqis0w54KX843mo5U2YiVL6wu44jec3J AY0Q== X-Gm-Message-State: AOAM531HhGxH1nyj6EHiK1ULrV+5G6+UiLNeQgMu8vFLB5deF9eTbYiw zeDa78PkFFvvTsrgVb4UPH8= X-Google-Smtp-Source: ABdhPJwszQjjnXnsiwMnGsLWmfMFJDb0i6N4HyFEVJ0rcCKX6VS8U592pjH05jYt/1cfzSlgS79udQ== X-Received: by 2002:a5d:4481:: with SMTP id j1mr17638463wrq.6.1632581618107; Sat, 25 Sep 2021 07:53: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PATCH v7 29/40] target/ppc: Introduce PowerPCCPUClass::has_work() Date: Sat, 25 Sep 2021 16:51:07 +0200 Message-Id: <20210925145118.1361230-30-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581621978100001 We're moving the hook from CPUState to TCGCPUOps. TCGCPUOps is a const structure, so to avoid creating multiple versions of the same structure, simply changing the has_work() handler, introduce yet another indirection with a has_work() handler in PowerPCCPUClass, and ppc_cpu_has_work() method which dispatch to it. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu-qom.h | 1 + target/ppc/cpu_init.c | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 5800fa324e8..36110112506 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -188,6 +188,7 @@ struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; + bool (*has_work)(CPUState *cpu); #ifndef CONFIG_USER_ONLY unsigned int gdb_num_sprs; const char *gdb_spr_xml; diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 6aad01d1d3a..2f7d262b176 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7621,7 +7621,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER7"; dc->desc =3D "POWER7"; @@ -7630,7 +7629,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER7; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER7; + pcc->has_work =3D cpu_has_work_POWER7; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7789,7 +7788,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER8"; dc->desc =3D "POWER8"; @@ -7798,7 +7796,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_= 2_05; pcc->init_proc =3D init_proc_POWER8; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER8; + pcc->has_work =3D cpu_has_work_POWER8; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8003,7 +8001,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER9"; dc->desc =3D "POWER9"; @@ -8013,7 +8010,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER9; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER9; + pcc->has_work =3D cpu_has_work_POWER9; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8212,7 +8209,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER10"; dc->desc =3D "POWER10"; @@ -8223,7 +8219,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER10; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER10; + pcc->has_work =3D cpu_has_work_POWER10; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8790,7 +8786,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip =3D value; } =20 -static bool ppc_cpu_has_work(CPUState *cs) +static bool cpu_has_work_default(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; @@ -8798,6 +8794,14 @@ static bool ppc_cpu_has_work(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } =20 +static bool ppc_cpu_has_work(CPUState *cs) +{ + PowerPCCPU *cpu =3D POWERPC_CPU(cs); + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + + return pcc->has_work(cs); +} + static void ppc_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); @@ -9037,6 +9041,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; + pcc->has_work =3D cpu_has_work_default; device_class_set_props(dc, ppc_cpu_properties); =20 device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581624; cv=none; d=zohomail.com; s=zohoarc; b=gn+kbddTiZRWaEw6heDNsYsQb1VSL58ubyM3xUtVJ08uksscpYvHgl9lH69YVsoDHFE6KWC/J+sbirl3g6QeMx0VN7kg6tCOZJDk3rKyRWmDBV3UJDnzCMK90AFJihxy7IkQSWaFuGVArg8QaVj4mS2zRBTvov78uYc996aB/2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=iQnyA8S0sLNHUgd2+nYabp775AoTcDp3FxLdNp+1GLq3jdfK/rfDUtIrn5X+02Gqfqeo63XwVMT0mm0S/ud5Z5rzM4rStwGUaWxP4I7E43dxPZi1DVoYbrcdD3xKK+iMZYcVEerWAfBf4uvFYoMaUNLQgYXQyfXKwMxQ1jVAO0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 163258162463229.417256119309968; Sat, 25 Sep 2021 07:53:44 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id i23so36576741wrb.2 for ; Sat, 25 Sep 2021 07:53:44 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c132sm15873859wma.22.2021.09.25.07.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=oa9N22veagxHVmHotr3xEvh0pdMb0uSKgqnKR1v15a7I8NE3DfxoWbsyw4DBFZspI7 jAIociFOwzbZX0OC0DzztlZ3Bd63o9jtbmV1eNjUg5g+lwkM4C4fT8lnNDvvI4JCY0pb JuBL+n5N5DHcnaDXuAoeDBUHAF79oFI8mpBeUyuWb+KthCDIMwZ+DxqqipW0i6Os4vyY CMfFwfw4WvPflHgwguRmWAMhj8xk/7hvTu9OefUXHNS8YS0pioV7dY9KiYiPqAlKWKZf 3bE8qcnljbGvYgV/3s1ingfgfs0D1W3LlQjsfrrypkLlgcXOWZy1hLOuqWpld2JrvfWc MxmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=JibYHRzRDYazbotoTYfjOWWlMRC+CeDwWJMTxsx+Q2mIBvUHU4hYEvxcrxOuWPCnE6 SDt+5+iyap5xQAIiANIgEHBacarTtx5GyBCb/OhFtdo7pM5bbcblYMDhJiwn7moMAk/M FNiljxNXGDW78xEeWiIu/8fO8ZM5WX18QrBQ8wdfkRNPsUkviT7dWI11UUk2+MWhxKIm Z/kMJPqbw2yn1NQCF84sAevh8PKw+K5yJAf+aGXzfOBrw2ygjysX6nh1Qc4lSH3J306Y vF7F/LqwCBBtXIVBAj5oDmGOhZuAfUM6dXjqlJcKbnd9wKeH1TEmy1hgfTSZ9ErdzeOU U4Vw== X-Gm-Message-State: AOAM532K4AjeyrLvoowvQfToQc4e0BFOYA0CjVQiSdTliW0FtvL/U7I2 wY4KqLQhJ2wyecLNcMT/KJU= X-Google-Smtp-Source: ABdhPJw0ZKv5G6qL/TsD0qZhdNETmr67E8gkLaWoXIQwbJfheOBtp9UTy7Ig0OZPSOtwh3h4gCNmcg== X-Received: by 2002:a05:600c:2109:: with SMTP id u9mr7226486wml.6.1632581622819; Sat, 25 Sep 2021 07:53:42 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PATCH v7 30/40] target/ppc: Restrict has_work() handlers to sysemu and TCG Date: Sat, 25 Sep 2021 16:51:08 +0200 Message-Id: <20210925145118.1361230-31-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581626183100001 Restrict PowerPCCPUClass::has_work() and ppc_cpu_has_work() - SysemuCPUOps::has_work() implementation - to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/ppc/cpu-qom.h | 4 +++- target/ppc/cpu_init.c | 24 ++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 36110112506..ff2bafcde6f 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -188,8 +188,10 @@ struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; - bool (*has_work)(CPUState *cpu); #ifndef CONFIG_USER_ONLY +#ifdef CONFIG_TCG + bool (*has_work)(CPUState *cpu); +#endif /* CONFIG_TCG */ unsigned int gdb_num_sprs; const char *gdb_spr_xml; #endif diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 2f7d262b176..5c134adeea9 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7583,6 +7583,7 @@ static bool ppc_pvr_match_power7(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER7(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7616,6 +7617,7 @@ static bool cpu_has_work_POWER7(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) { @@ -7629,7 +7631,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER7; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER7; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7672,6 +7673,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2; pcc->mmu_model =3D POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER7; pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =3D 32; #endif @@ -7742,6 +7744,7 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER8(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7783,6 +7786,7 @@ static bool cpu_has_work_POWER8(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) { @@ -7796,7 +7800,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_= 2_05; pcc->init_proc =3D init_proc_POWER8; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER8; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7846,6 +7849,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) LPCR_P8_PECE3 | LPCR_P8_PECE4; pcc->mmu_model =3D POWERPC_MMU_2_07; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER8; pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =3D 32; pcc->n_host_threads =3D 8; @@ -7939,6 +7943,7 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER9(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7996,6 +8001,7 @@ static bool cpu_has_work_POWER9(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) { @@ -8010,7 +8016,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER9; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER9; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8059,6 +8064,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OE= E; pcc->mmu_model =3D POWERPC_MMU_3_00; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER9; /* segment page size remain the same */ pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->radix_page_info =3D &POWER9_radix_page_info; @@ -8147,6 +8153,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pc= c, uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER10(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -8204,6 +8211,7 @@ static bool cpu_has_work_POWER10(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) { @@ -8219,7 +8227,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER10; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER10; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8271,6 +8278,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OE= E; pcc->mmu_model =3D POWERPC_MMU_3_00; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER10; /* segment page size remain the same */ pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->radix_page_info =3D &POWER10_radix_page_info; @@ -8786,6 +8794,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_default(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -8801,6 +8810,7 @@ static bool ppc_cpu_has_work(CPUState *cs) =20 return pcc->has_work(cs); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 static void ppc_cpu_reset(DeviceState *dev) { @@ -9021,6 +9031,7 @@ static const struct TCGCPUOps ppc_tcg_ops =3D { .tlb_fill =3D ppc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D ppc_cpu_has_work, .cpu_exec_interrupt =3D ppc_cpu_exec_interrupt, .do_interrupt =3D ppc_cpu_do_interrupt, .cpu_exec_enter =3D ppc_cpu_exec_enter, @@ -9041,13 +9052,11 @@ static void ppc_cpu_class_init(ObjectClass *oc, voi= d *data) device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; - pcc->has_work =3D cpu_has_work_default; device_class_set_props(dc, ppc_cpu_properties); =20 device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); =20 cc->class_by_name =3D ppc_cpu_class_by_name; - cc->has_work =3D ppc_cpu_has_work; cc->dump_state =3D ppc_cpu_dump_state; cc->set_pc =3D ppc_cpu_set_pc; cc->gdb_read_register =3D ppc_cpu_gdb_read_register; @@ -9078,6 +9087,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) =20 #ifdef CONFIG_TCG cc->tcg_ops =3D &ppc_tcg_ops; +#ifndef CONFIG_USER_ONLY + pcc->has_work =3D cpu_has_work_default; +#endif #endif /* CONFIG_TCG */ } =20 --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581629; cv=none; d=zohomail.com; s=zohoarc; b=GYOzvpOTMByG4+GSho8+pR6+Vm/VgYvF890C4fdUv5/+tsFFaCN1UQPAbYr8LMedmeJe8+C4JzFpEiREDvwMFnSdfZda8SIb1WKqR5wMEO7bDpFy43FyUJXOe9EJ113DtrnUh4aMdg9W3KP5gHUsrJM9Svz0P7BNxLcteY6Vc0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581629; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=gMH6FZlFL6orw9HApsddiwCgrgRpmfoXsFPZwFYB5zKFvNXoReMOeuUhXp0oWZIPK7NSx/kZ2PRZ5nXELzcV6o12WsNdP4WTOfEBZP5lw5ztWDFYiJiUzt/q+8kY3E9Dsq1pUEzKvoYpJwRehZBZhMxdRrbemELLjBqx+9H5a78= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1632581629361400.442646607395; Sat, 25 Sep 2021 07:53:49 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id w29so36393664wra.8 for ; Sat, 25 Sep 2021 07:53:48 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id m4sm15948511wml.28.2021.09.25.07.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53: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=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=q3KZqQlOBjDrcaSJm4Jwy/KKXubL22+x6kNrUoAW6U2VUx7YhIvaWaOxHNy8W5i6RM u6D+CVwGpINqvsrOpKYrenY9GbQsx7v3DAg9xy7yPRt1TjSZwCOugHiavJfSG8ehBPl8 NNE3J1C/EHej7Mh9gFKeNfEUlDGAYtwMQ4O7zJ+3Wk4sdJkMBhLtluXvM3PrHj3w8dAf J7eLX4eRCDAEacU3B2ffgQJUVNbBnvszQMSX3Ds+fdW257t1kBttlSyXNJlKaaAFX+h9 40GH+h2BmlmCRGuUr8M6QUYrmAl87R+c4U+QJ/p/GIuXE4XY+qSfXlnJX+W90m07OkPF H4nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=LwosTISZSt8Ufo+VUNdg9wOkhdaClsSKnm0eZC59RjgwnAQuZyosGO1uAYWzoFkhJU ZwxrkEOn2/T9zBgUbNf3BpJTISmjf+LYvLNTih7pg8YXw467ZLn8D4mxhlRi4zKdvKSC /FsAGDk99KCrk2IM8e/UKfTB2JL5u7J/vuoN1/0DfLygaPDfLFAQBeqaiTCJc7fIvc38 pCtez0NqPyGXdiTDzDch/wXwFLd2FX71uTQRxGZmhDxCVNT6L0Hfop6L9KU/slhh5+H2 dqTZa3TYHVCARuUA4P99eDCVAm69dEkosJM3OVeRKiN57vpk4UjAYpWDHjlwQ9QSsJnp JKMw== X-Gm-Message-State: AOAM531Ait0KUEg95tHPBjEusvwHRKl9PGEyDWFCKX8dGKmJtIvZiLC8 3zUUr9WqEWBV2AnIFTmnosQ= X-Google-Smtp-Source: ABdhPJxqug8MHgewM08Hx5zuahM8mlKGvykQPPGxQ89lo5QLD8hB3WieG+KWNK3urSrVZReA6jD8yA== X-Received: by 2002:a05:600c:a05:: with SMTP id z5mr7342567wmp.73.1632581627608; Sat, 25 Sep 2021 07:53: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Palmer Dabbelt , Bin Meng , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs) Subject: [PATCH v7 31/40] target/riscv: Restrict has_work() handler to sysemu and TCG Date: Sat, 25 Sep 2021 16:51:09 +0200 Message-Id: <20210925145118.1361230-32-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581630492100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Acked-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/riscv/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 7c626d89cd7..ca76bc34d9b 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -335,9 +335,9 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, env->pc =3D tb->pc; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool riscv_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; /* @@ -345,10 +345,8 @@ static bool riscv_cpu_has_work(CPUState *cs) * mode and delegation registers, but respect individual enables */ return (env->mip & env->mie) !=3D 0; -#else - return true; -#endif } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, target_ulong *data) @@ -678,6 +676,7 @@ static const struct TCGCPUOps riscv_tcg_ops =3D { .tlb_fill =3D riscv_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D riscv_cpu_has_work, .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .do_interrupt =3D riscv_cpu_do_interrupt, .do_transaction_failed =3D riscv_cpu_do_transaction_failed, @@ -697,7 +696,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) device_class_set_parent_reset(dc, riscv_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D riscv_cpu_class_by_name; - cc->has_work =3D riscv_cpu_has_work; cc->dump_state =3D riscv_cpu_dump_state; cc->set_pc =3D riscv_cpu_set_pc; cc->gdb_read_register =3D riscv_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581634; cv=none; d=zohomail.com; s=zohoarc; b=YcaqUwuJn6H7qB3EE6zmsBNw8QgLwtBFZMxICDJ6Xsdw/CMSiNmmtYKhUFYdaXbNu8BC93LK9fMc1q05QgO+76r8jrb6LFwql9LoMGrd85TYI1CpyJYdrIao6HPblv9OEV3S+TF0vMoIeX7h0Clg9YKBpwm7M1yfTnC6bJ2kVg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581634; 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=AvQYFSOqQFNvWwF3sPab2Q5rRpYLUWCcihXCI/TcLb2BeGjY+S1Izd9yRuzwULXau7anfRbdpyGcaQF0HPNoYudIvoSgESS9yHDDPinoAuw+IzCqGAk3RxQx1LfOdxbN4lxsqol5K21s5fstdGHowjLVf+lHU65NlNUy1PtmU2c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1632581634089935.0340138396458; Sat, 25 Sep 2021 07:53:54 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id t8so36545859wrq.4 for ; Sat, 25 Sep 2021 07:53:53 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id a75sm12144010wmd.4.2021.09.25.07.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o/vqGSMOnhzvKGrld2aIeHhcVaK006Y9gzP+FF74z+I=; b=bDq37a/lE37CTk+jAcFOz8DtR7um/Nas8YPLtoPubNP0GVjmacrXEmmp82NEhryl3L XtpAGISmw5dsRbMYJZFrjqdfdhV8SF1VLkSBCv91yXv7i3qmk9JEsVh6l/MGB2bR5vZm CbPWNSh/UORzJ0zexmLNPEXdvF1UFuCqdxJxY29cNboldwZymlZrDFu6V5rLxCffjtHg 5ycRMSx8pSO0J3g1f+WoRM+46Fmn3cojWN7m283oGRAz9Z7exfLry7lf9BSskc7t4FF4 DaYnrJaMcXqgQgLydbqHfVqN/S8aSnXqdoyEvtvMYKLc2I/0km1XJqMXh2oSRVIBzrH1 hQMg== 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=wLV1/FSyvlwAg5mpSFzjW1Q7/6HxP5NcEXYfa1A917hL7SFjKawXCgVIy9f9+6LK7w tjbjsAzqgFI7J+LUaAAg06NGUReJ1rTwY1Q+lxYtGakhHPQVCPSxicDW7XUkc/+6zrrE iUfnTIuWjDstvl0MDTQrvmZ1ukCAtzPYFxbhYVrOYfBPreGVQaaTNRbzhpibkCNdXHue C6ygode8IXpcY6okEgtH8bY3TuTUjd1UojBsid3iX/V6Obnkdu9GZ5LBeQCOkV5tuG0b hUiWgPj7iOYUq08Puzf9RSQ2gka5eTUQuOwQshOHnVkJAosv1cijdKFvcl8sykH5uUgp fpNw== X-Gm-Message-State: AOAM532f7MRApxrgqMzOjSM3R6ZAjP7Rg4A8o3Xo5wVkhO9Fdt40qqqR HBtsMWi9GW+C2Rjcp8OQ3D0= X-Google-Smtp-Source: ABdhPJxqRk3Iz8r3gtAsPOe/BWHkD0LluDyj+kPazr3JUmal6maIuI6kPTDUDx0mvo2M5WIfPpjimg== X-Received: by 2002:a05:6000:1b90:: with SMTP id r16mr17805204wru.250.1632581632326; Sat, 25 Sep 2021 07:53:52 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yoshinori Sato Subject: [PATCH v7 32/40] target/rx: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:10 +0200 Message-Id: <20210925145118.1361230-33-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581634516100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/rx/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 25a4aa2976d..ac6b40b2716 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -41,11 +41,13 @@ static void rx_cpu_synchronize_from_tb(CPUState *cs, cpu->env.pc =3D tb->pc; } =20 +#if !defined(CONFIG_USER_ONLY) static bool rx_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIR); } +#endif /* !CONFIG_USER_ONLY */ =20 static void rx_cpu_reset(DeviceState *dev) { @@ -189,6 +191,7 @@ static const struct TCGCPUOps rx_tcg_ops =3D { .tlb_fill =3D rx_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D rx_cpu_has_work, .cpu_exec_interrupt =3D rx_cpu_exec_interrupt, .do_interrupt =3D rx_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -206,7 +209,6 @@ static void rx_cpu_class_init(ObjectClass *klass, void = *data) &rcc->parent_reset); =20 cc->class_by_name =3D rx_cpu_class_by_name; - cc->has_work =3D rx_cpu_has_work; cc->dump_state =3D rx_cpu_dump_state; cc->set_pc =3D rx_cpu_set_pc; =20 --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581639; cv=none; d=zohomail.com; s=zohoarc; b=jWiXhgt2+KtAZHuJKqSbczIT6b+0plYZzx9YzC+1JLJORa8HfpZKWIlF8d5EDaAvCsqR7DV5oXrv5Nww1fGXR3fxIQx9NcUWr+3SotEcpypaiJ3zPEdIHKNyPwXbIF6xmoPKSB2NfDT6vvhZ23lT1v7xp5ZCmleSsIEG0dVaJ+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581639; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZAYjmxiur5f+p7A1SrpNSihQLXDhLnmlUZZ8rIaewhE=; b=e6TcjPy/oNeh/KVOMYpnpt4fU5b05J5hXJBxjPZvBokXIcRdfzuC0Jp3mBc02Ot2fKKFuVXNIWa+KqyTrsloKpBONbLMPhSJHq5godlJhHEjy2UhXfzY78D5abXW+5wepb+TfeHDOk4PSE0oP0qvUrFuczl5jvbGNG6kxpNtvIs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1632581639027251.4744449434554; Sat, 25 Sep 2021 07:53:59 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id i23so36577922wrb.2 for ; Sat, 25 Sep 2021 07:53:58 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id z17sm11127651wml.24.2021.09.25.07.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:53:56 -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=ZAYjmxiur5f+p7A1SrpNSihQLXDhLnmlUZZ8rIaewhE=; b=aQxsRYQIMX8vJbc7+lkGv7kE8uACN+7zrjpIq2yWAjSL8UvPXbHELavSQ9c9vi8Z7B BW3Dg2azlaaDlsw288fesgycwhPhWqxCXvCEPDpBRmsmo0gQegoANT3NAWTAaBNqDYzy uVAYOBukMyJFT0opo4hq5CEtygQh4lgV0HcVpf6wsEkaNn065NnbIxEhKVzmq6+m/w9v LEkzDKA8qPB/1np09OThfB8I6FLDhKt/S0rU6zHFmlDAXCB4vVWi9BOH62tOo+gPXYBQ bHYosYwl7U0Qiw+LsO9/oFHYXOwEJ8v+IDeJ1cLVE4K0wlzySH34d7pf4M4kqnOjyhCu a9Ow== 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=ZAYjmxiur5f+p7A1SrpNSihQLXDhLnmlUZZ8rIaewhE=; b=bKH7JRTTH+v2Gli8tM2wC1q3FhS6wqp9mxvBT2fMK23dAeWtbbfHqpBVJJRUBpqtCr yVMbRrn6JI6toBEzB6lClocrM80Mc07brwEF3Gl91n8t+FpUwD1IJdIPr0foRhuHxO4M w9L7lswdFv08qsm9P7eFcyTLOGWhdjZI4UqVRXvsJLdfobI0SZRMEWno3p1nZb1ck5+H Zp3rwyF3u0eq9OOA9TD01afSKAz4GioMiBMuDDVAELxq3sU9lsPZnGwWIGcsZcnPocyD 3v5q2zXTVnfx+0wQlyi/4lmyl0UeDj6boDjRRa7299mAs4vdwCN/MQOMyLYFCdZrlDIw mDWg== X-Gm-Message-State: AOAM530i3J82qCPuxRzM9fqfCmtqsoJFiEb3kyu8kvU3b9Cau4JDpPP/ KMELd84S7JkEc1c3xCp4LKE= X-Google-Smtp-Source: ABdhPJzLqwLC9wkrI46iPIBPW/hBXnGqEP5zHnqRLbDFPrkBdvJsIbHHen+DjFsKWtWpCby8aG488Q== X-Received: by 2002:a7b:c048:: with SMTP id u8mr7108728wmc.113.1632581637285; Sat, 25 Sep 2021 07:53: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , Thomas Huth , Halil Pasic , Christian Borntraeger , David Hildenbrand , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v7 33/40] target/s390x: Restrict has_work() handler to sysemu and TCG Date: Sat, 25 Sep 2021 16:51:11 +0200 Message-Id: <20210925145118.1361230-34-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581640733100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/s390_flic.c | 15 ++++++++++++--- target/s390x/cpu.c | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 74e02858d43..22bc38e9b4e 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -312,19 +312,28 @@ static void qemu_s390_inject_crw_mchk(S390FLICState *= fs) =20 bool qemu_s390_flic_has_service(QEMUS390FLICState *flic) { - /* called without lock via cc->has_work, will be validated under lock = */ + /* + * Called without lock via TCGCPUOps::has_work, + * will be validated under lock. + */ return !!(flic->pending & FLIC_PENDING_SERVICE); } =20 bool qemu_s390_flic_has_io(QEMUS390FLICState *flic, uint64_t cr6) { - /* called without lock via cc->has_work, will be validated under lock = */ + /* + * Called without lock via TCGCPUOps::has_work, + * will be validated under lock. + */ return !!(flic->pending & CR6_TO_PENDING_IO(cr6)); } =20 bool qemu_s390_flic_has_crw_mchk(QEMUS390FLICState *flic) { - /* called without lock via cc->has_work, will be validated under lock = */ + /* + * Called without lock via TCGCPUOps::has_work, + * will be validated under lock. + */ return !!(flic->pending & FLIC_PENDING_MCHK_CR); } =20 diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7b7b05f1d3a..df8ade9021d 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -88,6 +88,7 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.psw.addr =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool s390_cpu_has_work(CPUState *cs) { S390CPU *cpu =3D S390_CPU(cs); @@ -104,6 +105,7 @@ static bool s390_cpu_has_work(CPUState *cs) =20 return s390_cpu_has_int(cpu); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 /* S390CPUClass::reset() */ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) @@ -269,6 +271,7 @@ static const struct TCGCPUOps s390_tcg_ops =3D { .tlb_fill =3D s390_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D s390_cpu_has_work, .cpu_exec_interrupt =3D s390_cpu_exec_interrupt, .do_interrupt =3D s390_cpu_do_interrupt, .debug_excp_handler =3D s390x_cpu_debug_excp_handler, @@ -292,7 +295,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) =20 scc->reset =3D s390_cpu_reset; cc->class_by_name =3D s390_cpu_class_by_name, - cc->has_work =3D s390_cpu_has_work; cc->dump_state =3D s390_cpu_dump_state; cc->set_pc =3D s390_cpu_set_pc; cc->gdb_read_register =3D s390_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581643; cv=none; d=zohomail.com; s=zohoarc; b=eCLkb3wSJCLT+NnVOuuS2Xvkc4TlrlX8zJ/50q/tr6XTTvGR9/VxDDgbas2YvCXnOFH7+ZMk0KiLkSJOa3jeWH3LwlY1I2K/t6aLS6zoE2pgP60l53qAkL50rlM3BGLD3cvdGlRl1nTOzjQ/1w6bHVG0W24pOSFOWaB3ZuhIvEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581643; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=NhcDzlak4lGRlDsloGNlzkUQnoY/JyISUFAp8gdY/Naz352zfMQuUfda7nGgZS/XHnz6klIc88L+J5eI2w7Il8yjdUzzIZmPryj6CSiJYkfUszp7YvhIyy9sBfnKAmskuBjugHXCSCTWAIWI9J4Q2eK1b3BcAgskA3ofQfLAygw= 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 1632581643591165.8646907271251; Sat, 25 Sep 2021 07:54:03 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id r23so11149324wra.6 for ; Sat, 25 Sep 2021 07:54:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i18sm11441097wrn.64.2021.09.25.07.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54:01 -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=WTi905FpEEnUQcX06Ip2tGfdx6sVAeY9HE/khlNtUjaQKEDDAK5xzfNe5G+hy+wn2A hIxpf3e4bHJ8L9/MJmElJtEi5vR0iVva6n3Gbb96v8SsWzvGagNO8RXzJTLZmtm5kb+k VndcziOT8ZU3/viei6IbkXRDu4Jk28s+E5Q1jcw8NFXhtgOAeVdRX+MVt0F/ZVGwrrYK V0/tI57JxW/a7pvLORlrIVeKQcOUqzV0HYMDZ3FIJ9dTzXzFEtFd44E9ATmT0yCY5kN7 goahmA8WfxSA2/CD/2KB9n2yg2BDSyuxKkvxzOpP3xV7ikGxzq1T8CKq4j0bM2ErXCUz zhxg== 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=ljPuTX3k9987a7AI8y7yYPjpHitKxmAQk3CbWxbvdOQO5wKh/NAxWuYwux9wsbDuyA 2NDQDroyBIzoX595cW8J/4J/SASC1jfD8i6RuaMpiZj6+akaHo/2LvQVwlumI0Ug4/JH WQEWvNilSVcTcBRl8cnSarYFHjQQUJD33CGHn8Riu4cL6lO/7TDXjWAZqqhQqYacAuNl Wug9kS/kOQaC8Um5/3OQaC0Pe54opL+NSQGWhgO2qPVbWy3AetrvnXmwh7a2OfIz+cub etiaGZRYIvksTQxx2YSYjT/iSVSlqaelM6dgTMUiaTjzg6e1x9CGU0kr2TZfChoqV7oM udWQ== X-Gm-Message-State: AOAM530nPWsv/7h7ddykRqy1dgTb12/3gfbSFNdY+xGi2qjeK6trz2Mg tODH7ohNM7FyE0C5oaHgNgjX/Z81wA8= X-Google-Smtp-Source: ABdhPJz5XHzAMYoT32gRDCI021c8L/UcZiPR82gZZ/bxBgvXUiPTwUgz93zGxW44yxkILqCsz7wqkA== X-Received: by 2002:a05:6000:1a85:: with SMTP id f5mr18011282wry.25.1632581641853; Sat, 25 Sep 2021 07:54:01 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yoshinori Sato Subject: [PATCH v7 34/40] target/sh4: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:12 +0200 Message-Id: <20210925145118.1361230-35-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581644825100002 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sh4/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 2047742d03c..fb2116dc52e 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -58,13 +58,14 @@ static bool superh_io_recompile_replay_branch(CPUState = *cs, } return false; } -#endif =20 static bool superh_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } =20 +#endif /* !CONFIG_USER_ONLY */ + static void superh_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); @@ -239,6 +240,7 @@ static const struct TCGCPUOps superh_tcg_ops =3D { .tlb_fill =3D superh_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D superh_cpu_has_work, .cpu_exec_interrupt =3D superh_cpu_exec_interrupt, .do_interrupt =3D superh_cpu_do_interrupt, .do_unaligned_access =3D superh_cpu_do_unaligned_access, @@ -258,7 +260,6 @@ static void superh_cpu_class_init(ObjectClass *oc, void= *data) device_class_set_parent_reset(dc, superh_cpu_reset, &scc->parent_reset= ); =20 cc->class_by_name =3D superh_cpu_class_by_name; - cc->has_work =3D superh_cpu_has_work; cc->dump_state =3D superh_cpu_dump_state; cc->set_pc =3D superh_cpu_set_pc; cc->gdb_read_register =3D superh_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 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=1632581648; cv=none; d=zohomail.com; s=zohoarc; b=GAnZg5kynaWJ1zXV2fe4mE9uxLn1JvFPkw0bvh7KhT31hdbzpD2z9sIwOqIxKEi3OgFjyYkCIGYFDUJD0+RGhbt3Xzsi7G+evuUqzXMCu43ZIwQHocRNHrR9aOyhpdzuz/0s7DngbBFybiNnyKKILCSSKELFyL/3Jv+KTyfEOgo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581648; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=fMVKnSJoRJjKt4Fk07ZglNigDZScADxpVbYRPWrFU2DttyYTMcuP7MLiccLjstlrAJEKi4d5p75RkcjKGbcZQZmutTAKhI4khPnR4FyANZk5lyzd7ZKt99BzoOxRB/hVb8GAx9NSntlDHHMhCqOdLPYC+2It5dLmRZhiU9qVnlA= 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 1632581648209246.6363306116799; Sat, 25 Sep 2021 07:54:08 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id c21so6796150wrb.13 for ; Sat, 25 Sep 2021 07:54:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id x14sm11522211wmc.10.2021.09.25.07.54.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=QiljUGdm0PKQEXCkCNn340fVhtc5Zbn+wi8S6fwpUS0jh7tELuzVyXlWoJbZCo6vPO FMPH6IigiKzQZFC+/SDbfglQa7O8ORZ1dU8jOF+BVNJC4PAd0rYGT+uaWefVptQ6c9Eh 69Oc9ZmcLbWWtiNMz1uLt5UJMvfiTVarOPR0ajuWKeHRNK3LmdFZ4O+sAtaizLelLuBT DM0SnQQJf3KTpJ5Yx+a6vLy1Yqzg8Eu+KS0gcT5d9zOjqpGfaURv472vW+ixzq4FnANf t0GxC9NvVCYgb2IC96nReE575U12b5Kc1OzGdtLCNIQjbZCvdOpyoeU6eNk2cjCW6vgQ n3fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=X5HEhz37Cpaq86Ue3xSqCkr2G8WrZz/gXQXZHP3llIVmp1udf5EBcHXofoHVs5jZM4 w718O0CR+q+Q6efXTyxR+Xhu7iEGucCy3c0sLpzojs0MTjCwIzqpE7taN6ITTrMc2+ch NTlis63BpXLV9lvQGgO3jkOpsHQ+h/vsNAvBdNMn5MTH2DuDbDy6kR+89ygWpTcO7Ref DCGn9JCcyQ8AJ1FFLnstf7QvymCII0HGcApULI+hBwF7C9pCKjobJk0zDSeRT6Fpbv3/ sxaYx/TVTsUB/vFNr9DdMmdFaRb1YPI0/QXTiBJqAmEs83x9VhGJOlzh3jN30uddtI5f WXRQ== X-Gm-Message-State: AOAM5326E37cs6B1sjZ+nS4Ev+149iZscO0DUB7PVCpLJzwi1aDaBLf2 eS4OMEtxejCBFH2Sjp0VMro= X-Google-Smtp-Source: ABdhPJzTNnxPD6KolsrTO1Z3gTTabWnSOPpByyFJ7/q1/yTu3F2/RsCi2e5SEWuH4tvfEswqMj+FMQ== X-Received: by 2002:a05:600c:3585:: with SMTP id p5mr7460106wmq.88.1632581646483; Sat, 25 Sep 2021 07:54:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v7 35/40] target/sparc: Remove pointless use of CONFIG_TCG definition Date: Sat, 25 Sep 2021 16:51:13 +0200 Message-Id: <20210925145118.1361230-36-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581649051100001 The SPARC target only support TCG acceleration. Remove the CONFIG_TCG definition introduced by mistake in commit 78271684719 ("cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"). Reported-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 21dd27796d0..0d252cb5bdc 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -859,7 +859,6 @@ static const struct SysemuCPUOps sparc_sysemu_ops =3D { }; #endif =20 -#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" =20 static const struct TCGCPUOps sparc_tcg_ops =3D { @@ -874,7 +873,6 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .do_unaligned_access =3D sparc_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ }; -#endif /* CONFIG_TCG */ =20 static void sparc_cpu_class_init(ObjectClass *oc, void *data) { --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581653; cv=none; d=zohomail.com; s=zohoarc; b=a0zjqx5++1L+aR3RXQAHH4Uchlp35sjLoPs02qq3+rxpbbyjjVInc/deJaDx8EWvH5z7lmGZQjzl0UNUHJeDpyVsn+C5nKgd51ZtjlRThqnCL0pCzCL6QQ8dvj1SVjFd43p25CarDVpOrgAs7RMysRUl9Cu7gBmqgDcB6Q9+toU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581653; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=S2gQqI1Leo21r23HjFdB11Yeyf/Og177kSJU584lJ0ttgKZsN11KnMbVxwNKdDQtjo2DiccTDef3pe3505E4eixBoD9coZiTAG2w6tA5U+sfR90XsDjMk7tr/ILJ+VcRkltKNHvMb9PQwX5iy3lVbLtrwxw1QxsaPpf50vv2+so= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1632581653161811.1277769188887; Sat, 25 Sep 2021 07:54:13 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id r23so11150349wra.6 for ; Sat, 25 Sep 2021 07:54:12 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id q7sm11963610wrc.55.2021.09.25.07.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54: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=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=ijLH+UQoiCfmfrFOgh3gjvCnCVH6BEyy/QyDaJrrsVftBfqqTteorWngyySf0my8m2 MSTaV0cMNPL56uf+I3ixMj438bXjoxhh3hmQGH897aturmyVcCQ00xqw1OEjD3ZXiTvD phXRoOO9iNNjxvrdZI1kcQNEnhD0Amch//vi3WU+BkTZZjQJcyfZv38meq/zn6On2x/L 8FpQ543uFSlPOa1HrcocR5WDKiIFTLVvCnmIzk7n7hJgRy6JLFJu6awLp4xdbLP451Xc K5maObG/0kq2ZuqW7L+HBAWR7mbFTm4RNJs8DPt/UovB5XOg/S5khZE4UeH1ZyIdtyJ7 HWHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=CchJE7ptx6iKy//7wNG0RKz3+hXjganbiTKetvho/VOMKt93jTKmQ3mzxouEIO1hwz l613A+dInkPXfsAuGfZEJ91c/2S1wW2VWNPmG8VZ13FsXvsRy9oNxYqyG7dysjbZHw5i BTIeX5S61Cyvg7uomSZXK6AaVDlGnWw3ltXgwteGnJLUmNAojVAMZK2JE0PfVB/9nrgO /vP0mzCIEsfJiptn9/Y5SH2Zd7GEkMlP54HRh9FYEVAot4aQfPjif42H01IaLdmdXcsZ Gx/hEl1Y3MAqmiNCD8iwhM7hsEbUpUiYZOmm4g/fSpHOL+SZWLNss0p8YOgD8SieLpkf nBcg== X-Gm-Message-State: AOAM531PH0pBdo8knxK61d9+9OC+kUOEyTOB4qSIeeUv1IWpVRUOGnKk E+kwKmC/fQCD6BhWYOFLbe4= X-Google-Smtp-Source: ABdhPJw09UagsrFkhlht0hUTqy24dAnkUnWy7RPE1pO3uphUrcJt0CS4LBBrPvE/3w+9kB0ickDcDA== X-Received: by 2002:a05:600c:4ca2:: with SMTP id g34mr7260753wmp.193.1632581651449; Sat, 25 Sep 2021 07:54:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH v7 36/40] target/sparc: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:14 +0200 Message-Id: <20210925145118.1361230-37-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581655259100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 0d252cb5bdc..8d61bf15f6c 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -702,6 +702,7 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.npc =3D tb->cs_base; } =20 +#if !defined(CONFIG_USER_ONLY) static bool sparc_cpu_has_work(CPUState *cs) { SPARCCPU *cpu =3D SPARC_CPU(cs); @@ -710,6 +711,7 @@ static bool sparc_cpu_has_work(CPUState *cs) return (cs->interrupt_request & CPU_INTERRUPT_HARD) && cpu_interrupts_enabled(env); } +#endif /* !CONFIG_USER_ONLY */ =20 static char *sparc_cpu_type_name(const char *cpu_model) { @@ -867,6 +869,7 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .tlb_fill =3D sparc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D sparc_cpu_has_work, .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .do_interrupt =3D sparc_cpu_do_interrupt, .do_transaction_failed =3D sparc_cpu_do_transaction_failed, @@ -888,7 +891,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void = *data) =20 cc->class_by_name =3D sparc_cpu_class_by_name; cc->parse_features =3D sparc_cpu_parse_features; - cc->has_work =3D sparc_cpu_has_work; cc->dump_state =3D sparc_cpu_dump_state; #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) cc->memory_rw_debug =3D sparc_cpu_memory_rw_debug; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581657; cv=none; d=zohomail.com; s=zohoarc; b=lf80Q+LC79BdKYVIG3go82ydjYgUsHnCPnGw5fH2qQTUwSARkzaOY6kVI4PaEprIzxudaUb686pRCTsfPG4oPTX+zGgtzyB0xkHFCq3lD3paulmwQzjeW1KQmMrD7DqwB8tLdBo82U0B3KM2Ry4cdGAxplCL48hDr4y8Ez9kBkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581657; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1gsdxrxIkLL008ui7WH6lPMx1hd/4ygkSIHUg3uTtLo=; b=ZaoAOybGHDPKfKNOe0BP1G6IHC8hzxQ5Gm/E0PsNBlq1K0BtMW9FxtG12C5RVMjKDv1Eqg4FJntEEC7WPxkaDsuhkZJdWuJI2VGFR84jf6/rm4kyMe0ecJefC5E+UiupM2siyA+HKZHsW0Y7rsnNTnReeY5dTVPytd+4gAoIu8M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1632581657952629.0056186727236; Sat, 25 Sep 2021 07:54:17 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id i24so20543136wrc.9 for ; Sat, 25 Sep 2021 07:54:17 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id w5sm11286457wra.87.2021.09.25.07.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54:15 -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=1gsdxrxIkLL008ui7WH6lPMx1hd/4ygkSIHUg3uTtLo=; b=k0Sz8yUMSYMZ/8xbOcsrvFMQprsY5D03rEsFNB2SQrgBVNb1hlFa+knUz/kDL9rLzB dfjHNMc/FhWae7ujFy7ax7mfJigJkTDMLq0tmSe81MQwosJj/BZh8wGeN4fA+w9eB87r O5pH97URLpbLocqAAsaP+HxILpmT/CZQKi5aKNLToB9ZGUlvmRaiaZchfmerR6jM7Dqd /WrfQS4z3bXJDxDE6tBbry22Ttayhx2Nota+dx/O0FkBjuz0nRq/pbwkOUin78OnU89P nAH+xJG10ZI2+/DJ+72z0Kq33KWyIJLtBBqwPEs9WEVyifLf/a4kec76NlmT5PtNA6a/ 0Kkg== 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=1gsdxrxIkLL008ui7WH6lPMx1hd/4ygkSIHUg3uTtLo=; b=SWLrtlNHrFruJqMpinDkn1kf9B9dWBuJtfqvVyqTG9n9BH41KiQuUCdvkfwCOaWTyR ffIqNbAkbbT/UDeSJNchqLkrLMmQwqchfp0ynZCOpA0ow+cDtllAP6ak/cGXpDNPU+Ym T4rFmWmiEsiFCBQ/ByCOnu+Kc2pTvNswciComhHXygFHYh7WbNrfdQrwhUBaIMJ7GuLW //QLKzbAcIGxqMNh5rYDHkvJbeb2s4FOLs42peaQ8l7AoaFe7b6I9sI9z44tgNW86dUT EfsI9rNV82H1Dx7Q9FcUcoAJFs1xmBV/qKdC7pGJ1kmTS6Dc2PmNfSoHQCTHNVJIgTj7 J46g== X-Gm-Message-State: AOAM53287EzC4P/OcPr1sysFTj9uNABNvja3poxFlnzDdt0p9Te0W2vv dDIzNAbMXvzcdZl2hnLCZic= X-Google-Smtp-Source: ABdhPJzPfotxBBSzEU+E5O4FEXBLyWmWJLpARs2ee9fo32q/153reG1jvVpj6DyJlVWk+Y5sHF6OwQ== X-Received: by 2002:a05:6000:160c:: with SMTP id u12mr17585287wrb.128.1632581656243; Sat, 25 Sep 2021 07:54:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bastian Koppelmann Subject: [PATCH v7 37/40] target/tricore: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:15 +0200 Message-Id: <20210925145118.1361230-38-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581659718100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Reviewed-by: Bastian Koppelmann 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 Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581663; cv=none; d=zohomail.com; s=zohoarc; b=A+Am+zrQ59ljh6+79yX174jCFtk5WRMgyl5ZfBMVh6UHN/b6dAQpqsCwIHagIMe2uCVYKVGWSmerd4jshMuFT5nzDaIm+uKUJC9JQIvPVlYL3o8X3/dGkhbn2X0fx3iL+utnMCYTnsN8qEzdW2jD5QxC5OM4knCfFR7sDgXUZOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581663; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=H4y0gCopFputGaPUYS8cf4JRSBWSJeT2QFdaU2Wxslm7fERjCxuz7hdc+r1EgAmYLa/gj6dbV2043EeOzkXjrdjbgvFi/MeoaCMCCukwwwgoeRY9V6yt2+FIJbiN21atRcyTSL9V/cIMAcm9AmYopP9RUh0yXDCdgvWNAgwxjqA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1632581663149792.5976231762974; Sat, 25 Sep 2021 07:54:23 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id i23so36580059wrb.2 for ; Sat, 25 Sep 2021 07:54:22 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id v17sm1325275wro.34.2021.09.25.07.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=qWU4MvPZ5d33fFily2WsBp0lCIJ+9dZ12jEywn0YcLYbvd5J2IibCyiwEeldXAKvpB SG6zpIGxHY6wsdaEcZ4pIWIAzZyvCdmQUMGMeetakI5dFUiCdrlNFoHB7o7U7crJDfOr oI1B+OOn9bSRpFNxCzBOLu7TPhrcACUBh2IjGaJgJsnTH5UnmM6c6JzxmrOtWiKWJ94E 5jHf0dFjS9Y3RGNYfal8jO18q6uISzRVSFBhwEUPoG/BvvyiTF23CmQABch0+9EIBeVf zI3SEeC6sNVDYknfowSrC3vz6FZDwRw54qT+ous3m/PtPBJJAUnfXbok/bsMdyO6cu/S 0oeA== 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=OygtVIOXBYQJbQ+/QbvKl58waijnH65ZUX0VwZBuX2pn3ASyLfWPRG+MSdJGh6jqLx i+JnlTySP14z+KDPx8d2g6Zv8G31gxSQemIMz07GInB/2Zw+hquEYLaU/5IjAXjmhxwd 6lgMbhOevGx8zaiAdYp6KrO94zeHz8Ih+dq1oANEiTs+AJ68KK23Fcqs0Lc4OB13loIB UpbkzkiyCuNnpi3lRd9pLuNim1NjOlvpdzkeF7mgEjN8Y2mozs/Kq4H4nNsIiY7fVLGa LsumxzAz2OklaUq2Q9a3qRzufIfTF2sDEIGxj6rdaeHoitw+njRACy37z0yRJXcasjZH 847Q== X-Gm-Message-State: AOAM5301YI8sE9rXT61LsXs2RsSchj1K476JLQyULnmHhrvyd9ZIMgdq D+8Vhzaoaks5K3t8rEzQI58= X-Google-Smtp-Source: ABdhPJxZynzoTzWQihn5d1/8CIHagvpHrrcMrbwJB7uTwH04XrWwsKQIaT+4S8bQqpVBis8GozBtIQ== X-Received: by 2002:adf:e906:: with SMTP id f6mr2689169wrm.207.1632581661371; Sat, 25 Sep 2021 07:54:21 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Max Filippov Subject: [PATCH v7 38/40] target/xtensa: Restrict has_work() handler to sysemu Date: Sat, 25 Sep 2021 16:51:16 +0200 Message-Id: <20210925145118.1361230-39-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581663850100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/xtensa/cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index c1cbd03595e..5cb19a88819 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -43,18 +43,17 @@ static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#ifndef CONFIG_USER_ONLY + static bool xtensa_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY XtensaCPU *cpu =3D XTENSA_CPU(cs); =20 return !cpu->env.runstall && cpu->env.pending_irq_level; -#else - return true; -#endif } =20 -#ifdef CONFIG_USER_ONLY +#else /* CONFIG_USER_ONLY*/ + static bool abi_call0; =20 void xtensa_set_abi_call0(void) @@ -66,7 +65,8 @@ bool xtensa_abi_call0(void) { return abi_call0; } -#endif + +#endif /* CONFIG_USER_ONLY */ =20 static void xtensa_cpu_reset(DeviceState *dev) { @@ -196,6 +196,7 @@ static const struct TCGCPUOps xtensa_tcg_ops =3D { .debug_excp_handler =3D xtensa_breakpoint_handler, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D xtensa_cpu_has_work, .cpu_exec_interrupt =3D xtensa_cpu_exec_interrupt, .do_interrupt =3D xtensa_cpu_do_interrupt, .do_transaction_failed =3D xtensa_cpu_do_transaction_failed, @@ -215,7 +216,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void= *data) device_class_set_parent_reset(dc, xtensa_cpu_reset, &xcc->parent_reset= ); =20 cc->class_by_name =3D xtensa_cpu_class_by_name; - cc->has_work =3D xtensa_cpu_has_work; cc->dump_state =3D xtensa_cpu_dump_state; cc->set_pc =3D xtensa_cpu_set_pc; cc->gdb_read_register =3D xtensa_cpu_gdb_read_register; --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581668; cv=none; d=zohomail.com; s=zohoarc; b=PIq7SPabasbjBqMUO7fHh8Wv2JareKoP6sGLGeV2u//F2jPOpd5jFHCvxthyhtl38mpHUsPwTB5gxqD+q99fuN2zXj/gIytdQY4se4zn7P6PClSIiXAWBr1IxCNjoqbcyBrQUOC4GZK2Pav6LFX1pSV5rbF+FAW6ibZ2TEJMnuo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581668; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=BDJofxjf8JaCrqXSBqv54k7tPA28iyqzLrHU7pcHOnA/ztn+faETrEmw6pB8i+UecuBWooUuCroCNCEty9XAWg5CudgWhy+BQpSkCXVMHa2woMr2xygPBBuZJNUT9FPYZ7WDVJmjFS0+MmnHzV/RKBnJ32o4JEQpgtlPQLmD0fg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1632581668097328.80668311757904; Sat, 25 Sep 2021 07:54:28 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id r23so11151632wra.6 for ; Sat, 25 Sep 2021 07:54:27 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j4sm11680888wrt.67.2021.09.25.07.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=j2XKcvZjAzhbF0iXh1wHoimnzK7MTcasZiXgGUDBIw24aQkysZpZV2MgjkdvCQaqqB uvmyElm74VQUVie93oSPhaseqL1alTXdcYvvpm7YDSbt249dKlqfFL6WTX7EenuptBjZ 9WhNhhKr1XFI8+BTCXM9VmbMFhIOiMCHyeTfBHeLXleTUpUv3PQ/LGkXUaxAHujJbm3W xyZnPFTls1bGWelGTcb5BQIlHW/umcbs0QrgfrG4x+1TT6/Eoo8dQR9gHgFVhj+lNfRk C/i30R73O83Xy2w1GlS9ziojb4DslJe/IHVHFiFV9YaXZ9p48+4hiQN8wH3u9UFaW7AF MeNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=vw+YJeJRPXWEybKe/vGgzVkENsrligUVVcvlvD5WmfK8MUmKvZpyW3ZfyptODrq+mC amM8RaIV0WMBiZ88DKWZQp2jtNZG+PWNlaV6q4HsJHSf6DdtR05jzcDmtyTBxzO2MPNs j/3ERASBeS33qvH4yX/3MKZGuwQa+cxTKGvwh9H4sowrWY6XsIq+MvpnQ+XeYLwZO5x6 9cFBCTK3/N1qRPRvbJoTI084IWCJ4axv64FvYRsyON0DkTHMiY/qsQoFmgkm+69anVP7 kx76lpMrg0WaYEgHL8dnKDRPrz02L/i6n63Tiz2TJueLutoEp1hvLFN3PQ+WowB18EOs 3tKQ== X-Gm-Message-State: AOAM532bcwOj8EOslZ/EPQAEamirecDMu2MKVgkqHTOeAG/WkRqc9keu 06k8ZzCrl2kkQKiB2Q6Stug= X-Google-Smtp-Source: ABdhPJw8KBnY91I/w/nFC+xmJ1P2SRFfjejZY8DVCqC6ojyqeRXr6WksgOhHl4teltZayCtSxnIkGg== X-Received: by 2002:a7b:c766:: with SMTP id x6mr7293341wmk.53.1632581666382; Sat, 25 Sep 2021 07:54:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v7 39/40] accel/tcg: Remove CPUClass::has_work() Date: Sat, 25 Sep 2021 16:51:17 +0200 Message-Id: <20210925145118.1361230-40-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581669940100001 Now that all TCG targets converted their CPUClass::has_work() handler to a TCGCPUOps::has_work() one, we can remove has_work from CPUClass. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 2 -- accel/tcg/tcg-accel-ops.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 114eb3b9b2c..c64709b898c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -89,7 +89,6 @@ struct SysemuCPUOps; * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. Only used by T= CG. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID. @@ -132,7 +131,6 @@ struct CPUClass { void (*parse_features)(const char *typename, char *str, Error **errp); =20 int reset_dump_flags; - bool (*has_work)(CPUState *cpu); int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); void (*dump_state)(CPUState *cpu, FILE *, int flags); diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index cd44bb6d0d8..3c75ed2cccc 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -78,9 +78,6 @@ static bool tcg_cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - if (cc->has_work) { - return cc->has_work(cpu); - } if (cc->tcg_ops->has_work) { return cc->tcg_ops->has_work(cpu); } --=20 2.31.1 From nobody Fri May 17 09:01:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632581672; cv=none; d=zohomail.com; s=zohoarc; b=TEkE/kAEyz9T2k4pVIaNheWL4oofB8Lf9zXycvd+uKkXc4EmRTdhx4gpLIwPeBf6N3WYrwb2DGk6zcr3sEdA7DwYO4g1+8nz4WkO823mdwuRpwWBsNWZq+EVs7UArYGZLBfr1klW30l/Sz2p/ahntl1Y59xPFUgLuJoWyTlx7ag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581672; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L6ntqmXS7ifceLSpB74XEWOrQdhQXzlIYsRxqC94HM4=; b=gn299QzkIVMW1rzon2A76AGdKx2ayYSoD/jEG6b7t01y4pm3d1nCiHzeQPDGBK+EAJaPFAdfyrqNcbj3nJWD22/IYFvQtmECMOAVQCVA19XwcL3z1WbqL6o/geCoNFSuyBRQTzyrOyR69oLikMqQg55UP/cT0ZQeYnOL92BR/6M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 163258167286555.04830125737544; Sat, 25 Sep 2021 07:54:32 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id r23so11151960wra.6 for ; Sat, 25 Sep 2021 07:54:32 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id f9sm108882wmf.3.2021.09.25.07.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L6ntqmXS7ifceLSpB74XEWOrQdhQXzlIYsRxqC94HM4=; b=XXmlP6cLFpZrFEwpSQpqLjkIeoXbqru4Jzhp3Pae/ZVwAcQVcE5kqnZ25vCtt3IK5C ujgZIx0F+BjhHfFArQMuZYhqrCwjLe6kxBt0m1BR1jqSzhko5KaxNOQH4y5l7qXjwrLB zNERBOP+Or7Lhuhj8dV+OBUbvGy7UMgnyHAfa08ltO4yuqQ41InTJzmnUASj5Q9BwORP loxtfZ5/NXAqQprsPM6JeboJVjWHvbaE+59lEmgcVR5CMXl56SntlcqiuqoPInaKLAhb rTWpeHqhT2Em7d7MW3WAdjZZzDwr2LB/8SMoD52fY4ULB4/wKfW7WokQvN8bUW0pxoZ2 XbCw== 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=L6ntqmXS7ifceLSpB74XEWOrQdhQXzlIYsRxqC94HM4=; b=ihXjbOIqi/Ur6GMVHymn8lJ3AdZvdaxuoOEDDBKDrKUXmzBToz2DK1bA3WAWvd9mcB ZyBoSd0VkOxGSYIdSHWWGaFORG638X7DRpkXnN2aODiQ+tK1PllrnKX24p6MKKBSzNz8 KPWH+EmnWxN7IcL0Jrft9Hbcm+BTZF4+FzGad64njwB08HSp3p5eFUrJKY8F7RiS7AN3 3EX0/J5zZWTdpP67FogudOQHMJcKrUl4YiQSHzZ0Cyz55D3xXfw1yICcIHbM0Go/C4Rr pF6buwUvuTXua1YMbo6Q0ZyDzDmxOAgJiMvh+rg9R9a6ER491SIRiL0AwuqHdIxZUVpC 3KTQ== X-Gm-Message-State: AOAM530QVwUna06a9vO0ToEFaCQKoqX3VBYb6bEV8VMeDx7DeJ6A3Mlw g30FbpfCslLfEqaTrncmqC0= X-Google-Smtp-Source: ABdhPJxrqfAIyw96x1bvkCaCx6I8daOxiy5ZHNxF76Bp8IK2BEuJbPZ6vgedWh16WWOKz/ApMNYYtA== X-Received: by 2002:a1c:7413:: with SMTP id p19mr7418733wmc.98.1632581671055; Sat, 25 Sep 2021 07:54: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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 40/40] accel/tcg: Simplify tcg_cpu_has_work() Date: Sat, 25 Sep 2021 16:51:18 +0200 Message-Id: <20210925145118.1361230-41-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-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: 1632581674179100001 All TCG targets implement the TCGCPUOps::has_work() handler. We can remove the non-NULL handler check in tcg_cpu_has_work(). Add an assertion in tcg_exec_realizefn() for future TCG targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cpu-exec.c | 6 ++++++ accel/tcg/tcg-accel-ops.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 5fd1ed34222..d577a65237c 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -993,6 +993,12 @@ void tcg_exec_realizefn(CPUState *cpu, Error **errp) CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 if (!tcg_target_initialized) { + /* Mandatory non-NULL handlers */ + g_assert(cc->tcg_ops->initialize); +#ifndef CONFIG_USER_ONLY + g_assert(cc->tcg_ops->has_work); +#endif /* !CONFIG_USER_ONLY */ + cc->tcg_ops->initialize(); tcg_target_initialized =3D true; } diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 3c75ed2cccc..6cd32f04cb9 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -78,10 +78,7 @@ static bool tcg_cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - if (cc->tcg_ops->has_work) { - return cc->tcg_ops->has_work(cpu); - } - return false; + return cc->tcg_ops->has_work(cpu); } =20 /* mask must never be zero, except for A20 change call */ --=20 2.31.1