From patchwork Mon Feb 27 10:32:57 2023 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: 656942 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2274216wrb; Mon, 27 Feb 2023 02:33:32 -0800 (PST) X-Google-Smtp-Source: AK7set8mtxqNWpaUUXVI7aCiPKUUahpHAhDg3HRT5mWhHt59JgcoBjVdKf4HwWLXuZAcbo8ctrnm X-Received: by 2002:a05:622a:1985:b0:3bf:a601:6a84 with SMTP id u5-20020a05622a198500b003bfa6016a84mr39362199qtc.38.1677494011951; Mon, 27 Feb 2023 02:33:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677494011; cv=none; d=google.com; s=arc-20160816; b=shKVXEEVcQm45gePY6soyOOz6YIHbFgDf/6mV59hW8+9c5+rI3VBh98FxPLuSeG9f3 64cPfulZGYv6anR0wz/9QTvVVouwbvgKqDSjOdrlfeSGOY2o9CPEMUDUtmfyA08+mM3y jDS5Bb+BQlvRGo05AA5eSN0kkhf9xTJcJPmaxGrVL9jbUoU+EJvT+yqjGH+CvdRw44T3 xdJ8Y4OuCwoJmH2HhVI1wYc3Uzzf53Z4OXLeIAhHosu8mgp6fK4pWFS3zn9Gm123hZnU DKAibjNk9vcQ1p6+lruYH48GY77GsCdLJs70uIf2ytQP5NDiNF/RUoaXoPwemOLVjI/4 oTMg== 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=m2nY1zTRPRbQEspGXz7N1tgrBvNRnVFL1fwTqdC9gz0=; b=UgP4x6vxIDaJe6EJRThE/Tw0PMy/8D00GEXi+z+/ohaokRyNtjDt1XZQ1KZ2quS/wq YXFjOJn4F1VGucQA54s2btFbLLSd17lghbPjkpMCsZABrthBN8Vi5mJb2xRSPcGQA1NE WZP8FwAL7tVzrwRg2RUCb04WUicOuv3W3/86EyN4htNzYpxZphwwBxt5UiTiBiYFiQze e3o1ZaDiq/Y2G6yJ33Q0mC9p9lYjVibVMhowubPvqvRIrfB0l3uHVcfKcKcjKD614j6+ UDUtMeTa6eGeMi52UgrjN2Y4HZ6+KGckzsDs5fbDt66wzFJvJKP0iIrm8mrPrHZhYX+f lEuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KecM5klw; 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 l10-20020ac8458a000000b003ba23d469e6si5834042qtn.159.2023.02.27.02.33.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 02:33:31 -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=KecM5klw; 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 1pWaop-0000Fy-DO; Mon, 27 Feb 2023 05:33:19 -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 1pWaog-0000DE-1N for qemu-devel@nongnu.org; Mon, 27 Feb 2023 05:33:10 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWaoe-00018t-HB for qemu-devel@nongnu.org; Mon, 27 Feb 2023 05:33:09 -0500 Received: by mail-wr1-x431.google.com with SMTP id l1so2598396wry.12 for ; Mon, 27 Feb 2023 02:33:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=m2nY1zTRPRbQEspGXz7N1tgrBvNRnVFL1fwTqdC9gz0=; b=KecM5klwA4HxneGKxtXGaoqfmfrgiqzjeNtQD6NlFoIBNcBvJCaO8qJyl+0UNRlhmP 8SvCs1zHuiBlyuwibevl2ph7xVangeWmViftr3NXwoWpERD9HaemzjudoJOKA07xIxG4 bOlzfjdKaN0lzKRkpafLTRtGi7nR072TaobhuGxzVvhNfSdCV3YXEt1rBh9iRQmeqYTQ 4YAYaxwT8viwb3+EyDI+qob2f72CBDB46HMYXJi9m6u0zPo6//9D1hvyMWlVWUtfwxnH g0PEF7jJ/jgjbQb2F3y8B6tdgJbObQ5rbaE9oXgPYLZXoH5lv43JT4fTr/U/NJ4u+q2Z /v2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=m2nY1zTRPRbQEspGXz7N1tgrBvNRnVFL1fwTqdC9gz0=; b=Q4KgChNJwJBs7uN5lpxbYPErBKxnR8/ooMM2y2P0W8LWfqSpUxbZCimYJMAHiJGZ0Q VKuyhR2e2QpNRL5tIUdh91CWXWYQUiVwXueJXoWbJIT60MlBEB3Ltx6CVwX6gDc0q/3u aWHKzvKWcynJ6MJSsYJVJD2GE0fTWknAFLLZr9txFSnrHGh29p93Oj5oCLM67OLh+GoE HYojwCMHjtadjSeZziIDLyMg/vanv4xjoJjhdQeanW86QwlEt6RWiU4XcKQKDxInOn3Z 5/ZnwS/7EVrPCTxvmGHB+RqD3waDC56z4EZ/qzc6B71UYRekDo5jpHOlm8xTJD5I09hH y3vA== X-Gm-Message-State: AO0yUKU9D1i3/sT10AXYaJbean4hZnCvyfygq4IRew5FB/IMdXxO2G4u SvYeTenqEtB+1vKGCn+E24CL8c2pjaY8Z6au X-Received: by 2002:a5d:56c9:0:b0:2c8:7750:1769 with SMTP id m9-20020a5d56c9000000b002c877501769mr6926294wrw.68.1677493986792; Mon, 27 Feb 2023 02:33:06 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id c11-20020a056000104b00b002be0b1e556esm6582568wrx.59.2023.02.27.02.33.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Feb 2023 02:33:06 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] hw/vfio/migration: Remove unused 'exec/ram_addr.h' header Date: Mon, 27 Feb 2023 11:32:57 +0100 Message-Id: <20230227103258.13295-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230227103258.13295-1-philmd@linaro.org> References: <20230227103258.13295-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.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 autolearn=ham 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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Reviewed-by: Alex Bennée --- hw/vfio/migration.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index a2c3d9bade..f9ac074c63 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -24,7 +24,6 @@ #include "migration/misc.h" #include "qapi/error.h" #include "exec/ramlist.h" -#include "exec/ram_addr.h" #include "pci.h" #include "trace.h" #include "hw/hw.h" From patchwork Mon Feb 27 10:32:58 2023 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: 656943 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2274313wrb; Mon, 27 Feb 2023 02:33:50 -0800 (PST) X-Google-Smtp-Source: AK7set8mieGm6oN0zu/hu686ZPxQqOmuSyQYtxD6ZvT0trfJ3LEG3rl8qdhNYOLXL1XQ3SI9yKQ4 X-Received: by 2002:a05:6214:21a3:b0:56e:b966:4089 with SMTP id t3-20020a05621421a300b0056eb9664089mr44185779qvc.23.1677494029944; Mon, 27 Feb 2023 02:33:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677494029; cv=none; d=google.com; s=arc-20160816; b=nw0G761S0S6Xn0X9tHGjUsXIJ5WLqJCJLyxNADISrqh6gaIyPuFcq3nH673MNqV3QC YG5VCtgFIv/3z/vdDlNJ/dO8C3VhOLI6MFoBt26tkd1GYPzsLzQljuqtB05JtMOR7UZj UVA9cZ57NYGlLTSnKEcesr7lbPYFPFJQhe57FhNHXQQysh9q9C0iR4jDbX6lTqi6J5Pd PwWxyLDoJGy3TybFDrSkTkxm7QU43Q6aP7IPlLdrJ3Vgt1ceohHJ3COSk1IPAr4uItvB fEbdaJVmv/004WvysvwCk2WT/T/0z9cbdeYoRLx3Nsv+SvAzOxPRFHP0rWtsBQQoFLKe Hmcw== 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=SMCVeQ0rUUkrihdTeaeuUllAhYFqzhnhzh04vyn+ero=; b=xYodSSrVoqIp3m/GmjRR8NNmohP0pbnQI2PElb7JuJWtHS9uChXdcPbGp0Or+93TSi u35RjnpyN9czn6LWetRPpV3bL+wQLeDPtMlr642q8K9IErMKd34BOkBYRKeuvA08lF4+ VwFgt61lFslnvUfr8NO//zddwt9t+DBztYTOEg+ORJ9j7nVcwazTiXfL6e+PIPFuFyD/ O5Bp274/CTmhj6/fwqzGOrHM3HBvF64LGAPqeFK5SiqXS4KY/N8KiS0imHiy4WuE03Xp PATo0th+2AqYEnZddDHhCGMBMhaYWzYFJFTRgLmwG2oW74zmzp73rCkyoLDYnleEmd21 4hkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GZFI1gok; 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 m19-20020a0cf193000000b00571f474a2desi6242557qvl.349.2023.02.27.02.33.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Feb 2023 02:33:49 -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=GZFI1gok; 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 1pWaor-0000Ov-ET; Mon, 27 Feb 2023 05:33:21 -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 1pWaol-0000GF-Nx for qemu-devel@nongnu.org; Mon, 27 Feb 2023 05:33:19 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWaok-0001As-69 for qemu-devel@nongnu.org; Mon, 27 Feb 2023 05:33:15 -0500 Received: by mail-wm1-x32c.google.com with SMTP id d41-20020a05600c4c2900b003e9e066550fso3502524wmp.4 for ; Mon, 27 Feb 2023 02:33:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=SMCVeQ0rUUkrihdTeaeuUllAhYFqzhnhzh04vyn+ero=; b=GZFI1gokd3RO0o1jJMcCBSmjoCbTw5u9YybjYgvx+wJF8Pi4UPq0Ltpx7+z8BiXadC aIRUIDDA0BPxB+I+A1UrlPuBAcoaTxz0O3m030qBx7dJprVr9+KewLWLiUwLguNFRv0c o1OHCBOLmUqqUn07fWtPuWo9GZg39UR/yHzQs8xk75V0F/DiDaVtwuWtNjcQfyiD1z6Z WXEW76o6CyZKp5k9OSPzEhui3D2C9y/YxRgscXR9yIdfQnCim98hJFdW8UDikdnOwPXQ kUU2fTaDLlFIqJBgAku4Af2rzmVSI6iFc0lC2UlpybW4mEOfd0TSHu9BDPUU7ajsXG35 159Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=SMCVeQ0rUUkrihdTeaeuUllAhYFqzhnhzh04vyn+ero=; b=A0betAij4GVbXQ1Kt4+5d825b5r7hrQrmrnP7E+1OjwvKWieNaqouTgxpTWcApmnM9 hGbQOVxV+rVgglh4qfHdChRXJmVFd5nWPmd4Ypmqcz/tMaMeZZnVjOMhjkj5WUEe5QEn PaEpt9Kco8b04MHdoAlwOGABk1HNqQvPMxnYAxW597NQUQlOqgS3OOOzWKEaZBfHWMPV B9reKq9hwrekZXK1hdairJ4UVoOiwV7XNg/K7mOyk/WVNjumkUBZfk5fzsWjHFE8vT6A +nORcK4HDsrTLeuWU+cfoXRGY2Azj+h2+Ol8kltSgiOOMB4I1EOr6Mj75xJO8lroIeHx 2g1A== X-Gm-Message-State: AO0yUKVS5ithrmnR2xnA8v24lq7pbCE1oZKpNxMkU1EA/Vx6/thD+jdZ MZ2rQg6jvwriwhvEnUVRZYXlisboJ1i56OTh X-Received: by 2002:a05:600c:18a1:b0:3eb:2de8:b72a with SMTP id x33-20020a05600c18a100b003eb2de8b72amr6866432wmp.7.1677493992759; Mon, 27 Feb 2023 02:33:12 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id t23-20020a1c7717000000b003daf672a616sm8519199wmi.22.2023.02.27.02.33.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Feb 2023 02:33:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/vfio: Build various target-independent objects once Date: Mon, 27 Feb 2023 11:32:58 +0100 Message-Id: <20230227103258.13295-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230227103258.13295-1-philmd@linaro.org> References: <20230227103258.13295-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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 autolearn=ham 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 Signed-off-by: Philippe Mathieu-Daudé --- hw/vfio/meson.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/vfio/meson.build b/hw/vfio/meson.build index da9af297a0..a1ed62245a 100644 --- a/hw/vfio/meson.build +++ b/hw/vfio/meson.build @@ -1,19 +1,22 @@ +softmmu_ss.add(files( + 'migration.c', +)) +softmmu_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files('display.c')) +softmmu_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) +softmmu_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) +softmmu_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) + vfio_ss = ss.source_set() vfio_ss.add(files( 'common.c', 'spapr.c', - 'migration.c', )) vfio_ss.add(when: 'CONFIG_VFIO_PCI', if_true: files( - 'display.c', 'pci-quirks.c', 'pci.c', )) vfio_ss.add(when: 'CONFIG_VFIO_CCW', if_true: files('ccw.c')) vfio_ss.add(when: 'CONFIG_VFIO_PLATFORM', if_true: files('platform.c')) -vfio_ss.add(when: 'CONFIG_VFIO_XGMAC', if_true: files('calxeda-xgmac.c')) -vfio_ss.add(when: 'CONFIG_VFIO_AMD_XGBE', if_true: files('amd-xgbe.c')) vfio_ss.add(when: 'CONFIG_VFIO_AP', if_true: files('ap.c')) -vfio_ss.add(when: 'CONFIG_VFIO_IGD', if_true: files('igd.c')) specific_ss.add_all(when: 'CONFIG_VFIO', if_true: vfio_ss)