From nobody Mon Feb 9 20:31:33 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=1632476355; cv=none; d=zohomail.com; s=zohoarc; b=OQGMQa2Gftroeumd0WAO6Z9u+rVqDSs2Y+V1kpFrL73N6MtPUP5vx3YgU2EPgaF26EdCgcIyovZMBpf0Btr+XCp32+D+20T1kcOg0zgGckzCBKaYQa/fUI3wdT8vjHivgNM6fbcyFptmCtegQTdxRO6SoovSnu4TMY7I6kW3a8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632476355; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=f5vtkvmro+6Pdyxra48lfS6oRfdAeG0Gn7Vmd7avzjs3otOYdpt5YGdTh2zi9GlmUr0MHI9jz7kV/yfZXCvPbdM4HF3rmZ0D2M1VfH2ZQ2WWb4XQuY2wxDTKn9IMGmeEVTK6Qr7AziZ1QPbfC/BysQISMw+zB+pLWs5qJcs0AkY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1632476355207179.85091456106852; Fri, 24 Sep 2021 02:39:15 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id r23so153394wra.6 for ; Fri, 24 Sep 2021 02:39:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id q3sm6362677wmc.25.2021.09.24.02.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Sep 2021 02:39:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=dtaPENSHWgqPCqi+uk96kCR07UH/mqS1ORNhhtTyDM7hhadwpEy6Szr93fFMW0qjEF MVUbQ7hiiWAlWh+x2FJyHgwxu3DxQEOc1CWdWo6xS+oqjuu23Tj84K/2nixMYCXv97I9 NQ41qjmmFdQA3SCCl043i6iA4DqFqTlyPTCqiPzDAX/2fDnFF6MTPoyThhmhFw+9yOmE 9QEDItSxG5RKsUfyTFScLRrYQeYNcQk0YnVa4CRAsJqyMK3dNEQYjlL3EzULFEFVY0Ia 4Akhyp41ZIRPRLfRTi5gEOwWRjdooMOgBxkm58BARyTjnY13OJz5D4Lev9IlsUAoId6r mDZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=JzTrtSfbRmjf/bKAJM7vkVv9VoYuz9gRa1ULjbTk44eZ71mbI1KRUgEMUn1xC+sciA NqIidujuIb8DSnl0tKhHczVDDMCfTm9a7DE/cz9mCBfz4p9tm+0c1/VNxUbnLFI7PUBe gNtX6sXrkjXT3frqmaGw4/+IpN2c0qWSdZjwt1/sqW3A1yXuFS3kSfFBU1g/Evx/BAUR W5FIMkE/h4m2b4oPTNcpaVtp4f9NPu6fx7zirkzdx7MxknaUzpYUadgodVsR6PSPzSOv kloR4u26YBbYtoDa4Ld+UOaVH45bbTFOM667rSPd4i2G1UyQH19zaN/o7nMzbGLsiLwM Egbw== X-Gm-Message-State: AOAM530HsJOECdSMF2sCANp5FFRtaPD1ok2KsQbjfcI0+q45T4fGtc5Y KMhcAQStjVm08wfIC7MJwuo= X-Google-Smtp-Source: ABdhPJz9UK14yoXE1B3z9UZMUIsew3qRgZpVt2fmKtsCDzDAOGrjCPlzJrS0FAx9kT0lPHVHEVdVUw== X-Received: by 2002:a7b:c148:: with SMTP id z8mr1012888wmi.160.1632476353468; Fri, 24 Sep 2021 02:39:13 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v6 05/40] hw/core: Move cpu_common_has_work() to cpu_has_work() Date: Fri, 24 Sep 2021 11:38:12 +0200 Message-Id: <20210924093847.1014331-6-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210924093847.1014331-1-f4bug@amsat.org> References: <20210924093847.1014331-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632476355838100001 cpu_class_init() always register cpu_common_has_work() as CPUClass::has_work() handler, so the assertion check in cpu_has_work() is pointless. Since cpu_common_has_work() simply returns 'false', we can inline it in cpu_has_work(), improving the function readability. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index e2f5a646046..5ed1ccdfdd5 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } =20 -static bool cpu_common_has_work(CPUState *cs) -{ - return false; -} - ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(typename)); @@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) =20 k->parse_features =3D cpu_common_parse_features; k->get_arch_id =3D cpu_common_get_arch_id; - k->has_work =3D cpu_common_has_work; k->gdb_read_register =3D cpu_common_gdb_read_register; k->gdb_write_register =3D cpu_common_gdb_write_register; set_bit(DEVICE_CATEGORY_CPU, dc->categories); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 6a05860f7fe..accb20f0589 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,8 +255,10 @@ bool cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - g_assert(cc->has_work); - return cc->has_work(cpu); + if (cc->has_work && cc->has_work(cpu)) { + return true; + } + return false; } =20 static int do_vm_stop(RunState state, bool send_stop) --=20 2.31.1