From nobody Tue Feb 10 02:54:47 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=1632581500; cv=none; d=zohomail.com; s=zohoarc; b=YuP0sAn5owc2iwp9AiIAzWkxUlYyx3XeSDoFchw5OvIzYxpZqrRN1XW09BOrz++x8gvDaee7qFCVW1qjsHwpOByK2hEvRtPpgx2PGihZR/tiCxs3BpywKg6PAfZwcHgVwGJ4mwZttBx2cf6u/L5IrXGAfkcqBaCW0Ea1MpTXMGM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632581500; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=Jw6K3QCSA4RUakV6FN0YQnwnMWnQlXse2nnPeeKrUEDb/fAV1sqdd7irYrVKE6GdYQCAccoyYICQIlDHOp4ufe69DuI86jO98/WxVIqRNZnEA9WSW+x7Fhh8OwCxwn6onxBrqcu1NqeldlKjVYSoJSvU369I/BHWtrApGMEy2sI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1632581500572593.1462779240676; Sat, 25 Sep 2021 07:51:40 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id d6so36332781wrc.11 for ; Sat, 25 Sep 2021 07:51:40 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id y11sm13690765wrg.18.2021.09.25.07.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 07:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=VgGbYvr0zOUZ11vJzkJlKMILzL55l6ZQpg9wz0vVALAo+YpQSBtyttLYk4uZLw70K6 QFRzS1pjSxMpxKpmbF7efFCe88zrYnUdS4WePbe1p6td3Z8bJUHoarUxaccx8uHQZ6Zk emsGumLandXTuwIhRbt2x3eE/YN/a3daJg/Gv9wzyrVKVNMmossnMdFNJbYHd8xaeAWj Us/qadeN0jVSrocrs7WRWBSdDnredCI47pwoxpR3YdFBO2PAUvd/MegerPvrl14vbTPf slpQ1SKMCRXKYCOe9Tg0Bx9LYVZtYkWTHlKqajNVqQ03NrNAMAEJ13qxaz9YPZmNGKLV x2RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0AqKBFC+aFLNQwO8nQ0Y0K7FTRMmlUnvtkKFuSqHBPM=; b=zFNLLsCg1CM0VxUTYbSpWttP0Q5Q6ybPCDRRBYOylXZlbimOWnrR3pTxOQ09I+jyhj eI0uIlRcngzBpXriK/2PLqGOHms/ZQ4F1iQtOdL4+Ht+h+Ys8TLvkKeWS0cmpJ3dfqXv qboZtmtdDyVVa5VPJ5EqcaREDv/soytwThsEDVcD+9tavDfLGfy+KUf4yspmImitrD+/ /ew+7LlLhTwWk7vxp0017AmNzy2JfntDpf0wZk0UM/caifeUyv+eoLP1T4J5QHobC1up 3iG3WHFznrcbtSgaKI/HPq4nYfWXxucpj9A9LdHkZrqPHA8O91bePw1nKoQHCwFAo6xu JN+g== X-Gm-Message-State: AOAM532UjEgQh7dHcKRf3ziBzJVgA9H1aZOHjlezxjCEllN7Sb9dGJgx sfBqtr3yZyNn5qpsK8wOdW4= X-Google-Smtp-Source: ABdhPJynwAAYE6uZr6+Ls3W+qh141dZhbxfysqzxFkctP0T3IxaM6Un9nQ8j/5Zrpt4YlEbojogeXg== X-Received: by 2002:a5d:440d:: with SMTP id z13mr17596133wrq.433.1632581498856; Sat, 25 Sep 2021 07:51:38 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini Subject: [PATCH v7 04/40] hw/core: Move cpu_common_has_work() to cpu_has_work() Date: Sat, 25 Sep 2021 16:50:42 +0200 Message-Id: <20210925145118.1361230-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925145118.1361230-1-f4bug@amsat.org> References: <20210925145118.1361230-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1632581502221100001 cpu_class_init() always register cpu_common_has_work() as CPUClass::has_work() handler, so the assertion check in cpu_has_work() is pointless. Since cpu_common_has_work() simply returns 'false', we can inline it in cpu_has_work(), improving the function readability. Suggested-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index e2f5a646046..5ed1ccdfdd5 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } =20 -static bool cpu_common_has_work(CPUState *cs) -{ - return false; -} - ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(typename)); @@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) =20 k->parse_features =3D cpu_common_parse_features; k->get_arch_id =3D cpu_common_get_arch_id; - k->has_work =3D cpu_common_has_work; k->gdb_read_register =3D cpu_common_gdb_read_register; k->gdb_write_register =3D cpu_common_gdb_write_register; set_bit(DEVICE_CATEGORY_CPU, dc->categories); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 6a05860f7fe..accb20f0589 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,8 +255,10 @@ bool cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - g_assert(cc->has_work); - return cc->has_work(cpu); + if (cc->has_work && cc->has_work(cpu)) { + return true; + } + return false; } =20 static int do_vm_stop(RunState state, bool send_stop) --=20 2.31.1