From nobody Thu May 16 03:47:12 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=1632695245; cv=none; d=zohomail.com; s=zohoarc; b=lWZU6qs2vZ1EfPsIFhFZsJPC1i4GKBMCOBcYKckHI2XX8JsLjORoNxSb+q21aHOOg/f+YnFM40cFWlpOKpTOhEbRyk8hK+rcRXw+Ttwgmu+OQ/GKFJsowqN90hSz3k/jZk8VXnDgZ99/xc80HFerSP45z9Rql+b7rmuefd5HnwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695245; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2W0DjczmO00zs6me7cCuH7cvWlENeBJiJjnuJqxx7ic=; b=jrIcns0RQukFAVsvs91w6Omm8VvBmx+FFKZCh3bd2d+esmjt0Kc0r1NmxZ2N8QS9j04XZPld4tByD9MTgtYOJS+VyWTua52AtbILQgJOsGTdRZkP8VwbeD9uR3/rQjN8IItuBiCXnra0ihZ44Cg04Pr0iuapmbywK23Tqrrubrw= 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 1632695245452114.1136230497674; Sun, 26 Sep 2021 15:27:25 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id t8so46607776wri.1 for ; Sun, 26 Sep 2021 15:27: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 a25sm18738909wmj.34.2021.09.26.15.27.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27: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=2W0DjczmO00zs6me7cCuH7cvWlENeBJiJjnuJqxx7ic=; b=f2GnhHn0L/+gczIPwFeeDG/VOHGy5shwhm/t5bY+DsDjAvSW8ChtmWkwu09Cgz5iPY tuQ+ZfVRrO40T7ShLZMAsQB051MIrJPQXRsCSa3TdDsY0gWJ6YGPsucLcPF0UV7FOtOb jI9ZzH7Ed3KTRc3+Kt9YNmxlsOlisV977dMIioo3q1kGb/kkXrq8vX0t/VuqBP4NG44a K04Y2MloOxXxo1hly9FL/1M20pupCHRWYNBiJusc7vWr/QThxhz2BeqDIoYhTKSuoYDb cpK0JaDQ2Bqh2ni2qwTtpSzFmBgZK6fzlUhuX3LBj6sdtWkbDId8NwF06IgMrKMxdpvZ rdEw== 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=2W0DjczmO00zs6me7cCuH7cvWlENeBJiJjnuJqxx7ic=; b=3EBS+610wEzN6r9SjB1+RgzOUGFLZVJB1h3VtOv8/Qo81B7XX/9BdZa8ZrRLCEl06q JrI/TbgS+8hZ/YcJtUl3rqGc2NJz+XOOaRAbjfdCHnl5AYbpgWdKo6KkyJrpILgg6uS8 OgB22en2dn1qsm+r79fM+WmziwMwUJOhwvwzjc8c0fYnUpoLIgj5nW2ltMkqNVxBgTzU wBOog0f0k/sCg97oyxoy2JFbmLrPvIzmITLu3kvHl5XygBKnSBCVGEYeSBbChPo0RIgN ylLi7TKTe9PURpZx4oDQyfTGJZ51HIl9naL3EHKT+ps63JrgzpsS7kF4eUqinJDcbzmM aqhg== X-Gm-Message-State: AOAM532wzK0QFINrNEWMyOtOFRYNsD5TvGaQ+5ZvMRuWknzCOpbhdl5p NPgGVfvaga7D6HGLpoJsgxz0KmHRGMA= X-Google-Smtp-Source: ABdhPJwRJu/LGw8uWoWxq2vn5EWhb+hv8SBOYDggT1CHJPZNXu/cX9+Vg1G8Io6/GtsPy9ZyMSlCqw== X-Received: by 2002:a05:6000:1844:: with SMTP id c4mr23535886wri.355.1632695243746; Sun, 26 Sep 2021 15:27:23 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 01/40] accel: Simplify qemu_init_vcpu() Date: Mon, 27 Sep 2021 00:26:37 +0200 Message-Id: <20210926222716.1732932-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695245989100001 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(). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- softmmu/cpus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 071085f840b..646326b24fd 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -604,7 +604,10 @@ void cpu_remove_sync(CPUState *cpu) void cpus_register_accel(const AccelOpsClass *ops) { assert(ops !=3D NULL); - assert(ops->create_vcpu_thread !=3D NULL); /* mandatory */ + + /* Mandatory non-NULL handlers */ + assert(ops->create_vcpu_thread !=3D NULL); + cpus_accel =3D ops; } =20 @@ -626,7 +629,7 @@ void qemu_init_vcpu(CPUState *cpu) } =20 /* accelerators all implement the AccelOpsClass */ - g_assert(cpus_accel !=3D NULL && cpus_accel->create_vcpu_thread !=3D N= ULL); + g_assert(cpus_accel !=3D NULL); cpus_accel->create_vcpu_thread(cpu); =20 while (!cpu->created) { --=20 2.31.1 From nobody Thu May 16 03:47:12 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=1632695250; cv=none; d=zohomail.com; s=zohoarc; b=cBog/fUcRdCcvqEm6KMToD8coCm3z444e285765BTxKJ+Qgg9wl9FW8viT/52jVzxzgw/UEHDPVSxSOdVYEQprbwFx6vmGoN9NMA/QWbxmrOQtjP9RjI3CmQp8bntscQgbxEWDdWEz1m4+olinKdqpiWQxzsa0NwtC482/9GXhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695250; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=bQslFu8sGupuTGzacqU7scYZQ7L65crZDlNDzPGJDjZyhZTYb1uaArxKttPVtCLYAQDKoPrxbqq5hjwjK5DCIR9ME7dYez7Wi8T9TtpIX/yYyYSvYZSinsiiwAjZsrL9nyo7bKntjwadrmrgW+HI5ShOxEcl98elzFbvxtXQrpE= 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 1632695250208519.6716354860542; Sun, 26 Sep 2021 15:27:30 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id t18so46542558wrb.0 for ; Sun, 26 Sep 2021 15:27:29 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id d11sm7987590wrx.22.2021.09.26.15.27.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27: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=VrC3hwaeTLX0Kxv3lfQQysV9PzI8O+brgKJIBlo92D0UgV66nXXvoj8v/CyhYS2OOO EGIj9LMFCQ2hHkFwwlVVP9qvyEptU6cvtsWIdrK57UY3U1jFJiUW9SIyp+5vdH7Upqry eKOUbjxnJ+YDjw5msGdo85oWsyDgK4NxGkqmeSKzDVSMbGyq4qdzcO/6+kfAGVyxstYY 8j9AnKlVRTuXsEWDhBHRFucZbQZ7Ud+ar7lyALa3rIDCUM3Z3XrX8JoLFvPEgQS6qxBh Z7hZvKAb2yoqGAfRVMv3aeFjQEzuH8GQ7JE3TIJDSfz5VcR6ya2eECYb78Ql2olW/Fik Knkg== 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=cQsjx7dHZmaJAUj1hEp90X9c7r2skQ3dpKtbJ6y4XNoCA9kdy+edg6FQ3jRFFT4C10 oOiMecHcyPZyOzIedfoneR8qKeTHy4hWutM3sifkBp1CkfN60VhlYCShpQqwy/8+fand kA6BTzUFZhtWS07Ib3GzxrW2E+OMcvjT+Brz7glhOeyhXI+6521LRt94o51Mc3XmKNv6 eNQi2OzFDrxfKaml2we5RcLhfl/wTBBszwqHP3TpFhDcUFAEVQVptPYe6eIZTzYxUUdu HTXCG6NxU8KfeGsCY1fSPUpu0lrXdsOr7l66WlEOwdPPYurBmFoqtsHnb13ZrEGzIQex pDvw== X-Gm-Message-State: AOAM531kZ9SdRn54PzwUbwohySHP7FA06iw/m8JAc/sbYpbfS07IZuUS D27Ly5ZeySh7+ESVIl9fYi8= X-Google-Smtp-Source: ABdhPJzFWnvMDXy1tAkMScNtbQaTQALGQxVxwGGiqTw84p9GDsoqfslCrBW60APRwQRYg9smqLdBPQ== X-Received: by 2002:a5d:6c69:: with SMTP id r9mr24946283wrz.78.1632695248403; Sun, 26 Sep 2021 15:27:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 02/40] hw/core: Restrict cpu_has_work() to sysemu Date: Mon, 27 Sep 2021 00:26:38 +0200 Message-Id: <20210926222716.1732932-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695252246100001 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 Thu May 16 03:47:12 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=1632695255; cv=none; d=zohomail.com; s=zohoarc; b=n5CwT4WDWG6dz1+yMqrcFI2Q9scpr258cKArGtwX8RdzTmF28UJ/fmP23pv7Dn664jHMMf+S+hk/njtjELKZqIS65MIMptloeyli3M4Orp0UYWMao2KoB2XEGGEJYsf7fgMv8sdxSSkDdJviIlUbhRStlYvlCe/SCa6a5fycEvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695255; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=R9sxdC2OySCnNeruW1S0LlLNtQNlySJBgNfpFjlAnnpYeTB6CVRmd1aZksiEgUor6PFBAKJadrXZYNpwA+04Nb+5s8TfkrDl0KMcpwjBEzAsxxXAMZtgT5Uph0WjIfPeVpKkRRbno0g+P4bDJiBYZqnudi4T7iNi13CfUk0UXSk= 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 1632695254998514.9151988769125; Sun, 26 Sep 2021 15:27:34 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id s21so6461295wra.7 for ; Sun, 26 Sep 2021 15:27: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 20sm20499191wme.46.2021.09.26.15.27.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q67ayF6mp3x5mowVghP1HWubdfr0XK9yIREcYkI/kjw=; b=gVJfOEkXTSUsxNlhV1JRo+YQwIVWWBBbogwpBC2yysQk8bL5nQchQhF4IG1Tvo4ij4 bEdD3LGt93PTBYsZu4n3E447UKXdm/KcPKMjX2mQhwy1BsU7vsltd9W+7GPC46sr4hdo l6DFlh1D3wGBylUYnvvPVJ040MfhdlWLcau7O+XIBEleaoenq8FyUuTR3etd3Xi/TYhu coP1LOtcIIwBDzVrPnuOEDqyrr17qhjQAlFKeyLn71uUvoKbppRv0hEj/zwnd4IQKOvi blHUhfnVp3z1CmQvLlF3ViUAu8rLx9mKE4bfzWAuC5BTNUsvj4DBasKhCdLA/GBkgekQ WQQA== 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=vISGkzRLajRQ+SMBggdspl/rDbzM8zasbcMxZqfQoujmCzq1k14DTDS3i3c3Kyt+Ga fNDArv4mmzeZKYs4/I3bsUBmY+v4jq1vjvy/q0O62gVYF6nY4nUC4nHMAfpLOshPlGk0 QmGWjxg1bCgVieaWOhohiV8IWJl6plAz5kc6BWBffkrqib3cBiUOCl/zgydHbX+GGTbV 5U6YUUp/AyciCLCdxwkpWsbxup7i6C2gUHztlIDXY/S8qoVRwR8O9MJzB4YFaudCStof bO3tvk7Qk3baRfTg2uV7RknP0OPXhhBU8dGCGKA5+E0/YHA+48gAiPPmCbxnIeB+HezD P1Ag== X-Gm-Message-State: AOAM533FV1FDU0BNdSxIPZzzTksAJiu8a+swkNpv8skW7Tn3LPZHvWmr Cd438gRQt4yWlkn2SB1pDrshZaoyPHE= X-Google-Smtp-Source: ABdhPJz72EI171N6YHxQ5n9FwI45sOtdylh9CkpZmwOPSAtw2PcS1dLdpQl28jSmJsD+Zix320HF4g== X-Received: by 2002:a1c:19c6:: with SMTP id 189mr10041556wmz.121.1632695253233; Sun, 26 Sep 2021 15:27: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?= Subject: [PATCH v8 03/40] hw/core: Un-inline cpu_has_work() Date: Mon, 27 Sep 2021 00:26:39 +0200 Message-Id: <20210926222716.1732932-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695256346100001 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 Thu May 16 03:47:12 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=1632695259; cv=none; d=zohomail.com; s=zohoarc; b=FkZjZf8hH00RoOedsExCnuZ//5bygvVRZIkAJLI9BoYCqRqrYqIkNG69X+Im/6HnEaU3jGldrRgWPGVFIdPHJuR76POJztpw5MPcj+ix5Bvy8J9WE5mdg8NrfvaDWVzXR+/AVXJgeYBh/7YPrc5UgqlHmy4xealx5NfkpBuPzoA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695259; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=QQRybNbr91/DIh28TV728GZxAuDvZZj2sZ5ivTBL7gcuVaSv44NgHkYuXY+b1B+J4ZLEjGl1f/rM8z967kH4U9ZBbKxc5THSUZf2GrF6lis1meBoLB3M7WA1yaApOQxO1Rm8ZY5MhZiKZiwmARmkpWNck3YPt+SaGH9mNPXvWew= 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 163269525948151.698004894099654; Sun, 26 Sep 2021 15:27:39 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id g16so46513985wrb.3 for ; Sun, 26 Sep 2021 15:27:38 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id s2sm14428010wrn.77.2021.09.26.15.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=BEwRKqrjMQHMRTikiEs9+mKvi9rjtm0V5A4SrWuoplqEQFiL/6iUrE3XSinEPQaQBg 6NQ2/q5lTmt3TavNclLyxuCGQn/Us7IW10SI3G6Wu1T5Nd5iI3em8eDDsfNdndlq6evG xYVk4xqAcPYbX984a/zz4WXCOoVzXjJxmAJQRKKHHJk8/qsZCEwt26gsbS6VL3cp4vS9 yos1UrFt+ezV2WYp8sRp5vh5B6mq/b9SI4GRxqABFy3MZdBIgRZcHjTLqSwt5M48JFel fkE83fCGxR7hRuHTrhrvWUN/joWOCe+ymm6E4zC5Uu8noxQJ+Z8DcgCGGxh/3k/JEd0v TUpQ== 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=ZHP+JQ4oS++PGIJHE8ILVQ88dXUN69P3hKDJF90KZspzUqcBWy5IWebcrNEScDkIY0 R3yR44vUQjgQ0ZezZgvDVH8E0KV52k1cTPmSy5ENvW/+X7Xh2ecglijvJfbCMGDP75/a ssBjoJpAu1/npyMRRNzNcNUB8UrAxa+JjZWerG4FdQ3/dH1tvvRg379w4uvkJRIQ7/kW T95V9m22vaUEG23xKkNZzPch38w4a8FMFWwFz0POEeXH3QxYMB6TkianI9yJMLkOcTim dD6VUfl8WE91iuYRMcfy0Soe0p5sgzRaa/Vo/NnyhjFrYYG1dZLFmE/5TI0UzXyXuZq5 4CPw== X-Gm-Message-State: AOAM532Hlsxc6B71Kx9HTq7O8lmeTwxG5YCnGz4IBtC8UQLUtBdq0Iu0 EHUhRZ1dHVjAMISIbtxERNDZqtF2vXA= X-Google-Smtp-Source: ABdhPJwd2etxjr1/6ZHzGJzBhyh49DQVM3lL60rMd7zDtv5jCtF2A0W9Y7tGVDWT06axWfuxsOiKWw== X-Received: by 2002:a05:600c:21d6:: with SMTP id x22mr13271735wmj.121.1632695257785; Sun, 26 Sep 2021 15:27:37 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 04/40] hw/core: Move cpu_common_has_work() to cpu_has_work() Date: Mon, 27 Sep 2021 00:26:40 +0200 Message-Id: <20210926222716.1732932-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695260525100001 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 Reviewed-by: Richard Henderson --- 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 Thu May 16 03:47:12 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=1632695264; cv=none; d=zohomail.com; s=zohoarc; b=k/bl2auwSvSuxCjWsVHM/x4k6FmtZ1AxUVXD3AgvxFaLeMVIEKtzm+xTZ6tQGWUNStPSRKREZ26fFKDp7KNHBajtVN5UPQXHFGI0CFP3MzYHvBLDMCSd+X2/hNUTd2/JVzfyzZLMC8D3kKekGRiZekmBItTWHWngs+g+2dzsjHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695264; 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=eVIBwF4wZMnBYh9PpKHxD6uLapmcNhBmV0M9ZGbpSFCVh0dRgplaJyNYkMLMX7DhD5KZVpma0O8/BV/lympVHCVS6geyT23pZAWfAJ+n971j5uhVwbJjpmVlZtp2Oc7wOtokVGRVLG8j/cegJpowfm7j7h5ZmYxtF9Sbz6X2D9o= 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 1632695264003853.8041591185167; Sun, 26 Sep 2021 15:27:44 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id i23so46569764wrb.2 for ; Sun, 26 Sep 2021 15:27:43 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id k17sm14911278wrq.7.2021.09.26.15.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ka2Zs6W/m1VUMtJW+H1oHcUfryePq3cXFIahmgjrmno=; b=pzfCGttxJjFHrz6CzdTeug1V7wBYecdbfYdES2RtB1/A5PEvAZy3jGXgsshet1oQhz xzNWcyjyO57PJwok1DIWDAQxLxIpNm/jjoVQXXIQottDFvCt1DPxAqK9yUoDyQ4AQv2F ZinlQ3IvWwJHwvR6mDlKj2HFyGHZlZmPuFOCbFjjcyHLqjPUgRxvIR9ZazJYIR0ISUmy FU3GXMDInNGZrOfSwBgpiY3sgbqxs+fHHzoQHRFk060zmM7YAYYerEVW5RVmXOKPbuzw 5kFM4iX+JfpLz0KXZ2pDMrYP14hbxlVRxZoberEI3qgTSrCc2Kw8dZlzYMWHtqVjocIU HDjA== 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=vF1QrrFlF4rG/qbCATISD1+EPMV6YiadOw8En2g21LAKvAKC+4rIPe4jIRLpHYgsqB cVK6GgdDa1/x8/znsCVEarbz5HCpSP4i+VfXQv9N+63bgI7LgKiydL4Uuj383jRTKqNI 8G+3wHMgJyoHmJ2Uu/by519j26KVvowX++vNmf3Z88qBbH24YPzLJt6gy3frKo5DMD7B X9MPlAD2bWfWha4Xjqdl+ElddRkhdU6qkIgH6N7OIf3O4OFF+OqchLQj+sF6aOmNRpuR MhdBgAz2CSZy1rng3hcjKqUwVsqF2zCCGIyUldSqhp40bIVoJzYV/4HOUgE7n2LgJ9jK hWng== X-Gm-Message-State: AOAM532dsWOCpEAKsY4yqleazGBspOhuHbuq3RZ80UrM+yrCET8WamQV wowV0mPAms5T7+C73A3zCM5B5LAxdqc= X-Google-Smtp-Source: ABdhPJyaJpfbVN02fReKDqm7RY9CNNRdk78xdvEthkfFXhnDTPRucYvfhUAFoRRM1xfp/JFl+ysnIA== X-Received: by 2002:a1c:2b04:: with SMTP id r4mr13048636wmr.89.1632695262222; Sun, 26 Sep 2021 15:27: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?= Subject: [PATCH v8 05/40] accel: Introduce AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:41 +0200 Message-Id: <20210926222716.1732932-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695264940100001 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 Reviewed-by: Richard Henderson --- 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 Thu May 16 03:47:12 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=1632695268; cv=none; d=zohomail.com; s=zohoarc; b=itxEooz7HVeSoN58lNiOEIbDocyP5KQsIhaNEIQafkL3FiiOS1K25MMaHxzsle4rY6SMxK/iMulyW9P6aAMWuscMLAtX79mLpGAicfEqqhQOg9Y+tSBb0/1UTiEihQXU4dJUp7Bjlj5YafWxdu3R6SEy2NR4JXU8BBqY34nKU9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695268; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=coxC+Rw/D5fzy1/qGjrboU9djQqG21hW5sW0bI6VA3xFr1Rzuvir22w8YP3QowwNWw85nQwnX7pFjHFf3RDA5fpOYMf97BsCjhb1hMYcmxjrc8x6JZaH4Q+kGGWIN6kM5Om4xbCW/E6qlLMuxjzxkqtpB4WzlXN8zzTU4XrTjnU= 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 1632695268571360.90105458716846; Sun, 26 Sep 2021 15:27:48 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id c21so16804341wrb.13 for ; Sun, 26 Sep 2021 15:27: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 z12sm14726385wro.75.2021.09.26.15.27.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D1NIBiKsJLet/LtgtEl9N8uYnLoHyxQP991kqXpIcyw=; b=axH1gbBnfyTyHMdOx5ecrp2+VnFyE6EmRNhA0XCtUgRzbykFuB+eJWOXwEuG2Y4Om/ hYxqbxeesqEBsKdfflVD+mR5zrszBdR14q+9TduMY3ivYswTUPwFquo4+Xy1shZWRrVG NM1GhM/196K68PBUrOg6feSDWbD0qXO3qBQHltHyIVMVVGOGEqbkj8qrAPSGcwMxxE6q ZvYUa5xxGoWNE5HQQ/cfvX6bjCo2w3erKCmlVw0eNWQmBAefLJphHxf8NUKDgPawZzs0 LiOF9NibpX8FChWhIYLyKkWAxHGQjBbS723DVa2I4qeSsmHlRdIrJD8FVUTXKAB1T+OP sXoA== 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=SGBlHTKdFAhK6oXchDs5aP91m70rmiw4M6HX7AykHdXFUz8Hn3DU7zoFe/jCSq2mCA +DdrZm8TtlTcDjiuewlztm1IH8yZnxU73V2SoJO3bCtKV5HtXnSSdO6Q5UiRsMqwxxbb 8rj5A/y9vGJ968aqyqEBh4hyO/JTNxICcUNjqoKhYvIeOHlAnbqfu8Qy52DVsIoIohai AL8igyMVD1kkFVIP3lU4c9Nco4odnqUYQaVd0NYXUhSsbqJISqfE/e8DYy7qXjCRlLAb fupab311DTubT58i15lJWLD6D5w/CbZXquF4qoX/LHQzc1+AaWwrcH19n0Nx5CFfQb96 n/PA== X-Gm-Message-State: AOAM531v0kumxNWKNmPSDAa2CO+y7+ve7lznuQv5JA+5p6jZWEOaMc9a Q/hli2hHOkpC9F99Dk7c6ec= X-Google-Smtp-Source: ABdhPJzK67hIDjeNv+lzivFJ0ut+sSlo8xcApaTg0LIaaCyYCwrTBRDuS9PpcvnA3L1X4SchDAt+eA== X-Received: by 2002:a1c:22c3:: with SMTP id i186mr12878915wmi.145.1632695266856; Sun, 26 Sep 2021 15:27:46 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 06/40] accel/kvm: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:42 +0200 Message-Id: <20210926222716.1732932-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695268890100001 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 Thu May 16 03:47:12 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=1632695273; cv=none; d=zohomail.com; s=zohoarc; b=JC9O9dUblemuvocvHV12Srstz1sGJdkgnzyO8z8Pr4/YYRt6dwXB2RWNXh6U6nXPm1cAW1dBlobr/q2+sW0jeDi5wquWeikb2UL37vgwuSCIvYWV4J+u0ftv0lpfCw/f87xygDqRjWO0Duj0wZNZYHdPsY0kEkC8AyBq/sI43zU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695273; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=f6mdNhRUzyjjkOtF8wYFM9KmjGIpw6TegcchoZuyPKWt9618pdb9hnRvKbzD+0HH1htQV4r4GSyF5Dq2l6ujZhlk/LLFg8KbAkjiTBRKSx7m/UIINOGIlnZQ9RCWEyvDjIqcQueneTnVg+J/jz/gdeJmbY7TbelPgrF8hrqEZTY= 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 1632695273245162.2277355620713; Sun, 26 Sep 2021 15:27:53 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id i23so46570626wrb.2 for ; Sun, 26 Sep 2021 15:27:52 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id o3sm15552836wra.52.2021.09.26.15.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27: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=vUe+1tkOVnIH977cfWQkm6Ao8Hfy7tcpnU7MaXPzIOo=; b=osZOzyl570nMTzc8yw2awwxE1MsWORyofZqC0UxcPWtKnIgde5fIzu34dWWxCNJwvE Rms1Ye+bCnucVMv3AhpxbmoX5QiBgzEBruq4TqHiOoA/0FcbKyAVRlRc3RDO0bsZOXKq yfrsF/W4PUHj9YSH8+sI13YxLZ6VHpYml0riV/jNTGo5n/+szgrBEJSfQN7vVoRfRkmt hd+X6iAti6UhsgU3zNzCFi9AzQFVmV7LUtOgiPKv+KBjPspkLV9yKxgJeWfh6Sc456dn f9AQGWsmLTvAzPcTso4tQxfNJHrmkXjyJWnBwcmTSvxtQPAk9ozWSfWlzj7pANKdXc1R u9Zg== 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=QKyPFb99lADiyo+Wq15c3hIlPxnxVudeYdbAFT/FcRjBxFGKEMtH0ORi1k4botzwqd ja/2Q2sbIn1aVPJUSbi83BzT2lEerkW4dZWdz3TIZ0M+AyQh4fa8ZCXXmOeUq5OagMFb Kv9cC/BDLuacOtTG+fFBixe17fcAeKjSPRbrtWBUtlExCFzyrAC352ynE5txJkXZx6UQ 1tpVwryZMgrhIoXUYp97uLZKZvdo9qQe9FV/bxhjBXNq4Jssi35bqlpOvvflNk2Z0kjT vCZKmR2N5iT+nDIIKje1xr50sbYD1OKRJJCoRxKMpC+dwXqnTR3C4h09iflIyrIp9RCO Vufw== X-Gm-Message-State: AOAM5319xOWSUlS9qEBV4WNu4wIYkHpuDAv0klhfZO3tRBYkv0pZO7Lv LYWtG623AvrQgVmoXQqwrF0= X-Google-Smtp-Source: ABdhPJy2nDIc0bOSLZ9gSs8fB14NnUc66qIdOVI14E0smbIfjaQodDfkxrlvklf1xotUCP2kx6TGOg== X-Received: by 2002:adf:e649:: with SMTP id b9mr24756235wrn.309.1632695271540; Sun, 26 Sep 2021 15:27:51 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 07/40] accel/whpx: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:43 +0200 Message-Id: <20210926222716.1732932-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695275026100001 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 Thu May 16 03:47:12 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=1632695277; cv=none; d=zohomail.com; s=zohoarc; b=Oogpk/e1B+i5SFPeLOMDfre71KlSBNpQUaB3WTYV+fWJo7vHvZbU2r49lX+I6R1VG0f1sxCCJRei8NabjPSzISCFemqfAAB9Vejc6RuZNE1K73uf+us04lFo45jxGKc/ZTmjY2IZCaIy0SDLrcdUYsH3O/31SAih4LGc+DwQw3I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695277; 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=HDFIsYkAAn+vioLWhSley009jM9oSSknOdMlQzt2I9nlby6E7un2UVh/+rgPlEsOahmL0HttmAuVoXZq6BpTqeDbOp+mpCOycGy4RkNtgs8wQ4hAm8KLvERzzzgUso1XYavZ9Y19ci3Cdn7DbbT51Xfl8UQDSvsgx0tX7QqbeF8= 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 1632695277881282.28551792223834; Sun, 26 Sep 2021 15:27:57 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id i23so46570993wrb.2 for ; Sun, 26 Sep 2021 15:27:57 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id o13sm18491519wri.53.2021.09.26.15.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=unRoKxdhmIQ/3+a2J4b34FjTNk3kwzqzxXg2lM7z0e4=; b=QRuWnWT3WadM8I9r2IH3CQ/prDCEDvoUp5H8hsFGWpZLZQXAB7iJLGRPi8knZ3uSWj Pg1q3pNZPD4wUpnyqi9nWhx1sn0zmOvSaIM5Sl0jFVU9edSOr7cNaeO8oU3vmcGNWnqF WWe0NjN+MAgKAA2pxlIfLj18k34e6VTJ00SqsQkz9btkK5Q1YIDxv31Wz0moQTvBbscA 3eHfJskC6RgJUfvObFGBZL1TarbBX0+Lw2Gg3wgA1efFgl1tRd8P1O3zq/Kv/eyc6XHE hyaQIz1NYLZpQQXaOtN0Z7a+Tbbk8JjG05zzJcJJWt+TQDXmUoou6BBEiLqDx6EcCbE6 l3bw== 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=WpDiGfa45pImAI7cZgfs8trNrphEcN/jLVsp7E2yQZdl6z9zqd+HS12jZfNZtBDsfd gJ5jmt1KvpDGX9Aw2Oh2rT1XBaVGKaraMqQ3e9RFLv6vSU/4FGuCIecUn/YuzirCH4+Y sMPDsny6b3uadk/sE7tPBkESIm6230Vsc+AyfFdAt/d80gR9swvZoA17mBU3a4yJyA2S GNZKkTkIigLBofGNmlKusA+KiJCRBQj7cW13/lWSvN8vuxCWouDEtwhm7UZ9Yxo5eJV3 850gvuJktAB+kqnT9yPAzrWBCaDkevaye8Dhs6yE3+Xa5fYNC+icciXh7VpAST7fEh3Y HkBw== X-Gm-Message-State: AOAM530Q7sW80YGDaBASmlhiXmPAPKs6rH3N87V9FvwGDH7miuvek4kr DERLEZgAe80html0lmX0Img= X-Google-Smtp-Source: ABdhPJwzLznoh1qV93O5PQXzyZv01yeV0Pmkn2BPP/uK4jxHogim/HGyVgAZNm4xnuKlN4MpHhb9ew== X-Received: by 2002:a05:6000:2cd:: with SMTP id o13mr23937397wry.193.1632695276171; Sun, 26 Sep 2021 15:27:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 08/40] accel/hvf: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:44 +0200 Message-Id: <20210926222716.1732932-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695279185100001 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 Reviewed-by: Richard Henderson --- 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 Thu May 16 03:47:12 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=1632695282; cv=none; d=zohomail.com; s=zohoarc; b=gEH12FN/xKLicv+XLvKXKtBTpmrOG8NvXL/Ee1zKapHM/6ZIW5PbBxzJLWiwYZAqO9Mkx6O1RDxsvdZVtpUoiXPuTPDLJZKPv9O0NAOO17nW0PL3Cu1F1uiKFMLeLk7GXjLnl+klSTnJ4I1ZkyEBl3W1TRbRALJ7u6kznRvOcVs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695282; 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=CWIjButwsUrZs+GjsRe2OVOg14kqqevPvVahAKTqugGtQ5eq2JYj+WHxaZv+TaG0C7/LwIXX6HTtwvB8YGUN8xocH+3l7nOpN09XOQxgTYXxL1PXblxtBBHpgXHQ2hM3FHDepSGUk1eW42XlejjPMA+MXZ9LZwnWZzLDDKCCCW8= 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 1632695282812305.2707191449065; Sun, 26 Sep 2021 15:28:02 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id t8so46610591wri.1 for ; Sun, 26 Sep 2021 15:28:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id z6sm17776552wmp.1.2021.09.26.15.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=I61ARzsVO4/KzAGYtcJMZn32sXSEJVm6F+jp7uLlVMM=; b=l1osCv3MPzqgSzoxrqidoFJvfUrpqdySR6e3d5PyocAsPBu8DRmKHIjGSrbwgzEYhA bR+tCqk514wbnVqQv0VfY/v2NvvtTVruunZ2eChdI/C/XB7KvWTH0OSeAauJsJDYzUAY YKBvptZ67wBuQBbav7u1xzoDkHxPQEoBjNkerx1d6BDW9PKyrhDLAOUIYpuM+eoqpW0a 6n1kS6DjEc4nwiK0MP5/lDIt8fbw/8JXmRPL6CkhiLoknT9hXoamDnYxYn14EcLCI18A dcZlpfQpxfV3OfTKUHjlf4gItf51SI2azsfLGmM5z3wctde7EQZuYsoCzDgblz88eqxX 3eNg== 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=kzxzYYWMgmTaraTIgrx9Ld7nhBV5RCPHZfpmRIfb/s4utIJjxhg9szVXbBH3LTayL7 CLfO2rYghOuUtSUMYPbZ+VX+hA8sWzgQFxjAlYQIZA1OBknvBp0EgUtkTwZ8RgnZWNe7 kqXMEL52iKFR3bYhE2W9eUklawAjjjBZKXciT4RzxthdtRgGwcehltxek9DHlWBF7WnS DpLWhpMQqijgY+oE+SRXdOFhH7LsjuuNRCcPkm27VFNXV2jcwaAb+K/5h8VtGvQ6Fc0c nLr9Xu5Pa7a/k6Jk9CYAJVG8IFmT1c+JyyHTFAqWIKHPrWSoc89VwzaLwpqhsHsoWRxq qn6w== X-Gm-Message-State: AOAM532yTUNCJ7dw0nfdFoAkHzTI/1APP2Zxv8ykH0RsFCjsPSh6p6XI woPh4erYHiS/jA/ubDyLnKxjVEQuyGI= X-Google-Smtp-Source: ABdhPJxmPoo78Gq10X1qkG1+F6AOJR5/mKqsgSjopX2F9E8AKUc+XowymUi62g9Q1AyyCSqaqYnArQ== X-Received: by 2002:adf:d21b:: with SMTP id j27mr9077391wrh.33.1632695281066; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 09/40] accel/xen: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:45 +0200 Message-Id: <20210926222716.1732932-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695283359100001 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 Reviewed-by: Richard Henderson --- 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 Thu May 16 03:47:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632695287; cv=none; d=zohomail.com; s=zohoarc; b=V1dbOYiufDFYkeOtnhKX+Ja9pWLI7mL1ktSDmHpI1kJMf+rPeno994p20InRaIo3XSuZqxVdcOG/ce7zC933vzMAEJpkvBDPrm98VMDdMSpw3j6bbGpMjtDPAzdpwdjWg9EV3pbphXntaz3fjKF/s3YpZDqLA2OYPXDOGXmvn1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695287; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=A2Hg15jmSOAhot9VcnOz5KTJNkHnOLxVQ6mascWE0PN2PvCTXkjJMrfVlgmVcn6bSBGMz8t2Q6pr4FN8Heso3/aJBoL1vF5AR9Q2KjTvqcLq+baKcIQ4HqNngRYog9c9mCHqh5R0W+enYLOw4+Bg4axIcJH/1JaDet+wiSRGS3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1632695287286418.0373227840637; Sun, 26 Sep 2021 15:28:07 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id c21so16805764wrb.13 for ; Sun, 26 Sep 2021 15:28:06 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id i67sm17801799wmi.41.2021.09.26.15.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dCLxbLnwCEUqojfStjhPo9ZalBzirYzUtLUPN9TYqi0=; b=p1q50X1invMCdHbWySnroGfBro0IzBX3SAokQ52PVvE0ZT0Wj3fneFkMBn3HEYFBpY pxJnxr3OoVzMHskVrup2qTQgAvQPj3zpv5RrZdL/La49M6SJ6FaUOKM2wCLDw/2h/IsH O6TgensLqBINc5QDJOzFH0i7q9NMBoiFYmbRwb0AosiBocricGVbhmnVHU2MwWHB8Wxd bLeKvsl9hiNvBYtzya0s2g3hTI2hWvQEGohIsTqYPAz8cjBtwKWiskx4P+4hhg7IULH1 sH9RkQpfMDO703/GyWo+FkmSGgsqwnJu8Xoe0n6XVmRFGRSqAg0iGumCLQ/3Tc/nmXYS hgfw== 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=DzJ037mivSz4+4mN3xzIw5UuoelUWrIBZl6e5phUMPYNLXAy2wVPPp8mIEPcZ/UxIw E9kBsbkanoN6NPZSPWuYil9v0SaCkFUR80XKrDnD5Thdj1Kx2L1OE2rCUAzSGPiae385 MayjnhBtXSj4nwXjMbNjHB4LnhsZwNFkeizQ2GaMABO4Zp56IydegupuAcvUGiBJjg7W 70ENqUhg86MTzmHmetVLywDqYm4nmFBQv/eO2hi89B6RqQidDXiRD9s568Znkpgh9fC4 QeohtgKLfqlPAdk9pHyI8Ylfvyrc4PIruQQ4FT2xsDTKEo+HlXskU97TUE1zakJB14XN g9pA== X-Gm-Message-State: AOAM530PqnE3X9rCNJ0ImRVgZYzdLdsR/jgxbDtYhQ+ZBAdN+odceQ/5 v83/tXtohW+3FHYnUasimGM= X-Google-Smtp-Source: ABdhPJyJrnt7JB1iL+qPvwDLQlGRFZl6KezWSTiJYBlgvS8dqkbkejgKMY0bstYABHWB8Cm8v0eTDA== X-Received: by 2002:a05:600c:354a:: with SMTP id i10mr12468459wmq.77.1632695285592; Sun, 26 Sep 2021 15:28:05 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 10/40] accel/hax: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:46 +0200 Message-Id: <20210926222716.1732932-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695289474100001 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 Reviewed-by: Richard Henderson --- 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 Thu May 16 03:47:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1632695292; cv=none; d=zohomail.com; s=zohoarc; b=N7FwXiSkY66FrJiZYmyUIGm9x03I0AUEG3dShS9oRAizdX0vweCorP9YQPFMSZkRj6D8Ph+3CIDnYp7hZ8iE/10+k2FCbNj1EHT2owF999rhh8b+yXjLuvAJ9RepCGGhrVXim9UPH0TvMyLH+80rFc6Qlu3S7fXl+PgaQU2rLGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695292; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=SrmQWZThiZiXZVP7YLUyygujqEtgY4fI31e2cjUE9PPHwhc1vdFjBwaUoVBFidmPcUzXb9az0jLaTe+oJABB8KXHJwin8WHa8/MX1Y2HMt0DwNe1uax7JAzZsa8yLj34inBhN7sqrfSuB6c2JMRzyePTPcZ03Cuism8iMOx/y+Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1632695292119613.421375171566; Sun, 26 Sep 2021 15:28:12 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id t18so46545949wrb.0 for ; Sun, 26 Sep 2021 15:28:11 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id x5sm18522189wmk.32.2021.09.26.15.28.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tl5Shev5pC48yBd7v32jcWMdVT27BoRgDVkMAOt+xfs=; b=KDGXbEwVEfj5iCcoPn9Y3LdzC65NTG4Yg+o1wg3KE4F6V2r7sG1pw1y+hkClw8QSY0 HIq384GOHKwpaJxwZ4K+0j9T0VhdNnANJrEGAxBwwyt2YvgzPZAljt5BY1aShQ7vWnBc 4P9JQPMU58SMDMM31dreg+d83Jo6G2bT6bLpiWE+xHDut6B0gCtJZAmLRYpMfJgZkli8 GfW5fMYrpdlK25RV3IBZkS6R1/lQRnhi/4ta1koEdv6LSbhSZOowUmZiYuZGWo2ebSNZ 4ZXWA7cT7fbgEzrxXofiB4SVIUR7CXDN3poqBnIcLjBDVRIp26gk/N0z+l/iWon6eihO uzwQ== 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=3k1JUt7QVY824UB0Oav08ZTsdES+YAyWr6aW5e1zz9fqhZsM6l6kxLjUqEEuUJ7cot Nond5kAiXuJvUd1z4qJTOs/8ECh5T06mQLgF+9GQwGjK9fNhcazWyN2Rtl7SCAV7Gfi4 zTX+mzutiMFwlUVsiF7A6oMcS3/KcwsmQCj+SG5XdpgPwvEFmX8u0TF3cfGoNqvylIXa cInmg4sPSeRX4vd7xo12qxNO6YP8kT2FXHG8MH3qovbFWaDapSAUZLBKuAlkxYqNjeSi /y/lqJ7R/bJd16davpKtOG3GJrQOZp9Yd9Y8YdAknRJWkFrvD40jr1wh4l9C3BE90sVK SPWA== X-Gm-Message-State: AOAM531y1vKkISXtvPOmS3JMLf0b15tkYEeo5Mh+Qbx5vF0fkBPskIsS uhWbiSVUqhDYK/OW1iTCYhE= X-Google-Smtp-Source: ABdhPJzQwXKTQ+GYGsOnuq6HO1/QCUPtf1iwdOiHMhh8t8rFgkc69ciZaLQ90Uen/ZBEHagX5ROPDg== X-Received: by 2002:a5d:648f:: with SMTP id o15mr24409074wri.338.1632695290386; Sun, 26 Sep 2021 15:28:10 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 11/40] accel/nvmm: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:47 +0200 Message-Id: <20210926222716.1732932-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695293584100001 Since there is no specific NVMM handling for cpu_has_work() in cpu_thread_is_idle(), implement NVMM has_work() handler as a simple 'return false' code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 Thu May 16 03:47:12 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=1632695296; cv=none; d=zohomail.com; s=zohoarc; b=WmKYzQnqbeKbwWx4DTePstl1Q0jdsILElYFn3DG/wQIWlYrrkFoUQ14YI801CsGnw2HR3yKJ9S2GG0ilr6KXpQ04UWL5eiLiWsMtcpPLwWJA5jYpvS9lBm5AEqWNpgFEjFDc4wMjUSM2GOC3+eINtf9P8D3XSxFldvwsj1CIdjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695296; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aP21aGayxNLidjUWldaRN+0yZT8srWWtopHXNcPvGlE=; b=aOAKkgnoRoM3lbQY8gLDjA9yTTyEeLxuSTQKeJyq3R7ZspPMwil9Iu1n9isJ1vz+hg5YOQ0gCQxTvgiT7xXq5M7fy8iuxNW4bxmcZieZVsI9YeQO0CfeJyB4JVYAYA4AZe0ycyA8PCjRG2D0p4154SBKIX5+Gl9vDXxr2h6013M= 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 1632695296986187.41506025037677; Sun, 26 Sep 2021 15:28:16 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id w29so46362080wra.8 for ; Sun, 26 Sep 2021 15:28:16 -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 z17sm14413513wml.24.2021.09.26.15.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aP21aGayxNLidjUWldaRN+0yZT8srWWtopHXNcPvGlE=; b=nK8j5q7s3lNrxn2ZCDxUrIuPEkSH/7y7u01mDGg/44cRc++4us6+nCNT71y5fi3NFr eR+ZaGDQhx2TE+mq7VmNNca/PpkVImdtgfOgx50yuLON2ClQpdlaz/0ZXsL5re2leAwS /6fpcUzIFGG9i4Hf8/e6Ay46MBPvDKHugAdMwJkEsl3eRlHl1c2quQU/dIx0Wjb1I4vR 0J7/Mqc3JQXBNEMPJtenzCNKyuku98xUMe9qkmLH3W9iLCGdvvnFczu0EBjTVDSeAkNX MeTVo/PA6US6SKxLJquLcyMGiIBsy3bUXSxng1YZJbaV4JO/i6iRUIOk7d/7huRXdZ5u 0V7g== 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=aP21aGayxNLidjUWldaRN+0yZT8srWWtopHXNcPvGlE=; b=qevHAQEJ1fyeCOTmZvbhLeCB96lNe4LkwRTTDfW2oVdiR/hLEvhZV70dwLk5UV8lL1 6zbVxMULOcggcxBL74+P5CzYL72YVxvBsLC4N3uzyVcYwV4gwBP5hm//T/NWId+mZWkd OmsSb1U3Z7NhUZlO+TqxVDif5tLbTZg7HMnIGLoP1lforGIwu77Go7CG9APqvKo3GH6B UmVLr7KVGy0el/BJJ/+OFcGauLQ5dDYUX8+mMiA/TCn2qWacU7B2CNeoJ7E1SxKZX6qV 1v7OdYAOQ/iU/Twfd/uDF+0j57dQd/KCIt8lRIr+TST3t0OfxSy1rCtEDs/0lCoLPwUa ATlg== X-Gm-Message-State: AOAM531qFzq+QlzoSCcTaFln3sya4i8khwoxCuo6BXp2NdpJg6mA13Rt MRGzjJOn2vpk06WikZIb2ZQ= X-Google-Smtp-Source: ABdhPJxVG3UVyimD7YFqZkBt1o2mVO1k3I3OoG7AUQos+QiFs08HhrrH54AU/rmX2HJtY7B55O2vpA== X-Received: by 2002:a05:600c:3b89:: with SMTP id n9mr12735670wms.186.1632695295288; Sun, 26 Sep 2021 15:28:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 12/40] accel/qtest: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:48 +0200 Message-Id: <20210926222716.1732932-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695297725100001 Since there is no specific QTest handling for cpu_has_work() in cpu_thread_is_idle(), implement QTest has_work() handler as a simple 'return false' code. Besides, QTest is a "dummy" accelerator so not much can be done on vCPUs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- accel/qtest/qtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d52..eb5a17cef18 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -47,12 +47,18 @@ static const TypeInfo qtest_accel_type =3D { }; module_obj(TYPE_QTEST_ACCEL); =20 +static bool qtest_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void qtest_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; ops->get_virtual_clock =3D qtest_get_virtual_clock; + ops->has_work =3D qtest_cpu_has_work; }; =20 static const TypeInfo qtest_accel_ops_type =3D { --=20 2.31.1 From nobody Thu May 16 03:47:12 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=1632695301; cv=none; d=zohomail.com; s=zohoarc; b=QPaWooA8UPoY//dMzF6JBmOQA+yF02gnXE717Sjv2QxfngV6mPBQC64TvLCxXjTpxUJ8gfxgth6knbSCT9Htmb9TgDBUXE3idJm+Z+X/nYdR23oQC1aFKXeRxc7m7YhtBhEqUJQKfwipzqe5o7mLDuZE3mGHfM9+2y3wdYgD4f0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695301; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=E57cGaI6V6klxh5LrDfFmvEoB51OBdis2duAFretScefgRqMcaZU4qsuIoRDK/fZy9qwT6z3+5QBuxy07vIf37EbWFJsTHFkzkBGIkWbOZGAJkOwiDtsJgzMoKAugEq/Gn6kSBBiCWu+DFA3QmPyRQ/RDR3L9RxyA/iavby6UNs= 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 1632695301686110.67776436985366; Sun, 26 Sep 2021 15:28:21 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id g16so46517165wrb.3 for ; Sun, 26 Sep 2021 15:28:21 -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 f8sm14727277wrx.15.2021.09.26.15.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0BYMbs0TcChkwFeeNZ8rPK4jjNXuJ+c6QHnkutAyXs4=; b=OR3OPo45aC2xhKChcrZz7za2Uk1gRl7+YVRHyKl4/fDo7VUbVpWL7BLLaZy15w6aGi H03Qa2hgDLL4UEw/IzYe9l5Zt5nEDKnLtEpKYohvsQclwEoIiVJczD9Ok8HuavRtEWiO /lTmvtPR8ymuzEnm4kFkuIygv2qyBtDczzPHJlugzP+rNSKrh+FZaYKtahEHxM2objv9 usUnIm6kIOwZoR568lGNB3mBuoqerdy3D/DnzZdAapnXPXn8AudH77U7fHRfamqATa4j cG3+nmf3S6MownvkNDjvY+LC7X2+ojavEJQHgCGJHqGmT9+Fex5qFbGxiuNhf2KVtHte J1Wg== 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=i1Cpk/7Kzkl1vEErd34DPvJKdS75bsdG2WIeZ9geDSQQgrzDleDXgbnTxCZAjc1Z8t 8flOmNEPb/boyClYgc280v7oc0se8v03wJvO7O+oTzdKUKSXFUIC6DztkRsNnr2WHUxJ UFhnA3jkyyhMQMlJy8ov0TGselkcW8yTs80RcmO/JLN/XdFfqHThK8/luL/rA5GOuAoy 8Rkiv1E0d05IpV51gCcMiL7QbABehya/DzcSBDxcLCDyK/qN/znZQ7mLeT6EupNQJFVl 51sqfDNWDfmKotu6iYk5E30ZZfgywW72tJDj8KhwkyQuhu7kWOFmYYSbnRQLwBYHvGjd rm4w== X-Gm-Message-State: AOAM532r+Wgag/mmWgGTDJ2z5r1GidDcqk+tzKSN+bKEylrkH+6WSlBz JzH3iOj2A2R+5OR1Y7dhZco= X-Google-Smtp-Source: ABdhPJyjdJ7eLF1HdNjB1R1s6RdIQh08bx09tZ2GkYBNLlR6eCuTx9u46IUXIrAQbsfKFitvqeWSJA== X-Received: by 2002:a05:6000:18a2:: with SMTP id b2mr24015945wri.342.1632695299896; Sun, 26 Sep 2021 15:28:19 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 13/40] accel/tcg: Implement AccelOpsClass::has_work() Date: Mon, 27 Sep 2021 00:26:49 +0200 Message-Id: <20210926222716.1732932-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695303846100001 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 Thu May 16 03:47:12 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=1632695306; cv=none; d=zohomail.com; s=zohoarc; b=YF8Z72kQIq3mbRARLOONlQk6yewN/Pd7fkYWAjcp6f68BwFAQ36sWIIrT+kH0WLBuDIVR5uwY+a114GfGPttlaSjRVOaAjhiX15KgxumpxF+DPRJgQMPZ30CJMwxppiFwgV/+Y4AmJUIAO67LmwezzRaeCjeV0afgLsctbjpbDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=PJENO5Nf6zDP0cgOqQ2oTZYMKzns/CGwZjOJKqR7bNSEIscXnYyc/23r/TBQmSwC5yrdmNdBPtCXs5jGpNfIvIkoYoqcDxoEUp3kJCoZVp/YbRvndLOHhnVZaWi3wpUA+xLtaEpLXuPoLSYzRC20auGiukutHs+x6tFpneXr1io= 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 1632695306129906.7607530521113; Sun, 26 Sep 2021 15:28:26 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id c21so16807523wrb.13 for ; Sun, 26 Sep 2021 15:28: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 10sm17847838wmi.1.2021.09.26.15.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cb3odcmCuQWoFCXt4iYOTDt5qWlPQnfLAh89ZyyxruA=; b=VO89epECi1T9+YDxCkWYaV/al/dbXjdef8HSwscPIAQv3YG7q8w9eSSxonVH/y4UNQ wYeNa0sK2vX64T0SPIg+k1KklIfrhdoM+ziRNNQp3vVJegmqaL/JTB01LqsOO9M5gQZM knz4RshMQ7CXSq7mo5VlIYgJ5vwrgAa4jocCRv5drAI0IxfkItnf9pPHDspDK1kN+H/b PvxkQOQIS8rH1IeSDYNYCRj2cwZnKBS/TN0Hcg6m06MO1VJoUMYOH9fKMJtvL7qmhXOI /TT4h7QjJUgLt1ZFsDi4YlqFukIYe7NiZHogX3mms6rl5EHJQ92sjNusitcp01kh7XII GlZg== 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=z4tDp+ksDp856JCmsmuPNvBqwIwBEty2v7Su3UwgP4tYGtYLpwF48/QtUzcScg07JY lM6qrrLzHYYY4doBUCFoar+7rs/6DiJBNybvER0wWosMdRcITm1LBI/3IZv7ICZJijwf qtMcqgdHDJ6ctUowTt9huzU70To2ru/PDm04OGYjtH2ns9hkdPyHogHax3xT+/HqiGgN E67d2dCmXKNe0792VRRX4rNJl7ha24/a/Ad/7BITb35ztobZLmub7aDvDJeC6tCPe7Uw 5UFI9B3LDAR+DedMzAszV7gW0kYBQgrGHbY/U6U43yrSve9D3mfXYhCcB6m7n1rHPtsI oItQ== X-Gm-Message-State: AOAM532GRGM1tAKlIwOZkhL5fo/s5IfMBxWxZUZbKETnoMHumVu9FXFC dLbFtHhzzjC0BcW8WE9GQug= X-Google-Smtp-Source: ABdhPJx4Grbu+bnqpZdqpMlMhpH0SxlysDpUNKlhKe6LApT4A0XEZzYaucX9SR+lTa01aRlg9x7z7g== X-Received: by 2002:adf:e74b:: with SMTP id c11mr24838595wrn.101.1632695304452; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 14/40] accel: Simplify cpu_has_work() Date: Mon, 27 Sep 2021 00:26:50 +0200 Message-Id: <20210926222716.1732932-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695307938100001 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 Thu May 16 03:47:12 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=1632695310; cv=none; d=zohomail.com; s=zohoarc; b=DoQ2ELCcu+gtAzncTrLlzw98LK6O5MOE7MXno7QS8ogNdIU+VNTCkFp1xYsvBMVz5GfEbqxPYzBHU27dhuaEkPo15d66ff4R/ebwLhfasqqiHZ2dx/yOx3yUu5Ik0bGRV4u3ybv8TJPnOw+zAdQXeBRQb1N5Ky+uKY6fYO+vqgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695310; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zpMC5xjCsBbH9RpT6gPVCF+edgca48PVAQbhvKWBiG4=; b=KVISEAA63UsVo474yDENMqb2cPPUJOYtQUObr6wEgLtUks7ZhmOvFApQcj/QvwnsV2ButI2z6FBSPa7cnAaMV2xUT4V1ohMaWqlbcaLjyz7T+4IiuMV9GxOgBM4MtHc38FOfMsD56ywVrV3gxvrZLbYxnI1+ggHv5IPIH4greMQ= 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 163269531078631.331267720048004; Sun, 26 Sep 2021 15:28:30 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id d6so46337805wrc.11 for ; Sun, 26 Sep 2021 15:28: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 e2sm14921269wra.40.2021.09.26.15.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=zpMC5xjCsBbH9RpT6gPVCF+edgca48PVAQbhvKWBiG4=; b=eudP0goO9ZnicrGuuChVGFg6VRAPLWGodTwx00qC7j8AcLXJSIARimyry/vy+znOwJ CMJImwD3fXnN5lZp0S7d4LkV/JY17ytV9l4LM2x/QiOKE6oIcv2CquijRI8PPigUfhiI Olll9jpBSM4s4OWVRPFISaHUPUq4dttnKLX5Fk1QpYWRVmlebffNsdYX+JCM4bRMVAUf JfGzzbem8MMtENFMsn173L1vB1+IziAi0sA/q0uJ57KQKUu6lB1+N4FE+bdMBmhkgFmF EBYO3jQCsY191Q7vfjWZ+oxDXFFGDxOxyvmuHTUIo8+mnj1D6KDWZCxOiUCGvUCcLSfZ mRIQ== 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=0DHyMufh7mFP2Kw8/h58gf2zU3/nhIFEyOnYgb6xALh2RqTNmtjSto+X/usjKFNBUE vj8YP0/0m8sa6t+WLotBKzd2FJfywH/56/wG4y+1DQ0D+hBgq/EAEepg3zccDXfLpF8H +APjW+Hg/IUnxp86bXmy6FOWTct4qbmB+cngWtgqNLuY5SSwxdcjrtP0OLuzB5rbI5Lj IL3/x616jAoneP/0tpLnGY7ieX3rUB0Isl90S/QRDWzKTM1fjksQEZrjXcXAtvQc/uzT nWbBXAHcaq0L58YaFL1uhHSt58iso+KB/syCrUmFTCFN30AoMpgGyOOmd7mzDGfLoE3g YDqA== X-Gm-Message-State: AOAM530RuzxNHoucS/TRM2EyzPEoSKdN49coOhO1j3UhzbG6dLgdZA2/ FCX7iBhelGdTLeWznnv6OlYAskzZwwM= X-Google-Smtp-Source: ABdhPJwLNShyheWFYRfshXozc0iYHKyHFbdhGxGeI5uiwhin6ygVnDncSgPIkqRJvBf0uIbngT2avQ== X-Received: by 2002:a7b:cc8d:: with SMTP id p13mr12720547wma.10.1632695308913; Sun, 26 Sep 2021 15:28:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 15/40] accel/tcg: Introduce TCGCPUOps::has_work() Date: Mon, 27 Sep 2021 00:26:51 +0200 Message-Id: <20210926222716.1732932-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695312072100001 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 Thu May 16 03:47:12 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=1632695315; cv=none; d=zohomail.com; s=zohoarc; b=aTdqi5E/bAejkjBiwQmYs8TGl2jN/RgCFpLs1N+3PrppscHqRxYogpHzBTa3BWJVeLvmXPikbKtqAJ+tbeoHDXLmK9W9+JaTXTPdIJX+sQ/BBnTP69J1p3JwGZNfLdv1uqHjw7+Jc/KtILb/JejA87H3nJGpYt4U7fPRgK1+hPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695315; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UE09P3+95R7azQiB3uAxKhFAUsJxXecPBFCz3ofDdJY=; b=RtYA09rDqdPA7b6BtLOVlxV0e/k+mNYgTMpojDb4cmuQGkCroCT/ZKX0O1VBkQICviGbBIW3fFDwzTaPtUgG8M9MmxIW0t3DcjUOxeW/zu5pcjcSI1jxlfb3lO1F1o0b2xcu52T/ppddm/aknF5DoXoqqUSgjnRZH7nIWx53RnA= 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 16326953153339.608901594123267; Sun, 26 Sep 2021 15:28:35 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id t8so46558283wrq.4 for ; Sun, 26 Sep 2021 15:28: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 g12sm1871783wmh.36.2021.09.26.15.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=UE09P3+95R7azQiB3uAxKhFAUsJxXecPBFCz3ofDdJY=; b=nyWcoBadZ+pH8SsaCmOG3BSiKXQ9Y8mLrCl9+3L4g/sb1zi9YMV28pIRff0rp8phHk eLc0W159AE7lSRfU5YIXzl9CBy3eJioguy+5OptiG+7IefldrtL22EPWYvwO6KLI6nWI XW1oRpHwCLNif7xoKba0U5/rRsEjO2D1yP8+DcJ5sVP3FeI/sFgqJ/9uVl/OHpVJW0LE azccRPncLDsrSN43VFaDT7/nJJ/WhMz2NZZtucUqplFPXt4qfIHogmLiLYJOtLILbPUu WFUwVITszeRQ7v3pst12V9T7KwWspV5vYKDrnbgYmjvrgKBJpqSF3LDdXFykenafLUPJ hTDw== 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=Zy6KKKzppr/MclNVZnZ7helbEs5Up3JZx9jKkZ5vZGustO9YmZRrkoYKXXm1/brADH aSuXfBjQhxELppdqcaiF32wX4qZdv3x2sSQ7ZT17zaJY1wnZShIaXtLiov1oMF9gLMHI xzQpaL3C4hbF1ZVVPB3bBgURdQka/Z/vQY8t6A4ITSt7ahBGSPgesGfcyhtZ8KR3+MBO 9nOMgChDXSLmj7tpKYN+siHeqavUTStXpV7PaNV1/AuBbvaXAAsQiWe/0Zz+n5CHRKO6 XK0GTFfZsv/BPw8FYTQ59HreWB51nNjtXMC7KdYSZCkat2bEUSZbnKEMgSpoUAMnASV4 oG8A== X-Gm-Message-State: AOAM532RXT91kKpDtxeq6Wfpw80mGLaLWFrpHo7NWgyjOxsHld7X3fqV xFSKOSv0POe4VMvZmroQUes= X-Google-Smtp-Source: ABdhPJwBdEZejMQzggbxY5t2LnMSIVuiO1V5gP6pPawrOr3W53f5ggIwRq5/DTr9GjO0tSMuzsqggw== X-Received: by 2002:a05:600c:2312:: with SMTP id 18mr11916668wmo.192.1632695313610; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 16/40] target/arm: Explicit v7M cores use arm_cpu_has_work as CPUClass:has_work Date: Mon, 27 Sep 2021 00:26:52 +0200 Message-Id: <20210926222716.1732932-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695316326100001 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 Thu May 16 03:47:12 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=1632695319; cv=none; d=zohomail.com; s=zohoarc; b=NK4KeNX3JEMe0QQUo266AFjBSv9QaovnsHsk3LiEjld2PRpwmtlJfljZvsTFaDOoKczfk2dKl6XRxjLFYhA97bm6hxeqL3PSB1Vptvv5iTgQ4qndGJsG2KxZH3eEI60kx1e6LgMXUgFapV88R0V0dyskdox0p4bU+epm+4uy4gI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695319; 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=Ix+0XFjZABBrWnUahUOMEGnFGnJ2eyjTkP6Zf0PomNLVrQmJBNS3xMl8SPwvZLhUNGrRfLRe6309HPRJsa73RF6WENBX6prI4tXqS1Ht5zAloVu8NmAdn+OvEDAxxf0Tk4VGyxZ+fSs/5BJR/B6qfgQYXQXHmDX1SDrFmOs308g= 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 1632695319770471.02753396199944; Sun, 26 Sep 2021 15:28:39 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id t8so46558653wrq.4 for ; Sun, 26 Sep 2021 15:28: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 j4sm15186040wrt.67.2021.09.26.15.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=r6ZxEtcTtXMZRq7+nFZf7Av8uL6lok+sSg0IbMh7PU4=; b=Qe0Mf9yEZwjMz+ydJuf3ti9wMPQE6YwtWkrLuRMwtSWvRswAiHKvAno38Re+9ynLjy tGpx6CHu7lj5HuRsC9yZoGN9cZwfMEA79/uhkV8355pK88DzwmUI0yeyDnGzC56ILIMW QqgtyXhXb418Hc4L8mWppsAhzHJ39hS4/0op2Q3U1ArOfg1CBaNjKfKbutBm8n/OkRte y0635/iKpLNq10OFAofD7fHkeXpEMqu8FgGXUIc58Zd5f1EXNvB66A9q/cNgtCy3sFRe wZ49crC9QCx9duDuSNIhNGMmhy+gJu+k4RnAkmO+ypDJJGiGObWKmbY+las0LugnskYx Ml2w== 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=pki0RHc+4pQUFvwMAuKuiUMpSut6mtHhP8cTefm+QFN4s48tZGnpo9cKusshyVZ377 h6p1TeuylCgH581iC1L7kbKHQ8DWDzMFI+8nC5uHexgAw6pgA5BO2zo2ZJ9z7X/AnCJN mrq+sQ6pm0qVYIVIeaG9H5YBIwL29vPeeE0R0Ol9T6sVYaM6CmGxnofM/WIA0lGsO74Y /Rmr30uM+89aQet+ZV10GkBoqtH0n++AiDAr8tJlXjGtO/7nk5eEsvq3/ixkIe3TBz76 hTobYjbck5rhAko9Z6aN2ZIT64Em++zedzpE3fF2FECEKkbnNdd/dACK6T/ksqirS7sJ mN/g== X-Gm-Message-State: AOAM533tRKCw6ChB2vVhc7NbjMtsaD57TOOuZzknDtN3EoRsABlW/Tbo S9yJoHAU5MZgfaVbJw8/PuQ= X-Google-Smtp-Source: ABdhPJyiD0JWYAWHjgyS5g+bpRe47DYpSl3/WEG66YLxBkVuLFN0sgILQDL6i56Lqt81h3Ha15IsbA== X-Received: by 2002:a05:600c:1d18:: with SMTP id l24mr13333905wms.98.1632695318051; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 17/40] target/arm: Restrict has_work() handler to sysemu and TCG Date: Mon, 27 Sep 2021 00:26:53 +0200 Message-Id: <20210926222716.1732932-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695320417100001 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 Thu May 16 03:47:12 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=1632695324; cv=none; d=zohomail.com; s=zohoarc; b=SsQv5Fi+wiG5JZr4/uUMhX2obyFMzE7+AqKQ6K6IL51Uj1WSeHbRynW6fe1L/UJ6dAVs0mRzCMPDUPcGIotCMbTdizCDX4xmYohKWTJWAgg5PgUq5hcpyRbPcfjM6nE3yKk0bnSt2zjsQsvgjt1DrM/kqskl7zxxwsNBEhgvErc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695324; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bWsdPZ7x9Zv9ulmzVLDInqOVNAhrwd+vJJnOs6jG4pU=; b=F4ycswBvqyYOsGNUhFahws6Y82Zv3lj+VaN9ZTW7qo21qRNFpoC5hS38o1gHy0VprQJy6VevJAfFkQeiLQr4PWEEdFC7XQJak7zd3s60Q8C5a1AFl3sAkHVq5asDW+Pu3YTa5rb1feS8u3BHBpdpg/U4aUaAIznjhVkAaiDKMsE= 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 1632695324581388.4474096038556; Sun, 26 Sep 2021 15:28:44 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id w29so46364361wra.8 for ; Sun, 26 Sep 2021 15:28: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 z8sm5193869wrm.63.2021.09.26.15.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=bWsdPZ7x9Zv9ulmzVLDInqOVNAhrwd+vJJnOs6jG4pU=; b=Lz1qhq/uC+KoKYHEK0XLdGXE+6OedOp7CtPzLrZMbklblzQg5mCutVwNKYMMj+2qsy c4fLcx+q5HSxWpbTbR4LbOLxLRJcr/W1nd45FUz7N7MBCOfOPe/b4/gpvd1aY7K6Biqq HcbKcv4U+qyJedhwNQYK94dmRrcuBgL1cpnAxEDv9DoOwkKWiPTnc1Ucg4RElpCegDnp WmTu0snU9Jkf+oG9WnGKmd4TOXulOlN/sIZsU7fhATofKMhT8Ccb/PPW3WRTyWPt9cAV tLyJgcMC0nbF1GUeuvFU1AynEaRwRXmScwO8az7UIRgaw5FxHEkopr1kSo5Z9jmydgPQ AjUg== 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=dAQCy3y7ziDZZnf+W5KEKx9U/Wi3lgU8waNxZLJtRXGmQ58c62LvLZgGfrt1019nXU UmyyeWJULPG/k63hY+C1dN4//9B6eqbSnca0Jk4sjL2OAVuceCXjCReYsRAbyzeS6JsW neT3M5PGr7Ze5vhhJaHQw+In2U1Qdcy7koYjxdtUzhbWpi5K241NGs6PAcTPZ+PVx6Mf f2YfdtfIEvRo31TA4r4fuE5ln7D5bcimBqJv5ViYDhS7dHQnrga9gcBGO38HCCfkNFKK qrVAB6kRWbFZm/KSuLxYeXij0fOGpn18RjXHYEXRfn7qbOJSscpsh4pX8dwKmVdoq4QF 1hbA== X-Gm-Message-State: AOAM530mBwDRGkcsQ2qPLAyfxSfIe3AHBUzrNyXe91eYepUnjLVeP09u nhS2x3wKd+QSrtQM3IjS4tBmwfl78Ng= X-Google-Smtp-Source: ABdhPJwDYMt4yEfClFOFdcVVxIF/Fn5fCbl9IkMYlUQQYUSG92wS0+y2XgsM1Pyp8ecLhyMMJGboLQ== X-Received: by 2002:a05:6000:2af:: with SMTP id l15mr24655609wry.17.1632695322803; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 18/40] target/alpha: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:26:54 +0200 Message-Id: <20210926222716.1732932-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695326815100001 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 Thu May 16 03:47:12 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=1632695329; cv=none; d=zohomail.com; s=zohoarc; b=CrFdBCmkSE8t17ID0k3MERL+mbZrzzIJ06vWGxyITcVp3Yup+ksnZ7WGZA6RbRomxkzEhnKYgyJdNo7LxQrCgPhYPmcyNZLKoJ2ts6kBtvl26UZAzkGtK2ubbqeDIuzBGXAXseplIo/MqRHAXwpFwg4S5rxGmx7+qq8jaTMt50g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695329; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=esdj4T8w87yQQx5q0gedYQmjf/1Q5yjrjrc7iKp6hio=; b=NufCGaW6qjal9zmY2rSfGBC8jaQsF19DQAg/mjOij7V2E9weHc9dRrThxXmjQ0FS2uhELjoCgw2SKe+asSpLgtKMvwqWF1Mzs7AJgHdwpz2uF33RnWfIFM00A6xuxCWhyjRiOYpEwHXzRLsDd6+Kq9gO+Ezjs8UTiAhjMLGYHOE= 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 1632695329210552.3746727620509; Sun, 26 Sep 2021 15:28:49 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id r23so21138972wra.6 for ; Sun, 26 Sep 2021 15:28: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 s13sm1662078wmj.9.2021.09.26.15.28.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=esdj4T8w87yQQx5q0gedYQmjf/1Q5yjrjrc7iKp6hio=; b=gecrH13smwausK6V/DRNlOKZbmEp+oD/ny+JaRb9x6yq/TnzLzeaZHdtY72VbzjON8 lQ/INtdnMpvrsgMt1OvO08AtW/m+FKdl2spCtUHhx7a9lxF4yEk2MgAqfJ74t7YzFj1S W5ej/+xsozSbzIUz9dMc7bE1RqhP1c3wdwtHB/qySit0KnNHupwHWo5P8L4OfC9Bx5K7 At0MO5lrzGWfHNIjK+22GR3ctTcwj6yVgClZ7MrNzJWPTxufoGp/iXlMHXH8uTr/Em+y ztDUidKAngVjtyHeLoyV8OoijnQINTlPqKgR495B1eJB7pTQnHiFPjlynSHnhFckKVKc +Mcg== 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=mmLIy/JH/grP/jT5JtvKZD+ghGa+NL/fwT/bngCbbT0/Z7T8OVUW3+fW1YTp2vv+5e mHE4gm6R3yLnIEKwU6gyYY1Y4EAZR5ogG5ie88urtXcXZhJQxgi5UjvpN05Su8rKLYQp 5bgWO8mUXAXkxotpmwvPbeD+nV2IFt2B+BB5d1u4iH861PqSepk4ljroad0VR06XCLHw zaKdqLgm5S17YcqYuLJz7c4/wVBcTF2O7Ow5C2iQA5+EyrzGv4BDUhX5YO5UA173qGUK 7wPzqZhRidhsw/Wx9XXSLDhijXulcVqUQG1GY9laYFjc8iUe6gNW9HJTcDFAbza6N0S2 uq7w== X-Gm-Message-State: AOAM530JLnBDqSf1tSWIsLUnZtUFUMH+bCafJLQaKTi1IUxQYzVu/UaI gLLN4McT4klKxdypQPyTEuM= X-Google-Smtp-Source: ABdhPJyaGp3Sv9/X7ahP5iTmqxA+OFRT3tiHR6pN+PNuyKHrUXPyeGrkWvyeWu05KZAKHqKPVWObig== X-Received: by 2002:adf:e983:: with SMTP id h3mr24750995wrm.231.1632695327463; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 19/40] target/avr: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:26:55 +0200 Message-Id: <20210926222716.1732932-20-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695330729100001 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 Thu May 16 03:47:12 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=1632695334; cv=none; d=zohomail.com; s=zohoarc; b=cs1upQZADxvsbLUVEzoSAoWM7n1Z6Ra8Cc3KGhC1PHOqL+G8kNtLmbmixC2414rsy/G0dQh6cXghByS6x2sjBM6bLf+mb3zljahR1s/bw+zieR5R4jr0g5GA5wonTCfR+JWDljKO1DH6YntXqi9n7TPXEM8OvEv9ZBt3+4FzZnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695334; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=Ht/h8bW1oQZZRU3hL82uDEf+hLg2RJ6YBmcQGRvAjXs7UUlYPnmuD/w9+j8IWby+bV9uAKByRWMAYUd8gwBCIuU9uHgCrMiVniQ1haYvhNn4hT+AaJDPzkOPhlMD2Iv3vpbqHUDMulto2gGaeTPO5AKmvoCuueaWI+96VTu9Qn0= 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 1632695333998598.043500810351; Sun, 26 Sep 2021 15:28:53 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id s21so6467293wra.7 for ; Sun, 26 Sep 2021 15:28: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 t11sm1878658wrz.65.2021.09.26.15.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=BtkZfC3Jqv9BX8O65q6cSfCgutSi0wjc1sQe8Yf13mk=; b=CaHvRzc9OEUjh+VhqdSmYDRGncUTUtjOHahnwzwvNBGfaaFbfMQCQZIrDTapLhrW4i RVx1pyxEIl64Bw8BjQVyEA9AeN9WpEirTmKDgjpKLTUysn8yQyTKpV0jwX/dWlhJsaXH ZNW+ZYsKZxM1YFU45ELEIy5evxXwkxccUB5MJAjRew4b8+JJU9BGUF7Vj6AFUDjFBZ8B VvG3sfDTbuRXOrIVi3qoJ4JH9DEUk+GtdPqgTOUS36gk6mG9JTdY2gJGqweey8LqRtTg ifKpHr04h6WdQFsdwf6GNVrxxrD1dj1FbKZ9Ar83/6KvXrArJvz6Xzp0Ya8VJESXyow8 5a+Q== 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=T2P+jKlrdPE/kELK6cfRHjPq7eUqhzWHkMj7NyTa5gdOMCgI4kEDYHEQ4imPUH22RS Si/bwaxUncJjhcE940UlAUt25dsKlxYLcDZOuZOXUCN2W4zgRHHsY4jPRAHhXIibGLTn A1i/CQsipaX0qe6GSVYvGDsJrlnvvnRkjQlFI5Oqcvkstqofa6mYPrGBuWSg8JsT+yIz KiJg0R2Cbo1oHodd6UfosKblAoN+PmHFEJkM51TwI34T5+VX9M7iIbIOqnzA5cwudzwH 3OzQKJByclP4TiJZgjv6L7E36TyHuqmx2Hz+7TOh57BRp+S7zCFvT2UwtxAdHy+6vQHG vE8Q== X-Gm-Message-State: AOAM533UbLHC9pPMDT5MUjr6RQMUpizY/qDvM8blSYV8BgbSPuUNMb0z u5B0nwks/4VZ1PGd6gEgzak= X-Google-Smtp-Source: ABdhPJzXja2v4LLPPGDWb9/UMUA8/1QdkjShi4MBtTvUN/CLFyB/1XPtIsQzZnQo8IIUxQCM+Oze/g== X-Received: by 2002:a5d:6503:: with SMTP id x3mr24506219wru.76.1632695332185; Sun, 26 Sep 2021 15:28: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?= Subject: [PATCH v8 20/40] target/cris: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:26:56 +0200 Message-Id: <20210926222716.1732932-21-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695334778100001 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 Thu May 16 03:47:12 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=1632695338; cv=none; d=zohomail.com; s=zohoarc; b=MkwmmcKNXzU9RUQqqyCRTPtFHlteM3kmV/4dSh7EdeKgUo+0b3N7wdPymbS+eVAiICjWXWzj4/OeNLpX2RP9AS5sSC+6ZdUsv4ni/VqiB02SPfcJVC0LXDw7WILnAT/7F8vzPX2+oHG2v5ZEkBjyqtAWBUJ/jUlVGiR8NPD/MhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695338; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0ZgxjKAzE6UdfxxfzQvSE8AG7aSTa5UtgwXRgJWAVhA=; b=PlTxSeUfwODRBI9Jx7X00jShn4sm4HQ/yWZIR14aJQc7HrbAgEyphvfHWnf46cKg92Ok6sk12fWgu1irEO699MVQ63H2o/GlnPpqIsHt0/+KNIKABv4hAUHav2ElWkvAZKwgasy/jw0b/0GzmNrX7RG9SCntwL5qrmEC5Y7AFsQ= 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 1632695338591271.10942841274687; Sun, 26 Sep 2021 15:28:58 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id i23so46576139wrb.2 for ; Sun, 26 Sep 2021 15:28: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 x9sm6164154wrv.82.2021.09.26.15.28.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:28: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=0ZgxjKAzE6UdfxxfzQvSE8AG7aSTa5UtgwXRgJWAVhA=; b=hKTY54pQUf9p8sCU+LT0l/n9Nuvnz8Dnxeq+61FnvOvhyqmRpiovoOQ3XfEa00vsue Dy9HsjL9vABcH22zmlSaChPAWaV3TfE712ZcfwlAKSwBF3cMRy0GAKlyvbEQmmGJxMXM cdZyF4GnRIOWZQj+rsW/hN9kqZNYnu8Tag1lLqqk+A/ig/5EwAUPS0t5PwF8QwdulKVa p9Wfuj/3wqB6rvD9YNTgqXWAX1l6FZazZykDSr7UvJwy5RlftAh9+i+pR8lne24Vm8UJ 3FjVI0LkAIEmtE3n+7oOGdmPXiHkjtLBICGpectl6Q5Pup406Z/GesgbyfcTaTCYWO+B kEgA== 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=WEN/oanB0Z8x3zfvbGUpp8+3WlkUtlG92yYKae9PKhR88tuMOcZb+ejrqp1c6GtLlD aolPnCY63/lg/9AeQcRw9GwhmrNn/MUQcnIkM9UUwAz5jYiofAVwnXyMNY44UK6FrcrF REQI1lEymxTPubuPUiCO4Pf1i01LSmipJ1tQV40SvGmruVEE6Nx33lhVcH6p0NfnQS6M GQsuNKqDOtFKKuoBeF8HdYFlMHvj5Dw88qaVNssjI8tqGSGXJXQAKw45AebmO+++JfCs xUMkHQSsr+a9Rq/3FoHyrBExV8AWn3iFxkwLl4bsarSYH0t0yubUvRdhHm6Q0ilKO7IZ dWyA== X-Gm-Message-State: AOAM530bdYkIhjzvqbl+PLO+ekmXTf3XKZC6YX85u8bYd2p4I3TysjoX z+WwV5kWiu7GOc/Em/8VlS0= X-Google-Smtp-Source: ABdhPJxvhv9a7IWS+6OFo336SnZ1uq7uHzXnggWgqDSwenhzeAqcGZyPc4JE03TUsPJ8YifSiSy4eA== X-Received: by 2002:a7b:ce19:: with SMTP id m25mr12523678wmc.152.1632695336892; Sun, 26 Sep 2021 15:28:56 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 21/40] target/hexagon: Remove unused has_work() handler Date: Mon, 27 Sep 2021 00:26:57 +0200 Message-Id: <20210926222716.1732932-22-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695339134100001 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 Thu May 16 03:47:12 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=1632695343; cv=none; d=zohomail.com; s=zohoarc; b=mVvPAwnadzr6WbXUJCXeYJy1kKwrB2voAaQK18+fyM+FziIa/vqf0sF1ZggGIF+FwZJLrLXVzD3ywl6Muj/aBCrTPICv4l6He1UxYhkR4fwg4wmFQjjl0GcElyT4kTLQ8swptVVqeY+TyRZkC2lk/LORYbQb3HGRyrxEMDfFJi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695343; 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=FNp4JQnKLw/6W0cNiD2BjnvGmkwMbLO4E0Y2AZRf0Zbjadvn5ga+8KhMU0JLrNQR6MC+dOUIA2updxk7hS9CkK5WAmU2QwMvk9bzAVmQXPw/ig2z0ryLfnDfdpplK7K6s3+QewiOMYfiMqNVkgyps5i1iWOzvy8oSc56s72mclc= 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 1632695343418210.83102335013518; Sun, 26 Sep 2021 15:29:03 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id x20so1792396wrg.10 for ; Sun, 26 Sep 2021 15:29:02 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id s2sm6831181wru.3.2021.09.26.15.29.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29: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=HfPpeCahj5vQJxNuN5USHRZi30oEK/WxNT5N2Z+0tUI=; b=QMR6BWfkihxvHRKdBtjI/ktUWs4pukBuCgN6YRwtdpFPziTXlG6wZgFSFP3B1F0S/6 2LtUO8tPaLUaQ7bzzG66Efp12x3mntlluXz8XCoplSxbXBD8CL3U6rBFFZk54Ufj+RSv 2QX2dE82T+te2YFmYz1Yi9AWvZDWjfwGGsfiByd6JpHIPvQ4lxX3fsrhLd3V3cOnqNGQ Rp6KNVnYH5QW0APlvFl5cDY9Y1qQ3sRLhDKE6TA9frr2sYW0e/ROE59nQdaONSYzlukK uc3WLuBq0M0vu13TTeQ6YF4f/vPpeVTlQqVotK/LqQovYnVGFBcZFvKruc7MAbSCnkcG mB8g== 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=g55ReVhlhV6yDeuLkJskAsQvU2XN3oi9STuQyu9y5kDzlcqW9KC/pW/M/GaJVD4v7m 3j8d54rrnGPHl2nDtYyI/4FDJwF5H6wDl4DylHOnGXBgbGZsZBTqgELdJMe2zqeE949U 6sWmV3YnYtO/SxuS1M4bhJNnuRy1zBeJuqtAPK1qm6zSW5C5eMMaSD8wrGqbKRpZOGhU xKcr+GUEmkCUMoW2ZcY1y1dgaM2CEaCLOXwH3hjFIdd+aWB5bLPz4onSMapPQxc0DSTS UE0UH+zT8omK37JYBJIDZX7o3/U8HM2C0L8UkYIzeNrPYrlNO57dZia0rWOsZwNPZnA/ RjBw== X-Gm-Message-State: AOAM531JWOIiYyVMFvnrcO/kiI4QmbpbZm+taJloc1XPsICLhGABsCuh LnTPdIBcIFGqVp7RPB49I0c= X-Google-Smtp-Source: ABdhPJynnOI0gVkf7pZg7+klBFZPE1PiOFQTEKnf7j27nU8YMVbzm/NGCCsScpfjaD/IMsDi4E2uTA== X-Received: by 2002:a1c:ed0a:: with SMTP id l10mr13455109wmh.140.1632695341638; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 22/40] target/hppa: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:26:58 +0200 Message-Id: <20210926222716.1732932-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695345229100001 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 Thu May 16 03:47:12 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=1632695348; cv=none; d=zohomail.com; s=zohoarc; b=cwGeRK0tUBGYMyU0fZakw0EBZ7dInKQqhEuzCLue2by76g+2OHGFBz/0e14hLvIPF/MIefk8XS9nA8FI0NDSYvBSTLseYxKSay50tPGrC66kL8LbulV3BPXkjPwbeAErDXOaLIBYumzRXrAGfGbNVttC0Mft8TQMM6zKUFuV9T0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695348; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=ejNN4cz1AlEReed0ONlW1E+XHV3mTFQ3WZ76PbbbYk/EpMHSp43TLsWLu2Xbq5SXnRYKwqB36jqzf41lbZXdTS6TBgTDp7AQE5HYHAJ50Vhbz4QCGDOjqzSIHUxcwQg50IdNFZWZxuFDIjJnQU8IgSvUxhUlHqeUyE/irsG/w3I= 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 1632695348589303.07978056356205; Sun, 26 Sep 2021 15:29:08 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id u18so46535262wrg.5 for ; Sun, 26 Sep 2021 15:29: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 d8sm15797040wrv.80.2021.09.26.15.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29: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=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=EqjMAlG/pSk2um+MA0SXVOkYxXLoIyeHiJdsma86EhXCN9QjRdu/5NZPJJ/9CvPupb Hf01BS0XA7GGYcn1exYEvVXkMWypwWPHuIH3wvXpG+19qCNnVxTmqMYdBi+iRUBSq+cK u8iyGT69TNdtgHfuf+9FGIpbgDwlNrCfXh5ZJTyCCe7ztna6oRVtxbnFipNTrZ7Eiq9/ GFGn/uRSUfLf/YPMO7J0lLDnMnG+33q7j3uvTOOZPpoI/0bWXrfjE/SZv31XBIDnK890 P7rg7GwWExjt3sns82QoFzxvtNtbj6jPhtIIczQFApeOKgvJ0QxhUQ3w2Wy6ZGiwsz/0 t+RA== 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=HsUrKXKM2fDegICuoVGpY26i/5wh/pxoqmsogJSFOv9BfJEzlYmiXIpxmrUmIFVMAF JRQrhnziB4MAx+x3KoiG8vjevXVnaD0eieFXfB0+R0Q53tENfpo/Bdl+/FftxAzkM9Tr wM2JjWpOliHwkdlLpqb7v7vUH3yW4/Ahx8kDk18gHKCIDtTyq2YH5YGLx8lj2GVfeJx5 NdL8sGtZVkSosltrUWfrndUW99W5Egi5JlDUkcwyPEupuRMT1qvms5Hm2y7FtvE76Ofa PliuObGSTPEwExh70mtc3dAC2OyZFwpT6uHQjdu8l2+mR4QU/fS0CQSCxQ17vteWU/Fc g/8A== X-Gm-Message-State: AOAM533z5iDtQCDkEo6ZJYev2fWgeFNy8kXvHGUDmPDP/BWU8KU6FNSL T+loD6BapnI952OXSyLUHck= X-Google-Smtp-Source: ABdhPJwG6s3gEaSATqQ6TGjBELsRhm5cbSBOTIKXKGVGKHFANhlUGzS36no0tn+gIQdeKyJwmE9mWw== X-Received: by 2002:a1c:a78d:: with SMTP id q135mr13058660wme.36.1632695346743; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 23/40] target/i386: Restrict has_work() handler to sysemu and TCG Date: Mon, 27 Sep 2021 00:26:59 +0200 Message-Id: <20210926222716.1732932-24-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695349400100001 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 Thu May 16 03:47:12 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=1632695353; cv=none; d=zohomail.com; s=zohoarc; b=l/swhNi97F9gLGlmAuvOv38FPeB71j7ExWEBowkTPdK5Wkwk/ZlHHbLf0lxbDHJslKLUI4B/3pdZ/kaLvkpU4Y2JDr2KZEwxUlKKuuHqEdZhPmW9q6ZUlbaqe73hOOgB//7QoCD+P0dsvIsMzFlpEWmxSjOm0lMn17+CSJSSjX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695353; 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=CDkXQrqA66R5eh1WCSSXZwKQrV00lFBpOoe3fFEGbfkjybKOPgxOmyEvzMT0+scePy+xQTGDU2WQp5uFKmys6nquua5X0HTbmbHzhlsYG+AlG3r3LLoDixcmxM33eHHM4zAAb/2rrG2wDT4vfJKIVWS9fqTBkRxYcMiHl5g+YwM= 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 1632695353298323.64848440553; Sun, 26 Sep 2021 15:29:13 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id u18so46535599wrg.5 for ; Sun, 26 Sep 2021 15:29: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 s10sm15013558wrg.42.2021.09.26.15.29.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29: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=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=MZ+YNdm+PPVCfa0H+PUCGt5o3W7MxmPlymM/4l1jkbLlyMs+g2/kLTd4PIdUHpi+YZ RSSQP9jXfiulCWqIa90EvJ1RSJl0o8ZUwJnFLkLxzX1FgPUyQ7V/myg52xuw7OH5ddCT oojF//rAWHjEhrNetc8/j9O4xSCcss/9P69byZa3akuJ0+64exRVh7V0DZcbas5Dj2fo XnaJI8wxjSO/c3jvnHsIqhoO46suRm8EzACD+tE9VSQWH2DW7JAf7qdUJ84NW2tsfDQN 9ZirBew5UdiG1Uv3CRT1jboahNm626thBBw0MnRHapSzweRmseq48mypMEByuf/k2De0 tuGg== 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=scoY+LPcUndiwztMSyujTGDXbPmkPVr8uTHSoji8+l72g45UMyDaBeqHkRXn40INjU CIHEpBYi06JCXoI5Z1ApQ+u95RHL16ydvqd5jkkDuorleQpHk07EvKja4nLFU+Fx+Jfr Vl561t/BdyM+pcpEWeTFBb4NVpTQReSxm0RbUErbH1eBkb2O/dSJYHVuQFgGe3ZHJiYE Sq8DYoWVAUT3QF1ZwduZuYM8eiZNy1XV5bCNsgHKL+9JdvjPIbsutT+u2rgBgZbs/qbz uRoeH5IOdIdHXV+L/nHjNFAF59o7/YmqOnXbWcd9JsLMlKh08mNTTu3VIPUR/MsLX1sR G6GA== X-Gm-Message-State: AOAM530f5on5VzH583gyCKSZErD6adPTvv3AFz3XoODLGz1x2uzMA6T6 mDPHh7FRczJH0ykNTn1eRHMkNmgcvsg= X-Google-Smtp-Source: ABdhPJz59Y48FUCOG1rvt7ODG0HO9JPAEY8fF5bjMDnfEhPoTVqkLnwC/KBxjkmaJCudzJQe7e1hJg== X-Received: by 2002:a7b:c4d2:: with SMTP id g18mr732304wmk.180.1632695351581; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 24/40] target/m68k: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:00 +0200 Message-Id: <20210926222716.1732932-25-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695353553100001 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 Thu May 16 03:47:12 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=1632695357; cv=none; d=zohomail.com; s=zohoarc; b=n+yVuFdift0rBMFfG2CO2aQZvWQpAglLE5gQEi7+oVpLOaE/73w5A0dQMOM1nRK+s7rOXNZyRzPZi9CrE8mIhNBS0UbyM2h6ZH3ICoRJ+8Qt5PeF27bixl4e7CALFGUk3N6APx4/v3fEB1WJUVXHmgPVyUm1M5v6z/PbcfTTFcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695357; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=HNZUiDbeLzKy8TxkpiyPjhFfu5F8hOTypqWoP0tXrnApb7GhnoNEhrLEaCGdEXrcl2v+DhuoWBCRDk3B3FbtxA7Y26/+ISrpeJUabqe8W3qHn8NtSkxxxnDIa3CrMYpMSZcsnC5TQqC+UFTL9DiC9PZZH8KRP4eR3xr7yMpuF/g= 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 1632695357983440.59988084359054; Sun, 26 Sep 2021 15:29:17 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id c21so16811923wrb.13 for ; Sun, 26 Sep 2021 15:29: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 l15sm18920117wme.42.2021.09.26.15.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29: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=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=i0xNDxM2lC5uNHDingK/wwkKU1ZA3obK+2STrM6tW5jUqZ0loQqr35nCDSNdLGdEEK ojgVswKjFW/LFEqQP3JcbyvoOCnb5l2MlVW1BgFEXp6xezanPCa+XerY/aK4A41zHRdn G4Mq6A9Gb0wcBZ4BwOvIN5YFiVrLpY+xPsggJoQaRre0Y0PAc26RpE99j8msSuvq6hTD PTgb096vIoV5gjAXb+6D3vQQdtesTOwOdQ8ZkM1RePdaXdH/R1OhrvW8PzhZ+1WZXc2z 0kXlnMA5W7H6IKWZzWnADAAb0kBr7shl3oKHH7G5Ovc6GY/vZX7HgzNZzjLh2uZKgzNF jt4Q== 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=IUuh3qn8YDgRLH10Sjw2VU9j7r/94OEB+wk+lT+H6fMqp8H+RP3MwQSwtYHlT8z/RU 2IUxgAM/4my72vSk2Qh5+i9/Gffm0Ao66aTktuXuXDnYkVRoMfUOWcHTuqCRZvupI89q 7S6oadF5fZWtEIIU0R7Oo92WMMjp0RBZDJz7Zoeq/7O1F1yePxR7qY+jjv0QBJACSbGY dotZXhC0mX/qWyaDqak32+YZUJqdixHPRNccrc0ggBgZ8loeq0MXgUwF4lA2IgFHF2dr B+YHdgZa/uMSXwnFThv+cOTxBOc8xKAa2AH8W6p3blLTSi0szV2GfBwA/uMppOeqYVhH JAKQ== X-Gm-Message-State: AOAM5307Ezo0XUsJsY/IGAjzAxTWYL0KWyFZfHwPRmdwmc4lCEFu3gyY RHKeFGetzEAUfAYA3IC0Ctc= X-Google-Smtp-Source: ABdhPJyBmmhiYFymFJw/Q8uoeYHQ/zOPKphK5MnVhp7gsbYg990d4f3XCBBCt3b7agoQm8HdTq4o1g== X-Received: by 2002:a05:600c:1c1d:: with SMTP id j29mr7913851wms.49.1632695356306; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 25/40] target/microblaze: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:01 +0200 Message-Id: <20210926222716.1732932-26-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695359699100001 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 Thu May 16 03:47:12 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=1632695362; cv=none; d=zohomail.com; s=zohoarc; b=gYZiM8uxXlItPHUusGqDvyg7oN4UDp3SyeJB+T6QxQb0HRJEwNUIm2MdrI0nY7IrbKAubKxVaNRqiQP+3Qv6CGv0qJlRwboCMfbaOlwT1JrUsqNSwRfJ6DcNiGU9ZpOGef3HVj3goDquZ6vYXyOuj6TuBI5sQoi1xTtoi4PCHpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695362; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=Du6kGCZxY/NH06E3xTUiFft1y7aj0M7S/v53NHDZ+wCsFU2RAd1+KZURHGIt4ayB19DkXi+xaT4jVy+jlE2Aen5mc3HwSlArgtyzHiRfVpk1zxM1Y9dj5dgkoUP3JcEurVLiwPALE18sfb67jUZ7rCC7SrzCvMLpJhWwabOrn/4= 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 163269536250727.743369299387155; Sun, 26 Sep 2021 15:29:22 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id s21so6469761wra.7 for ; Sun, 26 Sep 2021 15:29:21 -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 v20sm15048016wra.73.2021.09.26.15.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29: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=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=UIUb7sadFgD6y+fxEmMOn2j4/DG7JfNdNLbPAn4weFjAjGdxF6vS4SyAJOsphHGkV5 i3MPqpOvlWUdAqpDfwgMem4myfmoH2x5m61HPGOokvXo/r+02jtvxL9Ct20TB7UhECTq q/NhAi7VrKwmOrusvphzuLU4rmfSk30loxsS4I9CsE4kuE9S+SMHQ8vIjRIuwk+zgXQ6 JujlKamU543yEFwTYX1MQgsGbV+2ND9xodKvK7q7NpA/CSgUoCZodxtS3vZi0z9fG3aQ cf+mwdsc4V7EzBHb43uW7yuumPQHjNIeoAvfrgBY9legGVeMzF9ypsOgVSRAQouAMvNq DZwA== 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=uNyzVHy9Z/mOb7SqlSE1hPyup1H7m/y0MgP48118wbS2yh86lZgguAwS6WZaLeCvqJ Vd1BWehNvBGk4t+s2IB2q0jRK3+55kkJCQ0uespSzYu0adJH5ltoeVzleMGEkAMpb537 6fyy4JIavJWzbRBsVFJOtAAT2Vw1ZD0oQxU4bTzM0HBmwzdS4J2N4nTXn7mBHIO8f/9u vzIcOgUJ8oPGhkTMnzmdJtWvQiLstsz0/KVQS13v9vLRvOgLYB7gwEVCbUYWkQJ5VpWy 1bYT2+pG3qDCn9sOScWzafmbl5r8e9UGC5TTKgRqPx+f/XIRwW6wWU71XmyOMi/E0tf3 c5uw== X-Gm-Message-State: AOAM531QG/00sxjsrl2cR4+I49chYea01bFcg89tmR1p3JD07NXAw8Hr lC4ZwRQnTDD344eYNxhiitTgD2p4UvA= X-Google-Smtp-Source: ABdhPJxyxdQVgGjMOqTZ71QJ47AdlF4Wx0l/CJfhjtQ42Jrj8/59+r+aM4Hu2gXjEIXTJ8kkQUTqBg== X-Received: by 2002:adf:a3c3:: with SMTP id m3mr24916339wrb.237.1632695360794; Sun, 26 Sep 2021 15:29:20 -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 v8 26/40] target/mips: Restrict has_work() handler to sysemu and TCG Date: Mon, 27 Sep 2021 00:27:02 +0200 Message-Id: <20210926222716.1732932-27-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695363819100003 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 Thu May 16 03:47:12 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=1632695367; cv=none; d=zohomail.com; s=zohoarc; b=Ft+7UYyD4MJHkv70g6LrMtuYYJkLlcp3YIdOwJH928GIgKeYpp2FEiEu7HLny7jQsu0DKS89VDox1KgwbSrHsGEsJSTqmXmhoe0R0n2fgFWqD9kygKh+hqrH2eTchOWeN08/cf5zMvfasyZJyxluVbUGFvZKXSOetkRNw2tO9ew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695367; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=IcN40vszUTMHjgg95m4VzlUBnCQFgPkwyNNIMbJ29uCfC3dpQmh62kMrSQvPCjchLeVmITMrTCOsXtC+VL5l+lh9/2SUEr/pyD9tU8pFHuOkJ0Zzrl6CI0iV8+MoNpbSzblV9VM0/DO7lZnoAcSgvQ1y2BY5CfEOmbbJh/4hfCM= 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 1632695367087835.5227208668291; Sun, 26 Sep 2021 15:29:27 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id w29so46367942wra.8 for ; Sun, 26 Sep 2021 15:29:26 -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 j19sm14800281wra.92.2021.09.26.15.29.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29: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=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=nkS/LYcg6s/akvHzRJmA5eDbGOYXvzR59XMuTYXRLEz16bltsJJUXLc7KHqruxgKuu YzlHL939T50KQNjrXH3fHV+0I2DYsHMmbudle1jZiyIRGgiVWnqwtbmNyZbOxQGNpAyh wAQPhqvxahZoqP9MY1SFlWlHdP7UnmA/JsmIoRx/s142flaFPrdyzGwtSzQT6EvZt1U1 AHlf08Dsf1/mnxxS86veWEng21L4Qw0pYQe+sJJoqYb6SKr3baUsFO9oov5Ctwr5+upa bTx2cJNeGVEFGtQ+jZigcN8/QekGZxsPp7HLKH1BEAV8PCHNGVmAG2JZUTQgZocYl4gM eiqA== 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=XuVwiiGxZ5Za7KdrRLzH8FIXyOqxH7PurSsrBzRZgke9hh54XOxtW7LDkMVSJVlbwO lcJ/gbml7l/fFAWu0Nj6Fr9K5EppkiJm4PB9Q3Z8TRooFWlT6PE735uoIz3/ZMxgj/zg 7VorZCnKoz/VMqQvdS71QoJZx5/P5omMumLz4FxeFZyE4GhkBAIekyLnKALYe2Rvkknw Wp8y0CDmP5ShnwU95PBIo61C4n7ExFuczIfoOuiKMit16fnWimhmsI42OJAHxdWt5JHJ eI/iXlYEvsZRl67ec590Bw+H2KBIsRqPOJgrqMXtLMWElgm+CzE5qM2O6xRjxhnFFG5O Njuw== X-Gm-Message-State: AOAM530Nwc0eBnNDbBCqUm9gCzwyh2jmtmBNL47qyYvrN/ZI4286OIvo a8uwRUVpfbRdhXu528eQFJA= X-Google-Smtp-Source: ABdhPJyjL2QymzAMUKPhqHOn9hW5Jf7KI2SXIy40CCIE2uW4MrImB2CQbQVxZQdFY/XQHhtLJ/DOgg== X-Received: by 2002:adf:fcca:: with SMTP id f10mr24103741wrs.304.1632695365378; Sun, 26 Sep 2021 15:29:25 -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 v8 27/40] target/nios2: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:03 +0200 Message-Id: <20210926222716.1732932-28-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695368030100001 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 Thu May 16 03:47:12 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=1632695371; cv=none; d=zohomail.com; s=zohoarc; b=dyjJatld2VSEbtuE/jC14On8RqduuZ7Ly3NdaYr3fwErFjx3+u7T9Pv7dAD+Mt8vo8+vevV5x54b1T2eUQ6M+tE/Muqio14c0+eqMoM9DnB8hzf/DHPY2LtA+lfVVkarTP9DnpJBOY9GvRYjJbisTPI/K0XekL8OMfUu3WqkAE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695371; 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=dyT0uTJ/EC1WX/kbPEcKR/O9mLSFL8AfOSlbtD2yh3uU+zW9/WYqvTUMHn3qY84M1EvI9Wubpmv7MzsNWOTXl5lhhbcF3FB7D+0KgevNvBIL6pykudAIoq5cwL+8U2GZXbH7YLvlRdenr2gv3R+6HEym//pTJ4S+GU9oq2cHmW4= 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 1632695371774785.5849675202429; Sun, 26 Sep 2021 15:29:31 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id x20so1794967wrg.10 for ; Sun, 26 Sep 2021 15:29: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 r27sm12541351wrr.70.2021.09.26.15.29.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h26pMLEnUsWrxMoqQtHQ2NCzZkcdqUGqN4k/9eCW+zM=; b=kl/O0kGgHve1TC1A+zDj77iXst0/jtYnelSp9GQDHqiC+nLqDKBDKWYHHsBLfuNaG6 7u+dm+pGpC+gECczcWD2albt3VcfZHvRKTZQDlIK1fnPW1rguOCm1vY5YK6LqrD6RaTB EKLAtEundze3Ddhq6Y016cJ+KjJPs0vme0lk0uSv78P8GtRuKavuivxGqHqhHaNwdr7S K+z1rCV068v8cEtp5IKwIoAdBG/IjiwFWv1t9+E8Y/sO0u9fjGPLmonCehSRm2gkXMIg bGZXI7hWSO89rUsce560tIQE+HyswuJDHYQQ4QDM5trb/Vp3h7zCrAKhVU272t6z/Hhs FmgQ== 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=G0fWaB+M1cNpa7VgkDpagEfNZMjAO3uQU7Qwk9DBXc1KasLQ/VV5xJoFr6N4ftjxKE rnWxmMY1IVjpbeq1atMWog97tgYOzSipyUKNhFpvKU0Va1M/rRnr8qRprO64PJYuE/Ic D5RrKSZBBDVjUPhkIn1YJbgMRhzhr8EpJnWE0FfiHsNcjzEwBDqhFLd94l5aplpzKKWk v/nRiNgoF748513IBol7CZ+XO2YFRhh7yfWbzvVahfskvk5XlGc63Qh0ny8KRZr39LlQ uNi+r1Kfr6cXN6oobNIicwgmPSlduyktEC5Qt4gaeUg24eilnXj6ggBP46VU6GPRKk70 v/Dg== X-Gm-Message-State: AOAM530bwPiriJloQA//OUsYsC7wi2YQhKO7xhTVWkFd2IG3ciHBRrbn iZ8IvO2bv2cQS8Z7X3IkitHHQY/2cRg= X-Google-Smtp-Source: ABdhPJwQEyacHfYB81Ch5Pvu4bxG+dqGI3hVh/ob32JsG99r7gD0mfsxnNJG8VxFDf4J220rskqfDw== X-Received: by 2002:a05:6000:1103:: with SMTP id z3mr1512924wrw.312.1632695370068; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 28/40] target/openrisc: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:04 +0200 Message-Id: <20210926222716.1732932-29-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695372103100001 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 Thu May 16 03:47:12 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=1632695376; cv=none; d=zohomail.com; s=zohoarc; b=iFMvN5riAK7BgN2zzXLCTYiMnh8w0TmDPakLYJMkjEb+V9ehlZbcJDAUyQkZFHk1n8iBMPuth9gvzWTNx1bO8Vf3dGhRw4GaxU+TLk9y80bhtmJQeOOt6PuZbApVhfmvQLkCVVKRBw1DJmM0XnUDl1Z0+OKBKq5lKGMHGEmMrTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695376; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=DlldeLHYg7RGadXIA9934aRaE6ZPkWEFFZOXd2O6OmSnw8s519zmu10gBwqWubdOH3o5onZFgNNNQ6lhpVKQaE1lSXNyr3ckUIBggD2RnVFIoaWY8bcuCHFcIhhndHqD5v6QXd43s9xhxVHMu+MRc/TquivvsknQKWp56bIHiwI= 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 1632695376371935.5747486739664; Sun, 26 Sep 2021 15:29:36 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id i23so46579257wrb.2 for ; Sun, 26 Sep 2021 15:29: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 g13sm14346201wmh.20.2021.09.26.15.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=hCe0fCS4MOLhSwXTjcBRw4hAldZ1NJCy+uvUvygejf96gtPcF/y5JQ9D9WgCmg1u/K OWznFrolwmDnc/pTbOAuX3wxJGPUc8zgS3nx5kWkQ+2o3cVU+SbKbfReOADm3mXs1uTW REKInPjRrCmHM1i+NswEXMIst5aUVzqK8fnXyc0KcJSzkzzkIoq2rT1jaZtzdBQM06kH Sp8qL+QcNWIeoaJiClgQfW9DRhgQtIximReK1xdqkN6Ef6loHNzWyNdsiMjjBQpFtcSK EoG1ixUMlatT65yr41KndSMdrmL3KELZIxIteNmccZjIM2VZ/5pLM4ujGbi41zzKYgLp uS+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=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=riRgpsq3FyWi+RQP//FvcLBZzYInMjubZfzHUyZ7+OhINb7Xq4tZ+6sdeEPGE6ch5S ow58cbtbuEHJSQ22gun3d2GyrlYQVALnbhp4qLoxmOE5CjAbEkzsVm580KUHBKF/vY8y IrCBflT8KH/000Kb7FlIU7W9/6tX4k4/rMKwbs5Qwxb7M01bT8EZw/7eQdO/cudDKfV4 gGdek3ReNSiaTGuuAIkwfDZVvQYSB86ZBkzGFLO4kjiVkH/NNFbkUwI21i1JyLQ/yVT+ m/Gq779CCRFb7jHPC4hvmzedaIQoOckWVWv4bwgxnbXMCr3+ZsElu9/hIi/axk+Hkm8B l3CA== X-Gm-Message-State: AOAM533/PAk2wFf9CCXaAXTgNxFYTj+426Fgm948/W0tN9+RH7ZgKlIU 5HQibfWzBUifFD17mP3m3kg= X-Google-Smtp-Source: ABdhPJz/EK5OqLlhoi1NR9ti7v37hBrWrS44S4o/F652aagSMzpbUuyfWEFtemA3Kpk56nkow1zSGA== X-Received: by 2002:a1c:3b0a:: with SMTP id i10mr1495559wma.132.1632695374608; Sun, 26 Sep 2021 15:29:34 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 29/40] target/ppc: Introduce PowerPCCPUClass::has_work() Date: Mon, 27 Sep 2021 00:27:05 +0200 Message-Id: <20210926222716.1732932-30-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695378326100001 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 Thu May 16 03:47:12 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=1632695381; cv=none; d=zohomail.com; s=zohoarc; b=jglSiXhXjPJakvVJ+Snaw9ZMrud4DmycBQrr6K9DwjId08qtrI+ApDt5Rx96WOXoITXBNDFFphIseJC+CiWLgWxONHgLrKOqC494nrq8VP/fitzRxHNLS+OxONHv7imAXcmrheGtvCDWey5aaWB0EYndrF89b127hxn7ofTgQXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695381; 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=AVVikYIIaH3S+b3QBOHmVvg3tkLbDtuyLIEbA8QFBeDkUNAZPVhw7MiK8/XrwTRRsE47HlEHeyE3FseEhuFkcgsySGJIEB/IQ8XqMHq+NJDs2SnOhT3HR0prHHjkz/SupNEAUeLJ6FPRgTUkqubGKjbqe91dUAO+bNUcQ8s4Ogo= 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 1632695381059523.683923090353; Sun, 26 Sep 2021 15:29:41 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id t18so46553284wrb.0 for ; Sun, 26 Sep 2021 15:29: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 i67sm17804374wmi.41.2021.09.26.15.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=mfuxglTwVl3wdKRMuIJO4I78DUezkg6M3uPXeqTkxuxRfb94WBp+dAmYl6aDxIURhA vgJTsvUtJbHFofuQek8A8nNkib6GVU7fRY1+744e4PGNMHqpW8NXAtuDrxf4wag9fge+ 1XggKZqUFjBPF5tbvq2OTrv6fJhnivo75IjDRLePrkWgDxE8GYmzxjemVbPb0bk9LWKi waC7nwYjaoqlG2HsKuEow9KWtscqXDUaE3dN5VZ9AsVFxnGZWZAJGdNRMtuUjWDWaMbT Zr7+8pPZCTapzTeohBlMsPoTMct+qFZOSeVL4adAL8c+wf5AjoHy3z32lxpgR/bbj1RU 4jVA== 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=1BkGtaNdlDKRL1x6I68PUYUY7cTAHdPK80wjnedPUWqwseOlbg7HBzIiPwMhpJdM6+ VObMM4iNZnn9bAXIi6c4AYiLx/xJWH8Cy9r+B05AFd1DGlkbwtXJfty95OS8xF6OxQ64 6GS4iaOyAVLJcXMvNP/HLH30eQqp5qlDe1Vu2mvQkwVAnu1TYxIawLKATmfFz4BDjFPI pItOyDwlOziDa4NSJMSWCs5MRsGcodYKRpQRzA8LV2SYHIeC0fJr8GoQiuIHT9mqmhoI QWxdXPHsz3xmw4WK59dSBiKHDZBd6f7bC2qxODuWQEsrWpQ6UB+XanF/Xq//WHW3xkrr MlDA== X-Gm-Message-State: AOAM530d89e+X3QMV3q5tOqNOLbMYpTppyNrtswy8ff9oNyJkrzRgNK7 gKO+fV6nWDXj4SGc1PIv8qw= X-Google-Smtp-Source: ABdhPJzBxkT7vYlgeCCoK/XGsGDSVZHzeF1rII+1qjdptzU/TcSsdNM5ZELaukfq078VIhOakAy+lg== X-Received: by 2002:a1c:9d83:: with SMTP id g125mr8927118wme.45.1632695379251; Sun, 26 Sep 2021 15:29:39 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 30/40] target/ppc: Restrict has_work() handlers to sysemu and TCG Date: Mon, 27 Sep 2021 00:27:06 +0200 Message-Id: <20210926222716.1732932-31-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695382499100001 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 Thu May 16 03:47:12 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=1632695385; cv=none; d=zohomail.com; s=zohoarc; b=fk2v64G2fPOqi+og88O4WirUSMk59zQZ9KqDF6xTBv9mPpMs53kQtT3WIEO6qiAK1DzcVD3r+q1TcmAbsRV9Ju9WSJUN5YtsnePaCIC/ZRvoU6Qf49NiYh2NQFknVlAesl1GJWHK+jEgJUpJtLYFdrfZsc3nx5yWcODjE3liIKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695385; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=XhFWcjg+tyO05vlj/73qmKOkUkB7t35pKFBgEVvBoNfUQWCE1G1tXZ5B+IPusV7aama6273dtHn5VcYJ81DXqTVgjMpz4Cww799PK2JT4B8AzV/8OUO2wI+h0YIQ0NMwOQEUcyVYZ9RT1gilHFeq76it1F4U4yWqhW/T0PnRhsg= 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 1632695385736456.97500465539736; Sun, 26 Sep 2021 15:29:45 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id u18so46538167wrg.5 for ; Sun, 26 Sep 2021 15:29:45 -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 o12sm14276600wms.15.2021.09.26.15.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KfwVihGSy9lOGZEBuM9IdCHEDMq8ZD4Rne15ZYj/c70=; b=afeNVEQ6/xv8f96LyPIQNxPc4JquMWzJe+gKm30pdQyZDgucr4ZyS+o1h3KwcoL3OR 6o2rO04twhAImniaI6MubQ4dW1zYYR8rvwznfRf0sC6WKhGUUY9rWDXUHtqL6eAwnius 8SWjYksQ0SblM9QDx+Ht0sYpqHszxnOZXELQACQWrdZSmU9zkPL+ktLd8HOElOfkPlYJ 2j1FoSmK0jUB9uN//pqLqFAs7yXCQ/DbvzJBCqMXPhFa6WmlspSNOCQSLCY48/pMD/YJ H91wOU6e+mryYGSwqzgS6OnazJ57fNZ0yp+KtjraT/aTcrVxtr1qN4ymcMNENWJpTCSk QyuA== 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=0C37t4JwlvE/A4oT6v4TmvYyxzFaOs4rNdA3Bmv9HvUbNJOu1WIvdOqpvDLb9sA+rz dKzNNeZoQtZMHlbX4Ci9AbLrIOhfoYD95O/GGD8nFWgNpC1IVeZTUz41W37Bu5Q5TaAk 2ld2M9dQRdqhByAPZQp0w2ie37nZ7zCO6FkJ6Dm27Q+JQqhD9dDceBqdcLdLU9ewhqEE zw8yiw42a/41HJCfnFvMqQIi9c4g2HgxHlIst5BsN+8ziBrf3ZSqXqTE8B38sYTy/mD8 I6iU70sQPXVMUhSSrAszwigbUmnPZ0Z4z2qFm4vqDMSRqkW9ws2s8AeIQYGecfnsrrBM NHwQ== X-Gm-Message-State: AOAM531J/FJKNGnv799aoinH+hNEKBIWFUtVQMlu5g5t0W0Nn3az/1Zy tD1dc3GzAkqBnf1MUAkjF9I= X-Google-Smtp-Source: ABdhPJxWdmHzw3ThFvNEOG75CUKPNCriHiIdJNiEBbViGothiXzeZjBS6z1KY4ct+i4aMd4PY4omjg== X-Received: by 2002:adf:ded1:: with SMTP id i17mr24157375wrn.83.1632695383982; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 31/40] target/riscv: Restrict has_work() handler to sysemu and TCG Date: Mon, 27 Sep 2021 00:27:07 +0200 Message-Id: <20210926222716.1732932-32-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695386562100001 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 Thu May 16 03:47:12 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=1632695390; cv=none; d=zohomail.com; s=zohoarc; b=IWdg1p5kx7f9GNePJXB8J4C8yX9XBK9aPWm7R1Vt2tBy7okaCzeZF6m2NuXgurPTTCvpUiNgyEIecF6I6lAob8U+BVS1XMSWb6b+f7QkAl/G/EmOG/cy39U2nfp42G6D5eMSG2SgfZ/Ek2ONt7N/bra9JcAE4eWaNrHWQZdARcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695390; 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=iY39S+ISzpO0r6AaCPUORmPrWb1H1PmwBL/GfLFYo46HaaeDgkYN9cOmuLWoeNP4oVxlJAoS97MZWE7qgSJYi/dJ/u8VuQORSdvXMT4zMQKlXbJxxkeQcbfWWzTBjKu+Ks6jjk7t5ngJnML50e0Q3Jj8LvAxAcXw2iKegnA8WGw= 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 1632695390422469.846675484261; Sun, 26 Sep 2021 15:29:50 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id w29so46369840wra.8 for ; Sun, 26 Sep 2021 15:29: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 i18sm15033279wrn.64.2021.09.26.15.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o/vqGSMOnhzvKGrld2aIeHhcVaK006Y9gzP+FF74z+I=; b=XNd8MKI/q2Q4tkPh3KCDOt78/7GagcGlDD8vBUoFfiHY1/wBN5Y1H+0sP7j1m5pxta Aq3b98UYKmVPJxjj5ySPB/zOoHIk+xCZAaIfNdU7oFOuVMXU+6F0etpBoiCxdZ8xq2Up nsv9YK4e+4W7DyrShSWAQ0RpFxKZfyp5xl8F5iSyHfwp3imUL39HLhoTYQ8tDUznv5PH 7vkHHVKvGVh/64eNwhi8kcDi/Q5czXhYCTszgLsaMdBWGEm0zB+c3FZfuUDtIHT/NGx5 CB9d+FXh2xcnAAUhAonkRfo9uV3/0jeN0VRHw6uxTSom4NHaph51IEro2EK/HRvZtHdC OLiw== 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=QIFrnHGDAF2CjEX8aGU/VXdCwyscSSc3TQB26txZfP/YtvLaoYhtetPwoZiU6TP+27 Jc+TfzfhX2/hdETl/aXI+oHbv1vk9/at+a333YcAPji2IwBOYeeJtxk4wF7VdyT4nqLL pzFdB8Q1SHbN6zQi/30BUZ0AOaZ9CpTWlXSErgNCHxHtmGkCMV7SZvCKxUM71+XLrub+ O02qt0VQgTVLlt5VbPlXtI/XD8h+V43RI4VLZx7xQThUOVQAROC6IkcPkCrCD+zUCGiU zDvDNZSx4ZQtrpysEONeM80lA4/FJc0aRSNgtva9uuNY83LW3ca5EMwn/zJhdE+6lVM1 EN3w== X-Gm-Message-State: AOAM532ulvb68XYG23NA0O9Wp8joVmFpXnCYUk27qgdytfuw6xiVQlEt dudk4rOUp9g3q0j5L1Lampc= X-Google-Smtp-Source: ABdhPJxpeiqSvwN67DdkIiy/xz9sJwgULgG2GJU+8dS6U3Y/PoKWfKjSd58qKhvDex7kIZ8Mx/H8AQ== X-Received: by 2002:adf:a3c3:: with SMTP id m3mr24917528wrb.237.1632695388674; Sun, 26 Sep 2021 15:29:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 32/40] target/rx: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:08 +0200 Message-Id: <20210926222716.1732932-33-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695390684100001 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 Thu May 16 03:47:12 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=1632695395; cv=none; d=zohomail.com; s=zohoarc; b=ZOlIs0Sy1GfJoGZfoWVcUdZ+NwJe10IDnS24De5DVC9MmdpFyCy+yFwiZIbyKjAdeh5KFyTXYaoiddOofwhuSR/jWGuHSt+Dg+7szbf6EKA1et5XysFpy7Lj+qiuTXG4zRGkIIg0LoVWpuHt4HVEvlCqJbGPc4a1f5dS0HGqK9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695395; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZAYjmxiur5f+p7A1SrpNSihQLXDhLnmlUZZ8rIaewhE=; b=iwQ5ScNfTk5e30auNL4EmsZ83YemJ/eaqwHooXVPlZYPvqGi89TayXsleIe5dSvjh0+shPk0AVe1P3H3+R0Ieq+hsQBJoE/wpx8yHywrsCPUo76Ulid4yjgJV3WxQm0BpWehvYHj96viITJ7LJEL3OuiuT5mu6vmD/7i7Mo9T4c= 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 1632695395302835.2674366279539; Sun, 26 Sep 2021 15:29:55 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id g16so46525125wrb.3 for ; Sun, 26 Sep 2021 15:29: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 s13sm19176691wmc.47.2021.09.26.15.29.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZAYjmxiur5f+p7A1SrpNSihQLXDhLnmlUZZ8rIaewhE=; b=jsNC4UiFCCOc2HUh0HNgZLNrEdz6P4qvQ0mAeYBhC7vOUFqJtVT+ZKTq+ommX2Gv/Z 5bCDDmm/W/ucFF7C1BKLiJKJYczgi6VI9KO+R60U0U+Bt1Vo9WD1amFz//cX9Jy4evbH PB2cnijxH3uXrPKjysxYQxRExv0a8RO9HtOeUzvYtJzN6AFLs1lbMT9biUI1PdjvtWdN B1OesHs76zxglJyP8j+TBiJQRM/O6wlgQDo8xgQXp2NmtJeTQz2lto6KZR3aJP2L0dnH v34IaWFzVpn11AKhqRR5Fv4xhHCcHZycB8fQTggHlTV0Nk+dke7RFQguVYESDlSoyUp/ IqHA== 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=1eQugeFflc614IzLsgIbR0DHFByaLYOQNhBPwD3fvn3TyP+CwCeaicxFcT2+boJd97 oRQyzxwnrSrr/QV7yLFKC75jnjc5/nBhFk+yDMtbt/RqwSyXOfiewuuo+GgWPA1JpYyF bl+e7I2UR+15xxjQtzchxg89O9lY7G8kIjwwIjWFp/us71h3W+3KS4Dm/a0vx0aPhw2f /vVzNmdT1EAUUUddnr3SlU4PqYZ5K2Rk2jpmO1rNGBrQXGDCqIKrC1ZBZ501qAqxaoq3 i9GYJ5CN8pAW4KFWBLkSZf3cOZVXRt0X95miO1NpfV3xZADtm01uf5OtrwLmTYP+j84+ aUZQ== X-Gm-Message-State: AOAM532j3aa2tvjFT/r9Y6fCorso2dSui6T/vsHHziaD0CCmzJ+VsA1O JCr2wNyu2FvSBlF4kmx5+E/Qr5GlJ1A= X-Google-Smtp-Source: ABdhPJzbAkOWH+XnJWCqO/LwNB8D6EKgJcl2dCcLx9IwuEfNbvFMuIN9ekfL6d5CH0G8+h5/PTVYsQ== X-Received: by 2002:a05:6000:18ab:: with SMTP id b11mr24875417wri.131.1632695393269; Sun, 26 Sep 2021 15:29:53 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v8 33/40] target/s390x: Restrict has_work() handler to sysemu and TCG Date: Mon, 27 Sep 2021 00:27:09 +0200 Message-Id: <20210926222716.1732932-34-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695396752100001 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 Thu May 16 03:47:12 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=1632695399; cv=none; d=zohomail.com; s=zohoarc; b=YzRhtwA5tDa5eS1L+0wr8GnbGWEldcrtsmjpB2RrmVKhdBK7VgTZEfqndUDYhKE6gQTpdJDDQ1uBxxRgxLW/MeBy7UfB1GXu4VxwtZWDPIXkdnkTZgoPexRbksb+wHGS3KNuD/QyiI2s7mZrHQza9CZmv0c/6vv/+9nJFnzUSgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695399; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=B1x7XE52qh+nxwQRO3r58DY2LtjhQokD5GIn8b/anLHXCJGlIjgoak8rHNr7z8R1dXiwXVwKYFfutK66L1aUxp3KtQVA9dqRNK2YRMvbXMfk335Qa6E/tKzoqV8obX/0QtX7SHKLVU+ZJXqiDn8RkZpFF1SQav9VBehH47k/BS8= 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 1632695399479527.563275887186; Sun, 26 Sep 2021 15:29:59 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id r23so21144479wra.6 for ; Sun, 26 Sep 2021 15:29: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 s10sm15014717wrg.42.2021.09.26.15.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=W/2VdD7UIKsXYPYqkrcazc7rNbJ/mpLgoXLXUg+txlI9WFcz0fACNZAn9yB1/8Y6bB 6NpgGsj75/iqhtYvYbTDmx5S2K+MXR920Un9v/ybIc//vGmYpRrg2v2vDRT/hb0C4RMH XhzOawRYwTBbr4QJzwi0y/TJjtBa+U/AtVc2fLPxMwTL0CfnYP0A9gB68NPuaKRdZWbk JOMravckf+9qPzqGulWqE3SX8q+00u7mxnn/043Xv6GGNn39gj7WqtKMATvD/EROnDr0 LF8/WO8VG+dvxSxKX0Ep2i93CvB1hXPS5gONei3CQJoMZyBPPgGkO/Mv/TuWYYKiyvRn sBfg== 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=wvW7FqP5VM8ieEC14PZWHEK/C4QKJMkaPOZ/4+0YX6j/SfQYQGXrMCTsT3JAXNgP59 df8a9w6t1OQz3qH9EyN0+8MWlQKWbsQBYHHcN6jVrd2/i5QOqnWNL+AdEd0FZApZX+tt UeI9V4QrVdSQuarczJaBo5W+6V3ljneVBIWlMuwvO92heIzXoI3B0m31Xrx27npHR2Rv pJ7IIAFdYL6NLahZEONLzszdHUkfs9gDPtjPVuDlcz/8ze1g9SnY/gFNRvAQEe/lJ43X JvFTEdBt9zuAikPxqShFtGC2YgqWK/O5/LsS/wNKbyyeBVjlC3f0f6qIs8LV0/xLusUA hFWQ== X-Gm-Message-State: AOAM531+NplNAvEb9BP1rFwmZHwoL8EyjNFxPZJJdmfRkeIKToteOiHd 0UOtz4B/QXJyr92ZvmrXQFOBDhcw/fk= X-Google-Smtp-Source: ABdhPJxej5VdZSnQV2wrEXelcFYizHjQvmtFi1ae1nbeQOCwcYb+gp4a+cBrLXBRS7RM0pb+CH80bg== X-Received: by 2002:a5d:5142:: with SMTP id u2mr7800603wrt.180.1632695397676; Sun, 26 Sep 2021 15:29: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?= Subject: [PATCH v8 34/40] target/sh4: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:10 +0200 Message-Id: <20210926222716.1732932-35-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695400839100001 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 Thu May 16 03:47:12 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=1632695404; cv=none; d=zohomail.com; s=zohoarc; b=KzXrwr3jCvEV4IW7OHfbg68h479883zAM9js6VXwFMn03XFW4ZiPMtF9eMajBVaLbcbFIojmMdnoZoHTif5gBed+wGklPFf+28UaAj62ayUK6+CX4QlGXoKNBsnPZbitKZ/AVGcCNdZxL2qrQurf+34BsAMZvby0yXJdhKcKfxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695404; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=m/ORYbXDowbesalysc3nBuLKbGY5vZmFXl2uegPTs+7SsgutdtFqpmH3/wavii/P7tBfr3AJB1bHN2ZUEu42NsBAI2iXuET3azOonfwkpyFgGXAcL0waO/E0/t8YUKedvXgYCN2I3Y5SatEmKcyGPYmf0HAkxqPFap+p8vi4Efc= 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 1632695404046925.0451260051348; Sun, 26 Sep 2021 15:30:04 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id c21so16815318wrb.13 for ; Sun, 26 Sep 2021 15:30: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 u5sm15966577wrg.57.2021.09.26.15.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:30: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=LjvVczq8n5tzr9drSBRznUr4y3SH1knsfynMe8Ogfbw=; b=Plli2p4RgeCRhPsFN89Fs1h+89fzRWd8GEWmlE/eAvFyzN75Uh2lZEXjTp8c5bwVaL bXimWXCvfnrGi/pbLYoEXVB4bGpL32xIDTrTpqFOgqen5AUMtDzPVL9nlqflnlEkGi6F iHEYwOcgEmfw4myJxO4EOW8Yjiw9syeiloLKT16rgA1ctYa094b3+DPqKMPrMG72SysQ Yv5FtDZiCo70GPUS60sCpRKbOBE7NHQmFHCN4bWTJL0nzNYer+AG/3yF1ZbFfShFQh26 Nu9Fzm5G7w2U+Yk1YNnhUUgVeoMXeTZ7SqlIcsnRNy+ycfaI7BbGyoFvf0m0I2ioOMcP R53g== 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=3TXTPKblrHfzcDgMCY1G2+tu3rPY8UTghfoFfICdy63gAVFUiEJEIkmkXvGJY634qc NcTrx3H+eC/6Ez3A3TocKPCP3O/zSkb/TDLPUEna6n2x7BeKVXufYn1jBEN3Styvt5kx LyN2y1aKL6lzld01fvm8mwy+oCgdCbRvdEiJk8QdmH5KHltAxbkee/yHFX2g1MLp0lPx cMsH5R/B+7wjNrOlMHe/C/tTF8jd+CYcrkmsZvSzrfjobp7eImrY4IqLaob38L9KgPmS 5adDU8dYgcLtyLwAWJyrzRFw6UsRNYCAxRC/uerog0dXTxIBGz7KNB0vCovX7iiDN7pA cCgQ== X-Gm-Message-State: AOAM531CvLRNMiJY1TgnLXoE23100E8yKjed7CaKHPLUYsyR4E24xRUy MZHGhVGzysQBBEdpMZutmHg= X-Google-Smtp-Source: ABdhPJxK35w25ovSfVt4Px0Bb5inK2M68TKXZR/POoDgejvYEqnpHi1m+0dFrzGUx7nti8W3YW0mPg== X-Received: by 2002:adf:e646:: with SMTP id b6mr24465466wrn.153.1632695402245; Sun, 26 Sep 2021 15:30: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?= Subject: [PATCH v8 35/40] target/sparc: Remove pointless use of CONFIG_TCG definition Date: Mon, 27 Sep 2021 00:27:11 +0200 Message-Id: <20210926222716.1732932-36-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695405025100001 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 Reviewed-by: Mark Cave-Ayland --- 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 Thu May 16 03:47:12 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=1632695408; cv=none; d=zohomail.com; s=zohoarc; b=aSZ/eQaZMTHZA6P6dJcMz0P1fq9kpL9Xw/AjxPGsKSmHuEG/MUnXKJ79NIN5Tk6fWE0bBSh2/UJ40/HrMp2kNF0eN8y2FiZbOBuJzsu6mtCe99MBBftzS3RXHor/Pn/sGWB3iY7LTe2aOON8vU/QtWlak2DrsOwVjLlYjmjYmbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695408; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=LkR/3asVk7Hi7pAMfWuT3R9il0j9J5Gjy0dtgQN+8EAoXc4Ho0ELDc+eVUQbFCHP405nlKkSsDih2v2qeMi3dUQRYbPHdhKXDac8rdZpVoRVTu+fYbeSBAc12L9CO8etEloCIT3RP7TbMcfe/80MOtxnos8kBJ177Khx+2sze1s= 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 1632695408742924.7232716413237; Sun, 26 Sep 2021 15:30:08 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id u18so46539940wrg.5 for ; Sun, 26 Sep 2021 15:30: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 o17sm11538359wrs.25.2021.09.26.15.30.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:30: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=7nxEt9EN1rfUcFm1gYLqiVpIjc8wwfbzfO8vsuUKuDU=; b=pMi81WMXuOJ3c0XLut1jrtULIRFuuA1n7UZn6OTU67Y/mqd94OA646JhXy8/Hkknvb SFOBui1hd4GFWkMGYVQVIadS208DrKaDoFood/usqkwVLuy3iMG8DdsrbodsDmVVT4hN BE+YNiHIf66rm3Ii81/+mgUTuB+3IJY8kIBdQaFldJJJtyX5YSt4fYEaQdnmKzYmyuzv n1TwtuyRXeTW3IPlPeoJOe90TVl5K9i7KrHlmyl2uIwsdKx0oz5uUXbdG2/GQWYkqoK8 GZ8hpX427Em0lklqf/EACVnTAPP96rwMMdEBj4oOcwLHyjbWbrEkjEBrwuRDjvERk1uy m5nQ== 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=7oFGorUL3aRBwYtg/XMgY5QzGjF5iDqIui4pLkmMtjbXAc7q2Xa6jeA+JRgG4NtIpq BtgihiUzEFa1xUneDfd+wLO4BmZO/y74MT8Is4UaBYJvp1yLtOP9FANgV5jn9BbgPe0T 3cdLVbxyG4qSQRBJAohltBQdL21OTkRrORIx8TIluL61pwIXjmJODSY1boDe3OjY36b+ j85FT6LSQ0CtK+4+p53PFu9UpvHyQSIYRadKL+UMRW64Q3DLJ5iy4oRDEohPPudxnxp0 UtuFUS17TgIym0mZf4uk5uQc0PNswy/bNsrwG+2MW+UvAaEiZXevtF9S0D+a+R/uYuMI eA0Q== X-Gm-Message-State: AOAM531iTbqIbvJIbNJlJGEJriYPAzS+uLEQKwuHi5GESC1Pu/DL9Cv6 BTLDEsn0wwVZ/RzDWx4xYszsGFrABrw= X-Google-Smtp-Source: ABdhPJzHlRzczQIktgVmo/fNCX8UBVOM1527eKH1eyvjPtRTcl+15duLXSt2f3gA+qSqhiBfssSRaQ== X-Received: by 2002:adf:eb12:: with SMTP id s18mr1156680wrn.97.1632695407044; Sun, 26 Sep 2021 15:30: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?= Subject: [PATCH v8 36/40] target/sparc: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:12 +0200 Message-Id: <20210926222716.1732932-37-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695409500100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Mark Cave-Ayland --- 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 Thu May 16 03:47:12 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=1632695413; cv=none; d=zohomail.com; s=zohoarc; b=LoM5V2b1CCaTa87gePP+P76Z44HW1r7BwjECN7M0HpCj9YAPKte+HvKdAvIjtF7ERc325XomYEOdiG5ZG97MtA5ANz3Thd1Ju970XGRfxZbQeODwwHdmE2T7o2HBv7FxhIFs858ApuUoH8RzNMvOB+O0viWgf2/I5SlLWM5rFm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1gsdxrxIkLL008ui7WH6lPMx1hd/4ygkSIHUg3uTtLo=; b=bZqCp9FRTCV3ls0IC2ChuWKL4/PmA6oHB+UTM7DicksYrJPP18IicZenJ8bFAd5mc4q4TbXup7UiGtgJXoGUUFC7KeCNd5zCOGHxBebzMyRS5Eh60AvfTWhguKlnbjBG55het7c+qjwzFKijW58GTzAUpJD6Xj2fG9Gje9vXnhg= 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 1632695413727493.14531358729505; Sun, 26 Sep 2021 15:30:13 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id i23so46582250wrb.2 for ; Sun, 26 Sep 2021 15:30: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 b11sm8345335wmb.27.2021.09.26.15.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:30: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=1gsdxrxIkLL008ui7WH6lPMx1hd/4ygkSIHUg3uTtLo=; b=PpjUmsuZA+KYcyopDCxf73aGZ1pXnkPG7BtLPRmyG7WNbe5M9hIDP6d2qoECu8wrQo D5LBKtDl0euZIeCBi9f3G7UeyhIzbUUS0QJU33xmpnr+EaI3noqRwJ9WS4otst5/R9h+ GKQ99dZJWhzq+XZfn3l/sNA1M82/Qs6kMq710sJVLEWPP4c6TqapJYHUMaODaHnxWkIE JMeMh5Jg4hCbW+sLx7i1++DiknYuLKGRp1SlF94nrrAfodNg6d3svw3w7SxdFTJffaLh xq3FFhgbDVKyYnT5lZg1HVL8f9BTNowE8l1uvhlxh224SWwLl9tfIhu/PC0XgqtlrCmS bgTg== 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=jXvqLhsFBXQgFurOpaSoodD61Yz+n1DG+KAl2rTOQWxi5t+RCexyoTwg/WhqdWrJAH vUlm3/baCdHXYufWRuhjfA1uJyIuJlfeBj+xbyY3q+ZbbFxeH+0XhEZqTCHX/GYgn8bL weESsT2vD0U2C/2WbEN8JwlquNc3G97RR8NM2IfjfP2Kgyy+ooha3k0oZ0z9PNZ6dSfM JA643CDKU2Uz1T3tr9YfkkiS7LVCxHK062cDJtdzkBDY+Vgf09axjxv+y+mMF9e6P2AO 3pBWLDmH7wOvovLIKK9TVQzLsvQg7n0RmbEUiXlULfOHr0MNIQ5sTA0uumG6Kxk0FSeQ G37g== X-Gm-Message-State: AOAM530noqJU/vRRdukm/l/3smICJ6D5jj0Cs8UiU0wsY8nKjelPkJGT f0F+8hHXZDT8W6XUbjMHaCw= X-Google-Smtp-Source: ABdhPJzSoiVhoETIUZjTn+HRPlmlsO5sQXjJhJz0SSvcLI654NXR9Jt6xwjYKO/r9o9vIU17JZmx6w== X-Received: by 2002:a05:600c:40c4:: with SMTP id m4mr12658825wmh.100.1632695411857; Sun, 26 Sep 2021 15:30: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?= Subject: [PATCH v8 37/40] target/tricore: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:13 +0200 Message-Id: <20210926222716.1732932-38-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695413958100001 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 Thu May 16 03:47:12 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=1632695418; cv=none; d=zohomail.com; s=zohoarc; b=JZxmiwkWW4cThGF4SioRujaHVL9ihzdLNDyroKZ7n8fKH4BPmUknpR2fuRMtEScCoyGkpzUah1ZmzrwGoE2by72NNZIHv2pZhto/QCBEgLw2u9zYC6xO5caSPUfSXAfoi9j8JCRpgDFfkrIWTNKthgNNko75OXzqZHiKg6zvlD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695418; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=CUsb4cw/Ose8LXiimJfvSFKcMfCRzQeQF0tqxWwsSbuq7FipvjivG4rOkiCNuTveifFfisgcmpipGzcgWIRO/18aF+9vqRlYtsIxuknipJ5HiiI08/LbgECWPFMuiZrOeXt1B3vfFbr5cgONlF3YVoo/OwzQYcdhCEfmlV98eN8= 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 1632695418543769.7365901487773; Sun, 26 Sep 2021 15:30:18 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id i23so46582677wrb.2 for ; Sun, 26 Sep 2021 15:30:18 -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 i2sm377577wmo.14.2021.09.26.15.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=ev721cXxgLolbweNdRqxTm2+gWhZ3yh6MzUBsKacYgWM50dN3tYHjXAFDUZDC727yE oJ77JYxgjU4DFqSBwV1u/KUl2EHg0fK0dcAVXpsPdxsDrzfqppwMMa89h6QBqS3If6Qy 7f6VokE1vUPc5gznJ8FYBzemHd4WkJy+zFifLU8Qsgjx9HsgQpzPdC5Y8TexwFwE6DZk B+ICXKS6RkRMS2ZPi/rEVRB2CTZiXSMc9ZzUIhxxQkiNDLREZ91fKK8ByZewVSoCMu7z Yqt/Rewq7vRjv2R0J9pZKOr+JrbOdo1+Ho4bbGIN9z8n0wF/PT9qXvVIUtjibz88+iyE dSWg== 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=juvUD5kOtkoCSWTHEDBouMBCiyMxLqQrj5wJAgcbOU25JTs5enm8+hlqrcWTcO8GsN SlqQ6J7YF5vi/Ru7R2dq1SBkoKysWZovqSiVxivMjmnsI0YNCdcG46mMdCrrhPz4xueo GEHWAeVi1Z0M7LvCF5sXVldVECLRWz5JwnJK/3WGc5YIm47fKxkVl9TM8wpg9dj8HkD5 Ew0/tfAUOJ9smtvsB2rR38WWSAkm35873RC08ZzG7+IZ8F7b5PzdtWpkAsU8CjGI3iYD 6THM5Yo1Bq5qCU3jwaSZwUak8eMmb0lIHgeivAyFQ2Y+EzkLrdNLbiu+4FYj5VVdUwRR uCKA== X-Gm-Message-State: AOAM531EDd1SkS9lE7GMPk2P2CrrXNkOzrM0Oe+5eeKp/ZaXqL3I5/HY Pi1AwILncnsdGhMyOcjPmdo= X-Google-Smtp-Source: ABdhPJyJ38w+VyaXiFQDbfOFpqzZ57HdmWtL+KR/j5RVZnUkREDAf6h7Gbbv1hDw4kLFo9Ty5g7/SQ== X-Received: by 2002:adf:f208:: with SMTP id p8mr24048662wro.379.1632695416775; Sun, 26 Sep 2021 15:30: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?= Subject: [PATCH v8 38/40] target/xtensa: Restrict has_work() handler to sysemu Date: Mon, 27 Sep 2021 00:27:14 +0200 Message-Id: <20210926222716.1732932-39-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695420517100001 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 Thu May 16 03:47:12 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=1632695423; cv=none; d=zohomail.com; s=zohoarc; b=R3BmaoAOtfyenGCe0vxmt0XXGhTcpoHuMgYfonjOnBVKEVb2GZa6/iQITNJA5S3J1MrX0MzVniPBgvdS6h06l8KSSVHuv8X/llhUX0MNb2fMrlxO2Fmmw+9AagMI+IYaVQg5O+dJ6KyOQ9evoxvOcscwJDbWpRliOAUVFsA5nyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695423; 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=LjD8zs7ZZiyL5FcoVqXCZMVhVBnNRZfXoTP8NFeKyQfHfQdkFhwtm8YIoRB3fIR0WWbrvqlono18U5c6Digvdp42c1IW2ewVnPobhxZItCxA9pIhfMU6eE09AZ2iYg9BYdyn232RMMkCJevismxa3H5UnCYbiRUXgcdRDMuOGn4= 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 1632695423003483.26111264030203; Sun, 26 Sep 2021 15:30:23 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id r23so21146503wra.6 for ; Sun, 26 Sep 2021 15:30: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 v17sm14525662wrr.69.2021.09.26.15.30.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:30: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=p+FhEVuxYvtBhbZfLgBuFMc/Z1Zw1Ec9d9CUDDVANlA=; b=DA1VubHwWduJoSwatuYzAl+vDf2LeRJU18jwlvUHUbi8s091WbGbU36cpcOTwaixe4 KuhXs2ZK+cS6MuzsW/eZUyKthgajldpt22XcUhJbnn/vZAM7xK7aeKS9EtvZ6SeWzBvC IShYGK963szVPJS/BCuVcksx8QIg1EA0h46dMLdb1qdJ9NkgIrjGaH0tJrdBw2f18pGA PHvIxHMhfDVBmt+YlHj0oSPjCc24r0DATvNaqBX4DfZBT/dyb8gYb3MaCErG8oFa8QVw OpjV4auRajZjoSq7G46WiZ5axmMdLdg55E+tVBR+OxhpJqLo9tzHde06/mkXKSzyNlcH XSvA== 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=oSr1El+PCnfDNybDCZUTFWpx8sNTso4BvRzcmt+NSh6ipFLptNSKRIgISnjbCGVDWG XzmTHDAR94PdQHvvqZBuxXd7ZWcLPlCyGx4G5IO/FPn6KxzGEwQfH2hJ4kCzLCfp43Su 6YMw/SOk8Mr7+hRPn3iq8gFvKy3Mrf9XESYLRn5Erg1s5iihgBL0qDtgbJ4zXvWsPrJa ofs43hV1PfVuGmfQRvwAUKaBqYu/OemVcqMKRS1yedUIIq8lW4QJBx/x7iM6XdYOMxHh mN4244OVAofhkWMF1dkVSPT70Clnzkg6JsXRCwdXm/8fOuHKeUQzu+EevhczzJbqM/Gb sJDg== X-Gm-Message-State: AOAM531Fpj2lYuTmovSqgFBtEXNYxNQ9WRH1PvMeWy/W6iEFQTm8F2V7 AGH3q/hBuXfIMhn9V0lnTHRh0RoANII= X-Google-Smtp-Source: ABdhPJxn9+kIMyYEnwJy5Vir0YeesvqCj/gWyyw5X7h0ork5oY26Q/yM2W7ekViVqEYpvdbTVr7DDQ== X-Received: by 2002:a7b:cbce:: with SMTP id n14mr13047789wmi.169.1632695421297; Sun, 26 Sep 2021 15:30: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?= Subject: [PATCH v8 39/40] accel/tcg: Remove CPUClass::has_work() Date: Mon, 27 Sep 2021 00:27:15 +0200 Message-Id: <20210926222716.1732932-40-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695424701100001 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 Thu May 16 03:47:12 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=1632695427; cv=none; d=zohomail.com; s=zohoarc; b=kTJ8a9PU5VmMy9tMh90xAzQMEFyVyr+XRZoIo3VT9uevLeu5dCyMviLKtoU20R43DTCyVDr+LD0EexHyP9EvK5Gi+YDrnFkUk5H8eg9EExz18erpTqJDA1ZPjeuCYGqqwvw7ylSmF801663awecmJTA7WLt/u8dCgncWvyBvw3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632695427; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L6ntqmXS7ifceLSpB74XEWOrQdhQXzlIYsRxqC94HM4=; b=CdCXJzWG+jmcvfloHdWVEd9lx0DNvOA0BHIEAU/R58Kq3yHReghJ1HhIaAxcgejN+Oa4jVldCh7YMLdI5eW3s1gNp02Cnd14AoE7EA0vBiaAMwmRDxl0N3XdQYy7a2ZtK1dN26fLjcoTEhYjAhTMs7HwrVzilIp+VUuFNAYkCXE= 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 1632695427746237.11423236230053; Sun, 26 Sep 2021 15:30:27 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id v17so3087296wrv.9 for ; Sun, 26 Sep 2021 15:30: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 u5sm15967283wrg.57.2021.09.26.15.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Sep 2021 15:30: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=L6ntqmXS7ifceLSpB74XEWOrQdhQXzlIYsRxqC94HM4=; b=UB1ZuHAEDwCOnYBJMXx5GsGLkCbYLg49aVp58+G3pqAKA2esQVSRgnBAvUuIb0+pkG fuLqDQB+qJRgmasVjKmx5cGyxqQvy+qGoA59A+9v1hvvPseTabM3pcDohu2RFE1zNDSo ysAa1NQyN1RxOADyBCWho5XegOTCuFxCxQkCufYJf6+3NdUpGpxSlNbFhJ5JaGt/zF3P G0zxbhh1/XIkXIbs/CIdH9FxAlt6M+YG5yU3w4QJu4gLOXLnEtQnJIQpQ7m6jV55urQc NqyqZNN1vDgpBywnj52pxlxz7h53LBQkspnzYVtu83OP6oB0+VC3GG+1++g8f5lO46zf ixgw== 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=OWK5DoYjBTZyDbE4e4TUTJG1Lb2Yfymwz6+vcFqEtf5VWymK016GB5cvgZX+v9k6t5 hi3zDbitZq6MBFBSuLz40pU2RrbTOagvu3hCHmECQw01vu9VU1eIoMhI1uRA9TWehG/R MaRiPKb1fRAzcXBFJWawWVoLO85j3G3B9t6cYwmYdHo3Dx+2kz2VYuyWPi1LZhuN62V/ boxrbWzlDg8hu2sNae/QV1IsHRHRGvM8SPXO2TSi5e7Q1Qg+nC/xoTzwjt4xO84LpdHj SO1oujU9cDlpxXeIPkHwB5o8I3QHIgxLB5z9MprR0adDNR42Q19LQDYAfcg4QatXhgVL SOmw== X-Gm-Message-State: AOAM532SboUKD5ZnryKM+uJgpp+ivAlVxcPhkJVXOMU3nzVdX53jG86i sP3KmKchtwQ+BmqexkboTHAaAmRNoQY= X-Google-Smtp-Source: ABdhPJwuprpBjTMgomoIinkBrGSQGzDEbyHdGIoi7a5I0stqV299IOSKI3PP7LgwVgKwg1yuAqmvrA== X-Received: by 2002:a05:600c:b47:: with SMTP id k7mr12796837wmr.103.1632695425998; Sun, 26 Sep 2021 15:30:25 -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 v8 40/40] accel/tcg: Simplify tcg_cpu_has_work() Date: Mon, 27 Sep 2021 00:27:16 +0200 Message-Id: <20210926222716.1732932-41-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210926222716.1732932-1-f4bug@amsat.org> References: <20210926222716.1732932-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: 1632695428806100001 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