From nobody Tue Feb 10 03:40:34 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