From patchwork Mon Feb 1 11:28:59 2021 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: 12058799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47159C433DB for ; Mon, 1 Feb 2021 11:33:14 +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 9DD4864DDB for ; Mon, 1 Feb 2021 11:33:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DD4864DDB 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XSC-0001ht-Lg for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:33:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOO-0006Ik-TA for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:18 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:40295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XON-0008Fq-C5 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:16 -0500 Received: by mail-wm1-x32c.google.com with SMTP id c127so12830581wmf.5 for ; Mon, 01 Feb 2021 03:29:15 -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=donqcXl7R+CymjCL8vc7v5IAilQU7H4mg0fNs68sCzA=; b=e5igdUOKRu+nuBY0Zu2Ohn5JfnspcW8pqSPyZT4CaQx7HCrrRF6/uOf16FFra0u+BJ Ip2eqn5lYrT8So/ZzTJBuOK58LV2uQ5OvMNgRK5m2cMRvTX/49GjhKxORVzEa4eJrH74 C4rzdb13gibI6wNTUMXHZhK73uON9FKBUZnBJhiYzLyhWkCmOv7h2ZqS35nM2cwMg30D FH5wZcwae4yATnosrM5VXNPMx3HwFM9aanKYq4QURPzWTywVp1ERBuFqs6BnMYJqn7N5 PcaTnrymB0a7DiW8jS1VFjqewxxHRSRqy9WA89Acn/1D/R6X3o5X5PvPGCkMXM1ctXvg FHgQ== 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=donqcXl7R+CymjCL8vc7v5IAilQU7H4mg0fNs68sCzA=; b=C0/+L2OWNEXRQJLrDBQeW6agIangXownkm9lyxofo2e1Pj2jLu7Qdr91g/lwmgtJOK riY7y/5UwN1bJ7+ZOuK6ZLZuzHpDy5cAjydgw4a4qzCM1Ek4XvW+ZUVqLIvbt6c6Kwdc i5fFlAssEa5Se95JOFyegGx+903Y++gic+jL50gFfZJz+M2T3NTobBHnBR4cu1iCZE8h 6XDHvOMfadj9Sb5OeQjIjiww3zxu+g7bD94QZkEONl55Ty4nrEDjGuWswMnBeano7m4n dvEEoQv9zo8Nj8ZRW1NLMQRhiLih7XFBC9htYQXvli9XQisAyTH4y82dFZ0Q1YtpuWzt QuGg== X-Gm-Message-State: AOAM532mV04DbG44ICvqbVXBTQATMLuKJBUAGDbG8lOx/Qjr76hJLaFL hW2CbEy+P9IYb+lu0PZLqqA= X-Google-Smtp-Source: ABdhPJx1pElW3YJm/WsOQahhG2HH5xZse6fgcEBep2dVSJwz1qWS4aDb1550CqyGQkCPJFpsp90m2g== X-Received: by 2002:a7b:c09a:: with SMTP id r26mr1225594wmh.60.1612178953873; Mon, 01 Feb 2021 03:29:13 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id f4sm26998449wrs.34.2021.02.01.03.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 1/7] meson: Do not build Xen x86_64-softmmu on Aarch64 Date: Mon, 1 Feb 2021 12:28:59 +0100 Message-Id: <20210201112905.545144-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The Xen on ARM documentation only mentions the i386-softmmu target. As the x86_64-softmmu doesn't seem used, remove it to avoid wasting cpu cycles building it. Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index f00b7754fd4..97a577a7743 100644 --- a/meson.build +++ b/meson.build @@ -74,10 +74,10 @@ endif accelerator_targets = { 'CONFIG_KVM': kvm_targets } -if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] +if cpu in ['arm', 'aarch64'] # i368 emulator provides xenpv machine type for multiple architectures accelerator_targets += { - 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_XEN': ['i386-softmmu'], } endif if cpu in ['x86', 'x86_64'] @@ -85,6 +85,7 @@ 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], + 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], } endif From patchwork Mon Feb 1 11:29:00 2021 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: 12058777 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 138DDC433DB for ; Mon, 1 Feb 2021 11:31:12 +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 5D2B864DD9 for ; Mon, 1 Feb 2021 11:31:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D2B864DD9 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XQE-00080D-A4 for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:31:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOU-0006L4-4Q for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:22 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41525) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XOS-0008I3-Kh for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:21 -0500 Received: by mail-wr1-x42c.google.com with SMTP id p15so16125023wrq.8 for ; Mon, 01 Feb 2021 03:29:20 -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=aPiraoQq+wBjdcIQOiUTo/rKER9nPb2vFzjApKq2T+g=; b=ko4bHURsbdywzQeAqTKNRMtP+zzJ6yTACMFwMAle7bWMNtkvJufYJrtPUI/M5VW3/O frmacZk8z5EwOYVKlR1W7pU0lJDo4Xtr7KDcSHqPIQGwsREIlJ5kPDQQ61Cr1BYMoUWE CF0rc60JUGkcPOKbMV0O0+zHtMU1Tui4QSz+lBYsHlKckNcTiNoyfbBX8hLgAYBcFvOE uNIFEwGblR6Um04jIkD8OHxk0Gs5LrqqQzd0x+eiVKhrXYbg0AxzeRgUoumA1uDQTC4m FxrgOOgPU5iJBrHon1c+gWeae2DbmRnTY7+cbkCrU59wU2snpSOPEcSb8jlKgXrUPOGp zwjA== 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=aPiraoQq+wBjdcIQOiUTo/rKER9nPb2vFzjApKq2T+g=; b=KB1oRkWvJVkaP+RKdBV2CPFPe6ysbkDhnxtRIrFWGTlhtkE14XvGi57eiAkljk+SZo T8ffv58w3LY6VLED11nSo9qr3g49NqsPnxBXm5xHZ6m9aNdbDueZugQIqA7U8WQeyxZ+ K7W50ImK/+G1WuiO45Ra8nVQIF1sfXoVytU4lY4LHoZ6z9n7rPtpHG/4xNBlcUZbYjEA uQmFvBrE1akTAe/jW2PVzHVOicAurAlG9s/wIsmSoT+Z2US5t/G4EDk4cvbL7kXxvjx9 nz4cA27NwRLLZo0kdqxxvZdpkJe49qt6xXhKR1c41VRePiuNsHEZCScH/9fg2OdEhy/L 2n2g== X-Gm-Message-State: AOAM531lC5ssM0UcXKmiVJTURvd2haRMXZLmuUD23W6G4/OeOREcVfQd h4VEeMShoINVPkkn7wgWe44= X-Google-Smtp-Source: ABdhPJwPt7ERal1fQeDzwH3w64qDIOwi7IRP9XTWdLtX/WYy5c6IDx5O5BK4Mw3ZLOmXAK4MQef0Tw== X-Received: by 2002:a5d:4e0e:: with SMTP id p14mr17735664wrt.58.1612178959403; Mon, 01 Feb 2021 03:29:19 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id y6sm26305538wrp.6.2021.02.01.03.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 2/7] hw/xen: Relax dependency on FSDEV_9P Date: Mon, 1 Feb 2021 12:29:00 +0100 Message-Id: <20210201112905.545144-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42c.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Relax the dependency on 9pfs by using the 'imply' Kconfig rule. This fixes when XEN_PV without XEN_FV: /usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function `xen_be_register_common': hw/xen/xen-legacy-backend.c:754: undefined reference to `xen_9pfs_ops' Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- hw/xen/xen-legacy-backend.c | 3 ++- accel/Kconfig | 2 +- hw/xen/meson.build | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index b61a4855b7b..338d443a5c0 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -33,6 +33,7 @@ #include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen_pvdev.h" #include "monitor/qdev.h" +#include CONFIG_DEVICES DeviceState *xen_sysdev; BusState *xen_sysbus; @@ -750,7 +751,7 @@ void xen_be_register_common(void) xen_be_register("console", &xen_console_ops); xen_be_register("vkbd", &xen_kbdmouse_ops); -#ifdef CONFIG_VIRTFS +#ifdef CONFIG_FSDEV_9P xen_be_register("9pfs", &xen_9pfs_ops); #endif #ifdef CONFIG_USB_LIBUSB diff --git a/accel/Kconfig b/accel/Kconfig index 461104c7715..7565ccf69e6 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -15,4 +15,4 @@ config KVM config XEN bool - select FSDEV_9P if VIRTFS + imply FSDEV_9P diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 076954b89ca..3c2062b9b3e 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -2,12 +2,12 @@ 'xen-backend.c', 'xen-bus-helper.c', 'xen-bus.c', - 'xen-legacy-backend.c', 'xen_devconfig.c', 'xen_pvdev.c', )) xen_specific_ss = ss.source_set() +xen_specific_ss.add(files('xen-legacy-backend.c')) xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files( 'xen-host-pci-device.c', 'xen_pt.c', From patchwork Mon Feb 1 11:29:01 2021 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: 12058779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AE8DC433DB for ; Mon, 1 Feb 2021 11:31:21 +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 B78E764DDB for ; Mon, 1 Feb 2021 11:31:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B78E764DDB 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XQN-0008DN-De for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:31:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOZ-0006TN-MS for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:27 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:34408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XOY-0008LH-1c for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:27 -0500 Received: by mail-wm1-x333.google.com with SMTP id o10so11297677wmc.1 for ; Mon, 01 Feb 2021 03:29:25 -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=86kgWxqaVQ459jB6Z+UlH8D45KqeOXWfxBT1ho7ZaU4=; b=OvgFBK6bmxqweSp3L77Aj8WaAxT1RQK0LtEk3i36jsBBT/QaFtswrGEa72xZLMd4Yb HIUhY+oLNPcVTx0grppbuToABViBp+iIgP1lhjj7VUfVrYskRS511GA7hnokxOH0+1hl Llq6UzcwQZKox5D1iLDy4JUoVe9v7MvTlaPAwPhQGGDyHg/dG4Y7wUG4nevlaACcQCNa OGhW/bC2jrKwZhFOXWeH02rHFHQET1ePy5uJIr09AQTtEe/LqnRUMrCDsUr7yNukAjNX KfV/ZLVI7sFYmKWV4CFTTIr/ggz3eMOkgOHARcOO5pOvHUgqxm9ZDMwGiTNoRja/YO0o FkWg== 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=86kgWxqaVQ459jB6Z+UlH8D45KqeOXWfxBT1ho7ZaU4=; b=BURWxvviuTayRyWDoKbZyG9jEf0HO9EHS77Uu7rwzN7UcrxkYZhYW5gUHpLBOt+kzJ GZ5eA2aB9in4I3rnC0qNqRIfS+orT08EMBlvw0El50pdY/ottHgzx/J/gDnVANH72Rse UlSAJhtEWGIUejtNH8UXXXnMluIlPvZfBaemKOm6N4yf3YXjByWIyLVyl2jOBqSreZG8 YatPy+KSzt9aL45MFcJGW+GHuNISfsLt6FjKMvfJ+Kj5dkbm6NKsJESjoMJrplJia5HR TM3L6wCuAJR3qqR48a1AOXyIezQmkK/9ecKeo4VXfUDH2lUF0gEID1K1Z8yTNVKTwmGX gVoA== X-Gm-Message-State: AOAM531NvFXSIsWtm+zS/W+hxvFFjrqa3bolx44hwU48luphoyGU2qyQ AZ9c4B/doNgdbQUD/4hqUBw= X-Google-Smtp-Source: ABdhPJxcRgfDMwb1tHeCu3Tj2p4+drVJi66+iJFM6aft3sJqiy4qEUbcRAahN2gmhZHZ8T/I+s19pw== X-Received: by 2002:a1c:f415:: with SMTP id z21mr14727242wma.114.1612178964810; Mon, 01 Feb 2021 03:29:24 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id s23sm20324467wmc.35.2021.02.01.03.29.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 3/7] accel/xen: Incorporate xen-mapcache.c Date: Mon, 1 Feb 2021 12:29:01 +0100 Message-Id: <20210201112905.545144-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" xen-mapcache.c contains accelerator related routines, not particular to the X86 HVM machine. Move this file to accel/xen/ (adapting the buildsys machinery). Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 3 +++ accel/xen/trace.h | 1 + {hw/i386 => accel}/xen/xen-mapcache.c | 0 hw/i386/xen/xen-hvm.c | 1 - accel/xen/meson.build | 5 ++++- accel/xen/trace-events | 10 ++++++++++ hw/i386/xen/meson.build | 1 - hw/i386/xen/trace-events | 6 ------ 8 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 accel/xen/trace.h rename {hw/i386 => accel}/xen/xen-mapcache.c (100%) create mode 100644 accel/xen/trace-events diff --git a/meson.build b/meson.build index 97a577a7743..f2e778f22cd 100644 --- a/meson.build +++ b/meson.build @@ -1706,6 +1706,9 @@ 'crypto', 'monitor', ] +if 'CONFIG_XEN' in accelerators + trace_events_subdirs += [ 'accel/xen' ] +endif if have_user trace_events_subdirs += [ 'linux-user' ] endif diff --git a/accel/xen/trace.h b/accel/xen/trace.h new file mode 100644 index 00000000000..f6be599b187 --- /dev/null +++ b/accel/xen/trace.h @@ -0,0 +1 @@ +#include "trace/trace-accel_xen.h" diff --git a/hw/i386/xen/xen-mapcache.c b/accel/xen/xen-mapcache.c similarity index 100% rename from hw/i386/xen/xen-mapcache.c rename to accel/xen/xen-mapcache.c diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 68821d90f52..7156ab13329 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -31,7 +31,6 @@ #include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "sysemu/xen.h" -#include "sysemu/xen-mapcache.h" #include "trace.h" #include "exec/address-spaces.h" diff --git a/accel/xen/meson.build b/accel/xen/meson.build index 002bdb03c62..45671e4bdbf 100644 --- a/accel/xen/meson.build +++ b/accel/xen/meson.build @@ -1 +1,4 @@ -specific_ss.add(when: 'CONFIG_XEN', if_true: files('xen-all.c')) +specific_ss.add(when: 'CONFIG_XEN', if_true: files( + 'xen-all.c', + 'xen-mapcache.c', +)) diff --git a/accel/xen/trace-events b/accel/xen/trace-events new file mode 100644 index 00000000000..30bf4f42283 --- /dev/null +++ b/accel/xen/trace-events @@ -0,0 +1,10 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# xen-hvm.c +xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx" + +# xen-mapcache.c +xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 +xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 +xen_map_cache_return(void* ptr) "%p" + diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build index be84130300c..2fcc46e6ca1 100644 --- a/hw/i386/xen/meson.build +++ b/hw/i386/xen/meson.build @@ -1,6 +1,5 @@ i386_ss.add(when: 'CONFIG_XEN', if_true: files( 'xen-hvm.c', - 'xen-mapcache.c', 'xen_apic.c', 'xen_platform.c', 'xen_pvdevice.c', diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events index ca3a4948baa..f1b36d164d9 100644 --- a/hw/i386/xen/trace-events +++ b/hw/i386/xen/trace-events @@ -20,9 +20,3 @@ cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint6 xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p" cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x" - -# xen-mapcache.c -xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64 -xen_remap_bucket(uint64_t index) "index 0x%"PRIx64 -xen_map_cache_return(void* ptr) "%p" - From patchwork Mon Feb 1 11:29:02 2021 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: 12058801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB4A0C433E0 for ; Mon, 1 Feb 2021 11:35:10 +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 01A4664E95 for ; Mon, 1 Feb 2021 11:35:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01A4664E95 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XU4-0003JZ-MQ for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:35:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOf-0006gx-B0 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:33 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XOd-0008OX-QU for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:33 -0500 Received: by mail-wr1-x433.google.com with SMTP id v15so16203055wrx.4 for ; Mon, 01 Feb 2021 03:29:31 -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=TsrsxDQVz5tygrPJnMSHXRKo3FHIhV5VlahOLojrTSs=; b=tdY/GT4s+Svs7EsgQ8L7VZEN1EU3auIv2pg9z7H40kDst9zeyUzRC0p5gOsl8bvrpe YEfky/hcCoc8afoXnaLPVYRZxcU/v8rs/k6MaSMzq+ctcEKeAEQchfrjelV4MrfHwi0D eC1Rwq0VU0EF2HasdLW5V7eFRpwPFIhTKRmnxU3el+nAOKtdZ98sCrKCVIybhaq+xOC2 W1yQWSaG7E6lhP016iJy6W+p1SEDmo8wCHivGUSQQBQIjoJ5GdDEc2vIbE170r2MxnPF gPKC/tKyGsVI8pq30CfaNfuu6QhMNJ6IKY0QfXPEW0jFuOpChYSTPDJDreWcOvCxTkpk arbw== 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=TsrsxDQVz5tygrPJnMSHXRKo3FHIhV5VlahOLojrTSs=; b=bVi3QpoFHQNT6hFVRB+Bon6FQ82AHqkmpZh9AhhusDcQSDBBOFkBMbB+Yyfk1NAabE n7Z/mhXLE/t4Zu4ESMUcb1Xjk6bhLQqAfOewZRwYzL9pdhFJxW7/SQsj03lPLzWbFT2A r2xkthCQUiVswyf4kXqDyPS62yreMTcEI22KAMMuEsfCGOTTCeRx6gl3vP96qKSxxZaK bkbr/7KbWziWI4iphjX5XG/k+ZGh2aUAbAlUOEYUsekZbJkDJw+rRfyfJ04Dk2JyWas8 8kUdB99446RonpFPKOqoSub2HWvAB3i7U0ZfTPMTuuG/g97Ow4IqhUL72/uXC+2xoODd xjNw== X-Gm-Message-State: AOAM530LFIoEUeRJ8IDQlY2dk84lH97sR2ov/d7UWM6tBV7+mel5RL7f pS/15J9QPYrI2eOkxJSAm9U= X-Google-Smtp-Source: ABdhPJyJ59H9X2zflNDtn/k6K0IuGMyavaSeLpb40ogb98MM80P8GyEJQcxbrbHoCIm5tQ98H9B8gw== X-Received: by 2002:adf:d1c2:: with SMTP id b2mr17953783wrd.296.1612178970576; Mon, 01 Feb 2021 03:29:30 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id o124sm21363300wmb.5.2021.02.01.03.29.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 4/7] hw/i386/xen: Introduce XEN_FV Kconfig Date: Mon, 1 Feb 2021 12:29:02 +0100 Message-Id: <20210201112905.545144-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Introduce XEN_FV to differency the machine from the accelerator. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/Kconfig | 2 ++ hw/i386/xen/Kconfig | 5 +++++ hw/i386/xen/meson.build | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 hw/i386/xen/Kconfig diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 7f91f30877f..b4c8aa5c242 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -1,3 +1,5 @@ +source xen/Kconfig + config SEV bool depends on KVM diff --git a/hw/i386/xen/Kconfig b/hw/i386/xen/Kconfig new file mode 100644 index 00000000000..ad9d774b9ea --- /dev/null +++ b/hw/i386/xen/Kconfig @@ -0,0 +1,5 @@ +config XEN_FV + bool + default y if XEN + depends on XEN + select I440FX diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build index 2fcc46e6ca1..37716b42673 100644 --- a/hw/i386/xen/meson.build +++ b/hw/i386/xen/meson.build @@ -1,4 +1,4 @@ -i386_ss.add(when: 'CONFIG_XEN', if_true: files( +i386_ss.add(when: 'CONFIG_XEN_FV', if_true: files( 'xen-hvm.c', 'xen_apic.c', 'xen_platform.c', From patchwork Mon Feb 1 11:29:03 2021 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: 12058803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5C8CC433DB for ; Mon, 1 Feb 2021 11:35: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 560FB64DDB for ; Mon, 1 Feb 2021 11:35:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 560FB64DDB 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XUf-0003aJ-Br for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:35:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOk-0006oV-Ur for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:38 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XOj-0008Sa-Cw for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:38 -0500 Received: by mail-wr1-x42f.google.com with SMTP id d16so16133396wro.11 for ; Mon, 01 Feb 2021 03:29:37 -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=RGHdflD40CpleI2qTHXo49VNZ9h44Tapyh7dWA7hgYU=; b=FmjS7JgVOCypovovv65rLivJnwALFuw37uvTf4RtBSvcme+5wkDBdr5zU4iNwMntrn Hgt/tdJZflBiPWoHmBRxbG99i1qLXeOQhLcOcdLq9qXB0TmlTxseS1ch4a/PWI2VGyNc KhQhMpM8iJtQ5GJSdlxU9A9hqZKd4pN6UylDzcX8C0OlBu12yLaR09B56wzP2rPTQjLP vVOdaRCOy8DqkeRS6zSuluHJq/mKNmWcbYvw77lsOx940Rm9a7a3DW/Tcykdz5FQtilS Hw5P7oc0/+gBflEG2AzBjwZyrKln8W4hxuuwJMVvRwX92wB1tr9GJV1L07lkC5+RAABP ywOQ== 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=RGHdflD40CpleI2qTHXo49VNZ9h44Tapyh7dWA7hgYU=; b=iKhrWpbyaKMqch6h4Jp6KMjc1DGWMqrKX9FFCr0++pDj+wFUpmA4SLrrS5sN9H9I6U f11Kggo+35HwbPc8oCxfktrk11FBs/B1pDNuzJDqokPZCqJK+eF2pKCODkwTca3AWMZN BCQ3dbwsB4jSkMlDTUTaJMhCK50T2di2dsHDAkAR5TGjrJtQjkeimLTJ89YPqKV5BmN/ aGDUBod52pGQ1GbPy8TGE+a9bJBGm4aSwW3aHTRO9NgtEPy65gPhugqibJsFkxUbHpep 23G1lt/fuzADfD1uVgfHILmiNzbEi9X8GAtRF5AIoYXO1ELUC36UkPNOkPhO3eWhJM5y yUxg== X-Gm-Message-State: AOAM5326cte/GgnTRxpyc/8NN7g+XSTTVkhK5xPaihkT9kTNu8hiv0yL kOVDRz80UGgo5UmYGlfrWC0= X-Google-Smtp-Source: ABdhPJzvuBjmMW0UYZ6d5GxA8BEVDlhSDPc0KocqiT7XJMYbQPMV9DKL5NtfvrqJaptzIHmm77u+zg== X-Received: by 2002:adf:d1cb:: with SMTP id b11mr17935101wrd.118.1612178976190; Mon, 01 Feb 2021 03:29:36 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id d30sm28931639wrc.92.2021.02.01.03.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:35 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 5/7] hw/xen: Make xen_shutdown_fatal_error() available out of X86 HVM Date: Mon, 1 Feb 2021 12:29:03 +0100 Message-Id: <20210201112905.545144-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42f.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" xen_shutdown_fatal_error() is also used by XEN_PV. This fixes when XEN_PV without XEN_FV: /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/hw_xen_xen_pt_config_init.c.o: in function `xen_pt_status_reg_init': hw/xen/xen_pt_config_init.c:281: undefined reference to `xen_shutdown_fatal_error' /usr/bin/ld: hw/xen/xen_pt_config_init.c:275: undefined reference to `xen_shutdown_fatal_error' /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/hw_xen_xen_pt.c.o: in function `xen_pt_pci_read_config': hw/xen/xen_pt.c:220: undefined reference to `xen_shutdown_fatal_error' /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/hw_xen_xen_pt.c.o: in function `xen_pt_pci_write_config': hw/xen/xen_pt.c:369: undefined reference to `xen_shutdown_fatal_error' Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/xen/xen-hvm.c | 13 ------------- hw/xen/xen-utils.c | 25 +++++++++++++++++++++++++ hw/xen/meson.build | 1 + 3 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 hw/xen/xen-utils.c diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 7156ab13329..69196754a30 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -28,7 +28,6 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" -#include "sysemu/runstate.h" #include "sysemu/sysemu.h" #include "sysemu/xen.h" #include "trace.h" @@ -1570,18 +1569,6 @@ void xen_register_framebuffer(MemoryRegion *mr) framebuffer = mr; } -void xen_shutdown_fatal_error(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "Will destroy the domain.\n"); - /* destroy the domain */ - qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR); -} - void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) { if (unlikely(xen_in_migration)) { diff --git a/hw/xen/xen-utils.c b/hw/xen/xen-utils.c new file mode 100644 index 00000000000..d6003782420 --- /dev/null +++ b/hw/xen/xen-utils.c @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2010 Citrix Ltd. + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + */ + +#include "qemu/osdep.h" +#include "sysemu/runstate.h" +#include "hw/xen/xen_common.h" + +void xen_shutdown_fatal_error(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fprintf(stderr, "Will destroy the domain.\n"); + /* destroy the domain */ + qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR); +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 3c2062b9b3e..6c836ae06e4 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -4,6 +4,7 @@ 'xen-bus.c', 'xen_devconfig.c', 'xen_pvdev.c', + 'xen-utils.c', )) xen_specific_ss = ss.source_set() From patchwork Mon Feb 1 11:29:04 2021 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: 12058805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 071AAC433E0 for ; Mon, 1 Feb 2021 11:36: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 5D26964DDB for ; Mon, 1 Feb 2021 11:36:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D26964DDB 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XV3-0004NH-Cj for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:36:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOq-000726-Ce for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:44 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:33153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XOo-0008Ut-PE for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:44 -0500 Received: by mail-wr1-x429.google.com with SMTP id 7so16199621wrz.0 for ; Mon, 01 Feb 2021 03:29:42 -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=XRtUPL4N+Vif4bfdhtAFgCO/ETkuGGWOvk7Qu3281fs=; b=otz4MVF8iuJeP0O61dnQoLLdWj7yRHoLIPiCQts39X7Iz45omjLW6B5RPKA0Ji8grr TaSCvFwiR5a4nyf8A49BwsSX6wD8hGldzi9ObmoQMYTN4EcsB6LLt+JE4crwXoA/Qwkd +v/aCY2PpUQZdG6YBQvHtLAhEhdzr6vGVZBvJFEd3QWL7lxOeg367jIC8KtdxkJkEIGa bxhcoJZxJVW9PcUVwMCed91ItAi23w2JLJqvnxc4jq/89yFFL+RirWl9fRoTqM/UfJIp olTqK+WR7XOw/vm5aC5mEmtouWIpsAPYBPUMZAEJgGJKcfDsc2qwHnZvE6Gp86q3FH26 Ljzg== 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=XRtUPL4N+Vif4bfdhtAFgCO/ETkuGGWOvk7Qu3281fs=; b=V/UoaykV4xaN6SY1ifyXH7HQMSIo6wXzzJJizgMEq3gsk5Z6nJ0zkcgHcvGqBhH/ME 60mwtbCgpX5V8jLr28wrStaDGfxv6aRcfSQ7zb7FOWP0rdo+FpQGDwsAQcVLKDD7EVoz D6R6AgvrvHMx29hmyCrAuYlJqdmX5DlQ0iCCCyMNk+t5kyMNikLHaKDj64nsZp1ET0ZG aLh2258jOB5KyMeJP3M2F6n5SNmLraIIxLuSV4C97J5ZVnFE0pYVPJHfMA5j/L52CEbx Eq0ZCd1ZNurFh1Fj8vKjbZsIazz/qK8xdVnlccsAspE7YgieWwqDvqEpekhAfZXyNh36 kNXQ== X-Gm-Message-State: AOAM531S4zHe+raPpX1iBzskdjpcJ9PkrtYVWUFLW2JetH6UmCoZXrBK nLLN+1Y+ooeUiWfZ7dO5PXM= X-Google-Smtp-Source: ABdhPJyOAdkL8yCg3T/QnJEGkqZccdLOHBM22xLPE323hR3HQAe/aPubKmDcduC4ijItMwsDSxlZ+w== X-Received: by 2002:a5d:6b47:: with SMTP id x7mr16884630wrw.170.1612178981514; Mon, 01 Feb 2021 03:29:41 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id o12sm26789769wrx.82.2021.02.01.03.29.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:40 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 6/7] hw/xen: Make qmp_xen_set_global_dirty_log() available out of X86 HVM Date: Mon, 1 Feb 2021 12:29:04 +0100 Message-Id: <20210201112905.545144-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x429.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" qmp_xen_set_global_dirty_log() is also used by XEN_PV. This fixes when XEN_PV without XEN_FV: /usr/bin/ld: libqemuutil.a(meson-generated_.._qapi_qapi-commands-migration.c.o): in function `qmp_marshal_xen_set_global_dirty_log': qapi/qapi-commands-migration.c:626: undefined reference to `qmp_xen_set_global_dirty_log' Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/xen/xen-hvm.c | 10 ---------- hw/xen/xen-migration.c | 22 ++++++++++++++++++++++ hw/xen/meson.build | 1 + 3 files changed, 23 insertions(+), 10 deletions(-) create mode 100644 hw/xen/xen-migration.c diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c index 69196754a30..85859ea0ba3 100644 --- a/hw/i386/xen/xen-hvm.c +++ b/hw/i386/xen/xen-hvm.c @@ -24,7 +24,6 @@ #include "hw/xen/xen-bus.h" #include "hw/xen/xen-x86.h" #include "qapi/error.h" -#include "qapi/qapi-commands-migration.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/range.h" @@ -1591,12 +1590,3 @@ void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length) } } } - -void qmp_xen_set_global_dirty_log(bool enable, Error **errp) -{ - if (enable) { - memory_global_dirty_log_start(); - } else { - memory_global_dirty_log_stop(); - } -} diff --git a/hw/xen/xen-migration.c b/hw/xen/xen-migration.c new file mode 100644 index 00000000000..1c53f1af08d --- /dev/null +++ b/hw/xen/xen-migration.c @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2010 Citrix Ltd. + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Contributions after 2012-01-13 are licensed under the terms of the + * GNU GPL, version 2 or (at your option) any later version. + */ + +#include "qemu/osdep.h" +#include "exec/memory.h" +#include "qapi/qapi-commands-migration.h" + +void qmp_xen_set_global_dirty_log(bool enable, Error **errp) +{ + if (enable) { + memory_global_dirty_log_start(); + } else { + memory_global_dirty_log_stop(); + } +} diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 6c836ae06e4..21f94625dc7 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -4,6 +4,7 @@ 'xen-bus.c', 'xen_devconfig.c', 'xen_pvdev.c', + 'xen-migration.c', 'xen-utils.c', )) From patchwork Mon Feb 1 11:29:05 2021 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: 12058807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D59D7C433E0 for ; Mon, 1 Feb 2021 11:37:08 +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 4E77664E06 for ; Mon, 1 Feb 2021 11:37:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E77664E06 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6XVz-0005VR-DB for qemu-devel@archiver.kernel.org; Mon, 01 Feb 2021 06:37:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6XOv-0007Ff-Qm for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:49 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6XOu-00005g-2g for qemu-devel@nongnu.org; Mon, 01 Feb 2021 06:29:49 -0500 Received: by mail-wr1-x42e.google.com with SMTP id c4so13457896wru.9 for ; Mon, 01 Feb 2021 03:29:47 -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=s9rQaS8UMqNJGneEaOHvqNQyzFShTSgQ9o1efcMMfnw=; b=vN5Dbc8LEBoxXzt4TOZpKQUfFP4d0DUrmJzsY8jZ30ugvsjqLnSTGDuzM7H5Fyrk3f abS4D3Ay2zNaJBSGMTGCJOBMPB0RMUXJbL6yqIkQ/k8U3aKlUwIlyhW30wiOETsY+lUU VJdwwEkBARJ7eV715aeJDCjTlEzuJ7ft/zc1y32IFpIdtIEhNETmDDSyBCzd5/cL7xO9 U50ggDjlwUQVizGN8vef1jmyXmIUVrOW/c4xcMiNqJGCJsnBZXQULkYBB67vLBH/7B24 jEj/VTilekOmxsfiANyo+i9GfbpLzhVXb7nSmdL0Jut2lRCZzFBDzUvdQG9EI5wxHfm6 AB0Q== 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=s9rQaS8UMqNJGneEaOHvqNQyzFShTSgQ9o1efcMMfnw=; b=tVoMaDw/LrmQ+IpcJA/BFXLqyXVIXPbfuZCbXnkZbq85zDPlFK+O26Ss90pTjWDo28 bGGcPEhYxHJUpH9y1ARwiMlmqqDc9vmW8BNPFHgFHSqxKjM1IhyT2YC+0nakrWZcPPNw SC1ffpUvxALicCXH6DjhaxyPd5ntLU4r5hXU6Z0R7G3c+P+TJ0EsWxDazg8fbotVF46E 2hyjumw0P9a3z/Xa8rLZWEfDY4eVP+9E3LXMC5oFM3f2xcN9mFozJVOYEbG254IGV+Gu /BToG7JGKqxl8JZeWL9HQaKHqPJHhEbSXmm2RG/VJtvZDYTYpKi4QCbhtU8MOL5rknBM K66A== X-Gm-Message-State: AOAM530r8GG8x9OVOYVe+yaTn8zFcn85mZ/AGvAFHOFl02GT+moBkX3k jZPyDnHk3sxDCFSsYkUeG0s= X-Google-Smtp-Source: ABdhPJzAYGwF+J2Ou4s+1HcJL36utLf3MJcMRSzDMAwMwQQaTKhKo5Am9QETvwv7os+GbvBC+C3N8g== X-Received: by 2002:adf:bc4b:: with SMTP id a11mr18119220wrh.260.1612178986887; Mon, 01 Feb 2021 03:29:46 -0800 (PST) Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id r124sm21261633wmr.16.2021.02.01.03.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Feb 2021 03:29:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v3 7/7] NOTFORMERGE hw/xen/Kconfig: Introduce XEN_PV config Date: Mon, 1 Feb 2021 12:29:05 +0100 Message-Id: <20210201112905.545144-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210201112905.545144-1-f4bug@amsat.org> References: <20210201112905.545144-1-f4bug@amsat.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com 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: Stefano Stabellini , Eduardo Habkost , Paul Durrant , "Michael S. Tsirkin" , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , xen-devel@lists.xenproject.org, Anthony Perard , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" xenpv machine requires USB, IDE_PIIX and PCI: /usr/bin/ld: libcommon.fa.p/hw_xen_xen-legacy-backend.c.o: in function `xen_be_register_common': hw/xen/xen-legacy-backend.c:757: undefined reference to `xen_usb_ops' libqemu-i386-softmmu.fa.p/hw_i386_xen_xen_platform.c.o: in function `unplug_disks': hw/i386/xen/xen_platform.c:153: undefined reference to `pci_piix3_xen_ide_unplug' libqemu-i386-softmmu.fa.p/hw_i386_xen_xen_platform.c.o: in function `pci_unplug_nics': hw/i386/xen/xen_platform.c:137: undefined reference to `pci_for_each_device' libqemu-i386-softmmu.fa.p/hw_i386_xen_xen_platform.c.o: in function `xen_platform_realize': hw/i386/xen/xen_platform.c:483: undefined reference to `pci_register_bar' Signed-off-by: Philippe Mathieu-Daudé --- Unfinished: /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/softmmu_physmem.c.o: in function `cpu_physical_memory_set_dirty_range': include/exec/ram_addr.h:333: undefined reference to `xen_hvm_modified_memory' /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/softmmu_physmem.c.o: in function `ram_block_add': softmmu/physmem.c:1873: undefined reference to `xen_ram_alloc' /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/softmmu_physmem.c.o: in function `cpu_physical_memory_set_dirty_range': include/exec/ram_addr.h:333: undefined reference to `xen_hvm_modified_memory' /usr/bin/ld: include/exec/ram_addr.h:333: undefined reference to `xen_hvm_modified_memory' /usr/bin/ld: libqemu-x86_64-softmmu.fa.p/softmmu_memory.c.o: in function `cpu_physical_memory_set_dirty_range': include/exec/ram_addr.h:333: undefined reference to `xen_hvm_modified_memory' collect2: error: ld returned 1 exit status ninja: build stopped: subcommand failed. TODO another day: Paolo's suggestion: "modify xen_hvm_modified_memory to become a virtual function in AccelClass." --- hw/Kconfig | 1 + hw/xen/Kconfig | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 hw/xen/Kconfig diff --git a/hw/Kconfig b/hw/Kconfig index 5ad3c6b5a4b..f2a95591d94 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -39,6 +39,7 @@ source usb/Kconfig source virtio/Kconfig source vfio/Kconfig source watchdog/Kconfig +source xen/Kconfig # arch Kconfig source arm/Kconfig diff --git a/hw/xen/Kconfig b/hw/xen/Kconfig new file mode 100644 index 00000000000..0b8427d6bd1 --- /dev/null +++ b/hw/xen/Kconfig @@ -0,0 +1,7 @@ +config XEN_PV + bool + default y if XEN + depends on XEN + select PCI + select USB + select IDE_PIIX