From nobody Mon Feb 9 09:35:16 2026 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=1632174295; cv=none; d=zohomail.com; s=zohoarc; b=BKBJIWIq3rU8TO97h3h22dlwLqX8H0Ry2UhEh9dfgI0UdtYKLfjqVKBdfBM2p3BQX2F9EmuWEjrtLLp468lHGBLxGO9mZTI4/Cydj/TODv5cxwIX26lhg5Vd3x6IFyOaqR5aph9audqf3vDjWprBAHuPkvfngsuTk2nNBmEsA7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174295; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ivfGIZqZ1ZvPdpMYGTfuFnTfxbUSRyPHF1Kx1zahwoM=; b=GOdQMjS+4ODOmofnZA5mMnrcnBxwhjX2JJpC3zmzWEYvD7yuZSb5tPIXWjBXTuZVmM3brUEDgfWZ/Ep940dfvYNwwzO6D6+u7wOQFxEY5bJDMkbqoL1xLMlEl9uP0gPSVAP9mcxw3BlK9odkEUsXgXyHw/xaSWDTGekWXnAgiMA= 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 1632174295912490.9412702495208; Mon, 20 Sep 2021 14:44:55 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id t7so311651wrw.13 for ; Mon, 20 Sep 2021 14:44:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id f19sm702529wmf.11.2021.09.20.14.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:44:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ivfGIZqZ1ZvPdpMYGTfuFnTfxbUSRyPHF1Kx1zahwoM=; b=OhCXDllVisL8GEsZVg/cYtStDQhvJvLUwRW8key5hWsaTk4cziSUBJzI06Bj4DKXBw m2fGoi3T/1d1RK982fqbM0ItMm2m+KyTIrwZuOKGSI/os1aR2wX2hV53lTVekmqNym9k tBG1tGyBOnodIohE9pKmMuYJRJdvwsRwFJ+/KHRefnvkN7M0cEuBaK3wi/RLvjUV5cPO pM3ZfTK7A7TLpfE2wTRDBfqrY6cBiVbc0ziNXXM+9AhFMe7GV6bRXWjqnqzEDK2miP/9 plbBjV9psXLfzt7k+WDr6RbEZtWRe9+z+HU/Uu7bWVreL2oJIg825avUB8Vfk4pb6ej2 8OJg== 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=ivfGIZqZ1ZvPdpMYGTfuFnTfxbUSRyPHF1Kx1zahwoM=; b=GQuS+JMtuCRnq2A+4NloxXZTLDeLPgOfdZRtyFOODbZ7ww6RaqfA+eAkqmF68tMCnq zkzbqX8kPkzfYtAk7oh59zD+8lDrRQ7NUUesTnvHsKy1NfIm95gE10FjATGrMSQY70zs 9mbal9frATGGOeN+nlhccesQ/cWufqt8uO0uHaUUtyRUO5AEsqGpXkPhSjq4v2oXaJS1 ml6W7wQznO7J5Bo8rTWdF/Yiom74AhLjTe1l20SdWEEPau/zmgI46MKcTqi9HNcrANw2 mvF7u4Zk5w2xYDK514usYv173LG0vZLmQTHxxqif2wg2up4wPm7khbjYUHn2f7KOZe6I Epww== X-Gm-Message-State: AOAM5306n15gtVZIrrgCHocwqxE0e2y4EQ3+kdv84JKhJSiXg/n7CkHd 2aeR/4q1WaUb2QWdehmogm8= X-Google-Smtp-Source: ABdhPJyPTzthXAmn2GXZhy03qHrJ3/gKBZwQz8KH3OfAB19h9df2YhVDnlo0fSDzknnwCbguAv/60A== X-Received: by 2002:a05:600c:3790:: with SMTP id o16mr1087348wmr.157.1632174294094; Mon, 20 Sep 2021 14:44:54 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , Michael Davidsaver Subject: [PATCH v5 01/31] target/arm: Implement arm_v7m_cpu_has_work() Date: Mon, 20 Sep 2021 23:44:17 +0200 Message-Id: <20210920214447.2998623-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174297166100001 Implement SysemuCPUOps::has_work() handler for the ARM v7M CPU. See the comments added in commit 7ecdaa4a963 ("armv7m: Fix condition check for taking exceptions") which eventually forgot to implement this has_work() handler: * ARMv7-M interrupt masking works differently than -A or -R. * There is no FIQ/IRQ distinction. The NVIC signal any pending interrupt by raising ARM_CPU_IRQ (see commit 56b7c66f498: "armv7m: QOMify the armv7m container") which ends setting the CPU_INTERRUPT_HARD bit in interrupt_request. Thus arm_v7m_cpu_has_work() implementation is thus quite trivial, we simply need to check for this bit. Cc: Peter Maydell Cc: Michael Davidsaver Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/cpu_tcg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 0d5adccf1a7..da348938407 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -23,6 +23,11 @@ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) =20 #if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG) +static bool arm_v7m_cpu_has_work(CPUState *cs) +{ + return cs->interrupt_request & CPU_INTERRUPT_HARD; +} + static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc =3D CPU_GET_CLASS(cs); @@ -920,6 +925,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_v7m_cpu_has_work; cc->tcg_ops =3D &arm_v7m_tcg_ops; #endif /* CONFIG_TCG */ =20 --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174300; cv=none; d=zohomail.com; s=zohoarc; b=HWROUCrXXce+wzUX8kdRB627xsgtdYrvpkE3xttjdnY0P8nOxJRJagS0m5sIc91M+vAORtC9/1Y9muyBlxArlLDvSY3WaV1eNHVY7mUzu15CMSoDrxnx2BnQaAJ9Y0KQqUUHTqzCKZzD0n4kScJeNc7XjFaIUO9xMerBEIY/eG4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v/6Xo0TImgBm2K/shdcIyB243lN4oaXhrr/liWYNm+w=; b=J5ThPM6CSfykyW5V8FGZlpctvxO0ynFb32YMlIFlTtjKV8BnE/rfMXJAphg/K52hMRqnQqfWkwOpscyOaWbLoOyoRCvzE4P7xXOe5YJJaXH7BnVr6EA887UBc1Zx1d8/IOX7jYseFmU/feXAzvKIbIROCSvMYgM2LWBb87xujlw= 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 163217430029543.480616875505234; Mon, 20 Sep 2021 14:45:00 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id u18so31831668wrg.5 for ; Mon, 20 Sep 2021 14:44:59 -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 g131sm659592wme.22.2021.09.20.14.44.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:44:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v/6Xo0TImgBm2K/shdcIyB243lN4oaXhrr/liWYNm+w=; b=iyIiBpXaiDOtuVE5r/K3BHMNp+WKn6HJY/7/DoxzRV/dtmPN3DpKEiTIx2qTxrF18l wYndNYEJi6YyasCDTE7Xu45G9njLGisYV7HLeEKvc8J5LkWHEq+XKji+4VfDORWlCNCq 3DsUMR5YdZ769DP83Z3UCPvDP/mbBanSn5x4OoMEsWmQPb5zPchZqfep/9nfhfzJcFho btnnN089KttGxtEtb9buuCk+U0BSuBN9Xqw0J4HoNCyf+oib4w2jSCp5XeQJcFr96sA3 SIUpADWu+y3N1cA66UFpw3h6436On0HszQrzcUcm8SwO23jP7V187EuuUI54BWe6mGZj Ecww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=v/6Xo0TImgBm2K/shdcIyB243lN4oaXhrr/liWYNm+w=; b=nF4mPxaFuODc0c8yGQb2S8FJ6ZDu1W+8T4fCeuWSXUw8QA6Sf+t/yJomrizFmuiK2P lQY3QwqZPFiy5eYag0SqTl4dQ3CrtMDkSM3CqT0qwSYF+j4LgSkNr1mU8q6lbA0xg1C6 RiCcWFiE8uUdKVk+ie90HvVC+mkSF9zk6dHaNDQayudpj89Tai1hSqFjhn0IfdC4Urzo bLfeOx082nPxv4Pa7VGpQOBIRFvOJTJbmEBVyf1dDdgiRZT4bjET6DtPXa0jGIMrsHNx ubmxR2XnMxXLMjZTVUcraViVoMVZ+cZvkCKbYZh+2veAkDytmT4TOQNGKM5V+QU/DdP0 Z8nQ== X-Gm-Message-State: AOAM5333OwEVIhq8Wm6TM+j/f65AFgCutwJE1tC1o9VrrdqECfWwtMfv w4smM+C6yjo9EKRt+vQNCUY= X-Google-Smtp-Source: ABdhPJx7QboejQArc3/bdNfXSm2K8eVuMBb1inDD6MguUTeVbEvyJZ1q26RbGJKVHz+41wiDoxaQdw== X-Received: by 2002:a7b:c104:: with SMTP id w4mr1128402wmi.160.1632174298541; Mon, 20 Sep 2021 14:44:58 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 02/31] accel/tcg: Restrict cpu_handle_halt() to sysemu Date: Mon, 20 Sep 2021 23:44:18 +0200 Message-Id: <20210920214447.2998623-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174301460100001 Commit 372579427a5 ("tcg: enable thread-per-vCPU") added the following comment describing EXCP_HALTED in qemu_tcg_cpu_thread_fn(): case EXCP_HALTED: /* during start-up the vCPU is reset and the thread is * kicked several times. If we don't ensure we go back * to sleep in the halted state we won't cleanly * start-up when the vCPU is enabled. * * cpu->halted should ensure we sleep in wait_io_event */ g_assert(cpu->halted); break; qemu_wait_io_event() is sysemu-specific, so we can restrict the cpu_handle_halt() call in cpu_exec() to system emulation. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/tcg/cpu-exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 75dbc1e4e33..5fd1ed34222 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -588,8 +588,9 @@ static inline void tb_add_jump(TranslationBlock *tb, in= t n, =20 static inline bool cpu_handle_halt(CPUState *cpu) { +#ifndef CONFIG_USER_ONLY if (cpu->halted) { -#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY) +#if defined(TARGET_I386) if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { X86CPU *x86_cpu =3D X86_CPU(cpu); qemu_mutex_lock_iothread(); @@ -597,13 +598,14 @@ static inline bool cpu_handle_halt(CPUState *cpu) cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL); qemu_mutex_unlock_iothread(); } -#endif +#endif /* TARGET_I386 */ if (!cpu_has_work(cpu)) { return true; } =20 cpu->halted =3D 0; } +#endif /* !CONFIG_USER_ONLY */ =20 return false; } --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174304; cv=none; d=zohomail.com; s=zohoarc; b=ZdDDj2Fc6zpQslJX51NddSAYWr+N2s/aRH6jiTrtXJVyrjWNobjXWw6xr37DQLDReGyXx/IswYFsQ3Ifj+PJCGPWX4UEXCIh2CslcBQm0y3/g91EIGp7Np1Rs/MoGmFE94bUjQEQ9/eFIBzowGX5dFVw5dbmgepGw0t0LlDmnzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174304; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=gC0BtGuK1VeaUnjeqjRO+kpNblXX8m5UXXJuu84RMTz6uRnmSuITWoSJhO3VECzM+Ap/iZ3RSm0iJ1/OoRMJLTBHRBMvZtkDI581d0Jh4OTHacxFHgad8c9eZfj04PZsSsnbozEWpW9dLzHzBoRDMOK58G+k7GkOVMNM5xp9geo= 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 1632174304791585.1891457104427; Mon, 20 Sep 2021 14:45:04 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id i23so33592337wrb.2 for ; Mon, 20 Sep 2021 14:45:04 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id q126sm657539wma.10.2021.09.20.14.45.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tcpBP/9O11lxH2OkY3DQ1OAE3IFU4nJ2jfhNdgzdGjo=; b=KNqaiPJJG7+8+0l9g/i8xd7y5CGN1e7IVj1XOui33LadYMx2Z8YehyaRKhXD5digSn tl3Q7iNGMk9aAmX69HGPDQiqk77kZIULOi5KiaB7HbE3HQ73MzjTWoYs37ONzjANdc9W 6q21G1DIFF9i+YGQqKt14lYzth4J+s8pnDyYK3xIq2ZWLn68FXRCtT3+HwMKtTmJPUdQ +cBVoaHUPqqHWx63F2wM2EcvDVz8k6ArZHxbNruyl+bFVUqng0kJkLqb/FNxma0/rdd6 0H2oYKnwtN4nhltlyN2ZQtWqeNm/9jUJJ6FkV5mzwmh+a8WraVr/LwalgnH+E8oFRnqy FlkA== 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=2rJo7YNkSkeCYPoYfzjfcpA8RVyRqw5ND18OnvGh2CV24D4ClIzuG1dQjQtwNjEk98 vR8nUfOS/lHcCJw/0/VakVJsE99gc7lKJcagE8Fx2DfLv2hVmwN4TRX+dp3AWDTjJCHn yQmZqGVoL4pDk3i3ksQQJ419cKqDxGEmmWUjGU16sy412il2U+CLFYzGXrOBQuETV10m hiKDy2gHP1iDxKLlx4irBsO6GRurLpRUeIz1NMSWK9pyEKAxxLSYRiehP1dUnyLO2uiN IgwOtl3H8Cj9A1+tazW/xx+QxqcYf2tHQ4Z3ULlWWg4yoQInYQeLx20LG7gMl4gzKZl6 AVUQ== X-Gm-Message-State: AOAM5321fQUhyS8TAf1btqSNqpp2yemyzUuKvwyz6s4DsIRZGgwZ8uAZ xiz9Xv6IEiFLa1u4XOYg1EdBeEpHM0I= X-Google-Smtp-Source: ABdhPJy61JGIBHdffCz52LmMSIW9jUKu7fnf0C0ppuOp9o6+JyYGfGk2UuP4emp/jz5ltlCzDpefHw== X-Received: by 2002:a05:600c:4e86:: with SMTP id f6mr1104874wmq.166.1632174303059; Mon, 20 Sep 2021 14:45:03 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 03/31] hw/core: Restrict cpu_has_work() to sysemu Date: Mon, 20 Sep 2021 23:44:19 +0200 Message-Id: <20210920214447.2998623-4-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174305792100001 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 Mon Feb 9 09:35:16 2026 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=1632174309; cv=none; d=zohomail.com; s=zohoarc; b=EDaAqkBI+uJawZLmnfqYshKp964RaeUcI9fwtvvOft3dg0HQBwx1X5K640KR5waSC1jOmhaH8K340tw03H0PlyPM7Ku5D0KOFb3GsQwkaumi0YITOu2EMbIOnOAxJEp4319BM20wfxx7TTi67TrYS8/GJh+UgGCAnIa9oYciOvg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174309; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vx2dmg3HFxd0D29HGrTm+o8SOv+3wRTwCa15ndCgeUM=; b=jslHvTOWEcsdp829ItKlpI/wJvxQYOiDu/wbxCSp6YCydYyTHe3hUUShLKA3hX1O1AR5FZU3eVETv8CakAFjmcOYxuptvKiIRDOFJBnpVjjxOVyBishTBqt6DuPZeOblniY0HX8V0R3lfiGnWaJsN7PVqxpJk3IAAJOc0AU1Apk= 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 163217430942961.71728427847029; Mon, 20 Sep 2021 14:45:09 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id t8so33587123wrq.4 for ; Mon, 20 Sep 2021 14:45: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 t1sm17188996wrz.39.2021.09.20.14.45.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Vx2dmg3HFxd0D29HGrTm+o8SOv+3wRTwCa15ndCgeUM=; b=m8ziF40J52/u1yKDfbYFuuNaThXb7y64HCXEw8Z8Bv8HKSynWACPyzJSRFIJ7Es3o+ gYOAz3fk4gEb5gLKJiXekdQJF2F66HlddC/BOu3lHr+ZWQADGT2vkWLE9xFsjIU3V2GU sxgYdsq1P+DItLZ6MW7qn3xDMLA+epovCcjkAJnx5MUY7wn8NO7wUj1I5zAwYmjNAewk ocJnyYzCflwZd7Z7kiEUIwEvdBF+1KLyj2+5m2fIvYDt18o3u2m2LGAo7YvFmuo/SliW /M0ASkqoqx0F8vm4SQ5vWNJY6FUjkhycqgSNtr4/jUmzdKU10ofdrrn9XNFtGPrFJ31r tE5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Vx2dmg3HFxd0D29HGrTm+o8SOv+3wRTwCa15ndCgeUM=; b=CFQLEsKpD1Ow86Vf7y8wGzF4wzQ4EEG+nLW6hQjOiApsi2TAHKaxODD/vHYjAaZm6G wXJSJkSptMXnMXc4WhcjS9mBPmtf/jAIt6UOgugr3n1VnvYyoJpKUfmVJ4pUlna6mUJd ZQiIv6PA9ljnwI2ZoFF3SMiF3Q18irdQZrXbCiit7t66t11Uh+AP3E3fLoeztatrrenc VEK61gySnmncwwHS1mpnih8FhQoDApk7MfZ6QAmmT+Fg4GMgM2OE4cMmsDGEmft++n+/ cp/58UDJNpdB0gLc2hPPxAN0ddoEHuo251vIk98fawI3xPCgntBGzCxeBxupCrL8Y3rZ jJpw== X-Gm-Message-State: AOAM532Zp3/1Rp73GtBkZ/M+zam1OLDlZrC45LyHOT32GFSw4aO3p/5n P+sCZljQcLEtZo5P+RxtYfK85NuqoEk= X-Google-Smtp-Source: ABdhPJxR6+L3F4UHhDgi/bqh4LNq9zga4al+3z9thIBUPK6X+INQKQq4/nEmmRt689ybzTrYpdYTrA== X-Received: by 2002:a5d:530c:: with SMTP id e12mr31000085wrv.81.1632174307559; Mon, 20 Sep 2021 14:45: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 v5 04/31] hw/core: Un-inline cpu_has_work() Date: Mon, 20 Sep 2021 23:44:20 +0200 Message-Id: <20210920214447.2998623-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174310023100001 We want to make cpu_has_work() per-accelerator. Only declare its prototype and move its definition to softmmu/cpus.c. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 8 +------- softmmu/cpus.c | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 2bd563e221f..e2dd171a13f 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -546,13 +546,7 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags); * * Returns: %true if the CPU has work, %false otherwise. */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} +bool cpu_has_work(CPUState *cpu); =20 /** * cpu_get_phys_page_attrs_debug: diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 071085f840b..7e2cb2c571b 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,6 +251,14 @@ void cpu_interrupt(CPUState *cpu, int mask) } } =20 +bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + static int do_vm_stop(RunState state, bool send_stop) { int ret =3D 0; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174313; cv=none; d=zohomail.com; s=zohoarc; b=gFg+43p6B5BdNKYLqme2cAwY6NHnH1vmdFEAWJq1fiNnvCuG6P4Jk/lxxlOFm/ioNFr8xBli5ZN7B+z0vR+OMiouE7+SETiSGq2cD1TYBohqz+Ycq1wf94SgJfJhJNBC0S6cMooJbsIIHvGb7hfazMBADad+MN7pIQtCaNBM1KA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174313; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8EcdesvsJoOlVD4oVUrlLoUx+HKq+WK1ZDA+Budxbds=; b=CIYd8Ie8XgKfoNlbbyetebaLS9semwnsLprEGCtpM7V3Ciw9fbZrgqe2WPhJMj1hp1jvJ9IlKqDKLJv1AVEcvnElnum1tWvREE5YrV4FQFJ8I4CkstAXo9U4eFEwSIEYKovQBsdp6iDc1jfp1IbUdg69Ol8VkjVulIh36oUDgZQ= 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 1632174313900165.38372942796536; Mon, 20 Sep 2021 14:45:13 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id i23so33593139wrb.2 for ; Mon, 20 Sep 2021 14:45: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 b207sm759238wmb.29.2021.09.20.14.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=8EcdesvsJoOlVD4oVUrlLoUx+HKq+WK1ZDA+Budxbds=; b=Se/2z/geo5FI46kWLvoUFaBaTiYbHfGC3XDIQIWMW5byBRWA6HAsiEd+X8A++IYic0 PUMvwzGa5vS6iRHULvULPQaoissydXnBxTA3W2wVLWW4xWGIw5OF8WJQyPVZKR5v/ZFh ct0kFGjN2EwIGzqxag7mFcP3fwuynpPfUouxRbQpa3x17RvpPw9YdzWfOtyQK4ztwBa0 JPWFEsu0rVu+DAf2XcANd5/L2vFfYtyE0mRnG8OlN8UtMg+1RujReg9lAO06n8GqMKce E/UhmwFXkOBQRwk+nz+iqOnQRbOlFQTMlN6QHOD/YYWDdphQ8qliBr7uFxoBQa2/5pYF zssw== 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=8EcdesvsJoOlVD4oVUrlLoUx+HKq+WK1ZDA+Budxbds=; b=N1p7vl/YrL3ES66QzWoljMXvhTtXkjZBoRfXz6VK4xBn8cxiNs4pFubcLal1j3U2II gMNmEWBKA3nl1FMvyJTi7r+K8PJwZ4PBC8tgxXT0C1nUDtgUsrRDZzTZNrN/4NVBn0DA K/tAAa3vP3jWvnFz6Z9eCVR/G5XZLX7Vkc3G5CewSSZprH37a/PCfHWJz5NLsnIcrAvw c9m9F5WYsoRSkR0FEZesBXrYEsMe1KI1xBrZeybMZ4ml4I080Xvh8h/ZhlN8BDZdzA2L M/SjHoVa62T5fWZCfcWJvWhXvvfeZI5HZxpZQoiQQx6hRQI0xt3n33Yht5lqc5fX08AO F3Wg== X-Gm-Message-State: AOAM5309Pp+Dg/+EeQoPZNootXTqUU/NGn5UDU7ZW92opIXz5VlN4YZW 0ni4qQtGqkH7zNdKVfD6rk4= X-Google-Smtp-Source: ABdhPJzlOI9er9FjK4o4c2iPxj09AR/ZVzEbvFwr0m6nKF+czseY1PAcsl51p7XLmzJaUNvYo32eUA== X-Received: by 2002:a1c:2b04:: with SMTP id r4mr1107445wmr.168.1632174312177; Mon, 20 Sep 2021 14:45:12 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 05/31] sysemu: Introduce AccelOpsClass::has_work() Date: Mon, 20 Sep 2021 23:44:21 +0200 Message-Id: <20210920214447.2998623-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174314410100001 Introduce an accelerator-specific has_work() handler. Eventually call it from cpu_has_work(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/sysemu/accel-ops.h | 5 +++++ softmmu/cpus.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 032f6979d76..de83f095f20 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -31,6 +31,11 @@ struct AccelOpsClass { void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); =20 + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); + void (*synchronize_post_reset)(CPUState *cpu); void (*synchronize_post_init)(CPUState *cpu); void (*synchronize_state)(CPUState *cpu); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 7e2cb2c571b..e59046ce39c 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,8 +255,13 @@ 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) { + return cc->has_work(cpu); + } + if (cpus_accel->has_work) { + return cpus_accel->has_work(cpu); + } + g_assert_not_reached(); } =20 static int do_vm_stop(RunState state, bool send_stop) --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174318; cv=none; d=zohomail.com; s=zohoarc; b=ViA8lOj8jbSj4cl5elqdkyGcKwUm60le9pj1Y2lYY90HkKt8HZ49phzedWhQh9ZNYocks4RjoB//gtjXwiD+lcpGavobb4dgrorM2OR6R/Bq2vbskknOaKT/1YHE6lVIogD4g0GoGkSNA/Pq1W1XlWx1R3G5gaETVOZlBfRGHNk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174318; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=naPHzWGP/6yDNY73WXVrE5ILIKRmkCw8JxXeNmytdeA=; b=J9ByQbg90N/wP2SEm+uJ/BQyONgKeV1wXHhqO4ytYdbRUVGQXsmm/wzO+gzg1rjcyskGS21xgzv8mCoPAlGc+3Ze2NxEyyRlULStP0IvLjr+HPIFupVSaM+u+dtXeM060cIS8Bqc+A+N1Lp1xWWoNoT1/eNRzM3vvD5SjvPE1sA= 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 1632174318431594.7460718278894; Mon, 20 Sep 2021 14:45:18 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id t8so26585322wri.1 for ; Mon, 20 Sep 2021 14:45: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 z133sm845447wmc.45.2021.09.20.14.45.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=naPHzWGP/6yDNY73WXVrE5ILIKRmkCw8JxXeNmytdeA=; b=qEU7DtBipdoVl7ow0AHc7m6ziI8W0+qT7r+IklWK5dj/zMJnLq94wQs1F3mduc/fuj EK4nlM29YXIomVtpwTYDwPycJH/c/PCqtGTBew+N0H8lgWwCU/NCYYZPzvxx6p8TsCQb dUC6IIaS2VvU+U4knMx7drgUZ3zbbG2HfLrO7JLJOfKdbFkY52JfvMH381kLm0IKjCqn TVI6nxEApLWza6/8b3RwmBGkZwrqyfiy7ZmG4jg3tRTPRD3rL37SfXI1WdJ9jFAywle2 yAv0gYxRYvtzsAtEOQtbjNGFi3/nc/RKU7zrYWQCcJ1HW/dwzujmPB+k0z+OsYp/KMME uB1Q== 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=naPHzWGP/6yDNY73WXVrE5ILIKRmkCw8JxXeNmytdeA=; b=zxQqhcTPTjdpCxwubQIe4wvM8nHdrIkLzIBLo17bIxVnwGCrX+MrTmKyH/t7CRSRX7 qm3QLYEkAMVpAcJXCrm39LlFAz51Bh9hwOXlU74QQEiHZ49uAzGdOlDHDq7S/F797+oQ J0eyICxsqdoECdvdi2CCAhYAEmdFREmTGbxtbZNoJrTP56r0uouXltg2wf85qJHF41FD bCdTcgMH4ScIkk7TZmRACehXcQlxw0Om/4qnYFVghiFKhMvZ8B7u3CVS29LTtKu/BV3p 4vpDcb2kcNu7K+JLwViLOtS3yfP7rJhv9kAWKfIosbILuJaU9yp0De1NHZMdzODCL0Eq 3bEw== X-Gm-Message-State: AOAM533+nq85Q8Wp25lKuKW9hsPik9N+WaagMlPwE2aSAUdT3KPwkjB2 UmfvJwkGvt8OnNpLE/kqJeJ788VoxLc= X-Google-Smtp-Source: ABdhPJyaYXH2NZetoujDi4+SAio4VhjxVTnNYQMcS7VanbwpAPfd0qMfOvD7PZ4LNDv4G9qxW80RBw== X-Received: by 2002:a1c:ed13:: with SMTP id l19mr1154876wmh.48.1632174316700; Mon, 20 Sep 2021 14:45: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 v5 06/31] accel/kvm: Implement AccelOpsClass::has_work() Date: Mon, 20 Sep 2021 23:44:22 +0200 Message-Id: <20210920214447.2998623-7-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174318650100001 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 e59046ce39c..b22804c4193 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 Mon Feb 9 09:35:16 2026 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=1632174323; cv=none; d=zohomail.com; s=zohoarc; b=j28PYiHwGo+RzPRjpgIo4PQ0y7sVTP/uw7Idfp5T9QgzB5m8s71m+TIrz5mV2blYg3b+pt12JJ+MAoZDBeFYw5znUh7uYfOakBaR7cEowFZ+9PwFNe4cH/mLaEymLtRMQwZlTSN4aVHTR339UvRO1ELWoXaMSbDd5cGSvpbYa7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xA2Qs5A8kdrstJ0M2RueeVwtCE7JAIn7H4+fKLqTQLg=; b=RO91Z4HdCz+eGb6zIWQhA1a9Yw6sz+B0Qj2uPRrxYNknUBqbvFNX5k4SLUbJjd5LEbjMQQ5mfDQKdYAnKYRxMPInXs38UdMpvpGTnN3Ig/Qf5wLI+1Wc+fnuW9EdJW5PZzHdmxX87qavO1Kbo0W4FGWA6u8MUMKgrDhQxulCd/w= 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 1632174323046366.98574462124236; Mon, 20 Sep 2021 14:45:23 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id t8so33588396wrq.4 for ; Mon, 20 Sep 2021 14:45: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 n26sm688230wmi.43.2021.09.20.14.45.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=xA2Qs5A8kdrstJ0M2RueeVwtCE7JAIn7H4+fKLqTQLg=; b=HyiXFPUofu0hyaR03SRT7hHtaIsHV81Brl+6tFlqSo9BLYvyXCghkOES+TPlpFKtHS r8YhYE762T/3FHInykUzC5F2BS5JiYvjWHw8W2eOBf34gzAyTSeJB13EkIeDPbnGKHaQ lwSfEN+jOIFaXp0VWGcMjgUrw3N0R4NhHg7NPzfljsJ2S4sx0DExm8hjRkk0dqsBP+0e Z8zVzKOaSyUi4So9CbhuXbqFa+1a1M4yThOka8M93e/RgRJVZQ+27UbPmLmWXkL1bRCx QjEzyGvwNswbs20QBPB24JiZKsC7Bd0jVCyhjKY/O+KWcK9ymvBe9rrm1m6yMkrn4DOV oEgQ== 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=xA2Qs5A8kdrstJ0M2RueeVwtCE7JAIn7H4+fKLqTQLg=; b=4SbXU4oZh6Z3Y3l2tRgfDlZBnd+kWENvAY61Kp/eM6oL+chJukCokq4iMpHcNhxvZ6 PSScwDt1aJx+3u23DNKlxB44bLUaQZZqZODJLZE8230qHooAgLSduH6mddN1FnwEmzrh 9dA/0wb+VMLSN1x715IV6NtT/n4E7UYDtmmNmFq2l4ER0cNTcYKNw/uVXRdDJOMjaHJb cDO9zBeiYTHE1U72dZaXUHSIqKc8BtMHLiHv6DAi0BtRVFfuS06FP6m331yS68E3z9Ei t15wGDQGpatuyZaaDyOKAooINLUadI7nv7pirycDvz78L6XZMoPjSuka/vHGcY1bjTTs LTLA== X-Gm-Message-State: AOAM532knOauSKOv7kvXdSI56Lxj1rDRUYdaI+v0xgHhg9ieDBzLFP94 NxEzYsekRTki8sqOodbdteY= X-Google-Smtp-Source: ABdhPJzHooTMuOlKidkNAcJ0q7UpY6tbSCsVvn669AIkNs/X3LYaEn78O1Dhsp3cXryhPG+QPXWMLg== X-Received: by 2002:a5d:64e6:: with SMTP id g6mr15434822wri.151.1632174321282; Mon, 20 Sep 2021 14:45: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 v5 07/31] accel/whpx: Implement AccelOpsClass::has_work() Date: Mon, 20 Sep 2021 23:44:23 +0200 Message-Id: <20210920214447.2998623-8-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174325057100001 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 b22804c4193..98b4049aba7 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 Mon Feb 9 09:35:16 2026 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=1632174327; cv=none; d=zohomail.com; s=zohoarc; b=avzuWyZfPMjINd6JKbUvgwu2/vQRsa8t94YS1oMjHPkuMBr23cs8g5yElZApFmlvrio8pKvpqQ5txWp5U6CG56ZIJsG7bX7nY3BzSz1fypRxTuXhZShza7bXPj2ry0a6rmLKiyR2SSBzYORmylQ+lIynnHeN00qpCPVm5C9XuSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174327; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TUgRmwD7tXnbjAggXKtnmXyY+RsIf+0q/OJybdA363I=; b=AmzJHvUchEqegVkyoE1JrgR7ZAYYmRbSnFFDbQi3qvjygPh7Gs0ep+/6lBWMhkcApy/wH6pVMgrZ57NfJptaT5wKJ2gVzjELo5FPAVRnnVRAG12hvd0YAWcfn+yTa4BEtF3AWWlhYgJZg8bFc4zvL6hUAh946aGuPiKyDInMk0s= 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 163217432779646.42991376252087; Mon, 20 Sep 2021 14:45:27 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id i23so33594336wrb.2 for ; Mon, 20 Sep 2021 14:45: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 g143sm705924wme.16.2021.09.20.14.45.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=TUgRmwD7tXnbjAggXKtnmXyY+RsIf+0q/OJybdA363I=; b=bP9nQ7BoyCGod1BhG3z8QZjF/kVFqwUEfoZ7mDAOk+OudBxaZ+fOGTHUuyl0in/mIw iRqpPiEhME4Q9diVh4WgxKmzEOClBH7PjsGUgzBHK4K0PLCJNbnJDn5Kt+eZwwzEj5+A FDZ8kZJer87URFV5zW7EPRCLnW4cexqt01vKe4rkpuaVF+aFFqCsaXuo2SgBxDmrFTo7 xftvGEYol89+cCXKrls/rGJr7AOu4Wa8QIHU5iF8ZZjZJpbBjVom1oGfWvYrxRgJa1/k ycL+MFvwF7CB4JX/blwrL58wXkCF4oXDB41m/9CUY7lzzTop7KBKZeWASwea9L/6HV8/ Oldw== 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=TUgRmwD7tXnbjAggXKtnmXyY+RsIf+0q/OJybdA363I=; b=KmUz8uCBcBX0tzdKn/9jWo9hxHlmm3v8jZUlSG3V5ewylsILCP/ipsAKZ+OhWI7Aj/ 0Jusa0vgc+gsNEiTxdv8HfyZoqkcwUjD4Pql7ZzX1O9FP9386qBdcx5mVs4szmpo99Kh 58G3vhLqgZH3isyse+BXA2+JrtnXPld6yTHYS5yBLFhjQeYWlZBSlG2CMgrPcLO5Ddxd Yg9SE7rUkSDNMAIxC0DJLYtM4pUmPPMv58GEjPJCXPspxsNouQwdIJxAQqx1jdiUabcy 63CQ6UneZfPug/oPpA2MB9xVwvPAXQjyY21fH3bI3mre9MnvMh1O5vGHlzZe/TTgJg8B Lx2A== X-Gm-Message-State: AOAM5317BVlxf3uK9rwFtmTBeR9EETehPS3U1I7fzelhPr7ZS32sKtj+ xIhmbbv+WrlrIgHda1EU9GQra3B3r6M= X-Google-Smtp-Source: ABdhPJxa7VtuXXanz24afeAyQiO8JqFLYZ4juV5+cGW0bQm8KYYDhaBDzpEwMTV0gtXtARqk3WEpow== X-Received: by 2002:a1c:f302:: with SMTP id q2mr862462wmq.56.1632174325818; Mon, 20 Sep 2021 14:45: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 v5 08/31] accel/tcg: Implement AccelOpsClass::has_work() as stub Date: Mon, 20 Sep 2021 23:44:24 +0200 Message-Id: <20210920214447.2998623-9-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174329360100001 Add TCG target-specific has_work() handler in TCGCPUOps, and add tcg_cpu_has_work() as AccelOpsClass has_work() implementation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/tcg-cpu-ops.h | 4 ++++ accel/tcg/tcg-accel-ops.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 55123cb4d22..4a4c4053e3b 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -66,6 +66,10 @@ struct TCGCPUOps { void (*do_interrupt)(CPUState *cpu); #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); /** diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 1a8e8390bd6..f539ba53806 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -32,6 +32,7 @@ #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" +#include "hw/core/tcg-cpu-ops.h" =20 #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" @@ -73,6 +74,14 @@ int tcg_cpus_exec(CPUState *cpu) return ret; } =20 +static bool tcg_cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->tcg_ops->has_work); + return cc->tcg_ops->has_work(cpu); +} + /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { @@ -108,6 +117,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->kick_vcpu_thread =3D rr_kick_vcpu_thread; ops->handle_interrupt =3D tcg_handle_interrupt; } + ops->has_work =3D tcg_cpu_has_work; } =20 static void tcg_accel_ops_class_init(ObjectClass *oc, void *data) --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174332; cv=none; d=zohomail.com; s=zohoarc; b=HTnZGOMw5vbf9Je4g5eo1fX2CBUSkO1rUtxzEukkxd+Uq5GL3xuZxN/T+yzvvNCJQsEZPYplSXahCRs7btHfKkR2Edgwj4KImNUDNcrYPHpo3eZUoAfm3RjYCIkYdLYCPpz6AFzuqD92CCg4J+UTWPRlpUICup8VeBNjtSQfqqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174332; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oPh/K3P8lnOCu8w0iWaCapa14gPkR6lDKFebYBGUl3I=; b=QrdNhLGXZZq9hBpCa1faszn6/w+H14Ua063tnJ/qWhJG7q6QKY5QwPrNM8Sz3ZwJUd7Ng/9Fk7sDI7YjeOU+OiNv/xUtVS06EdYUY8PEaXGa1ByxmiPxc3QRrsqaNbM4IdBRTYqzSsO0C5wV3GjhCeq11+xDz4dMpJpsuB2HuCk= 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 1632174332079664.5505765441891; Mon, 20 Sep 2021 14:45:32 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id t8so26586399wri.1 for ; Mon, 20 Sep 2021 14:45: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 u13sm621478wmq.33.2021.09.20.14.45.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=oPh/K3P8lnOCu8w0iWaCapa14gPkR6lDKFebYBGUl3I=; b=RZbhYo5OWGdCLeGr5aYLwyXcr4gedjibwjNxpisukN9dGE5+4cs8LWcyCnvf4hhKMk 7EM5SYlZ69x2vi1lk8tCbzUM2ObuvcmMLt4ew0i7Onz8Aa2/3PduPRf+hmC02wl2Qi4c 6U+sq3zAQ+N/c5yf+PPGNwMNxLz443Hl+q9G088uQIZ9sPPK9ec5Oio7iEAQ2QV0mUmN m3YWUR98LY5CccmDVpnNOvufuOj6EY2o8HMII8tvDU/n+M8rqF3DGwNZbguCpnsnxAha WNqTh1TjYPLnUqy9dVJz4UxiDI+ACUZidRYZHXzqqREImMILyxAK6r5Ld4RInsxJuw6G 4khQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oPh/K3P8lnOCu8w0iWaCapa14gPkR6lDKFebYBGUl3I=; b=dSchTzQsDZHyUEu47KXhlLQdAjDKzQv3fOitR3hRp3Xr5P43meq2VuLPXD/xrGv9i6 IuRvsd/ZkLqqCaG55ustzyEglr0SF7iaeV9Wu/XKTxRjUl7HHl6IdnwvOlhOErVl5679 RCWs5oXOM78UVj1QSxspZ76nhfHOn4GU37RhnQmm2uZZEs9lAYr4guHWdwhxHZEKBTiU XSIjsI1b05YFOoR0qSwvRaQVv9Foz1YTAWSBLgUgkizEEx1JKzWwPqCbdojwTAAQFKYW USpOigOtVF9Rz5qUagb1NFMTy0UAwKTElrhlwDglcoyT4YJ9830iSqQ8UuOR+Ai1WbIx JN7A== X-Gm-Message-State: AOAM532CE7zQ3qnYQ5gE0sed/SPlITnFkNjFMSz+MvYzIzGD0UkuS5W+ uoMvGEGEuMNFXIvQkXf1F1w= X-Google-Smtp-Source: ABdhPJzM0eU9RVh/uOnSl5hVDQ3CyKgvqJicO+VorVDA4RFTxqjOqq8Cpj7kBuV55exREr4Sx8f7gA== X-Received: by 2002:a1c:2056:: with SMTP id g83mr1104582wmg.27.1632174330370; Mon, 20 Sep 2021 14:45: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 v5 09/31] target/alpha: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:25 +0200 Message-Id: <20210920214447.2998623-10-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174333726100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/alpha/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 93e16a2ffb4..1ca601cac5b 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -33,6 +33,7 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool alpha_cpu_has_work(CPUState *cs) { /* Here we are checking to see if the CPU should wake up from HALT. @@ -47,6 +48,7 @@ static bool alpha_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_SMP | CPU_INTERRUPT_MCHK); } +#endif /* !CONFIG_USER_ONLY */ =20 static void alpha_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -221,6 +223,7 @@ static const struct TCGCPUOps alpha_tcg_ops =3D { .tlb_fill =3D alpha_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D alpha_cpu_has_work, .cpu_exec_interrupt =3D alpha_cpu_exec_interrupt, .do_interrupt =3D alpha_cpu_do_interrupt, .do_transaction_failed =3D alpha_cpu_do_transaction_failed, @@ -238,7 +241,6 @@ static void alpha_cpu_class_init(ObjectClass *oc, void = *data) &acc->parent_realize); =20 cc->class_by_name =3D alpha_cpu_class_by_name; - cc->has_work =3D alpha_cpu_has_work; cc->dump_state =3D alpha_cpu_dump_state; cc->set_pc =3D alpha_cpu_set_pc; cc->gdb_read_register =3D alpha_cpu_gdb_read_register; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174336; cv=none; d=zohomail.com; s=zohoarc; b=DncoeUkBnG1dUz/rs+GLVwpbM9hnVfcR1shkFejVg0P8+RzXUoWQ+Rhpw+thhoEW24M8osijJiNKho6N6cFK3redJ/4jnAOrtieRKRD6f7RXueSzTX1ZmgUF3fOTOt5WdAjlB3faOy9ddG0UU6a4m9t4AchQWxWaJH5OAnUkDG8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174336; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kUpo4gBQv8Yjxq7BisSezlZpsvG2i8VN6l835nBley0=; b=fJqX0T55xuBVt6immzMKOoKnO7XffSHOUOoTC8/uqzEzk7lfqh185W0ijdQ1lIfHfB25/DCVB+/VhHYIy9ZuTU+fME99c5WABcokgxN85Jy38h4lPiEed72UoVITylRlM7slGqXolYwH+0iX1V7PbN6TfYsaBu1vGsgnOW4R148= 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 1632174336779746.6226926286853; Mon, 20 Sep 2021 14:45:36 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id u15so33592831wru.6 for ; Mon, 20 Sep 2021 14:45:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j20sm17168577wrb.5.2021.09.20.14.45.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=kUpo4gBQv8Yjxq7BisSezlZpsvG2i8VN6l835nBley0=; b=Yvo3Oo9E6ujCAbWK67zJf2j9tw68pZ07Szvd2eO9Sxf3SCyt8QbKwx9S2GbMbl9Xxt LUPZZzwl1whwtqt3xuywssblsPTuAHo2dWqqGThQiUrWQqfsPYmUsNecqwkvRZsOez9D 3sX7mYs3NL2ljnnjGcvn5/rcuMKnOb9x9scoNGGkgCGyETK6290Yz8d+XQyAdOBpQgG+ cQq9EdT0Ag7KPTQDWHZtc3+mLIbSH1Xf8NvOY0A/EYc+7iJv8jILK5LLHRYgzKSFUxt3 Uiy4246V9f605J80BmKQFEPgwu6iWw/q2zCQDuxuEFti1d7bo3NbvQDxyvEPBuCJd/KH Bz2w== 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=kUpo4gBQv8Yjxq7BisSezlZpsvG2i8VN6l835nBley0=; b=EThKYASWNmQLMuxx6gZIz6lweUPjmcGA5bKRCoGTX3ZOCiG2PxV3CXJR4e5Cmit3vb nMNj6Q2XGq2gmlcrqDr++460Yi3G1Ect8/k/Nkhu4tvFI2KaUoOa3XMRFK9chDX4HGEi AAVlOZYkOlMn/WYm1ldIIaaCP8tF7jV+ZWnZGyRq2cfD4GaweSt/frGKsGC35tVUUKql /XLmlnT6T3S3Y8SYeAGKEBBDgh4ew0vZISRhSkQrMo+IENYy332vqVVdGDgIWJPmZ8a8 c4960m5NwBV134xQ7mMi57UGFXxuBgRiOPwXJWnLv0JdAxkEvdATtZkwkiVQm6s4GKkl G4Fg== X-Gm-Message-State: AOAM531VL6TJpdk01w3TG1z9DsM+K/lS6bDRD+HdCItp5IsjcNgQNMw0 GrBg4slqY4nGbw/BWhYFZo8= X-Google-Smtp-Source: ABdhPJwUwoC3jRn0a4XxswmUhPY4jk4BBQmhfVb68bY3NCDF7IjsEcxKsWFrDpNd1+tyr6g2JnKcIg== X-Received: by 2002:a1c:7515:: with SMTP id o21mr1135281wmc.150.1632174335038; Mon, 20 Sep 2021 14:45:35 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 10/31] target/arm: Restrict has_work() handler to sysemu and TCG Date: Mon, 20 Sep 2021 23:44:26 +0200 Message-Id: <20210920214447.2998623-11-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174338090100001 Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/arm/cpu.c | 7 +++++-- target/arm/cpu_tcg.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ba0741b20e4..e11aa625a5f 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -73,8 +73,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, env->regs[15] =3D tb->pc; } } -#endif /* CONFIG_TCG */ =20 +#ifndef CONFIG_USER_ONLY static bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); @@ -85,6 +85,9 @@ static bool arm_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ | CPU_INTERRUPT_EXITTB); } +#endif /* !CONFIG_USER_ONLY */ + +#endif /* CONFIG_TCG */ =20 void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) @@ -2017,6 +2020,7 @@ static const struct TCGCPUOps arm_tcg_ops =3D { .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D arm_cpu_has_work, .cpu_exec_interrupt =3D arm_cpu_exec_interrupt, .do_interrupt =3D arm_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, @@ -2041,7 +2045,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset); =20 cc->class_by_name =3D arm_cpu_class_by_name; - cc->has_work =3D arm_cpu_has_work; cc->dump_state =3D arm_cpu_dump_state; cc->set_pc =3D arm_cpu_set_pc; cc->gdb_read_register =3D arm_cpu_gdb_read_register; diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index da348938407..a3df208249a 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -907,6 +907,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_v7m_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, @@ -925,7 +926,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_v7m_cpu_has_work; cc->tcg_ops =3D &arm_v7m_tcg_ops; #endif /* CONFIG_TCG */ =20 --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174341; cv=none; d=zohomail.com; s=zohoarc; b=XpWiNdXwH521yp71mhXvtkEj43teVluCu2giatYIoV7JMNTGDPWK3MJeQKDCFmCIXMEnxxchRXwZojyHjqvGAx25R56YK4gHTLiGpqUrsG1lxQELFSs7aRI83sZVGUcAsq756aTa5vHTBbgxUKdAaGwGZg5ml5tIloy+0g0Ul74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174341; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=MhRrVeHCe+5+FEX4dY1fF3Nc+0kAF+q+tV455P1ty9rHmy1D7802/269F5fSUEzmDei25nUrUeU8WYRbQdmUqoDoHBrFWVM/Z5913+lrodSWD6IzPyl6n60H18Xh2ocgMEggIKeGGKI3AmjdLv+V4a/l2F0499qQwpVzE+BL+wo= 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 1632174341337675.7999477226427; Mon, 20 Sep 2021 14:45:41 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id u15so33593204wru.6 for ; Mon, 20 Sep 2021 14:45: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 i2sm16681225wrq.78.2021.09.20.14.45.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=aUG3VnS8PRspHNNsOlFg/xGnuK52cKOH8eUfMyNhWuErtW8JyHzAYl2rRXRuNfZkid pw1uoIqysdVB8NFfZUOSLr0tdcFns2qyySDb+MjJScyFrYmyJCWmC4YnTYwxNZUyum1M dkHM6ohRRZG5KEaOzpLSKo1PRAjwzDCdeGqdYAvjGqXUtxvCkexlBY8PPuTNMP88noeX +tjjqEO2udVh4pZjWApSNK0pc4Vo5AP8F6CfeL0t6RE3YKhFlU945KCTyDEraRlgaI9Y XNkHiA4rbH07eDXOjwoA+g5oJ8KsSu2SvT7aCxDQg3i3K8ewWZs+l+GqE1fRX9f1twBb 0m0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GnKfjoq+otyiJmny5QHC7t7xnub0O32xM8y+f0O0Xns=; b=CtqHZbpx3likuny6S7cH5CPJ5QaJVW01QJ5idBvJVWoHxLpUKXd4FXcfTHcWy0r003 PoPy5+JwumKyGOkWrftjZVOE/78f9Pvj/rIY4U5xA1AvG2jRGkmrO+JAjbJr9aUmieyP +4yJy5HWWdn8UX8M+IOfJHmeBOLEGXsa/8wTW6XkYPbO0T4PxtDE8oaCixran61EofXZ vV8xPl64BbrZFp34TMhpaulRwZrkvspn792XiwxALv/muh+HKLp9hIgaIIvAw25MSaPy sDuj96rJ2vyAmbijWIPTC86yPkaYe5lwE0D5RPuzaBcuGjWIjTC6gHqycT/wSlISSQPT Noow== X-Gm-Message-State: AOAM530D76qN02XFKK3q5yFJZM06ybyJ5Fg/npA+bLCZEdcHV2YkMCR7 s6AvhS6fWsvdeBbfwvzejAKJDB6S19w= X-Google-Smtp-Source: ABdhPJzY/ycWivqFKfqWMk7aAEpoCHSvw3d9eXkG5jy1eJOAwUYHZObjQJ+PopXfyIUx4iRKKD5bFA== X-Received: by 2002:a05:600c:40c4:: with SMTP id m4mr1128249wmh.100.1632174339522; Mon, 20 Sep 2021 14:45: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 v5 11/31] target/avr: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:27 +0200 Message-Id: <20210920214447.2998623-12-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174342546100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/avr/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 5d70e34dd54..6d51f91ca2c 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -195,6 +195,7 @@ static const struct SysemuCPUOps avr_sysemu_ops =3D { static const struct TCGCPUOps avr_tcg_ops =3D { .initialize =3D avr_cpu_tcg_init, .synchronize_from_tb =3D avr_cpu_synchronize_from_tb, + .has_work =3D avr_cpu_has_work, .cpu_exec_interrupt =3D avr_cpu_exec_interrupt, .tlb_fill =3D avr_cpu_tlb_fill, .do_interrupt =3D avr_cpu_do_interrupt, @@ -211,7 +212,6 @@ static void avr_cpu_class_init(ObjectClass *oc, void *d= ata) =20 cc->class_by_name =3D avr_cpu_class_by_name; =20 - cc->has_work =3D avr_cpu_has_work; cc->dump_state =3D avr_cpu_dump_state; cc->set_pc =3D avr_cpu_set_pc; cc->memory_rw_debug =3D avr_cpu_memory_rw_debug; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174345; cv=none; d=zohomail.com; s=zohoarc; b=UBUD01aOC/M+xz5l/ZDzICMwqscz420PmoWn2f7XhP9gWdLbXmSfURs6fZrm35wY4h2wLxBF36FZcBg5QxcAsUyJKcSnDvY2OrcaKL5EjRfzrdv7PYY1oYuL5LbfmlK29vvDFU8fbV543C2dPNskl624DWibJx/lZO+LeiH5nSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174345; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=515hkau0jAwCNUY0b60zTLP6vtr2DuE4L4jJT+1axZ8=; b=EMcL3Zm8ujHz/lgCCZ1AB5IJ1yrOvVEyEDx/MjQVUv0bM8EdA4pS9MZYfiDlnt6/alxo2hbqJ45aDWYayg83k6SMXUMo1i3+jGPDiSSUA13ZQcLql4lP39cvd5WOXnA2vKabpmVRdrVyX1PvqTOnj+wdFaVkpQM8XcJWDg+fRPc= 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 1632174345695399.8315530042362; Mon, 20 Sep 2021 14:45:45 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id q11so33571451wrr.9 for ; Mon, 20 Sep 2021 14:45: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 r25sm18515908wrc.26.2021.09.20.14.45.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=515hkau0jAwCNUY0b60zTLP6vtr2DuE4L4jJT+1axZ8=; b=fog9mSRk6oA4t721LaVRibVJUuKqBMtQ1MN45+qwdEv6n48svcjDzuAX5N/PydEznc u0PQX8UsFUiOsr8zB6jUor74VgiJpzDGIo8XmNpJVXVw9JXYmw63mY8kF9VGO43/z4If Ut9aeib+qSJQ4CzmSm30NzMqep7FmJC+An/mF8Yu6gJcpEVonjPiaHDr1nD4OmhCXtAg WO7eN9PbWgXT8d9c+GP8Gh2AxPLJgQVodDHiOAyp+ZEiuRv9GR7ufhQI/loT2yFRzjb7 vQuIGa6RuNhzWlpTeQBXVMOC36A83zhEexb72t2UsTY2eKIPGHhDrBJYRFfsIUGjXjci rGGQ== 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=515hkau0jAwCNUY0b60zTLP6vtr2DuE4L4jJT+1axZ8=; b=W5G/KiAfwryIYKjPgC6LKoJNntNdHz+A3gQ1XN/T72qagUzLmo4xzldyHMneVkk3dP 3RXYaLmQ183XiOtW+yTcBDA/H41ksikwfGQhu652B3rjpP2kcKEUTP1wx3IgSgSyCCxm 5yJG6NLqpdoAbXKkcz3jv74fayxbH4nyRPgIlSmAGpazylS0p/ksSioPVCtqAHlbq0cQ lLfbJ6u2SnSlZNv2vBge8SIUtrFwZ8FYMBYiSeJT16rk2n84Ab49oYtohHKmrLxuP11V yu2qHCRBVUJTq+246m+tHcQ0N7USG0L2w9mCVm7d1PJc6YNSEgsFojbwhWeueWw2T7qa zCFg== X-Gm-Message-State: AOAM5307eLg0b8nz6GnkGZpv78ecwWYhRGm8+t//EV/x6gqKc6QimrIQ 3sxc7sZ3gkCeuA8icIbnWDY= X-Google-Smtp-Source: ABdhPJw+98ntD47EnCMN8zLH/vNXz5K23OdplBrNTJZBOMF5b2M0D+vJZvec8jXM7F0NuRF9wnV7Fw== X-Received: by 2002:a7b:c92f:: with SMTP id h15mr1173537wml.60.1632174343985; Mon, 20 Sep 2021 14:45: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 v5 12/31] target/cris: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:28 +0200 Message-Id: <20210920214447.2998623-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174346851100001 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- 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 Mon Feb 9 09:35:16 2026 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=1632174350; cv=none; d=zohomail.com; s=zohoarc; b=OehK+CIIYP6uKBpDozCS5DbWgR7Lycis+IembUMQez0nEKBKZ1eMBoGu3W9qDrj6UIFCaQ4gFQOSRqlcfWhaGxQEW79Ueniwy9OMl44IGVGBCyADgf6/WEai9d2hWQ8PUPp6TS+csikFRFvB+ZNI2KG0FzXT9T9K8eZoswEyu0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174350; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=e75aMYkkV5LDJl0RnYu12qnxt8nDrxmTnYxLr/iTuJxk+/kLcToLZSNmATk8gOheGDreqyhMW/YmVSrSQbX663duwKCePD2MIrme2DI3+2KO6skE7fKj1qZns9MHyxLJfHtEmDYlGECzkuOpTMzcHP067MsZIq8iw6TIVG9AEuc= 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 1632174350242686.4439124891104; Mon, 20 Sep 2021 14:45:50 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id q26so33543892wrc.7 for ; Mon, 20 Sep 2021 14:45: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 b187sm684413wmd.33.2021.09.20.14.45.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=XXWbgm00iFE49HHklH+65W3NSXsyBxKCO3toTe5wWWbF1ObCV3po2sc6QJtfvpfaZJ YFudGo+SmPJ32wTb9I0PUmtCAAiAsHBnnocCS5r0cfSgsiuN+f0Zvg9mIi1SSxAzxtTz W01WC+Vft/+sc1foBHNJGyd++ccpSPiEmmeU2jVBmH71XV1mh3G8iwTPKHO7P9j2um/s QY0hve//5/T3lRTwSxX6/jLV/uLh8YSJLIjxMLHY5yOoBQQhi96Ap864Pigc6k3g3ZXD od8bRC69lezBl1sf2vruoja1hUzQ6p9kbZ5pP85uFwzjxjp2haqtEGFS5JD5wK+VEvz+ gwTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Qq83gm6o51EoSTv2SvU60Q/ZscN9CmckVp0QDVwTqtI=; b=3bmLNvEnrQg6xxbZl42Ftn+u6W531ttgNf4edY/pYADb++4CICbgaVbD/aM64XJbTj Mksvoviuu4im8zvl93Ml3nsbk87IIbntHik8Ussa4R3VmAsxCBR8VMZwvXG6hKxf+qU3 ZaTdpxwJKYESGpYYaCdvz/c1OxB1CLrKd2pA5bfQ6o+UKq4PuPsiBW2qdFXEb9HggNmf 1+lRFpTpLS5julwwtzQTh/kM9KOoKSq0vK/37BnYhF9GfEZXpqLtOfGummVKlYt86wm2 v01QPSUKLCdUv7+lOUpo1CiX9mKWKs/oYLIxPTLPO6QQaEbHKOSVJ1BlSSbpcT6mEUxO iYcw== X-Gm-Message-State: AOAM532rAN5y4FsryEb2914nkqnW9eNxW7fbZ41dwukEDMzBaLdc95b1 JAafwMA4ZTZriSVT9e/p5SY= X-Google-Smtp-Source: ABdhPJx3sEOoaRnZAjzz4menBb98jEQ1nRLMMAiug+EK3o7sOUwTfrs1mliJifjmc65H7zAEGO/G3Q== X-Received: by 2002:a05:600c:4e93:: with SMTP id f19mr1102543wmq.185.1632174348453; Mon, 20 Sep 2021 14:45: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 v5 13/31] target/hexagon: Remove unused has_work() handler Date: Mon, 20 Sep 2021 23:44:29 +0200 Message-Id: <20210920214447.2998623-14-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174351410100001 has_work() is sysemu specific, and Hexagon target only provides a linux-user implementation. Remove the unused hexagon_cpu_has_work(). Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hexagon/cpu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 3338365c16e..aa01974807c 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -189,11 +189,6 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *= cs, env->gpr[HEX_REG_PC] =3D tb->pc; } =20 -static bool hexagon_cpu_has_work(CPUState *cs) -{ - return true; -} - void restore_state_to_opc(CPUHexagonState *env, TranslationBlock *tb, target_ulong *data) { @@ -287,7 +282,6 @@ static void hexagon_cpu_class_init(ObjectClass *c, void= *data) device_class_set_parent_reset(dc, hexagon_cpu_reset, &mcc->parent_rese= t); =20 cc->class_by_name =3D hexagon_cpu_class_by_name; - cc->has_work =3D hexagon_cpu_has_work; cc->dump_state =3D hexagon_dump_state; cc->set_pc =3D hexagon_cpu_set_pc; cc->gdb_read_register =3D hexagon_gdb_read_register; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174354; cv=none; d=zohomail.com; s=zohoarc; b=EhZkItL/ACRzzosgM986aoDWr7MqOzeJwGN4SwXN84K1w2eHe4iTq8eIey0gXCRQWie4naV4nsQc2V1sE+q1ise+ZxKef9g396vl6gArSCXdZsu/zz23fIaRZb7rU/4E1wIq5UjAcYQG7SnBbQESnsRQXpohRxDsPctbT6Vl1nY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174354; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=MtKdvZ+3LrJeeRF7VcivCtHPIwUJ04ELwRi5dQDbPaqu96SNyXvIAkiP43O0Rpz9w/ZzEqyZX6HC9KcsoI9KMjucMMA54Zd+ZbToxPDKsH3rnOCeH4TkZGje02AMKWmlSjfbJM2se6huMiWwSXRpYL21GMbfu7c4O74XdUMTgoc= 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 1632174354692718.3803809581844; Mon, 20 Sep 2021 14:45:54 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id u18so31836398wrg.5 for ; Mon, 20 Sep 2021 14:45: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 f19sm704360wmf.11.2021.09.20.14.45.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=CD2PjDJ8GcdKi8ZMyxoeNrbQGOTaH2d0ott90B+x+izyIp/GjSRg2oAfGWRQxAawjY 8AbOSza92y33EHanVFNqZZdzFlQa6k8mo9CmeuuiPKpotL1GRRRO/W/2ib63iGFJhsRu 2rAFLkY/HTw+aZ8TR6Kzy6IiS4EIokNtymzUFTMS3m1+haHpNhPWYjPKPClT2/juwRF7 zUgmwkPrb+wSWkusUhM/OX9AKsFX0tceja1WY8tilYZTsTsOXtQe5aNP+C8rzWvVZRqG h+0MtmhPH10hYs2Kb629KLU5wGVnpnNx2vWF823o2MaIHhO97obyu6WTQUfTIj5HLfJF RkVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Hcdc/mmIgCeyUTMws35ZeDR0xT8KVD3mt7/D2pvFUfg=; b=OgAtyUmIaYpE7Vei9d+TfBWnUr1nUMMVMLG+/1KTQcM9R8h8gLf8KOTY+InyqKLBgu +2YQAj+50I6ETtjrvg4/QBv7W38TjDjrtvgxEMGtRwMW+Rc7kn+tcAwVaYo8gOBjav99 Mcd1pwUlon6/V2lV9RcVA66Efoi5cIJDHKnAqugxzT1x+qkEcC07igHXp+7QGeuK85DX vjXBg/UxwO/Mu8WMChHvXrg5QFTQzjoqv5Dx07661rggS549nBVD5JecMG8rII6dxVKw +3qpipfxqED9R+IpJuVCkBUGdnN3m2kWj9i+bDmXXw3mJUjoSL6UzLZyeS0qOmFCfyU6 KFRA== X-Gm-Message-State: AOAM5306LWfWXI3k8YMIqf5a2jUJ+sEEKUOzKaphOK2Ybt+DVqD4I/eb NPUNy+bnaA91KyYF5MptDNM= X-Google-Smtp-Source: ABdhPJyU42dfyyv9jAFR2QokFLy8Pbwkteyy9lIVEemHSD0pyQmT2ZhSj27sRquhYGT9xocKKPwrIA== X-Received: by 2002:a05:6000:1844:: with SMTP id c4mr7033782wri.355.1632174352951; Mon, 20 Sep 2021 14:45: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 v5 14/31] target/hppa: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:30 +0200 Message-Id: <20210920214447.2998623-15-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174355929100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index e8edd189bfc..be940ae2246 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, cpu->env.psw_n =3D (tb->flags & PSW_N) !=3D 0; } =20 +#if !defined(CONFIG_USER_ONLY) static bool hppa_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* !CONFIG_USER_ONLY */ =20 static void hppa_cpu_disas_set_info(CPUState *cs, disassemble_info *info) { @@ -147,6 +149,7 @@ static const struct TCGCPUOps hppa_tcg_ops =3D { .tlb_fill =3D hppa_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D hppa_cpu_has_work, .cpu_exec_interrupt =3D hppa_cpu_exec_interrupt, .do_interrupt =3D hppa_cpu_do_interrupt, .do_unaligned_access =3D hppa_cpu_do_unaligned_access, @@ -163,7 +166,6 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *= data) &acc->parent_realize); =20 cc->class_by_name =3D hppa_cpu_class_by_name; - cc->has_work =3D hppa_cpu_has_work; cc->dump_state =3D hppa_cpu_dump_state; cc->set_pc =3D hppa_cpu_set_pc; cc->gdb_read_register =3D hppa_cpu_gdb_read_register; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174359; cv=none; d=zohomail.com; s=zohoarc; b=bFVRXmQKNYrsHula6fiURC42nXZgV5h0ma7rIs01ihjJULwI3B9kysB/RQuBZLZzEksOSA4DPV3M9X4sIHyK+B8qEDH/mpSB5ewC9rwvgmSsB5NTyYndFtgSgxvga8X4h6TXZRkzt/uK7uQOfE9XZxwwrHsDSio5SC5E1RFHFrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174359; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=IaxCFRl80h9Vak/RTde5MQBuds2xfnPudxYf/QnC7vyEvqMiVcvszce+wTrFO5NBGCh3ygNGKL3i7ck/lIC/447Ck9IlSIAw3P9Z7hnMFhqjkmykKMmPZKpHF96uRabTDZA09DKo9E0+f2GF3Yg4KkuA64iIOwefzup/d8fsEsQ= 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 1632174359413452.3191017594884; Mon, 20 Sep 2021 14:45:59 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id t7so317286wrw.13 for ; Mon, 20 Sep 2021 14:45: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 k6sm626163wmo.37.2021.09.20.14.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:45: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=FoSlQqSQ8ZbPbrlQxUB8XNqV2UVRF3KYNvOO8ZgTpHU=; b=cNTV7nI4+Ey6QhADr0AAVkgQ3XiQBxeAwVU+MYCgPOnEqSJjjn0naeyCBaZL47TLzw 1FVuvtIHJP/nRlt61um2pCJm6SVFsBX2i75iSWtLC7Ttk5B5tWdZR2WE5u6a2JbEoCdv YAb1kz/Qlyak42TrQNc6zg/pknLCwQHjVUNnrChYeBAP+SvdZGijgByLazaCA1KtF58L 3mASM9qB62b+K6lllWwtcknDSRl/Inv20sumsDPJlC2RY9vfkKVWjgAZ5WflHbZwK3zq NMJx0Ak8635C/YSNtJ1fP0dxoj5VabFivHVOJc2fT/FXgzfvT7MclccKpIUhdb4ZTeQ8 VmTg== 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=8NgprNmCchsLHTZve1fsNlG9Bh3A0EDDk0nYm9gmcojWU0rUzXg6bttbRFRSayZpU7 8NTQLAjqaFkQUzZ0qLIknhERsUy0HP77bdgdqR9o1XjYRU3+RXtOCN3wd8XCkaBN7wtN nZZQl1MQDpdeg/gY9Kihk09Jube0XVHt8vRtFgJe/FQ5K9o/+5IFH7hNtTJUXjOVjdTt Nw2YnQ4vNwLclhBoeHJ9pWOMKSYgxyuW/4RzfiJy6ktRCc+/dJmrbPoNgQP0PcUAmkB7 YjOiJNxhtAmID0DejhhTvDeJmbcOV14drLLoyBXeH9TNrR8K1XLNjeOTFOZQmcMwFsJN SnhQ== X-Gm-Message-State: AOAM530ZzhEP7uJGhmWGsne3SGZw7nZY6axBNuW6FspeMoVJpi2qV/8Y 43LVAqLpS0daJad3WkAj8MU= X-Google-Smtp-Source: ABdhPJyi2cVly5lukhzc+4Q682i63JYeUK1kLBdkLDuOBG7mjPFP3plDN+/c3hLBl4yzvpewfEuokA== X-Received: by 2002:a05:600c:5109:: with SMTP id o9mr1131950wms.90.1632174357544; Mon, 20 Sep 2021 14:45: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 v5 15/31] target/i386: Restrict has_work() handler to sysemu and TCG Date: Mon, 20 Sep 2021 23:44:31 +0200 Message-Id: <20210920214447.2998623-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174360163100001 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 Mon Feb 9 09:35:16 2026 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=1632174363; cv=none; d=zohomail.com; s=zohoarc; b=CbBNoylxcqloK59gN5dtn/77BzISjZ7ToCBkqbLItlphmWn/BUsfn5sOyuv6TokDWt5g2I9DY3hntJy8iB4/3v58M8nOGrIAUHTl+/uy+TUiYNV/w3roa7gatms7novP1epwNP8eUGS1Dt2U6W9AgkIXnrtKLD4omXVzyvtYYDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174363; 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=L+qtcFwwBshqNNAxbZTDPQcjwDruFAlJZAmWjtZ8xrXcLip7P21CczkmwOK1aIp026ksnHVSNrVFcH34hWJRUheBsPDDq79FVZAx7r6SNw3yJyWKGV0kacUO2TiXCwJ+AHcdvzK+2Uzh3ThPcQBNGQAiGBEVtSlw27bchHekzkc= 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 1632174363827365.5807312478819; Mon, 20 Sep 2021 14:46:03 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id q11so33573072wrr.9 for ; Mon, 20 Sep 2021 14:46: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 i187sm756289wma.0.2021.09.20.14.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=2wVO/8lNTdglwVP+4rQ9px8jTQizKXJBfsXgcLc7jls=; b=CdhLOGGk9wcYBoA1ic6uC2i7S4/qwzYgdwY3e7Iih1vK12nBhUrCUVblAH+HZEGmpt oTw0kgEl7jn1xcRF65K9ayqSsEMQeBLBRI+tnS8cxOHFsDiw3bmcUwuhJCoEEhil6LZd dVL+jz+MJ+vGHIUDvPdQjYxJcsEqg8XZ8xBzM5A0uCiRUERKolMv9epy1yhtBmGyMQHw iNebkhBmMj4+auptcIhpYeFF4KaEJZ8QB9G/kXiX2cU9wT60LXmoynE+A1gr6JjbAzGg lbF5wsoGab9+aQkKB8OyZYXrg/y5LBQPxFBKjV5k8LN81hmwMtUR/22ASXjZO9C0EIzZ 1Niw== 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=t1fg1RvHPC8fRYh4TqyFSg7LNMltlOLFIb35kHSiaGssym8MZcHmmToH7xVNF0jiK4 Ru9AoWSCqRRtACQUYpr51hiKpvgDF7GOm1NjnFVRZMpPs85mAe/6xFWUupcfFV9qJwI9 C3J9bF5xuNMJfwVC0dX3wuGMjwSkJEJQSxYYSOJMo/dZNkkVm8CQjptQR2veAGaXMgW6 G71RkBxcreLz489Sm5myXrtuiYppmrvwodRg+1fUY/r7A+/9AOiE932a7NjEhidTT0jH 56fT81B1Zd46/tHyv85EShy63ga2BkTs7PxFmRz3GAMZIy7T5m+oB4FKXXC1c92V2f4B kDlQ== X-Gm-Message-State: AOAM530tUFQ+b+MifiNhgQ39zeWbJPDKlp+S14ukcOoHEI2WQ2jA9RuZ mJN9/GwcXwz3cca3JuFm2Cc= X-Google-Smtp-Source: ABdhPJxUDcePurXZf1ITLaut7qiBIof3ld86cwxFRy70Y+rKW1r6cxoft/bQRkU0rlz/xIXVgGzuUQ== X-Received: by 2002:adf:fb89:: with SMTP id a9mr472774wrr.164.1632174361984; Mon, 20 Sep 2021 14:46: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 v5 16/31] target/m68k: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:32 +0200 Message-Id: <20210920214447.2998623-17-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174364425100001 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 Mon Feb 9 09:35:16 2026 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=1632174368; cv=none; d=zohomail.com; s=zohoarc; b=Iv2dKh2YrBzoR7X4kM6h50e6DLnm1yDe1hJlG9ck383ecF707QVMZ/dpX4dFclwpBJXglJMGE+QTaBzWnj8G+MuuokwyhVaE5nC2j3yFNtHGxhBHa+1l0gSCxR72byJzecrukjvi8+G/r2h+yXOhki7ILimwQ4zVQadXehppXMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174368; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=ll/bBMtv65Uk0AU+EqNPNpAeeXP0U5hUyRdnE01jgBB5U7R8/PDOc/WcQZ3M4yTAPpG0Fzh3R3u5tk6qEN3znUN8bKqxTLQfnf7W6VLEGGPfyIiEbXit2Jv6YUDTsiotLh9AWVKub1B9b+5JgTSIM5B6c9pKXyjIgcwjRM0Z2wk= 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 1632174368294785.0786308165747; Mon, 20 Sep 2021 14:46:08 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id w17so25444721wrv.10 for ; Mon, 20 Sep 2021 14:46:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id o13sm19723379wri.53.2021.09.20.14.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=TotqMEN5DrXYEF17ne4DDCu2zSM8Bp20jLCGhp9+svs=; b=RW9OMyPnfZHjKr8QVrqMfR+B1DHPz/CqNm2/7q3J3IDtNQ089rvkVEpsvdrJusIpHB VgJTR8KnMUcBWwSWmhCgSLnCs9+LWpJRNn12dlZd0cxbQ1xOanVvVHBtlJXfOM8iA26M xLEB9WhcGLeewoexUTODykYjCZamC20orfqVJ3OsWghwytw7JoarzrtrMHTNf3fGTbp1 msrxDOtoZ6gtLj+QauXzVjMB9LpgFaEDCcXKY2QyeWTo1h805RSF3db+9xcqRczYn3Sb axjtRTbUS25s8Y6W1np0Rx1cuq8CGkCZLYq9AXZdl1RXUZAwbDfxVypWDkKQSNXMJVng xRnQ== 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=HXpsFOcivWWoYbApqFbf8QixlzIfsmj7KdX/qyww/1+S/TFh4fXJK0uWeY4u16FbTw MtWQG2ASxZLuCAQjwGiMP3LBWJlMwYNjk+WddxHHbVxFe86qObACPVj4lkwOOIz7YJia FtDCyCEGN/5SD8fBOtklneotco/GFe8DEhpOdCYPdvheiW6ABQYXCe0DX5MjS2QIWLPw /y/XJLAANQSReRnU9GBBvZlsD4T8cwYiNvBVhwWp6E0/2wKBs3gqoHBVbyv+U3n1tVgz BIGis4m8uXhheV2aEsgc9LsM5vLWEEuFu3vBIcRE7Q4+KkqF9pz2D2hqQPx69gP82lP2 DP+A== X-Gm-Message-State: AOAM533KNiCNlJ3t7OJHvGLnGvLPjIxhxkM3L2j2HXUYonWBnAg+e9Qa XDu9J+PypQrv2uc8IkPNTGY= X-Google-Smtp-Source: ABdhPJx/6xikLl9YXorAg2QqaB0ejqFhyTJouHkUlavvT4Lz9qnjNalmvUXW+Z6q+RvP/SnCM84YtA== X-Received: by 2002:a1c:2904:: with SMTP id p4mr1129679wmp.49.1632174366518; Mon, 20 Sep 2021 14:46: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 v5 17/31] target/microblaze: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:33 +0200 Message-Id: <20210920214447.2998623-18-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174368725100001 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 Mon Feb 9 09:35:16 2026 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=1632174372; cv=none; d=zohomail.com; s=zohoarc; b=cyXS9msATrCd3DG9M9HMWL18kcBeZcmxRPzKALBTq079jrRcuQIphqIQT/JBIs3ogaPsi0s9SGigEZZpHQ2C9U72bLgVtQcV0EngJuY/lZKsY8U4dAEzy6AzghNMjDxxs/IPwi1VLQSSBcnAWOoDrq6H/6xkK/jwqKgt7uKBfsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174372; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=jSM/Xeb8MZpDmeWIPNRLvXsG+UdysX0fHH2ksPyWdQ1qhYPCgQ2BLME8sO+TsWnRenpIY+tTEjgpKJejKkk78xj8yeIuIngQcboFqOO95W/ReqZrTu9C2CHGHTN3Qmc5E4RgFOi8SK/hryxC1R1g4WIEKWXvlYAQ6wo17ie1DJU= 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 1632174372844543.0700705453897; Mon, 20 Sep 2021 14:46:12 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id u18so31838056wrg.5 for ; Mon, 20 Sep 2021 14:46: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 h18sm16852001wrb.33.2021.09.20.14.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=GZ5/xyZtnFFYBVUznjjJPl4Hx8GySmnlujofeyE8OYJxDOq1NeNPUQdvtwg9CtxgiD qPiUwESjrkgjRgtgGU27K1FT6e2ArP1aXec9fLRozsolWWV7gjDbgRLhlu9pnIJ5nVwl vWeAV/mYYFDB4ATtmmWPBQ3zCCTkTG7SzMtx0NwJWjp5H1oexDyrU/NDVJGz1EbAFkPL vfcPBrKp9YzDAldU8lxZrP2C6imTfSN95VMBwkxF2MzjvSX1h2oSwBzgoch+tNAGE74E MFYaDSoMfPQjyhcESojMdMHjNALW4+aJZyIGoInokk8zDjI2tgRypM3OaZq5mirc3mMo At/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=iR+hhecIhVQbqLgRtJRf7TAYJMYyVJckrOxOor2tvDk=; b=eGtKyAJvGwo2vUkt1TTEiT+/GYBRoUB8H/9MMB3JGQayfxUHUmHgcPOwQIUXvKH9CL RaYsUivmNWW99MBKYtMy7sZHLK9SjUXBSOtHi+MR1/NIIRMwHEedVdj72SJ2oSIUmSYB CutaET+M4vKIXdJoQW/uVXLhJjqyM1C8I+tNB9xEhSTQPOQlln423OxyGDrm+HA7r7fq Hd7HfrYm21fO3nNIoMF42K5ALM/0wAj0vBQ7YtVX0FXAFS2yP2wI++abvtRJgH1dWU0W pBIAS3ivnRDeUAozCnfp8NBzzY7EVQcxhLwO17qufSu7KoNIiH9t3MRI3MzgsTjbwt+E ZHWA== X-Gm-Message-State: AOAM532RrO1Zm2QOdL0rT2+sQAqn3jYZ1pfMZuYVlaFJ2t6Q2QTggOt+ c3vwKCyTfKCsy5AkWrYb9WZbl43fHBU= X-Google-Smtp-Source: ABdhPJx1ERoOIA9jusdg714l6s8vF+98Eoq8aNnCT2JiKHW9awb77LqNp7+MVHkqGja+IdugXYNkWQ== X-Received: by 2002:adf:9e0b:: with SMTP id u11mr31320130wre.85.1632174371048; Mon, 20 Sep 2021 14:46: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 v5 18/31] target/mips: Restrict has_work() handler to sysemu and TCG Date: Mon, 20 Sep 2021 23:44:34 +0200 Message-Id: <20210920214447.2998623-19-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174374998100001 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 Mon Feb 9 09:35:16 2026 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=1632174377; cv=none; d=zohomail.com; s=zohoarc; b=X5PMthkOrZ4pWDIjOzPKRPkjY161mXe137whZBWImBTnnYqWu5XyvKvyzEL49jMjoVrt4BPbD09rLuHQxID33SRBwfCPKAhZnRN0aNNQJQwJzOlQAxIVgKMjNgLi/ERh5O7KkX0K/SPQnaoFpGZN7NNmPaZwYHRsrpP/tG82S0o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174377; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=eFPb8Tf02w18qRN2ZJTEW4d6sUwpFHoLaFIfQpQ9IK69rta8gWc1OA5M8NlhWbXV/d87vB78B3XlTLfprEu9luh+UwABHrkqtVMu024a4yvHA85PaLt23CK60fyPe0LRthi+KXRGptpwF3hW637gU6Us/hZORGcn3yQ270CWXuE= 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 1632174377259601.1215818954244; Mon, 20 Sep 2021 14:46:17 -0700 (PDT) Received: by mail-wr1-f43.google.com with SMTP id t8so33593230wrq.4 for ; Mon, 20 Sep 2021 14:46: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 w14sm17056505wro.8.2021.09.20.14.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=acgjCaHCdDvDEO6aQNdNA165wsQFWfR3HbCbuPW+vnw=; b=Dq/9m1UI7ZUreo5GB+WPahxegkwjbXPjm5++zNmmFOLJ01mKkh8rwRVGuN2+5TrozZ Xa5D5n45AWNKvHBizoYhaFVytPHYSzucHbm1GVzcBdjwVTXB1EyfOA3iCfACB/IO/kVG qkNHGYJTpRycgIBtPN8j1c9vJDUETT1/RLmBXZbQGFGvbmBp4xn/vyOnT8HMdxp9YKQq DDQetBAFMht0K5j8w3nGZx2hy6emtH4B4jrj+3T0i4pDiNpJiTr3nYPZ5qsOhYwpzTza YNTz//2VXTrO+yYel9lZZrRpcxstfs3wSZnua9HoZnAMFctrVRAgjnbxtXAY9WtlzYXs C4ow== 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=GeXOJeCUlqzXnJQliABKC6ilf4a4NMkb0dvMpL3u6wlGhf2Nv8LHJMf0c9QXKvq5tS kxaoUN2TxFjOfR1iRKlrTMvAT8U1L9j+WgSs+Vs59wiUCE6p1dPgmNEIaxEQW9XfZgMf La2UD9vYrb4mDLAH+bMbdnFbdeejDzKyltvaaLGOFUY0+QaMS1R9y8B2JaGuXKCnHIia 0vJC7PZdAvf72WEKXinVM8xUl+e541f3SpY+1WckXfC7uNqR+hvnVCCiBIxWSZOjaAUc Jri5tba/GCswxyMQGvUSWg8HeCgsIAh1upbPJbVD7xST8CIQQh7ceaDljSuF7wkdQ75F 5QoQ== X-Gm-Message-State: AOAM530gDeliV8Lwmpj6MIqQ9aymqAYsN6tgTEtehg2vx4OH6suGa79P ukpYvh3t7XmN2k4wpLYdO21OPSMeS+w= X-Google-Smtp-Source: ABdhPJzymiYa1/8HTCrUCYZbmEagQPdIKXhVnLC/PQpwFHBAeemeCiPPMfKEkS0DN2kTxBYDd9o5Dw== X-Received: by 2002:a5d:6841:: with SMTP id o1mr31113066wrw.39.1632174375533; Mon, 20 Sep 2021 14:46: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 v5 19/31] target/nios2: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:35 +0200 Message-Id: <20210920214447.2998623-20-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174379346100001 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 Mon Feb 9 09:35:16 2026 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=1632174382; cv=none; d=zohomail.com; s=zohoarc; b=ERiqpfXVvRXzaYj3P7ZEKcu7tw2ZWy5gu1MKIfGYqJ31vaFcWXJpDja3HQjIt10jPMp3F+hufF1Y1b0taYZ5QFQ433vLBc0aXUC9QnKUHfXreBQQXCmY0k9N3TqbhO/SUDQ8RaWBb4GsZ+DBDCJ48Mp9FOlwN/IUUH/f+z4trvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174382; 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=l5pFhLETyfbnixZRtADPk8S1iSNZzajvP5s5L7lY6Sju6TxNWbhxFMiHzDTL7VKFznLx4kpW0iaEru0WX+nJ/R5LTXoD6ijw9ngowRRJXNhCnt5i0TLz1dby3z2zeoBdvwpv5VRI0WvbOY03sZ1X5FoKibwf66D0utx/c1G1Zbw= 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 1632174382180691.0206273430198; Mon, 20 Sep 2021 14:46:22 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id q11so33574699wrr.9 for ; Mon, 20 Sep 2021 14:46: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 d70sm702776wmd.3.2021.09.20.14.46.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=h26pMLEnUsWrxMoqQtHQ2NCzZkcdqUGqN4k/9eCW+zM=; b=HW8Q5L1PV7MEkXxO7VUDWF39UanwaF2++taI2xa8FB9TOoI0cMPOlOoY3BMIDVaTve 61+CjtToPqXMjb7domkU73P6/TeD0jDBy46EbZh8+o+rhCjksZexqbpSOf+Rp3NWFBsK 1EtpjQPmciIol6kIUtOLtfArtFb1ZT+H4r5lnC6ajdNGFt7zjEzH3jlj/8MfPcNQ+n7x gaa6IBmMMc2jf99pnt2dVceZcGF9QsgJthgDgnyD/ahBqXZP+WML7D0zGo1IzLPi6ZtV ZRnUmp0QlO2KZrTs2wQMszUrICk/g1i0yBnc1kzr7eBrDJtUD+VYk5Thql0xiMGMPIun jq0A== 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=Tbb+aAc+bO9x8HeD7RvJN44OgWvfAWtFPlv7tUEq2t8exqF9ZMjj9oGIU9mp56Glpg Aq5mrzzljmyEGpA3XJSM5SALbD8Akb5pEvXQQeXn+XS1DzmLG4avkOyLR/3FcUd32cBk d3OrRgYJEtfxbsYyNyIA6Oa+o93yeYaoMPdyz5oa1HRk3RwciH41peBQ1/I2LQM0yZqM rovleo+vz3PnKUVjDgo+TbxYd37ryNKJ7Z5V4JPdFHHdJ6uB4tx4sWq24LwUuVOsEqta faJcHsM6mmyxf9t7quOFwk1yWJFog5r162nihPjEbA1wu0WAl8twSoD8NIQimCnUPHwA l/7w== X-Gm-Message-State: AOAM532x3dgEr7yr0GknldFpld/YRMl6sndsIGdmf2swoQmJ8sTrMj/L GMPqNPEDNgWyyT9rP3oocHc= X-Google-Smtp-Source: ABdhPJy3rpKGHmpWGqANvzV24lwsGdNKY2PCIeppJeWFC8mDHADMvE4kRPV3WYrSRESXAG8LGcIteg== X-Received: by 2002:a05:600c:214a:: with SMTP id v10mr1077722wml.167.1632174380385; Mon, 20 Sep 2021 14:46: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 v5 20/31] target/openrisc: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:36 +0200 Message-Id: <20210920214447.2998623-21-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174383758100001 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 Mon Feb 9 09:35:16 2026 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=1632174386; cv=none; d=zohomail.com; s=zohoarc; b=YgTbjXcuY+MH2X9Cecp/amCrB0aoTlBS79LXd9Us6+xJ3ZDLWIZB0QAaDRFIYHdXhFW47y3A8M7/l5zAwOn1GbUrF4yQF+foecH/b+n/9yvprWrzhaBCodBP2D0DWZLMCMGXSEKrRAWA8x9vHWTJzs56pBgN5YXb1yPZRQ59KSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174386; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=di2xB501lVhZG4raNR+fhLaD6pfJFNR20nMEylx693prU/KTcPaK6wvKKHrYhIq84xzJ0eA8foUkKCau8OdIfcJW2bf+9SJBXz0tGtRQKKZ8rZmOtMMnhZYsuThw+v1Dp0H9lyYkk1EPvgcXJ3isTPoNnUknPd7g/zn0TXsFiuQ= 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 1632174386767213.75785722127296; Mon, 20 Sep 2021 14:46:26 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id d21so33521558wra.12 for ; Mon, 20 Sep 2021 14:46: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 j23sm768229wmo.14.2021.09.20.14.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=7WPGnjIwDqq9FNiuzjIUo9e3oGnINOP8qAvzXoIP118=; b=bT/vg+vkwtKXTMpukqDINGoyLEmiMIGNN4BhbQOWnZPr/j5CpH7aOsp0j8bWPlF+k7 TQMcrquYxF2pNjOE5sGHJkhpPO35rZyblgsq2zPf/4iuaXpqA+fYqNuJOjWt5ReEKufZ 6jfVllNP1Bm1+Ruf72y7NiaAHVZxDFr/9nB4/zS/vMWRZ5ikhsOsVykdSe/iGUpiAoxD AGcoCeP5JLAiqkuvkRBOeHnMntk3KDrxOEUUYkwenRxlyD80nlysBFT38YwNqeADgzOA D+nGSFw7IHcNNyhN6x75VgeR+FCDrap1iW9UOzg6b7DiLy7NZ+x9YLT5frgR3Z+fvj7J 6lBA== 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=uRmzYKbdCqZTuRzYeYsfdXbBPtuGA8QVGDIW0Zid7M/VKjK/lFVpj8HYfqEkJha/Ks HGl/3GumSg68HzrSqW2Hnyv4gvBD/uo2gV4O8Rwyt+ns14Pzozvp98fqkXSFMDaPzmCZ 6dGr5joBoXXlF4c7czo4bCTf5L9PfQOfQ1tK5g8PFZ75eNPmdjdrSVv4NacZCaalG3ML gvp9DxcZZJ4q0TGr0cNAmaJ8VL7jpNZeM206zUYsaOHANk6Xyy0GrWo1qj7Tj7Cddw5u wuzWsM7fZLz7TX0pvroXVGC5cgg1+BlQjvzx3jAzPbUlSFcR3NsAK8EZXXe2oTMd1eRY Y5hg== X-Gm-Message-State: AOAM531uaRQG6isQlf5hKo9Jt0zYY+jDk76d1ZBGyTLZ2ViEUA431Llo CbnoZG9EySWGN5zIpIIuoEw= X-Google-Smtp-Source: ABdhPJwdxqe2DyXo+xpeKs60iMYldzID2g/tPLJsL26Jt9nJ1wysh8AiOnmo+HmM13VGkYH6WE+opw== X-Received: by 2002:adf:82a8:: with SMTP id 37mr31371267wrc.409.1632174384961; Mon, 20 Sep 2021 14:46: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 v5 21/31] target/ppc: Introduce PowerPCCPUClass::has_work() Date: Mon, 20 Sep 2021 23:44:37 +0200 Message-Id: <20210920214447.2998623-22-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174388079100001 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 Mon Feb 9 09:35:16 2026 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=1632174391; cv=none; d=zohomail.com; s=zohoarc; b=LE03E57I9+SHK1Bt85UllIb3U1v5ZnhDFwftbfEfTaWHa6CWED6k1I6A2HwwpCt6M5++iGYJdkEo/1ZbmgmjHURSlJx6GJE/jlLolq39wQYX81CBK2qMCyt8FF8QZdYn0uKNsSugpM+8LXR+2wG7S5fqtRaVthemnXhNB6kgB8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174391; 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=lk8OI4y2yYdogKktEs+svF87gyTRYM3WWO2APDwNZPFH6DD1h+HTfjLOGhvt8X5dfvvKGI5xnJuzkYN6mWbSXhTulc/REF4uITKoGk66p1y5TBsOObI7zeAHb4Of66jy9xYRg/DXxj2aEGvgwUlBa01zJ0Tt1d+5UccBfF6Zshg= 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 1632174391436323.93968854130355; Mon, 20 Sep 2021 14:46:31 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id u18so31839717wrg.5 for ; Mon, 20 Sep 2021 14:46: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 r25sm18517486wrc.26.2021.09.20.14.46.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=IiP54nTlira6zI1808uaFu0plQ+4ScQiNyLo+fDpcgY=; b=LOALPSYHoDVFiRGELP/7EULwr1m4gKsi8qCVER2Nhrfuu4hnModprpteBzEV6MuWJR Osog5mzdFNNpTDDM8KysGWjtmZzjalI7GJjOBRHPH+KHLWDAUxI/DPFYabApbTrP4+Zu BUmeN4t2koja+qFjZfWHhB441k9yJ/2nREluZeiptfcYsLs7VW6iwsK4hUDvMcccaKl/ ICEwcwQEi99CJKXHL+9B8aYV+FgFk54ACQiPJvMxKU5YQKGXEbs5oMnyPw1LN3a61sg/ 3QxbEtxg3Kt25+CSXKOPhiyADte1zxHGlyCHYzztOwG/HVE2R4QEnP7AHhHNQMUjPD/2 Jhwg== 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=su/MGMwC3oDSJSEUn6S9mlUXYaOasCPg35qLT2FyX4zCXD0HhXZkt82gIUEugZTZEG bUJSU4hoI/V/90cMvYv2b490EXszDBinABR3cdKXn1Z9IWsFTc/8sXDHC83KN2UPLEsW RBgWHWLUs2ERVXuiEerF5ZlrSZrxYKAOeKi4QPTs1NA/3tySCfpPI4N4AzSVpToxNPqz QByBvvOTu7ezZtrPBBPFTTahQYy5bAag47XIwTLmkv24F82+PfDvzaL9JgUSZ9UsTXCS jwrvCNRxvMlmRq6sUqO+HAO6OTHLS171Zl7+kvmwslN/Nm8C9K23IsQXtygy839fr2rA cUwA== X-Gm-Message-State: AOAM533sM6gpm2lwE6+JFtC4Ih1vgK9bPaBdZGlVP22Zc5JE9aeoWshf FlIVtF+uBHCMW5q2oVREJgA= X-Google-Smtp-Source: ABdhPJwFvSzS8ZzkE7cOAntYgH3Jl5pese9ZWMXEwrGE6tOB08dPFXuyxl29zA3KCEV4Gk2FamDyAg== X-Received: by 2002:a7b:c92f:: with SMTP id h15mr1175876wml.60.1632174389455; Mon, 20 Sep 2021 14:46:29 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 22/31] target/ppc: Restrict has_work() handlers to sysemu and TCG Date: Mon, 20 Sep 2021 23:44:38 +0200 Message-Id: <20210920214447.2998623-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174392509100001 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 Mon Feb 9 09:35:16 2026 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=1632174397; cv=none; d=zohomail.com; s=zohoarc; b=ImfOaJfIynmiXm4n9FZiq8cgja8qKjYgXfkyNCsCdSy29dGHr45tNj/eXDeh8gICxj5CtHceb0R3uojZVeUtinQwLNXLr1eSBpTdyld3QasBi9V0BwXLf95NPmDJ4i/BrkYYh8HwGszr2XVYE7cTC0D/Kt/LGgupLAhwHvwiLZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174397; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FSh6oWLMIgLLqTTqDcEll1Q32OdPIjqXmSpoO2tYnP4=; b=gT1bWpnEXScE9AKtDfFO37yGGR9OLVNfZaNDa3cCs0EHlaUqvKu0Tfrmb2Tw7SAEW5mepM3SWSCdQpOy7Y6PboDpH6YmBcGyjLIztY5UXPwsC9/naJXTG/Dut89n1+ybVsJ1tjh/rQ9rePqDbqrBUrjxwdhreASW2XEpzLvvoLc= 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 1632174397445305.3027994489328; Mon, 20 Sep 2021 14:46:37 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id t8so33594792wrq.4 for ; Mon, 20 Sep 2021 14:46:36 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id j134sm850886wmj.27.2021.09.20.14.46.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=FSh6oWLMIgLLqTTqDcEll1Q32OdPIjqXmSpoO2tYnP4=; b=CSYfuQgEGr1P/ImdWdV/+6Ny7RtT4du9pw+0i0l/xJTZX7u0rwTy68fb0AeYVIARaJ 9/aaGeX+AYDL6BKFwr8hsyKr9CxECF6dwPJx2OGBYqU1knTnwdG8/CYSy7hfAjvDlw73 6L/pKLxAKblbX/VtoYO8kZD0RgcWiiCZt2vZ5IhkcbKblgY/BV/iYz4W52GtyE2eaXtg Wq+4HNJCOss/4OdIyyFPWhqY7vLcRmNiUYVxr1MCvICqgq4kpENT9ezOATDI5BaHW9V+ jmG8G3LSB6hstBQ1QNhB3Rixqj9lBjj/AyS8o1RG4e/JJd5vvZQCUsGkJnQ7xYWWTCCG h1Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FSh6oWLMIgLLqTTqDcEll1Q32OdPIjqXmSpoO2tYnP4=; b=LapiseKQJcMdFfFPhW/xQTGmPoxTB7COFp/pBGj+46PeXIMd1G6S9bevMnduqXE40I 3kVaohi2ZQpeWLkqrZlRLf7i/38Ox0PGrrzUqmv7L/+7iqvp4GRZzs+n03YquHEhU8u3 6dkEHxPBgo0SOywc6UY+NS1aCe6GdQykzSZlr1O64Xl09k+gNr1UQEc/VMB5cqBQjegT HgdoR9SsJFDrgUI2+j4bhJItjlzmWhHq2hM+2tXZOWhNGaCsLOI6feNHOvKtxD8+g5+K QuyrejzvlmJqtC+mn8Hf8cod+WpbExXxZHFuhnmvKAveJLKASmUtj3YlIU8VRiibc0lJ Ciow== X-Gm-Message-State: AOAM532KUcRMR/CPpHLOeMMtlF3prpyRMwBBfaJ1EIgIvEWa6ui9NDni FSEr7k6EoGQQNRBl0pCsyBA= X-Google-Smtp-Source: ABdhPJwSm8TBDSoIqISABflKhkyxJol0VAi3w1ycqhUpkjlskgtB0WAY7QY3N+AhpjtEe2yvI5RRrg== X-Received: by 2002:a05:6000:2c6:: with SMTP id o6mr10474263wry.292.1632174394073; Mon, 20 Sep 2021 14:46: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 v5 23/31] target/riscv: Restrict has_work() handler to sysemu and TCG Date: Mon, 20 Sep 2021 23:44:39 +0200 Message-Id: <20210920214447.2998623-24-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174398757100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alistair Francis --- target/riscv/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 13575c14085..abb555a8bdb 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -335,9 +335,9 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, env->pc =3D tb->pc; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool riscv_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; /* @@ -345,10 +345,8 @@ static bool riscv_cpu_has_work(CPUState *cs) * mode and delegation registers, but respect individual enables */ return (env->mip & env->mie) !=3D 0; -#else - return true; -#endif } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, target_ulong *data) @@ -647,6 +645,7 @@ static const struct TCGCPUOps riscv_tcg_ops =3D { .tlb_fill =3D riscv_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D riscv_cpu_has_work, .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .do_interrupt =3D riscv_cpu_do_interrupt, .do_transaction_failed =3D riscv_cpu_do_transaction_failed, @@ -666,7 +665,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) device_class_set_parent_reset(dc, riscv_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D riscv_cpu_class_by_name; - cc->has_work =3D riscv_cpu_has_work; cc->dump_state =3D riscv_cpu_dump_state; cc->set_pc =3D riscv_cpu_set_pc; cc->gdb_read_register =3D riscv_cpu_gdb_read_register; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174400; cv=none; d=zohomail.com; s=zohoarc; b=Bt4E0Cujv33pfNpnWL24AUqXHsqcSyTkUiUeNBojpuQusNbYOHtJIeYwve0L89MOnl/WL74OG6pWrZNDlgdaPlPcrHWil70VAfUVkjIIQdXY4tzdp+Hds+1gdPWfRqtheH6xR1tliBJEbDL5vWSagRIYlh2ro0JrQmDGUqfGWSA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174400; 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=HVp/o4FK+UpRP/UuyIKuzaAitLPGxvJh8qk88F6GXv4zikvJILQaqK3fUke0NejlU6xotk0ErcqiDahqI8ffwbiqTUGWzmyQxPacWqPhmqM7ykO4l3xheaqd1BYKPpeG+R7BV+ECvY4YucqNCJw0QyFrjSD6edtlUVrRcdu74hg= 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 1632174400313208.8203501339657; Mon, 20 Sep 2021 14:46:40 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id t8so33595254wrq.4 for ; Mon, 20 Sep 2021 14:46: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 a75sm791659wmd.4.2021.09.20.14.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=o/vqGSMOnhzvKGrld2aIeHhcVaK006Y9gzP+FF74z+I=; b=INfXDIy50zeWCbDUiE9KJI2J1f2L/lAdM5VSF9ZNygCu1p7ZxeZdHThtlrh6DvLfXl parDm4Z38edBgf57p2kcND708sdJ3fmZLKJUssqbQety73c1xBiONSbj8IeYLbufZt2m +dEGyB1wvU90Dii1L2H7gvVyP777LU8CLvbKApHtw79Cpen1EqkjoI9AqWLtcHSQy8ke DxwsbU/pCPXgT2tPj6hsnQD/Cnno8C9+3MaMK0OjN984b4QffR1hOKLDzmpTlD49BbVI lzFB6eU1ZFG3zpdZLboPyGxWSXFzCEwlXcIXUjM88ff+ENB86qROYDGcKyYtg337XjuJ sJLA== 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=oPvYzrYUySy37/UiQqCaBfvWw6r/aiQT3Gk/56i55+RdQPSJDI2PO6vvoCNUJDoCvj LY8tZr5cEk3EVpRovDdq/PWfBwN1somUIZgr+SZhrw7TApZm0nyWcIhxpk8KjUxPzkd3 g0Euy+hIDO32IOLX/2Y6SYKE1kEp11XI9y1snxEamZXjGtqUCkyQUVzJi59bXndYqOOT egc5W11N/QcjltQU7xtIau0AZmK5ELyed30afhCOfi+mU5nEPfEvn+BuPnSFhVgZQM7j GoTbSpBMv3ABa2qkHacGGbdPR3A+mW/iuHRz6v+K4szzL5hoZeIp759RZ9nu9dGCG6u5 g7cA== X-Gm-Message-State: AOAM531FxjJbLJkxywlmBfTQeWNg2EIOyQLZaFnccLfVyqnl+Gbq44/7 Huxc7NpL2Qzt/xYaOKAZqDM= X-Google-Smtp-Source: ABdhPJwP12dcIWprUC5udVhPWEx8Mtd3Hx/4FVS8NihGSrEAmHQPbgo8XCMO64K3MptdvmpL0ozEOQ== X-Received: by 2002:a1c:23cb:: with SMTP id j194mr1133421wmj.1.1632174398590; Mon, 20 Sep 2021 14:46: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 v5 24/31] target/rx: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:40 +0200 Message-Id: <20210920214447.2998623-25-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174400932100001 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 Mon Feb 9 09:35:16 2026 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=1632174404; cv=none; d=zohomail.com; s=zohoarc; b=DWqp/mXheFXBkB/YjktjBLe4QUyLiyDMbH2SgZziGQW7rtZudTKhwTBEKxKL9IUskW07o5jYkAxcZamjE0i+QWSO0rYBn4k+v+jaNXHcBhQnb/0YbcDBVbN6DRFDnUjgwmx68bKcXvm5KUw0mjigIoF9evTt3q6/iSSGovXFrNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174404; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=Uv2mQabDdlhPoFcBY2PA1qF1Tb59KF+TP04zrnDzdImGiS+t35luo1ZxVLbWmS62sMvIsiIaiY+74kc3kvPA+3aXmNvfMLo3/JVOO3ZkWzbHLD2J7nhSqMCn93gGXDjv7JgBol6Cbh7qvRcxVucVL67cRymx7D9pBxddg2tnZ+U= 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 1632174404846877.2137515494935; Mon, 20 Sep 2021 14:46:44 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id t8so33595643wrq.4 for ; Mon, 20 Sep 2021 14:46: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 i18sm17103448wrn.64.2021.09.20.14.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=AsKO1lWKSAt+JXw3uEUSzKsvnCBTst6cJjnyjM+4pCRiSBOnZJuBBV4pwpyR6Y/tuN GA5x51sU8ti4/GJc7p5olND9qG7itUZGnFTG6W3IETggE3YJWi/jY3pAyM7MQjBDNc5K 7SifzAy4jaw4F93/dI+ZL2BNfeSudjl4C6sGHgQfSv5Y0pmS4qaY0/RkZ1Tmyur+lClP XgP9bqiJbmoF5KPLKmiD2eDMmgAM4GDD1WWRjJANQbN2P03P3OarAyCRJ1Xeq8+hkh6A Mdk/eO9mx/6rzl/4/GJhs50idgm+oC0uNEj+/CtHzI/dfJoLgUE7WJAeu4aIHJEbueaE tfNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oUBogEzePDVOMR5F40RC1OgAVa089kvAJx/8ALSm6vg=; b=n/8R5w6QQ5uSOQZVjhs2v+rF3yxIGlawvd3lFVQBC4HoqfyW48fik0dWdhcU9qI8T4 VjCsY9XVRH0eqXYC8Hr3FX1jwqry+/F8Rcch/+5wdYF27mF2Dh7mTzbwZ/zHRZGcX7VR 9YQWcVXkDJmf+HQ/q+ad8Jz2N+608RYzAm5zKusJZ8j3i4f0W2U9wlvsPGvdrngxLsuJ 9a8E43IaI3D6GbtCTIzYnYed+gSfXGYZBlArlpxFI/jsKd2EOhbCc4W8P/tW6hZ9Y1Cf AVvxzuHkauZhEtvbPUUBwTiFhAClI6T7e4uMc7q4OrOV6OuxEf4nGpUDHJkpatkUEk3X WCTg== X-Gm-Message-State: AOAM531aTWIFoRbYJZmX06hpA4lOA7UXsphCEvnyaaODOhBZqV8ddydV 9nzzh0UOq1Moe8oKBXR0pCE= X-Google-Smtp-Source: ABdhPJw+QLWTUrTTo2c9xzsbcD4BWaAZHVPOqVtEu8OVjR9onqlFXDTC4tReXXPng5oZWcZPMPXkuA== X-Received: by 2002:adf:fd92:: with SMTP id d18mr31401977wrr.28.1632174403041; Mon, 20 Sep 2021 14:46: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 v5 25/31] target/s390x: Restrict has_work() handler to sysemu and TCG Date: Mon, 20 Sep 2021 23:44:41 +0200 Message-Id: <20210920214447.2998623-26-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174405298100001 Restrict has_work() to TCG sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7b7b05f1d3a..df8ade9021d 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -88,6 +88,7 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.psw.addr =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool s390_cpu_has_work(CPUState *cs) { S390CPU *cpu =3D S390_CPU(cs); @@ -104,6 +105,7 @@ static bool s390_cpu_has_work(CPUState *cs) =20 return s390_cpu_has_int(cpu); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 /* S390CPUClass::reset() */ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) @@ -269,6 +271,7 @@ static const struct TCGCPUOps s390_tcg_ops =3D { .tlb_fill =3D s390_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D s390_cpu_has_work, .cpu_exec_interrupt =3D s390_cpu_exec_interrupt, .do_interrupt =3D s390_cpu_do_interrupt, .debug_excp_handler =3D s390x_cpu_debug_excp_handler, @@ -292,7 +295,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) =20 scc->reset =3D s390_cpu_reset; cc->class_by_name =3D s390_cpu_class_by_name, - cc->has_work =3D s390_cpu_has_work; cc->dump_state =3D s390_cpu_dump_state; cc->set_pc =3D s390_cpu_set_pc; cc->gdb_read_register =3D s390_cpu_gdb_read_register; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174409; cv=none; d=zohomail.com; s=zohoarc; b=BU2Z44Nz+mOetGmYWuKnLCy/LmsC+Fo4eFthNwhQ+Ur238O/tODb3je6vV0/7rO3rapDXaWzVX6vvfecKobBwJ19m57duwlr4HIxRV4wxDTAqWWnQL+QqFCsYhos7DyHPc3MOi+UITH9+Q8CcEN+QBKCPT+pw7Af6TIQs5oDnhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174409; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=etuY0cIo5tS1DerZGDnwapwFJkSDpr/VjUcM4xh+LeQ9AmmrLtjBtDb0lXvl4SWLkr8U5N9XnfZt4S/oxmovYjrwL0UhmoagekMadybKJryibYOYwAslT6jaIwj2M+0qTWwZuGFHKvwDUpecAZvd+zt3JMjmFl5s7Abm2wWswxQ= 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 1632174409321901.1940194038896; Mon, 20 Sep 2021 14:46:49 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id q11so33577120wrr.9 for ; Mon, 20 Sep 2021 14:46: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 z5sm738782wmp.26.2021.09.20.14.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=DvtLk1KDYMk4Ooy/WV4tyGGjURyvQDa7DPky1rRpIYc=; b=lQnBqwiTCY2KfbyVpLeTEqTwjkokqRx5kAf9B9NL9GmWhKEcV++GipJvKU8CRue4US /DEmIyb23hVYmcUx4dk8GabzUSfKF/Eday46HQfKfbNP8Hm/AFqCRkDioheLsn2wlk9S qYF6H31wN4lOWNYwtib0INajwu8BugTFZeA7ywWp9Xn9vgPLPkq5HyKoyXd8p9Yks4pG 4BtII1yBAvksneLKX3ZkOiYBzG5fpCM0xvV68Xi7oklm9uWw65lxnd+utZf+gcjnpLIc o0DtChvRpKQY2vhVgJj2sQ2XuoFIWWR/u/PWjJzjo+GMnOXsroaS4qy3oLnnmYgQDIX3 tSxg== 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=djdNQs/dFbOh/oI/lRg1iLWqwgk5tcZxHE56TlOZ+xFMtTGXCPwTNVPCjg38BYMGdn BfLcumvYMbG2cS335059BYp6DOU04pgBjyuTP4DOrJGiTxxI/q/MKijaLTVLjbq1mYZz CkcAl6wapRs2FNEbrDPqhBZdHR5VsjEs1XPM06L/RRzXfAwHKoLRhj4cNfiB/TnffaKR TF+87wbLy0/BVH6vKTCJlDuRn3K6qmqFL458wIiVU6hcEUNy406PhBkPn1p+oalPqzii dSKZake/I1qR/JXQkL73OfwK66Yc6ox/Z0U70RIeVXaI/G3UrINrRz5EoZzBbsk+P0sT eZLg== X-Gm-Message-State: AOAM530jlZZXPUrAhr+4RapVjXkl91BnB4K1teo/XH+2MWz+O53HZH68 Xu3CEE9IJB2D31XIxbzfa00= X-Google-Smtp-Source: ABdhPJwTJ60R5RSVmdT+IH9R4KZEQaHuTI+qvKyX0zaDce+B+YJHtTA9oHD0DtQ4vLTUEnF3gQpCxA== X-Received: by 2002:a05:600c:1c26:: with SMTP id j38mr1212888wms.12.1632174407535; Mon, 20 Sep 2021 14:46: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 v5 26/31] target/sh4: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:42 +0200 Message-Id: <20210920214447.2998623-27-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174411433100001 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 Mon Feb 9 09:35:16 2026 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=1632174413; cv=none; d=zohomail.com; s=zohoarc; b=fNRsqtp1c6sALPXvuh1qiMlRcp8K9Qd0ffIDff9KISsm7FDFuSJDVJBF9iu6GpYkWgubM5eR6hKVHHAPHW4eNn6ZBK5EKtEcTGwuNqJkCI0Mh3CMspdIhkhmvzh4i5hq3SqnLRBllFOL/GJsuSu2WXLsvRqU140x4UZNMl711Ng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ng68G2SUo/Wom1Lm26r0e0XZx7BrOhoYuLk/QBnpHvs=; b=RYKDYjhabvZm6zwKrcr+pB/SgNP20XF3CeLjTdCww9p3lXA/j4NLCqyIsghm2xzCHJlJYG+81T196Zsm8zwCErMZLbuE8ZZXAOcjYyJ4H/ToXWfOtmECbJRumbGJOHvF85ddrBsUf4nx0IQ2MsWrooasbj9p7CtPws0XIVdXp7k= 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 1632174413863876.0230184505234; Mon, 20 Sep 2021 14:46:53 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id i23so33601965wrb.2 for ; Mon, 20 Sep 2021 14:46: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 f19sm706102wmf.11.2021.09.20.14.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=ng68G2SUo/Wom1Lm26r0e0XZx7BrOhoYuLk/QBnpHvs=; b=kevIubyPGcrs5Ak8lDXLPOYv4bwO0r/sFPqrxkO0FB7xO6HfDQcotW5BFShwPheN9T xYmBSCY+vBy67CkfzkqaTFCdEXKjqmtwSvbgMCAfuTaUkKjw24ccMFUsZlR+axlN91Da lSg2bS/8hD8lQTFc9ITdzfSdtrg/1CJz5vvWzYqwSejNm4qwm+V0DpyM+ufwAokzh+r0 X+6ofhJriKGyXum/M2HsIEuyGWnBbial0jE2byFZrYCkQJrqNlAE1IrQeeFumC+xT6uZ OxrApjopFD7UpPcHnmAp8rpLXxjPis+caNxQtM+UNzq8VsciST58SG1zef5ujP1+FZd9 DLwg== 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=ng68G2SUo/Wom1Lm26r0e0XZx7BrOhoYuLk/QBnpHvs=; b=RlLqqD7S5b2xWLqiJh/OXViLXuSUPmBMufmBuy2nC6OF2wabLXETA4mgpwbNxT1bjR b5fmBttuY/7+3wbZXz4j1OpjcuoAVJkgTZB4HYMmYYCPab9ZGMi4VmxmQCBfvGQVBkaY f+4W/o1TvysjUtE4h3qvSTxQYY4euzpjWboSW7rS/mJs+dlpGpbHCnpIn7+IpkrtBetl 00WZQLBFbFHRePLvAoveNpPlmHuvz81ru0Yat/YWwD9m4N7Mzfw6fVqY942Ht0MYj305 76aostQHHrFkV3rPNu9qlSudjuBcVo7T+6CvfEI55Jo6npKSeJ93T6lAVaN7rOW31+Zn wmSw== X-Gm-Message-State: AOAM532XcoalhJwYwUkWWrnO8sPKUPtLHtXeolmyf7j9UKqlK9lcMJYQ zmNRf9+zEh85R89YJb8Tvn5uCSQxe5M= X-Google-Smtp-Source: ABdhPJw9WCwjDAdBMimjv3YzkuWzJBSedyx2xh3ptMzY65sc4hAlEQOw6NwoDJoA+UXD3z7PuG9wCw== X-Received: by 2002:a05:600c:2301:: with SMTP id 1mr1183501wmo.138.1632174412095; Mon, 20 Sep 2021 14:46: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 v5 27/31] target/sparc: Remove pointless use of CONFIG_TCG definition Date: Mon, 20 Sep 2021 23:44:43 +0200 Message-Id: <20210920214447.2998623-28-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174416172100001 The SPARC target only support TCG acceleration. Remove the CONFIG_TCG definition introduced by mistake in commit 78271684719 ("cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"). Reported-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 5a8a4ce7506..e83e305aa9d 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -859,7 +859,6 @@ static const struct SysemuCPUOps sparc_sysemu_ops =3D { }; #endif =20 -#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" =20 static const struct TCGCPUOps sparc_tcg_ops =3D { @@ -874,7 +873,6 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .do_unaligned_access =3D sparc_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ }; -#endif /* CONFIG_TCG */ =20 static void sparc_cpu_class_init(ObjectClass *oc, void *data) { --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174418; cv=none; d=zohomail.com; s=zohoarc; b=nk3+A8Ujq4OCffhv682NdM54aeEaUvl0dkmq8sNUFQ/cHlgHVQdQzXUO3IJ66PES6Q80JkwNGKcxZYnr5413KCHWjeqw6PcopqxhcxouLChOV7bsIIQHn02xIYjoq3xzVzX2qbGt5EQmFdWlFr8TxQNpOuxOJdO+TzSvQGMHipY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174418; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sD6WSo2YHvghifkbZDHrEPR9Egwbzuw6eNNdtPTmG0c=; b=la/HoH8IhA84uHE6gZR6WVZOdgtVIha9hzRlqD3cWMaBXBw+SBFEULS2HgIkTpGytCYc515py6vgI5YVR75T+hTsQsKr2eGqeOFHUcgI1IODMdVE3resxTg9D9B4QuZXDqkVCRcH8R4pBPifAUnUMaFwdjaX0vieLnRGvkY2XBs= 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 1632174418406195.88715897655527; Mon, 20 Sep 2021 14:46:58 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id t7so322546wrw.13 for ; Mon, 20 Sep 2021 14:46: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 t6sm662929wmj.12.2021.09.20.14.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:46: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=sD6WSo2YHvghifkbZDHrEPR9Egwbzuw6eNNdtPTmG0c=; b=qHKz+TOZDCC8j4hS95QHm2xkezOoHw6gO2UtTxwypEUXDgmpjI/S+FHiLS7eUzC0Gg edicqSAzRiQ+zeoPsm8HJ8R7pOZAj6Qw8z7wasrYxcjL76KRR6Ay8dAvvQnrXiWCjvd9 gKSVEK0WevTS24bnUa3OiM3qMHqc5FQ3I1kOKFlpWV8LZsNWGCgx6+tW5aFhAiZ543pZ Ubfr3n+b/rBBOAa25u2g6R6kZb3HaijqYasiwXL4/Dlk8DZpfYfcrh2QOYy6KGIreEp+ 8HbDYOmRGK/O7dLK3P+Xr7hlXEjWJ8W6oCIP+l+5xroocnGGCAMFCYOiMfP0oROH9Sp/ yfaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sD6WSo2YHvghifkbZDHrEPR9Egwbzuw6eNNdtPTmG0c=; b=YXS+nRln3cbchvE1JneWjLIIy43TNA9HJI3Moq3FJPShgEsaf2uJKWIemP7Q4VmQPS ubTwADLYoX6rRQDzpTO+dZrDwr1JHmdZVjBo1ERQgIWnRQ+HDron+JLHMAnicbIz3Fk1 4HrbAmsUDc0B7YavCHBQwoBa/ieiiwfR+d0dR6KRyBkiZxPnBwrDI2xWUypyQ5+OfdMf m0NGDFCPjPCAVKqFLkQ9OnLTtlAsXe9WOSgIwFOgbSBZjEfaYSOnlFEkJLfJoSj7JAPe OTCxPdEc5Qa6whM89WRqET4qYwjotSlONmcyYjNKsV8pDWvfK+oP2PkSdFbyLhCQfK0V HzBQ== X-Gm-Message-State: AOAM532bPiX60u2V5aIe2RtAMHIGbVKz1KuFygNW7jhK4gPAAZXdl0ry fVI4t2+nW/rwoY6Ufj22qxU= X-Google-Smtp-Source: ABdhPJxfH3fL0wFvEYOJgzynrrgtoibixJEl4Ny+U5biHL50rB6KT2ggRdlgSQhZrMXW87rwr0zrtw== X-Received: by 2002:a1c:cc16:: with SMTP id h22mr1141992wmb.117.1632174416684; Mon, 20 Sep 2021 14:46: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 v5 28/31] target/sparc: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:44 +0200 Message-Id: <20210920214447.2998623-29-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174420438100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index e83e305aa9d..4a63ed12644 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -702,6 +702,7 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.npc =3D tb->cs_base; } =20 +#if !defined(CONFIG_USER_ONLY) static bool sparc_cpu_has_work(CPUState *cs) { SPARCCPU *cpu =3D SPARC_CPU(cs); @@ -710,6 +711,7 @@ static bool sparc_cpu_has_work(CPUState *cs) return (cs->interrupt_request & CPU_INTERRUPT_HARD) && cpu_interrupts_enabled(env); } +#endif /* !CONFIG_USER_ONLY */ =20 static char *sparc_cpu_type_name(const char *cpu_model) { @@ -867,6 +869,7 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .tlb_fill =3D sparc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D sparc_cpu_has_work, .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .do_interrupt =3D sparc_cpu_do_interrupt, .do_transaction_failed =3D sparc_cpu_do_transaction_failed, @@ -888,7 +891,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void = *data) =20 cc->class_by_name =3D sparc_cpu_class_by_name; cc->parse_features =3D sparc_cpu_parse_features; - cc->has_work =3D sparc_cpu_has_work; cc->dump_state =3D sparc_cpu_dump_state; #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) cc->memory_rw_debug =3D sparc_cpu_memory_rw_debug; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174423; cv=none; d=zohomail.com; s=zohoarc; b=IgfMuDoR89bcuL5I4gW+XjibH2uTCYLxJNyYKYvjekaXEoXoyXJW8qBK8QHsxBZvwnB/sxBvWY4PtdtVoTU4qStGSLryvUtWHt8Xv+DBV8ThJGkN9TnmLsbviOf0GgDXKZ35aWqnYC4yNUx3FPYQ0aBb5PhOmijtzVG5vXtpqC4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174423; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=gMhTP078i9StrRj/pxOXdQ5+QKMc32DOfLRKR+eMBz0vYLVMNjtkK+N+fODv72Vultxr/KYCwmdLC7C477joY90CvkZCcpYAUBPv2KgE2ZzZqOPgGZ0c22opud2yklJw3w8j/rLMiJ8mn08alaKthVAfQBI+Oi6Rz07sIiSBUA8= 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 1632174423055139.92002751132213; Mon, 20 Sep 2021 14:47:03 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id t7so322914wrw.13 for ; Mon, 20 Sep 2021 14:47: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 n26sm691138wmi.43.2021.09.20.14.47.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:47: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=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=HZcPnQNoLd1/5Cd5QMamTZjuLhCfDQ5fM0ZSH0Su0vWHMEr9mK/7mACayWz/YxwyKO 1gHzYhX2a4+8TYZSy+VKj0GMlf2X69kLczl7eOHn/LUyVx+E6OoBWVqWRtk6BbddyY4y h3vnVOd2xf2zXQUz5QfzvI62yob4Dae0/qXpe3781tBxI+4g4jz25lqHjTDuP0AUTxe7 1cM/TJ+QneqIMfFa9pWG6pdWMf2+Y7Cs92HXIFL69isAvG4/Ft0NHZxU2FnBZj+r3rcT KmFLMaHxIy9dFFFxKK+/8W2E+OIBf3i+XfaJSGGBRFph/CipcOrtVNUq4I9Pvy++5Mo3 ZB6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zo8kftudnPOZgXxxzKZCu6JZDCUogG66dPAYCxpYeH4=; b=SbVxxEwsoBoCvmonQ8s/fw9ET6w8bYgSPhi+Z7J3yZxgvYPHRSmBPZ4nPZTV8JgYSQ nPTYOfvgomolIe3wkR0GI1BXo2tswX5pza19BQnDV8+Fn7nBY2IYKd/+1Ma9NENdTuAz qgjFjcuTtJh6aHgF4GNsMQ6tKQJ0sHlJEPEswER96iV7t1LyB0ydNndBiMBCG6q741d8 Uh95aBP5qgBJtYYFH2LyfIwBPmuasc4YA9tcJbTrf+Gjm8VjHc/GANmzIe02qsVwUAuN BLfv2fobl66esa4eNz+PRwYXF+JT0UPlpfrYyuoAKEs0oGCdc3XWwrx8W4qKEV5B9j4R kxPw== X-Gm-Message-State: AOAM532k0bqupG0C2jdu8q0DI+JeCFpna3RyekHOaI1Ry16ZYiWYCr/1 d4vQUJEhybfv/sN2yRe/b1c= X-Google-Smtp-Source: ABdhPJxGk72mR05cqEE/KhitBJgbpHrCKGeuzOMe5hEemP1wUt/UROqmXWBFKD1k/gJUEBwaCzl8rQ== X-Received: by 2002:adf:eb4c:: with SMTP id u12mr31459538wrn.111.1632174421315; Mon, 20 Sep 2021 14:47: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 v5 29/31] target/tricore: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:45 +0200 Message-Id: <20210920214447.2998623-30-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174424862100001 Restrict has_work() to sysemu. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/tricore/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index b95682b7f04..419fa624bd5 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -62,10 +62,12 @@ static void tricore_cpu_reset(DeviceState *dev) cpu_state_reset(env); } =20 +#if !defined(CONFIG_USER_ONLY) static bool tricore_cpu_has_work(CPUState *cs) { return true; } +#endif /* !CONFIG_USER_ONLY */ =20 static void tricore_cpu_realizefn(DeviceState *dev, Error **errp) { @@ -154,6 +156,9 @@ static const struct TCGCPUOps tricore_tcg_ops =3D { .initialize =3D tricore_tcg_init, .synchronize_from_tb =3D tricore_cpu_synchronize_from_tb, .tlb_fill =3D tricore_cpu_tlb_fill, +#if !defined(CONFIG_USER_ONLY) + .has_work =3D tricore_cpu_has_work, +#endif }; =20 static void tricore_cpu_class_init(ObjectClass *c, void *data) @@ -167,7 +172,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void= *data) =20 device_class_set_parent_reset(dc, tricore_cpu_reset, &mcc->parent_rese= t); cc->class_by_name =3D tricore_cpu_class_by_name; - cc->has_work =3D tricore_cpu_has_work; =20 cc->gdb_read_register =3D tricore_cpu_gdb_read_register; cc->gdb_write_register =3D tricore_cpu_gdb_write_register; --=20 2.31.1 From nobody Mon Feb 9 09:35:16 2026 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=1632174427; cv=none; d=zohomail.com; s=zohoarc; b=OJ7ZSaSExYQT0FcUkdo2XQAy084/GCJEGX3KlyToRTZPm2RDY4U5NLfHEbQDCJ6v3+EegF4epjOPzd8OIc7P916oWhO+Fc+82PBbTNSNHmvhCgq9Gh/tIexwpm0FzHjzHapBjuE/VfU71dUmD0dypG/VBk0WsrrNUwRxXl54JI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174427; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=DauwcmOJdhM/ykB87+1tbg2F1Kk4oW4AjKAkKCiHPwTknyLuG0Fp3KYhe0KwhPoRQdEIy64lLKyYSvRl1zhOhmGkdA9aNbAmbM2CU2XwJjBXIxQKWjqd4ICtGhhArdMXmvF7nHEibin2MtgW2PUo9Riq/GqJNoabHIXBLUCgsiQ= 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 1632174427862427.64003178248834; Mon, 20 Sep 2021 14:47:07 -0700 (PDT) Received: by mail-wr1-f50.google.com with SMTP id q11so33578721wrr.9 for ; Mon, 20 Sep 2021 14:47:07 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id a77sm678969wme.28.2021.09.20.14.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:47: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=F6iT0mYKdizTZwY+Alp0nWU9C8rVfDyZdw7MbXpCAAA=; b=Tyxc9eLFkeYJdojgIyuM4bw2U4FTBhzD9h2ccY3ujNwWeY+Vel6Y5tNo2HoE5ZmQzH YJBd+3lLpwAAakStc4w6aLcTUm4eygiKh5XS9NgSC1bfTZXocViDkggZDrWDPvMT94+s kE84wYfg1iDWeSSZceoVBlWixU9gPNC0EDJiIa8tB74m+Ssg8IHAt0VK+UcrCg/e4SEn 5GhVLlNrhvuLd4NQynDDhxKAoo8zNMM/WypKi/b6rktJFkWKNRtJiANxpvo/7FbRI5Ql EC7qNoxMPNuA9PDT6NiT8LcY94D4DNmzlCKFudXfn3nK1NhWvSRXPL1RhJ7dSzsZOHao nVYg== 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=LgxLYNDUGn4yeY5haPQPgmqbBvVCBlZ4Pcwg1TKi/plPCugQiIhWV1QN7eHtMV29Pp cHVbzmSvxfyzgEpsH+ZJqNmiQkDY8wCNNcfbfG7RjMejGjUgESgSyDeECt0ADqfoQ9ET pzpmUri2mpfI8RvfFDWdemfXWgFE93ykwlIP3djGJHQYRS4Yf6knda5JvaAgyscV/qBm jFSMcal/fD3iL9A47mwillxydWg48TZt8RzfWravRik/5R/4T1SR9USd7mKfdaJFCFyY 7S1c1yB8eIz/+DsWKBTgaF6nPlRI8zgiq2N74qeHbbWteTKRrLlviiOaT321Fkh46BnX phWA== X-Gm-Message-State: AOAM531uowX8PZRxGTR5gTnYkMt9fM84dMlnqAy4rC4cLujgORrzIfOx OBMfBwhqxZtzJhW7gWYqnSk= X-Google-Smtp-Source: ABdhPJzxbVt6a8xXkBu/CtYSdFkRFxnjAU66PDG/iBh3IWbVr4lFDuJVYRiIwTPWwudj+x/6UrDp7g== X-Received: by 2002:a05:6000:1a52:: with SMTP id t18mr30410973wry.21.1632174426088; Mon, 20 Sep 2021 14:47: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 v5 30/31] target/xtensa: Restrict has_work() handler to sysemu Date: Mon, 20 Sep 2021 23:44:46 +0200 Message-Id: <20210920214447.2998623-31-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174429333100001 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 Mon Feb 9 09:35:16 2026 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=1632174432; cv=none; d=zohomail.com; s=zohoarc; b=BsEMF/gqBjrsZLyXoWZ8KrcTqpPKb86BrKq5/hngVrRWxjAoUAdH2NlSoI1BsdZvdZYWltnhXLPYkh+ul+J+dwRvI1VDqKPynRAmZFsgR/JeV0iXIIFjAH5PcigbbiArZzD4FE0wXHozRtXcnQp6IktRmKNU5x6xce7BrU/vMN4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632174432; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1fT2quxplJ5GzjL7Rxg21kKvMAH6bBYwpkK2l5yjvQo=; b=j6myo73DUXDH3uUXUenT4Mh/J22q+yFEhB8szY2Tz9qutUNvryyqTMz6uJE1xS9eRRG3/6nRj4srjmIxhJLggOabNuzSo3uEhSbE7aNTtdzUEzqPoPaKDs3CT2pqWst2WzBRGIK7FDqeHKBpeqHafrskJGvqbcqu7pCYYLn5OpQ= 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 1632174432592658.1331798117811; Mon, 20 Sep 2021 14:47:12 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id w29so33581827wra.8 for ; Mon, 20 Sep 2021 14:47: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 l124sm732345wml.8.2021.09.20.14.47.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 14:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1fT2quxplJ5GzjL7Rxg21kKvMAH6bBYwpkK2l5yjvQo=; b=R8nuokHfBefjPDnD6JhEgV32Lfk5fqb6cFKS7gvVlAZeqetJoBTdz/dthkWy1xSz2N 23GgWn/RdyZxbw1guhB8G5eUbi7AOmaca0QynJL0RujEpFb1Lq+I707tO28kt9tswTn3 hbCEJwOzb+XcLj3XpRDyhcNDfJpjllC+dlItsuhoDgU1UaIwYZKZFk2hJuz6N0qwf7mF vnCHM1ikzGsuGQfw6XRpYVLGg4pJuzmgE7sdbsiFhfVq8U/CxqC4ZphX4bGdBb5UYT/x 7hic92Cl6Jf1oLqv1ENtXq0mq7PmqR4fP7WjQzMT/W0PpNVBfeIzu2T7TSAFCScJHRvY yPMA== 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=1fT2quxplJ5GzjL7Rxg21kKvMAH6bBYwpkK2l5yjvQo=; b=IZnQXs/+6Tsn146w3gcojOQTOGbVZN1UNBIqpNyzcpEOm0xbXtYeCeeWnPU0h5De9H AvYtnC1NUKMO92cMGK2lNm5a2vD67I4mHyA4mx3e3ih76b6bsHNuEcrGQLg7f1ziYSKe yS54ZMxOuXTa6BaNTCJsQz5oOoUuv72Iee2mgvyU1mKU7lMX63ooa/Hw/gAq0Pez3/hc oDqd8AbzsvTOycrQ6uucPhBITjmaUWEG60xXs78C5nAF8UIaie2BzpUe8gHzhwq9trxJ vR5H/pF+kUcxS233oaojqeIa+O8r8XMbSdN0v+z+T/DiUFb1+jbJnmncQkdo1v6DuQ5L kVlw== X-Gm-Message-State: AOAM531gaDD2tBO2rbZvmS0XR5bowwabN0lfEt5PSZTEuF+/ryhZV96Z dkrR+wd+ewQ/vGFuEkibzGo= X-Google-Smtp-Source: ABdhPJyR5An0CuA/D7A6BVciKJk8k63wZbCqLYIkkkWVZPbBsC76SiV6zbcI3qbRL+BtQuhbhK3XOQ== X-Received: by 2002:a05:600c:4fc7:: with SMTP id o7mr1116578wmq.91.1632174430793; Mon, 20 Sep 2021 14:47: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?= , Paul Durrant Subject: [PATCH v5 31/31] accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one Date: Mon, 20 Sep 2021 23:44:47 +0200 Message-Id: <20210920214447.2998623-32-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920214447.2998623-1-f4bug@amsat.org> References: <20210920214447.2998623-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: 1632174433963100001 cpu_common_has_work() is the default has_work() implementation and returns 'false'. Explicit it for the QTest / HAX / HVF / NVMM / Xen accelerators and remove cpu_common_has_work(). Since there are no more implementations of SysemuCPUOps::has_work, remove it along with the assertion in cpu_has_work(). Reviewed-by: Richard Henderson Acked-by: Paul Durrant Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 2 -- accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/qtest/qtest.c | 6 ++++++ accel/xen/xen-all.c | 6 ++++++ hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 11 ++--------- target/i386/hax/hax-accel-ops.c | 6 ++++++ target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index e2dd171a13f..c64709b898c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -89,7 +89,6 @@ struct SysemuCPUOps; * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID. @@ -132,7 +131,6 @@ struct CPUClass { void (*parse_features)(const char *typename, char *str, Error **errp); =20 int reset_dump_flags; - bool (*has_work)(CPUState *cpu); int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); void (*dump_state)(CPUState *cpu, FILE *, int flags); diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index d1691be9896..53c427ee42e 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -446,6 +446,11 @@ static void hvf_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool hvf_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hvf_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -456,6 +461,7 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, v= oid *data) ops->synchronize_post_init =3D hvf_cpu_synchronize_post_init; ops->synchronize_state =3D hvf_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hvf_cpu_synchronize_pre_loadvm; + ops->has_work =3D hvf_cpu_has_work; }; static const TypeInfo hvf_accel_ops_type =3D { .name =3D ACCEL_OPS_NAME("hvf"), diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d52..eb5a17cef18 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -47,12 +47,18 @@ static const TypeInfo qtest_accel_type =3D { }; module_obj(TYPE_QTEST_ACCEL); =20 +static bool qtest_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void qtest_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; ops->get_virtual_clock =3D qtest_get_virtual_clock; + ops->has_work =3D qtest_cpu_has_work; }; =20 static const TypeInfo qtest_accel_ops_type =3D { diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 69aa7d018b2..fe5a37fa2e6 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -215,11 +215,17 @@ static const TypeInfo xen_accel_type =3D { .class_init =3D xen_accel_class_init, }; =20 +static bool xen_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void xen_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; + ops->has_work =3D xen_cpu_has_work; } =20 static const TypeInfo xen_accel_ops_type =3D { diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index e2f5a646046..5ed1ccdfdd5 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } =20 -static bool cpu_common_has_work(CPUState *cs) -{ - return false; -} - ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(typename)); @@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) =20 k->parse_features =3D cpu_common_parse_features; k->get_arch_id =3D cpu_common_get_arch_id; - k->has_work =3D cpu_common_has_work; k->gdb_read_register =3D cpu_common_gdb_read_register; k->gdb_write_register =3D cpu_common_gdb_write_register; set_bit(DEVICE_CATEGORY_CPU, dc->categories); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 98b4049aba7..e6dad2243c6 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,15 +251,8 @@ 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) { - return cc->has_work(cpu); - } - if (cpus_accel->has_work) { - return cpus_accel->has_work(cpu); - } - g_assert_not_reached(); + g_assert(cpus_accel->has_work); + return cpus_accel->has_work(cpu); } =20 static int do_vm_stop(RunState state, bool send_stop) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-op= s.c index 136630e9b23..5407ba17eaf 100644 --- a/target/i386/hax/hax-accel-ops.c +++ b/target/i386/hax/hax-accel-ops.c @@ -74,6 +74,11 @@ static void hax_start_vcpu_thread(CPUState *cpu) #endif } =20 +static bool hax_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hax_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -85,6 +90,7 @@ static void hax_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D hax_cpu_synchronize_post_init; ops->synchronize_state =3D hax_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hax_cpu_synchronize_pre_loadvm; + ops->has_work =3D hax_cpu_has_work; } =20 static const TypeInfo hax_accel_ops_type =3D { diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-acce= l-ops.c index f788f75289f..36296f79ff8 100644 --- a/target/i386/nvmm/nvmm-accel-ops.c +++ b/target/i386/nvmm/nvmm-accel-ops.c @@ -83,6 +83,11 @@ static void nvmm_kick_vcpu_thread(CPUState *cpu) cpus_kick_thread(cpu); } =20 +static bool nvmm_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void nvmm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void nvmm_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D nvmm_cpu_synchronize_post_init; ops->synchronize_state =3D nvmm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D nvmm_cpu_synchronize_pre_loadvm; + ops->has_work =3D nvmm_cpu_has_work; } =20 static const TypeInfo nvmm_accel_ops_type =3D { --=20 2.31.1