From nobody Tue May 7 00:45:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) client-ip=209.85.221.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1604915156; cv=none; d=zohomail.com; s=zohoarc; b=DlmbYnzgRkaTQ1re+n2RbiRfJphrjo68YfsH23xeEIvs2QhMQZcSdUgYPJaRqN6cvzBYUGihjo9jSG5t1RwpzRbEPyJsrKsn7KkKL/LASIw0wHYNfHH2up2BRJzLZqXd/+9MnY+Daph6fMzBkIOxzZgBRsSSD4hIgzglomz0yg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604915156; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1o8lO3koG16AlBbmrKd/snSNhrR/M4yhMjnc+WbIftA=; b=fldktgMRbKMgCxQKp8gto8R+nC9BB5PSwvymP0iPdMJWF5SqTfFTb3G9mjOTW3Q8a2a+WJ5UTPqg6i8kswTTmeCAy77XKnZYSjMLUPWo+V8in/iWnWoglxbu6HHE7Anese1lgxpCiZuwSkUj4usn+L0b/+TLkvTIsc4cdoxuNF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.zohomail.com with SMTPS id 1604915156453357.2808999825421; Mon, 9 Nov 2020 01:45:56 -0800 (PST) Received: by mail-wr1-f66.google.com with SMTP id j7so691881wrp.3 for ; Mon, 09 Nov 2020 01:45:55 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id z191sm12223304wme.30.2020.11.09.01.45.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 01:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1o8lO3koG16AlBbmrKd/snSNhrR/M4yhMjnc+WbIftA=; b=lfFJ0JNb2rBiiklBvMRWfCR2xuij+pgMCgqsLCy81HP4dnZsGa9ab/tral6KSdVN/S b4DSOQga0Gi+UYhfqO328qbmbgMW+VMAqCGR4HrGkoy2LrW1g6x80sYavGnSv1s98F5v XumyaGK5Or9PB2BeK7vAxuNBbdg1E3V2cPYRJ40N7a7NeO4KY70hCSOoP1Uy4dCvDKWA RqBJfzxMsqqYdwpfdzrM+vVZk8hugomSvGJeExtnJemU135/1Bsnwnhi1ipEEk0qTuVT rRrW9PLQOu7nPQq052VIQSaJT5fJF4/YsBg78TsY0MfddTYxudPiqIVcZgwELwdU5ejr 4nwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=1o8lO3koG16AlBbmrKd/snSNhrR/M4yhMjnc+WbIftA=; b=qhIDskn9uuvZ3Evi8tUneW08uCrbY5PAusWbUxZ9afs3NL+kTeKhmsoOMfqV+lctW3 8wMFrj5pV6oc8I4DiKAUZIXcRswZ2m2aI647V9WrsFxE62MPLYoY1HYbkOh0IPubV7nR mOAKNtdxq2TdnR3rif8YWo+/gzGUUsY7lClVvqgiYIozWpDJwcECoytpu6VL/WgMcK5r dykiKRuK9y0v5dAHQJgiHITDa9v3XTc2Cj9l+eQ2XjOEwFX1mo4PTTSgWXRL5iTfkI3Z Ic9gOQEb40xpTVNzQtXESjVcUX1gF5OtpQxMff69ieQ7rI2Iuue5OyFcHSGATWmSqGj2 7duQ== X-Gm-Message-State: AOAM533XalYFn4g8HRX1gGo3LdW3VRYSur8G95UjMSLtEsAzQfrCH3z0 ePffAD370iJjiX4/B5ZPOV8= X-Google-Smtp-Source: ABdhPJxc4TZdtgyhqebFbBYMGgeJ98UQ+2SDOy/fHp3mL6Ipg+mK+zm9sk7kmSq1DbuRl+juTBkF8g== X-Received: by 2002:adf:e64e:: with SMTP id b14mr16979874wrn.68.1604915154540; Mon, 09 Nov 2020 01:45:54 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/3] accel: Only include TCG stubs in user-mode only builds Date: Mon, 9 Nov 2020 10:45:45 +0100 Message-Id: <20201109094547.2456385-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201109094547.2456385-1-f4bug@amsat.org> References: <20201109094547.2456385-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) We only require TCG stubs in user-mode emulation. Do not build stubs restricted to system-mode emulation in a user-mode only build. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/accel/meson.build b/accel/meson.build index b26cca227a4..609772f129b 100644 --- a/accel/meson.build +++ b/accel/meson.build @@ -1,10 +1,12 @@ softmmu_ss.add(files('accel.c')) =20 -subdir('qtest') -subdir('kvm') subdir('tcg') -subdir('xen') -subdir('stubs') +if have_system + subdir('qtest') + subdir('kvm') + subdir('xen') + subdir('stubs') +endif =20 dummy_ss =3D ss.source_set() dummy_ss.add(files( --=20 2.26.2 From nobody Tue May 7 00:45:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604915161; cv=none; d=zohomail.com; s=zohoarc; b=aDpemniFLa0ygKMLlOkOV5bLOizNXx/yDm2S5VBzTgKRpDtnM1t3qfh1i+7khEfaCOdOC2Relea6ADdWAwOu9nmr19u+zO1gKOcZQBNwfm+N1Zrgc+48VwWQKkaUEFPea3Xb2ZLOcOl39u7BYRD3UIZnROAxgXZhbxzDWhb4ASI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604915161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OUYrJMZKmRU5gfzMdZni/PewvUwFGv/yOXLZtLqq/rA=; b=cU1GtN+o951Y71zmcqvoGIlZulQ95/k9Za0i1X/6WlZQ/76fmmu38WpUVm1lm9B+A26c8sMFpWYyFjjn4Xko59bxT4nOYZoa2SgD+QEpgE/ICqyd9rtVsTAJU9ij8P2FvoZOObbRLLTtmGPWhY5I6ataZ1zyzHxpeVvJIKQZ1u4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1604915161239284.4349362779757; Mon, 9 Nov 2020 01:46:01 -0800 (PST) Received: by mail-wr1-f68.google.com with SMTP id d12so6424657wrr.13 for ; Mon, 09 Nov 2020 01:46:00 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id a17sm12837504wra.61.2020.11.09.01.45.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 01:45:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OUYrJMZKmRU5gfzMdZni/PewvUwFGv/yOXLZtLqq/rA=; b=Rym4zP1Gy212Y6DC8Ti9e67ZFiG8o9H/mun5p3eVP/l4unpQXp/SCMc0Y8PVbSUN98 kAb8p6pKNT39Bdaw9Lok8Pk8clFS3Z5J6eHks8SHPVayOLB19Ew8ryEUY0GfP6Q6Pzov Ef8y87K0rjeWrtgyqSe1EcCDTpZ3F9fNmcXZBk4xV6+Naf7HzsJfdTa4kp+/0Tpqso2z Xjo3yVR8AA9FhhZaUtmfJhvq2yJ3rYPEHtjoAbOkDgK+j0IuzzbszzVOJ1TgcCQidyX0 GXnXmusnOxIw/+DdU5w5yeYNDNsoz66Vr35hL6TJ74Rfztu3EgQpoX1/wPqWe9foe3BJ ocqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OUYrJMZKmRU5gfzMdZni/PewvUwFGv/yOXLZtLqq/rA=; b=UBil10pc08xV8/W2mw8tkpRZb4rbvpawHUlkYoK4vt47wNf7ND3Fb3Lbu7Vf/vOR+F /dYlURwYgeR0Sjadll4U23gtY0/GeIHWnekx/CU5GNHp0iWSSNNYj1laCMVpXmtBXAuf 6MU1ZEFIAuSjJyrFsYdFMWK84SScrSzZGTleDMoImz3vvqiO4R4YN6VEhqoyXXgq31ZJ 059+eGrPVmQ6tuJT0cFdfXWf83a5cSTjujP4rPy2kBoMBEDwZWoI40vUil3WLXJNlKq9 vIka4qOc5WvWLwk07mJcChsGhMw/LCCYjXELB4jbCv3zDUFTH4RMbSTnv+5nLIw/0wAF NHsQ== X-Gm-Message-State: AOAM5316izBdXAqxzFLUhlDgYdArgqnrvq6LiHOiex0cFgne5jNUzESm RucoZwNFjO032oH5goE7npk= X-Google-Smtp-Source: ABdhPJxt5z9bdv9Mv9Zt4CoeM7KloJcC+UEmkeSWlobZoei3yRhyzsB5igE5vQS+QtJ4sEWc1Ys7xg== X-Received: by 2002:adf:8465:: with SMTP id 92mr16122883wrf.50.1604915159327; Mon, 09 Nov 2020 01:45:59 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/3] accel/stubs: Restrict system-mode emulation stubs Date: Mon, 9 Nov 2020 10:45:46 +0100 Message-Id: <20201109094547.2456385-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201109094547.2456385-1-f4bug@amsat.org> References: <20201109094547.2456385-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) This system-mode emulation stubs are not require in user-mode binaries. Restrict them to system-mode binaries. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/stubs/meson.build | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 12dd1539afa..a83408bc0a7 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,4 +1,8 @@ -specific_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) -specific_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -specific_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -specific_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) +accel_stubs_ss =3D ss.source_set() + +accel_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) +accel_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) +accel_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) +accel_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) + +specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: accel_stubs_ss) --=20 2.26.2 From nobody Tue May 7 00:45:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604915165; cv=none; d=zohomail.com; s=zohoarc; b=RDowls6f+g2gi+3jzCnFHWquHPE9FUJcrXmhL6NgqNfiT1MnEJ7Uu2h/mu8l/qXC4XfgSsB07qmj1BFeZl48IH/2NAxgxVpUiMi5BUSwSPE9kXp9YOzPc0P+SQxQxZKDHkfycmW6rgLxBm4lM3LVOvhUmH55uXZKzZqI0+wBZ8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604915165; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=skEK8mcEbaIFgeS0C2weI3p2dBXQu/ugQCxgA8/QJFY=; b=cFmWN9I2BYeiQzul5JJJZhUfmo5UDZnXBdTYugWcdRYqucZZ9wPVqn7eIb014buMNCIy65wB+nZip70hQ/nWHTVDJMmCOEFuFR0q0OwONnqfhODgFJ5FRcs+s4XyVQmkkra5ICzC1/M50ATST3/R3sjlkb7PZiHzew/bPmyjJsE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1604915165848621.6499960757866; Mon, 9 Nov 2020 01:46:05 -0800 (PST) Received: by mail-wm1-f66.google.com with SMTP id v5so7340464wmh.1 for ; Mon, 09 Nov 2020 01:46:05 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id u6sm12219003wmj.40.2020.11.09.01.46.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 01:46:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=skEK8mcEbaIFgeS0C2weI3p2dBXQu/ugQCxgA8/QJFY=; b=F06rSHBKrzqDcu8FaVWSwws98lz5ArIBJmV6GpbautZMtgl2r+YYdcFYVWealFs9t/ TN5556bSf+/nyhzs1b3SBy/EWxHicKqZ77PPvLiHWH0LYMJsQTkFOCkdv3Gujh0dRK/z AxFEih+MVOq3F3oabqYB24UXKuUiDcZXd0swk1NYUYN7XB2He6dS9pJMeP/hJm+Tusds qIdbGRbFmSd2VGwpJ4N6MxCWNktY+ksnTGEsxY/EY+TaH6l2Q8bRgOUdy3ckSzbeLO1e I5KvkOpoJz7eBHHtPP/6EtSuKEsydtV4zevKzuf8S/v5aLa2bDTolpeFNcJVwqKm/moh aLug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=skEK8mcEbaIFgeS0C2weI3p2dBXQu/ugQCxgA8/QJFY=; b=moWMB3/8P05ffVVOhQ5CoXZR8W5zPy1z/idpuJShTkH9HE0sxyIVuPOrhYR1pr2m5L zqIR1LCycjukFe3dnw15l+WcIPwhI27FmGmEkXKnY6WQbU5ThZCsR3ADy1u4nAnvsIWv U2kEJyYlgkbNCqas/mV5v2+o87jnn6yfrKcF7ZGtaHNVzX9C3xc0c4iqBuWUR87nUtMU NvM0WpvsvpeXAqfTRqom1fFbcKKvNo8cghzdLqu7ZuoJ1/4Qfl1Q+xqSyH4C5A6w3f6j jTTJJvCIM3GX654EX4omkOsKpioAAQIiTMptkuuJ5WAWpzL6yzFFiQSM1g+N8a3p1M/Z cDYg== X-Gm-Message-State: AOAM532CUZlllw8DNN5Q3Fu4Z2PnNjq6zFJbwArG/yrJXmpMiF5kVFDa YuMOocOUAobVTnFYCxW1q2A= X-Google-Smtp-Source: ABdhPJxDdTB7I9WJICHIIjy4yAPQvmdbvjdorOinX1TetlCZiYP42zLjOjlMNmvL8ohxokfQ4DLVcQ== X-Received: by 2002:a7b:c308:: with SMTP id k8mr10264042wmj.76.1604915164072; Mon, 09 Nov 2020 01:46:04 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] accel/stubs: Simplify kvm-stub.c Date: Mon, 9 Nov 2020 10:45:47 +0100 Message-Id: <20201109094547.2456385-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201109094547.2456385-1-f4bug@amsat.org> References: <20201109094547.2456385-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) Now than kvm-stub.c is only built on system-mode emulation, we can simplify its #ifdef'ry. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- accel/stubs/kvm-stub.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c index 680e0994637..68fdfce50ed 100644 --- a/accel/stubs/kvm-stub.c +++ b/accel/stubs/kvm-stub.c @@ -13,10 +13,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "sysemu/kvm.h" - -#ifndef CONFIG_USER_ONLY #include "hw/pci/msi.h" -#endif =20 KVMState *kvm_state; bool kvm_kernel_irqchip; @@ -91,7 +88,6 @@ int kvm_memcrypt_encrypt_data(uint8_t *ptr, uint64_t len) return 1; } =20 -#ifndef CONFIG_USER_ONLY int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) { return -ENOSYS; @@ -158,4 +154,3 @@ bool kvm_arm_supports_user_irq(void) { return false; } -#endif --=20 2.26.2