From patchwork Mon Nov 9 09:45:45 2020 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: 11890821 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5C1B016C0 for ; Mon, 9 Nov 2020 09:48:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C7E9E206ED for ; Mon, 9 Nov 2020 09:48:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lfFJ0JNb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7E9E206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc3n2-0006bI-NR for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Nov 2020 04:48:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc3kM-0004M1-57 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:45:58 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:33610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kc3kK-00036A-Gn for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:45:57 -0500 Received: by mail-wr1-x444.google.com with SMTP id b8so7955209wrn.0 for ; Mon, 09 Nov 2020 01:45:55 -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=nHScBAdADOV6JyrIbvIg38TiMpfIH0kwhUSYV2gJ4YPm3K1FdDQNcZLxw0d+dIXTb1 Tj4HZ4JeChpVsNCc5dZ2ANjGl3nOm2GjkGszNO1cx/GAioNyxbE5YIDHx6S6O9axOEm0 3D+isdCtyH+smjj5n0H4LJyaHmcH3HrP3yDAPSMNaTb0N4v8CGbOSFbSWcPjFCtJxSik 7VHXgVybVp/yCwIfOSbpfRO4/pLQjWl+k+HpAWjjHHPFOs+GSopadSvTzvDgBiWkvfaS YNGOAUEbWONZGpNkMXV+AsVFl8XPOLvhzDYRvL5i4UiFFEzRUbJyTr+RIJGUeevFfiDb tm5w== X-Gm-Message-State: AOAM531arVbRGGhNl8P9OhMXT+12qF9l6fOojUimqnnSqRRd/g/NsAw0 m/uFEqfmlYf7bDq8y8xnsXng5fOB6vw= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Paolo Bonzini , Laurent Vivier , kvm@vger.kernel.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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é --- 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')) -subdir('qtest') -subdir('kvm') subdir('tcg') -subdir('xen') -subdir('stubs') +if have_system + subdir('qtest') + subdir('kvm') + subdir('xen') + subdir('stubs') +endif dummy_ss = ss.source_set() dummy_ss.add(files( From patchwork Mon Nov 9 09:45:46 2020 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: 11890823 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6287C6A2 for ; Mon, 9 Nov 2020 09:49:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F11D9206ED for ; Mon, 9 Nov 2020 09:49:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rym4zP1G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F11D9206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:50618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc3nR-00075p-V9 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Nov 2020 04:49:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc3kQ-0004Sm-F3 for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:46:02 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44526) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kc3kO-00038b-TT for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:46:02 -0500 Received: by mail-wr1-x442.google.com with SMTP id c17so7928050wrc.11 for ; Mon, 09 Nov 2020 01:46:00 -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=JoTyPYznjO7hWTH3iHWTGY8FIoFOJQxhYevZflJ3RX4DHToxYpJyOUGqVP08zbYzUL cSwDVwQ1P7M6njZTNXUUly0+c7JyK4rII+nE+SW1oWCDpb1jRqrHIO70UcaeBPXGHY3f cPqmbxIKUA4jTAamMlLOFqP4+gYgdaD7IMp/p2WzTaQNVBbxXAsiVTafSH65A5u14MqC 4E0FPnQ+pcKg9GXwFizmwDtvutE3EuBTJP452JupoUC9Bl3hpl4g7MVdOSoJHVnzMNc6 YXzS2k8COK7sdn2WIJsrFq2WW8lknOmq1Eu2MzW7L9T3o48dMvWL+MmsVsryYMhFF3F3 Sk7A== X-Gm-Message-State: AOAM530ntKM0TGL6sNHwDPic/X/rmr8lxd98hBh9tNADEov5Da9joruh f150mqsdUuNkkE9R5T+xPyu/JgtdRmg= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Paolo Bonzini , Laurent Vivier , kvm@vger.kernel.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" This system-mode emulation stubs are not require in user-mode binaries. Restrict them to system-mode binaries. Signed-off-by: Philippe Mathieu-Daudé --- 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 = 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) From patchwork Mon Nov 9 09:45:47 2020 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: 11890825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3CCC816C0 for ; Mon, 9 Nov 2020 09:50:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C739D206ED for ; Mon, 9 Nov 2020 09:50:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F06rSHBK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C739D206ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:53348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kc3op-0008K1-QQ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 09 Nov 2020 04:50:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kc3kV-0004Ve-BE for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:46:07 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kc3kT-0003AX-LI for qemu-devel@nongnu.org; Mon, 09 Nov 2020 04:46:06 -0500 Received: by mail-wm1-x341.google.com with SMTP id c16so7304096wmd.2 for ; Mon, 09 Nov 2020 01:46:05 -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=GS+ng40M3tFB3jD7afOVBws2pTIlfaFkEPHqUYyTjslzwzXoE6PM0qXAOW+TDIiefQ 5GzthA61QiEw0L8U4IHAwVOgPliZoNJ5AGqEaGFUVkU3l2HwROBRrEvuGD/XKJug3pjL dMxLfQeFkEOieDZStm23YkvXd47Fkv5IKj6YPl7HbKTMvWFt9pWE9oLVKiYMxCuUfayJ 4QTG56zLBORXx9UHhSfWF1KP6ZoAzUwhv9yuV2b4aSfb/1jsNopzGlhXuTNGJ9J/Fkxv oGN5rS+VDS+a9L0QBZMA40bdMHQIW45+kr4HooUbv9oSYtCSnyIMLP3w4VM3n/WKt07m zWKw== X-Gm-Message-State: AOAM5307xWcgrvwnCOKqMRvYRqNqqzrl8VsYNparHC+O96SYn3FU7Xn0 bbNFNUtJf41RWKzqW9Nhhv2p0h+XCM8= 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Paolo Bonzini , Laurent Vivier , kvm@vger.kernel.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Now than kvm-stub.c is only built on system-mode emulation, we can simplify its #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé --- 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 KVMState *kvm_state; bool kvm_kernel_irqchip; @@ -91,7 +88,6 @@ int kvm_memcrypt_encrypt_data(uint8_t *ptr, uint64_t len) return 1; } -#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