From nobody Fri May 10 06:02:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602598042; cv=none; d=zohomail.com; s=zohoarc; b=nvgP+32Mx+xhQdFqgd6z220fBL1UYPuFj0NKwYwULVeooqWoPA5DdV5cTC+dJFF7UPhdkcyDyoYI9CJUcYjlkb+eL8vIKeq4Y/qAIAYnqb3WJApuHZfkok7jKrT9XmunJ9MMAj0OtQAKSB+u8bLdGukOKXv9IeV7JoR/5dVKDaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602598042; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UycC6Mqg0Rldvi+xLfIHf2k2nJwmsZhNp06Zk4OLYro=; b=Q8UGAPKN4tPQl8hjxpGBD9t/qQNSf0Q3Z6BMVCDK4LY5/ORrqrPKufV8mNtDULznPfNJnSYvW2lDO0cPfy+Lq/I74aOKrUrcU1fEdXLkBCUc+q5u+MF2LEdHJXk2eGvbW8fti+YGl/pvzusriSWjEkedd9eUkV463JZI9a7Di/0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602598042151458.70034440994687; Tue, 13 Oct 2020 07:07:22 -0700 (PDT) Received: from localhost ([::1]:52480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSKxU-0000GJ-KL for importer@patchew.org; Tue, 13 Oct 2020 10:07:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSKvz-0007VG-JA for qemu-devel@nongnu.org; Tue, 13 Oct 2020 10:05:47 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:44436) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSKvx-0006KP-TV for qemu-devel@nongnu.org; Tue, 13 Oct 2020 10:05:47 -0400 Received: by mail-qt1-x841.google.com with SMTP id m65so1620122qte.11 for ; Tue, 13 Oct 2020 07:05:45 -0700 (PDT) Received: from shine.lan ([2001:470:8:67e:2df1:3321:942a:fbce]) by smtp.gmail.com with ESMTPSA id z26sm13793609qki.40.2020.10.13.07.05.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 07:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UycC6Mqg0Rldvi+xLfIHf2k2nJwmsZhNp06Zk4OLYro=; b=j7ndtEqKZgLfhAIljTN576v9T9UpCWsu0U9cLrcooB4UsntSbD8jLHzUpXYboRcdB6 xg24x4dJuq1mnuALDZ4kMJqlppQhKH646glr2UJe5kaF5x1YvONk2+Zm7qHJ0XRBBHfp Tz5IuAC4nBfmmMivSwG4PDO1BeOUw22sOu/iFiIUGPVvGXyiAnHUgCiun2c5ezeh9nFX vaZbC0dzmgtf70WiwI+mSNJVwmzm62rbfzirisiihcBm8LqUa+B6iZ93H3j1PwGSQye5 7B+SyxIKRZR61/xzJVz+b1BfEccu3Gu6qiEJJw0nSBLxsJJNMEBXNf1o/p1O2pz8Uptt h+xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UycC6Mqg0Rldvi+xLfIHf2k2nJwmsZhNp06Zk4OLYro=; b=PJlDpJrXJ+w9qWYOm4QZZpq1bHg78YtXT9a+XUalw2z/Ogi2B3hsB77aDkShL3yZVM 7RGUd0oRPVsaHQWT4DLQ+OyVNYJNaZywhU8GMaOsOXkrV8mlZmkL6wkKmoBz3Iqnx/x3 OM6k2rSxNSiVwrjKwjhYEODkdwqCnfg8CH8ZOKbhSJ+UO4jJpnQAYy8x/G3nNIl66SXP 1m8iSI8KU4uK3PdmffBd5+A0TQxpRnLqOi+zss5xtTEcM5UnQIcX7if8nONlbLEDbOyB sy7hX4nqRoDTYWWXpLSnho05/30H76P40UW3R0om7EVpRi0wIa6m/eGE/dwgT9RWultW 7HAg== X-Gm-Message-State: AOAM530oGHhJI6EwmUE9Vk0RWTMWKMAFOnJYNrC0e6EPjzKsk3ju2xlZ 02uBNO0KiMi9oiHhDp44pYWibxNuU38= X-Google-Smtp-Source: ABdhPJxUcSJMH0vexXm8bfZ5KPesXIY3PrRKUllw+uhLUbCprr03cyb2b3g9FvVW/5EEWgbjfajJcQ== X-Received: by 2002:ac8:3984:: with SMTP id v4mr15402217qte.240.1602597944593; Tue, 13 Oct 2020 07:05:44 -0700 (PDT) From: Jason Andryuk To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] accel: Remove _WIN32 ifdef from qtest-cpus.c Date: Tue, 13 Oct 2020 10:05:09 -0400 Message-Id: <20201013140511.5681-2-jandryuk@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013140511.5681-1-jandryuk@gmail.com> References: <20201013140511.5681-1-jandryuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::841; envelope-from=jandryuk@gmail.com; helo=mail-qt1-x841.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , Thomas Huth , Claudio Fontana , Jason Andryuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" dummy-cpus.c is only compiled with CONFIG_POSIX, so the _WIN32 condition will never evaluate true. Remove it. Signed-off-by: Jason Andryuk Acked-by: Paolo Bonzini Reviewed-by: Claudio Fontana Reviewed-by: Thomas Huth --- v2: New in v2 --- accel/qtest/qtest-cpus.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/accel/qtest/qtest-cpus.c b/accel/qtest/qtest-cpus.c index 7c5399ed9d..db094201c1 100644 --- a/accel/qtest/qtest-cpus.c +++ b/accel/qtest/qtest-cpus.c @@ -29,10 +29,6 @@ =20 static void *qtest_cpu_thread_fn(void *arg) { -#ifdef _WIN32 - error_report("qtest is not supported under Windows"); - exit(1); -#else CPUState *cpu =3D arg; sigset_t waitset; int r; @@ -69,7 +65,6 @@ static void *qtest_cpu_thread_fn(void *arg) qemu_mutex_unlock_iothread(); rcu_unregister_thread(); return NULL; -#endif } =20 static void qtest_start_vcpu_thread(CPUState *cpu) --=20 2.25.1 From nobody Fri May 10 06:02:45 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602598055; cv=none; d=zohomail.com; s=zohoarc; b=SBNL+Hmqx+o4Q0F+A5EjhefLztDcD6iFbYq3szjDyihi5bclD2MGJEfDQF0U2/Hr/91otWW38YjFVDk3dU24tEa0JVsrctCCtYJLwv3yOvQaYnXUbTIXMQ1Ji1BsWCDJ3ZlwYuWaoqY729TgswO5ehDTSRVhDlEN9cYbDlBZHiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602598055; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6+g8uPOejQwBA3L5BeMjyy5nmgRlbyJPcNeaeTMUqfo=; b=M3YWUV7pO+JugSoPChWIzt0U5ln5qjOm3UyUgMohbNjXgpEhlL/TXyuyvHWb5MNbEAY/B5cwlX6GFU0YhubgdEgU5tPNKbKEb+h6ZXDy8FlmeBrNhWe28Ozabh7w0AA0KZ+f7Yao/ut4CVMXUI+fwg9a7k+NIN9h2ix7g1I1jb4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602598055089404.252760418428; Tue, 13 Oct 2020 07:07:35 -0700 (PDT) Received: from localhost ([::1]:53390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSKxh-0000fU-O8 for importer@patchew.org; Tue, 13 Oct 2020 10:07:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSKw8-0007hn-SF for qemu-devel@nongnu.org; Tue, 13 Oct 2020 10:05:56 -0400 Received: from mail-qv1-xf41.google.com ([2607:f8b0:4864:20::f41]:44923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSKw6-0006L0-Vu for qemu-devel@nongnu.org; Tue, 13 Oct 2020 10:05:56 -0400 Received: by mail-qv1-xf41.google.com with SMTP id s17so19764qvr.11 for ; Tue, 13 Oct 2020 07:05:54 -0700 (PDT) Received: from shine.lan ([2001:470:8:67e:2df1:3321:942a:fbce]) by smtp.gmail.com with ESMTPSA id z26sm13793609qki.40.2020.10.13.07.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 07:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6+g8uPOejQwBA3L5BeMjyy5nmgRlbyJPcNeaeTMUqfo=; b=BfqoSDg2lAx8yDZ2FN5kLj4me9VCGqs5t/tR3Ptz4H2JR5zC2XufHPEpmwFNXk/Y12 c5OwQMAJbQ8ZpfdnrboeDRZN3J9n3pZhQsXR/dMZWRwVdvONLK5Daja5DtYkW7eD8kNn PR8xH+qtCRoUb/GQNy+qkc7t1U9kftRwiByYbcNCT81E0CjLer9oCj6cDEg7QJJLFxnA ul2EXccejyh684ib45Er0rsF26tRCGr4LHdIyjtPLZMm16PUcucHwLD3vZRfjaFebP0P 0pHIAtO+86I721+B7MzEW89NRmD5GEAgokSnvBPxPuqwZplIcaToCVwre/h31i/iX7vW gFmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6+g8uPOejQwBA3L5BeMjyy5nmgRlbyJPcNeaeTMUqfo=; b=UeT3hDpmQRYJ6ABXePnITqpYDr+hFJ9Bik0mDdoP1AeG9uxc07k+0yg+IbOXO9RStD SCsM2YIfcBqtZhdELF1T3N4vBgytPoUTGWLPQHYf1Lvz5AcV+DXwzKS8p+p74H3YfR5/ AewiXKM9idVi5wCdus6IJHXJuJzmwyHQhg0/vy/VSEyBvR36Y6JpMGSWZamE/eNjlyaL G//ZKXp9Z/SyaV5R74nf2V3Y7eAEwfEp3cFyesInunZfxXlGRx7JprJUMpJuCiM97oMr bbas96ateLHhahIUqXwDpnXb0K4Gr3jhc1bOweT+hHMBJiq2ZbZuANKpZvNOjWRDE0Vx 37Dg== X-Gm-Message-State: AOAM532nDgXDWyuEdxl7+66xBH58fScGO1pGfsGsed69XoYhLM5MtksH 00A7fUqIJIweer8MELW26p9tVduprrQ= X-Google-Smtp-Source: ABdhPJzN6wVrQ9U+RAuKI3YeHUAXbPyBvvRNyANqqUZQrv+6NASfi7VEs3T2R5pMIJDYrocA8Qzwvg== X-Received: by 2002:a05:6214:122a:: with SMTP id p10mr146394qvv.0.1602597950173; Tue, 13 Oct 2020 07:05:50 -0700 (PDT) From: Jason Andryuk To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] accel: move qtest CpusAccel functions to a common location Date: Tue, 13 Oct 2020 10:05:10 -0400 Message-Id: <20201013140511.5681-3-jandryuk@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013140511.5681-1-jandryuk@gmail.com> References: <20201013140511.5681-1-jandryuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::f41; envelope-from=jandryuk@gmail.com; helo=mail-qv1-xf41.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Jason Andryuk , Claudio Fontana , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Move and rename accel/qtest/qtest-cpus.c files to accel/dummy-cpus.c so it can be re-used by Xen. Signed-off-by: Jason Andryuk Acked-by: Paolo Bonzini Acked-by: Thomas Huth Reviewed-by: Claudio Fontana --- v2: - Use accel/dummy-cpus.c - Put prototype in include/sysemu/cpus.h --- accel/{qtest/qtest-cpus.c =3D> dummy-cpus.c} | 22 ++++------------------ accel/meson.build | 7 +++++++ accel/qtest/meson.build | 1 - accel/qtest/qtest-cpus.h | 17 ----------------- accel/qtest/qtest.c | 5 ++++- include/sysemu/cpus.h | 3 +++ 6 files changed, 18 insertions(+), 37 deletions(-) rename accel/{qtest/qtest-cpus.c =3D> dummy-cpus.c} (75%) delete mode 100644 accel/qtest/qtest-cpus.h diff --git a/accel/qtest/qtest-cpus.c b/accel/dummy-cpus.c similarity index 75% rename from accel/qtest/qtest-cpus.c rename to accel/dummy-cpus.c index db094201c1..10429fdfb2 100644 --- a/accel/qtest/qtest-cpus.c +++ b/accel/dummy-cpus.c @@ -1,5 +1,5 @@ /* - * QTest accelerator code + * Dummy cpu thread code * * Copyright IBM, Corp. 2011 * @@ -13,21 +13,12 @@ =20 #include "qemu/osdep.h" #include "qemu/rcu.h" -#include "qapi/error.h" -#include "qemu/module.h" -#include "qemu/option.h" -#include "qemu/config-file.h" -#include "sysemu/accel.h" -#include "sysemu/qtest.h" #include "sysemu/cpus.h" -#include "sysemu/cpu-timers.h" #include "qemu/guest-random.h" #include "qemu/main-loop.h" #include "hw/core/cpu.h" =20 -#include "qtest-cpus.h" - -static void *qtest_cpu_thread_fn(void *arg) +static void *dummy_cpu_thread_fn(void *arg) { CPUState *cpu =3D arg; sigset_t waitset; @@ -67,7 +58,7 @@ static void *qtest_cpu_thread_fn(void *arg) return NULL; } =20 -static void qtest_start_vcpu_thread(CPUState *cpu) +void dummy_start_vcpu_thread(CPUState *cpu) { char thread_name[VCPU_THREAD_NAME_SIZE]; =20 @@ -76,11 +67,6 @@ static void qtest_start_vcpu_thread(CPUState *cpu) qemu_cond_init(cpu->halt_cond); snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/DUMMY", cpu->cpu_index); - qemu_thread_create(cpu->thread, thread_name, qtest_cpu_thread_fn, cpu, + qemu_thread_create(cpu->thread, thread_name, dummy_cpu_thread_fn, cpu, QEMU_THREAD_JOINABLE); } - -const CpusAccel qtest_cpus =3D { - .create_vcpu_thread =3D qtest_start_vcpu_thread, - .get_virtual_clock =3D qtest_get_virtual_clock, -}; diff --git a/accel/meson.build b/accel/meson.build index bb00d0fd13..9a417396bd 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -5,3 +5,10 @@ subdir('kvm') subdir('tcg') subdir('xen') subdir('stubs') + +dummy_ss =3D ss.source_set() +dummy_ss.add(files( + 'dummy-cpus.c', +)) + +specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dum= my_ss) diff --git a/accel/qtest/meson.build b/accel/qtest/meson.build index e477cb2ae2..a2f3276459 100644 --- a/accel/qtest/meson.build +++ b/accel/qtest/meson.build @@ -1,7 +1,6 @@ qtest_ss =3D ss.source_set() qtest_ss.add(files( 'qtest.c', - 'qtest-cpus.c', )) =20 specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: qte= st_ss) diff --git a/accel/qtest/qtest-cpus.h b/accel/qtest/qtest-cpus.h deleted file mode 100644 index 739519a472..0000000000 --- a/accel/qtest/qtest-cpus.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Accelerator CPUS Interface - * - * Copyright 2020 SUSE LLC - * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. - */ - -#ifndef QTEST_CPUS_H -#define QTEST_CPUS_H - -#include "sysemu/cpus.h" - -extern const CpusAccel qtest_cpus; - -#endif /* QTEST_CPUS_H */ diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 537e8b449c..b282cea5cf 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -25,7 +25,10 @@ #include "qemu/main-loop.h" #include "hw/core/cpu.h" =20 -#include "qtest-cpus.h" +const CpusAccel qtest_cpus =3D { + .create_vcpu_thread =3D dummy_start_vcpu_thread, + .get_virtual_clock =3D qtest_get_virtual_clock, +}; =20 static int qtest_init_accel(MachineState *ms) { diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h index 231685955d..e8156728c6 100644 --- a/include/sysemu/cpus.h +++ b/include/sysemu/cpus.h @@ -25,6 +25,9 @@ typedef struct CpusAccel { /* register accel-specific cpus interface implementation */ void cpus_register_accel(const CpusAccel *i); =20 +/* Create a dummy vcpu for CpusAccel->create_vcpu_thread */ +void dummy_start_vcpu_thread(CPUState *); + /* interface available for cpus accelerator threads */ =20 /* For temporary buffers for forming a name */ --=20 2.25.1 From nobody Fri May 10 06:02:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602597979; cv=none; d=zohomail.com; s=zohoarc; b=nLCG/Pq0fLsOH625jcZ/1X80YK9ghMNdrEkGt61i8P6Nkh8gmnGbrISbntBBwbAhI60eZaG8zWY4ns1iF/n6+BnBk5SLrrENenifwpByyFrL2erirsBGUh6/pIZo4cdRumHL9lQ1yiaN9cgjZ+EMvwZLFWWZOZhpHffo0ELWkrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602597979; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z5sCn2g22QNClDVC8ApV+Mu5VWc6D2QWQMvZw+Aegos=; b=P2dJE+Vwla92F+wm2SU1n9uJqYrRZ9NztgWUb6bniNjdq4IFNJyB5VCjCFlLb/3PGhSkpniIIvHkbKRYc2ebXLz+vnBy/m+7uMBGRgQZe0UX6tlE9Lq7IXO668L/U1GEh0YCFbwta57wlj2Sg9R/UdqUKLYbm98EH8DpALvIcUg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1602597979626301.1011730742978; Tue, 13 Oct 2020 07:06:19 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.6233.16582 (Exim 4.92) (envelope-from ) id 1kSKwA-0007h5-1z; Tue, 13 Oct 2020 14:05:58 +0000 Received: by outflank-mailman (output) from mailman id 6233.16582; Tue, 13 Oct 2020 14:05:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kSKw9-0007gy-Un; Tue, 13 Oct 2020 14:05:57 +0000 Received: by outflank-mailman (input) for mailman id 6233; Tue, 13 Oct 2020 14:05:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kSKw9-0007gn-Gq for xen-devel@lists.xenproject.org; Tue, 13 Oct 2020 14:05:57 +0000 Received: from mail-qk1-x741.google.com (unknown [2607:f8b0:4864:20::741]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bbce91b6-eb35-4f3c-aad1-1bb9acab6041; Tue, 13 Oct 2020 14:05:56 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id b69so20908874qkg.8 for ; Tue, 13 Oct 2020 07:05:56 -0700 (PDT) Received: from shine.lan ([2001:470:8:67e:2df1:3321:942a:fbce]) by smtp.gmail.com with ESMTPSA id z26sm13793609qki.40.2020.10.13.07.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 07:05:55 -0700 (PDT) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kSKw9-0007gn-Gq for xen-devel@lists.xenproject.org; Tue, 13 Oct 2020 14:05:57 +0000 Received: from mail-qk1-x741.google.com (unknown [2607:f8b0:4864:20::741]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bbce91b6-eb35-4f3c-aad1-1bb9acab6041; Tue, 13 Oct 2020 14:05:56 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id b69so20908874qkg.8 for ; Tue, 13 Oct 2020 07:05:56 -0700 (PDT) Received: from shine.lan ([2001:470:8:67e:2df1:3321:942a:fbce]) by smtp.gmail.com with ESMTPSA id z26sm13793609qki.40.2020.10.13.07.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 07:05:55 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bbce91b6-eb35-4f3c-aad1-1bb9acab6041 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z5sCn2g22QNClDVC8ApV+Mu5VWc6D2QWQMvZw+Aegos=; b=CfvQXnZCbKI+aeJIUwszdFQKsZPrD0OxTTWrzEaSn/d3DDvLCCcXgs0dyeR+jPToj2 ukNtrMP4s3qkhNcd4ZKW8eZc9hXTU5do+L9/1IXwwlil/SY1O+BoBGnTsV9LbPuRBOoW wLvovZjgplbCIvu7UWrbpYFfsq6LUq+KITh8knWtWOPyNIDkmkzgC/c/vjm/h9BKZtWR F3MUx8xrMrC6VFmBxyBfXPQUwvR2XyfQNtTxOgCECyVPgaWY048xCzZMVL3/JPU2XvOH +G7OLxyuA3UDUcVKDN5GSAS0q0FP/GZ8g0JPMLVvw8X0pYznkVSbSR2BOS0Poh4A+h+J J4RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z5sCn2g22QNClDVC8ApV+Mu5VWc6D2QWQMvZw+Aegos=; b=AG4hg/rEiy6IO9qtZMxObc70OtEiA2cRKN+VUG8+22lQwjZ1N5y6uTviHIbnO4k67o d30yXrueHsyZo61OVHtif+Zcf+e3WF4iUwLgtklAfMAXvv+A5IRNPBuCbOx5h/lk0S9L Y6NmOVvrF/x8V5vDQNAY5hot9CS+6LduDf1Gt+m8tFHWAm9wAJXiCCKhtggrs20KsP0G oux9/wJqOlBv2G9R42gO1MCyzXG3rAtvuklP9MiaTcPGfyF86i9Ai9ZJIhA2F7nQO12R MXCBwXIXSapXpO3MFthQqAE3c/pJBdvl9IxNwASn+HBP+y1z6zVLqqgvUzhgwnzmcOqB 6xaw== X-Gm-Message-State: AOAM530HOA163ed//RvL6zTQ+ae+s2xpAUs7cpusf9/npPeZRzWvTvAb SB8uDpuygBcj5dXQYweziN0= X-Google-Smtp-Source: ABdhPJwtxBEnRnNPjEHcuVVHof6O92obazL/vN2TmbQ5O2rfIz0/rAfUoxQkml2srmIG5IH2ZnkKwQ== X-Received: by 2002:ae9:ef56:: with SMTP id d83mr100087qkg.83.1602597956496; Tue, 13 Oct 2020 07:05:56 -0700 (PDT) From: Jason Andryuk To: qemu-devel@nongnu.org Cc: Claudio Fontana , Jason Andryuk , Stefano Stabellini , Anthony Perard , Paul Durrant , xen-devel@lists.xenproject.org (open list:X86 Xen CPUs) Subject: [PATCH v2 3/3] accel: Add xen CpusAccel using dummy-cpus Date: Tue, 13 Oct 2020 10:05:11 -0400 Message-Id: <20201013140511.5681-4-jandryuk@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201013140511.5681-1-jandryuk@gmail.com> References: <20201013140511.5681-1-jandryuk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Type: text/plain; charset="utf-8" Xen was broken by commit 1583a3898853 ("cpus: extract out qtest-specific code to accel/qtest"). Xen relied on qemu_init_vcpu() calling qemu_dummy_start_vcpu() in the default case, but that was replaced by g_assert_not_reached(). Add a minimal "CpusAccel" for Xen using the dummy-cpus implementation used by qtest. Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD Acked-by: Paolo Bonzini Reviewed-by: Claudio Fontana --- accel/meson.build | 1 + accel/xen/xen-all.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/accel/meson.build b/accel/meson.build index 9a417396bd..b26cca227a 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -12,3 +12,4 @@ dummy_ss.add(files( )) =20 specific_ss.add_all(when: ['CONFIG_SOFTMMU', 'CONFIG_POSIX'], if_true: dum= my_ss) +specific_ss.add_all(when: ['CONFIG_XEN'], if_true: dummy_ss) diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 60b971d0a8..878a4089d9 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -16,6 +16,7 @@ #include "hw/xen/xen_pt.h" #include "chardev/char.h" #include "sysemu/accel.h" +#include "sysemu/cpus.h" #include "sysemu/xen.h" #include "sysemu/runstate.h" #include "migration/misc.h" @@ -153,6 +154,10 @@ static void xen_setup_post(MachineState *ms, AccelStat= e *accel) } } =20 +const CpusAccel xen_cpus =3D { + .create_vcpu_thread =3D dummy_start_vcpu_thread, +}; + static int xen_init(MachineState *ms) { MachineClass *mc =3D MACHINE_GET_CLASS(ms); @@ -180,6 +185,9 @@ static int xen_init(MachineState *ms) * opt out of system RAM being allocated by generic code */ mc->default_ram_id =3D NULL; + + cpus_register_accel(&xen_cpus); + return 0; } =20 --=20 2.25.1