From patchwork Fri Jan 19 11:34:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 763910 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a08:0:b0:337:62d3:c6d5 with SMTP id m8csp397688wrq; Fri, 19 Jan 2024 03:37:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGpg/wTx6HVqN4Sx6HbueYiy1ZxKQA08Z3LEjkrLKIuJ2EKu+P48ygKaLgjksLG1BnpnT3u X-Received: by 2002:ac8:5f4d:0:b0:42a:202c:a5ff with SMTP id y13-20020ac85f4d000000b0042a202ca5ffmr1990036qta.127.1705664268646; Fri, 19 Jan 2024 03:37:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705664268; cv=none; d=google.com; s=arc-20160816; b=XwqSCxX3dsOAmkba8jXIq0TNU4c5Ix2h7hV9npXe++xpKflEOBmEI2EJvjUbEZo1mN GqxTvmBJ1+yOEjSJZNt6yh8WFUtrBtbgZsxwUMlivSsMYX9+8ECUx7jflmKvAlOwAQrk s7AftlbcN7nAp1KmFgGfQEpCx5mTQyDNudbTgEiYrbSEr5bKJY9LouF32IC41EOoPK0P Gn0SwmUQMtm9I6zTYaWKIJ0Jz5cCtnjpeH19sUkWAHh4y/owbL2Vdah79D42n88MM3n5 V47Alqv1zcbg89YJzzTzIr3kKMzLTZy/kqt0pUUA9gyTU7967U6d0CwlYFp4dYEClDIG PyZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H2zlYB8RHgO8CCP+jqoBT970ZAV+LbSEyEbXoFvRXkI=; fh=7bHwpYwJTQ83+a+dvE3Bpy6AZG6gjvkTWbe0ZYqyLws=; b=qs7pmMeUrBaY27NLQuyJlZSemFpO4r2JH954xpkXVobg0oZth0wqCkTTBHr9G1kFHH okPOxlqJ5aBIGd4UYls07hlaG6Cou/9bTqKCZMMYL6PbtNr2nXLYyy++FukavSkN8jCV VVveIi6YOGVDQV2BK+TvK0GpOdGWLdLTsS0kX440suNiXLAF+qUOGRkVzHUDwlJchzkC f3i1CXgnLwGLCblhxFebYrkW6zuGLY9iEbFOXNu5HIhU++QB+R607yNXN4gPxyYu0nxr zuoSQ+jwQGPOzefcmvxxnll1rQAMv5Ruu2YCpzGUlCS6TbIcwweZ+ruEcbBfAAw8rGyR ow1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qzs905oI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t7-20020ac85887000000b0042a279366e2si803779qta.655.2024.01.19.03.37.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Jan 2024 03:37:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qzs905oI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQn9q-0001ei-2N; Fri, 19 Jan 2024 06:35:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQn9o-0001bV-48 for qemu-devel@nongnu.org; Fri, 19 Jan 2024 06:35:32 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQn9k-0007Yy-U7 for qemu-devel@nongnu.org; Fri, 19 Jan 2024 06:35:31 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40e9fd483e2so2598895e9.0 for ; Fri, 19 Jan 2024 03:35:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705664127; x=1706268927; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H2zlYB8RHgO8CCP+jqoBT970ZAV+LbSEyEbXoFvRXkI=; b=Qzs905oIjX9Qx/rZ4OLyTlFAdU3S0idZTECKM5QQeqQ4mnEFy90b9MGigdj4sXi43i 9HREvQuj6izbvH9HsQrq29JQtna9OIBqTTq/IrXDsF606VgwnbufiMCR1m3rC8yH7jsR c4hX3ImLNFRJX/hlube2Teo+GlQ4FiP30x9uQWI+7tf9SZCrnIloyz4OOrU94vvD0Hih cY/d3Ls9XFMgSjiLC4aqfNmI7rk2tJyue3QSrvBuXfDifYHHsslI51hXa25f6SePUR3E e9oszdUp7edo7ebOb+T/vOtjyJ7TC8Fc+32tn2zZ8wo1WuWujlmyVDnkfNK3ip38d5SU QhRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705664127; x=1706268927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H2zlYB8RHgO8CCP+jqoBT970ZAV+LbSEyEbXoFvRXkI=; b=dzG748B/h98Kr8guV/FDdoChRABgb0F9zXhnxLZETE5vBpWRx1XxsIoVCCAFDFUkai mPqZobz6Wnfryyq4Zvb8DsA9FlGr091JtsrieoDRZpYvrJ/aMGzGBigviVycXoJfTH4y nKmPKieocOwC8+NjSX8/WYyv32rG7n4Q2inA8RiCb9dxLCWFmoj0hJDUzq0NxIuzFSWB 4eSnmqY54V6Dinsv+iu9z9qyHJotLsjEzK2r/XDhiJtxZfStY/etUyyqqoGeJAJ5Juk4 dR4UJn67Nu5mU+jZJ4Xw7qmeBX80KhCaMH+p6IYskmGiEWeNnXWQ/zJPBQle5zVcwkjp y6rw== X-Gm-Message-State: AOJu0Yw0KVS/oe8pGn4Tg8ZlTJNOPcmlu+QFf+X11Lv5+CaEgmLMrDM1 bUe4jp3OVbdaFqEzIIckuPOXwLYv+A4oG0e2PLFvg1FiZrJl5tLBCseJcAXBoja8OAtJyONPmeo 00iVavw== X-Received: by 2002:a05:600c:46cf:b0:40e:5118:5046 with SMTP id q15-20020a05600c46cf00b0040e51185046mr1365481wmo.21.1705664127043; Fri, 19 Jan 2024 03:35:27 -0800 (PST) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id p10-20020a05600c358a00b0040e559e0ba7sm32395502wmq.26.2024.01.19.03.35.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 19 Jan 2024 03:35:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Cameron Esfahani , Roman Bolshakov , Paolo Bonzini , kvm@vger.kernel.org Subject: [PULL 04/36] accel: Do not set CPUState::can_do_io in non-TCG accels Date: Fri, 19 Jan 2024 12:34:33 +0100 Message-ID: <20240119113507.31951-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240119113507.31951-1-philmd@linaro.org> References: <20240119113507.31951-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 'can_do_io' is specific to TCG. It was added to other accelerators in 626cf8f4c6 ("icount: set can_do_io outside TB execution"), then likely copy/pasted in commit c97d6d2cdf ("i386: hvf: add code base from Google's QEMU repository"). Having it set in non-TCG code is confusing, so remove it from QTest / HVF / KVM. Fixes: 626cf8f4c6 ("icount: set can_do_io outside TB execution") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20231129205037.16849-1-philmd@linaro.org> --- accel/dummy-cpus.c | 1 - accel/hvf/hvf-accel-ops.c | 1 - accel/kvm/kvm-accel-ops.c | 1 - 3 files changed, 3 deletions(-) diff --git a/accel/dummy-cpus.c b/accel/dummy-cpus.c index f4b0ec5890..20519f1ea4 100644 --- a/accel/dummy-cpus.c +++ b/accel/dummy-cpus.c @@ -27,7 +27,6 @@ static void *dummy_cpu_thread_fn(void *arg) bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); - cpu->neg.can_do_io = true; current_cpu = cpu; #ifndef _WIN32 diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 8eabb696fa..d94d41ab6d 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -428,7 +428,6 @@ static void *hvf_cpu_thread_fn(void *arg) qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); - cpu->neg.can_do_io = true; current_cpu = cpu; hvf_init_vcpu(cpu); diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 45ff06e953..b3c946dc4b 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -36,7 +36,6 @@ static void *kvm_vcpu_thread_fn(void *arg) bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); - cpu->neg.can_do_io = true; current_cpu = cpu; r = kvm_init_vcpu(cpu, &error_fatal);