From patchwork Tue Oct 20 10:02:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11846217 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 2173015E6 for ; Tue, 20 Oct 2020 10:04:41 +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 AE13B22253 for ; Tue, 20 Oct 2020 10:04:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="RoLhxgc9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE13B22253 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.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]:53952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUoVT-0002CR-ME for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Oct 2020 06:04:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTt-00082D-He for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:01 -0400 Received: from esa5.hc3370-68.iphmx.com ([216.71.155.168]:1688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTo-0007Dt-RX for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1603188176; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zf0xNBg2rvKZ1PY17/ruG8OT28rHF2w1XniqvoCnWWs=; b=RoLhxgc94Qn+XEDofc5zVfn1nx5eE8KZZNPcZCHOxl2q5JZe+e5BxkzP mt8pcPyHaPR+QtTEeq2g4T+HbLmUSyFw9DcNGs6y5KLhOH+YLv7t7Xw2Z WpbHWc3IzN4/n+aTiSoCx8GBczdZ/JMLpsOZVN7a72WuzWLGQlYfG2dTs s=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 6WoSkRcgJM0A9EMx6tkY2Qb3gLwxcXjvfMn6Q7JwGLst5NK3NnHUxrDxi50oq/PQSwTUzcJb/T 28O8LcJNWkpnh0oVqjDmMb7Q+CQqUh+Khr1dhQ2c78bPF/aJOzVafBGscXkDXycYZ4XSJzR8mU 5nQ8g65S6PT+AhDUfYR9V8UhN39ax6ilY2pvp2+CWAPmrPmLTDlU9quWCJvq1EDNx6tKYw4dDb gPXw2nZC5ESqyK6U9kki7xsHqqBFPORRsJHVMstG/KAwc/7bNvr/21dBkNhsGj3fK8I7sQqrnp +zM= X-SBRS: None X-MesageID: 29425539 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,396,1596513600"; d="scan'208";a="29425539" To: CC: Peter Maydell , Michael Tokarev , Anthony PERARD Subject: [PULL 1/4] xen: xenguest is not used so is not needed Date: Tue, 20 Oct 2020 11:02:36 +0100 Message-ID: <20201020100239.272748-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020100239.272748-1-anthony.perard@citrix.com> References: <20201020100239.272748-1-anthony.perard@citrix.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.155.168; envelope-from=anthony.perard@citrix.com; helo=esa5.hc3370-68.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 06:02:53 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Anthony PERARD X-Patchwork-Original-From: Anthony PERARD via From: Anthony PERARD From: Michael Tokarev There's no references in only file which includes xenguest.h to any xen definitions. And there's no references to -lxenguest in qemu, either. Drop it. Signed-off-by: Michael Tokarev Reviewed-by: Anthony PERARD Message-Id: <20200727140048.19779-1-mjt@msgid.tls.msk.ru> [perard: rebased] Signed-off-by: Anthony PERARD --- configure | 4 ++-- hw/i386/xen/xen_platform.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a73fb8756ef1..e6754c1e872c 100755 --- a/configure +++ b/configure @@ -2532,7 +2532,7 @@ if test "$xen" != "disabled" ; then xen_ctrl_version="$(printf '%d%02d%02d' \ $($pkg_config --modversion xencontrol | sed 's/\./ /g') )" xen=enabled - xen_pc="xencontrol xenstore xenguest xenforeignmemory xengnttab" + xen_pc="xencontrol xenstore xenforeignmemory xengnttab" xen_pc="$xen_pc xenevtchn xendevicemodel" if $pkg_config --exists xentoolcore; then xen_pc="$xen_pc xentoolcore" @@ -2541,7 +2541,7 @@ if test "$xen" != "disabled" ; then xen_libs="$($pkg_config --libs $xen_pc)" else - xen_libs="-lxenstore -lxenctrl -lxenguest" + xen_libs="-lxenstore -lxenctrl" xen_stable_libs="-lxenforeignmemory -lxengnttab -lxenevtchn" # First we test whether Xen headers and libraries are available. diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index e9601031bfd9..7c4db35debbd 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -37,8 +37,6 @@ #include "sysemu/block-backend.h" #include "qemu/error-report.h" #include "qemu/module.h" - -#include #include "qom/object.h" //#define DEBUG_PLATFORM From patchwork Tue Oct 20 10:02:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11846215 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 8CEB615E6 for ; Tue, 20 Oct 2020 10:04:07 +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 2071822253 for ; Tue, 20 Oct 2020 10:04:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="FEr/WzXe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2071822253 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.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]:51772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUoUw-0001KM-5M for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Oct 2020 06:04:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTt-00082N-NR for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:01 -0400 Received: from esa4.hc3370-68.iphmx.com ([216.71.155.144]:49467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTo-0007Dz-KY for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1603188176; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DivzlSEYGx5djsY+aVmVgrz7JhYnipPXWYC1o2Q+IOY=; b=FEr/WzXe3IEdzhU5CFheOwPm1dhK6+rPue/oXtp039q2qXw8wq16nZnx AmMLPWRtJs6Gfuw7JbV440XRXoXhj/tBN4fAVv8eIylMX6CNsWv7FOAph x1YWY8dnSmmRPsSeadZGaKw9hvaDXo/88w0PSKgIl2RG25D4NR0X/EUoy c=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: KOdXoYAQ7gfB2dkNWG5ae5SEjLEq9NRTtwCY4ufZRI37zY+J8r7ho/vqPKxH0MwI8k/zQ/2cuK 316I9BBk+J9K5JsikXoMVDU4LQdqniPqfZooJ56q1g9/cptOpPRF2T/FKx9pQmu3l39VS+dzj7 h1rH7td9o8tlttUIBqjh90ByMgp6llet3jYPnrFwmnXA3J0o/9WPTUen3SNpt75yG/LOD9rmFq d3uU9BLY9vRAH4ylvAas39y1Nyfbh1wMtp5uDwqG2M/KT+WfNcTOHFVzunVrFZH+Pvx0HqnQpS bi4= X-SBRS: None X-MesageID: 30419945 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,396,1596513600"; d="scan'208";a="30419945" To: CC: Peter Maydell , Eduardo Habkost , Anthony PERARD Subject: [PULL 2/4] xen: Rename XENBACKEND_DEVICE to XENBACKEND Date: Tue, 20 Oct 2020 11:02:37 +0100 Message-ID: <20201020100239.272748-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020100239.272748-1-anthony.perard@citrix.com> References: <20201020100239.272748-1-anthony.perard@citrix.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.155.144; envelope-from=anthony.perard@citrix.com; helo=esa4.hc3370-68.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 06:02:54 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Anthony PERARD X-Patchwork-Original-From: Anthony PERARD via From: Anthony PERARD From: Eduardo Habkost Make the type checking macro name consistent with the TYPE_* constant. Signed-off-by: Eduardo Habkost Acked-by: Anthony PERARD Message-Id: <20200902224311.1321159-58-ehabkost@redhat.com> Signed-off-by: Anthony PERARD --- include/hw/xen/xen-legacy-backend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h index ba7a3c59bbcc..be281e1f38eb 100644 --- a/include/hw/xen/xen-legacy-backend.h +++ b/include/hw/xen/xen-legacy-backend.h @@ -11,7 +11,7 @@ #define TYPE_XENBACKEND "xen-backend" typedef struct XenLegacyDevice XenLegacyDevice; -DECLARE_INSTANCE_CHECKER(XenLegacyDevice, XENBACKEND_DEVICE, +DECLARE_INSTANCE_CHECKER(XenLegacyDevice, XENBACKEND, TYPE_XENBACKEND) /* variables */ From patchwork Tue Oct 20 10:02:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11846227 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 50991157C for ; Tue, 20 Oct 2020 10:05:54 +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 EE53C22253 for ; Tue, 20 Oct 2020 10:05:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="JKmZ25Xm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EE53C22253 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.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]:57052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUoWe-0003Zj-QY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Oct 2020 06:05:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTw-00088f-3t for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:04 -0400 Received: from esa4.hc3370-68.iphmx.com ([216.71.155.144]:49467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTt-0007Dz-V4 for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1603188181; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OpXFFycQpm63jLyG0eJbtosSLwARUWOqqFYJe8oF60I=; b=JKmZ25XmE5x56kv2Y/5SJUnpIbbozN9mk0JuZFKD/L+Rj8D2wnm5j/3Y 5AhvW7T4EMd6HsujuNrWNpvkJSEZ6BeICUfHtRClqAxENMEwNhk2eiVvI XBiD4RO6ncCysy8saaph95t7I7X6Obad3PtGvPB8aSOTBJdYkIwIMTqsc U=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: HUdtSCvk176Hqd5za+zmg5siqa+utctAw0qDn5VOihY2m3fWBEkzyDek0qB7FeC/8NVbXQq6Ns X1WhSO0X9B78I7Ez7jYVV9P3po9ayOsPasOoVxYcSPGQeUZY1XrA8KVMsvjSHt+13/wrTY1YDr +cf2FiamsVjK8u7hLS0mZQOaCYDG9FNP0nTGDAE0KqnmtM9MSLzA+3OixVQV1zBWzc/eptn8KD v8F2jfZwSzt3zUJ+bjDH6IHbItNqiQ5WXAYmGL4ZUq2exeXZxlfqp6jMty28R2xTdxy5LVImFF mjE= X-SBRS: None X-MesageID: 30419947 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,396,1596513600"; d="scan'208";a="30419947" To: CC: Peter Maydell , Paul Durrant , Anthony PERARD Subject: [PULL 3/4] xen-bus: reduce scope of backend watch Date: Tue, 20 Oct 2020 11:02:38 +0100 Message-ID: <20201020100239.272748-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020100239.272748-1-anthony.perard@citrix.com> References: <20201020100239.272748-1-anthony.perard@citrix.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.155.144; envelope-from=anthony.perard@citrix.com; helo=esa4.hc3370-68.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 06:02:54 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Anthony PERARD X-Patchwork-Original-From: Anthony PERARD via From: Anthony PERARD From: Paul Durrant Currently a single watch on /local/domain/X/backend is registered by each QEMU process running in service domain X (where X is usually 0). The purpose of this watch is to ensure that QEMU is notified when the Xen toolstack creates a new device backend area. Such a backend area is specific to a single frontend area created for a specific guest domain and, since each QEMU process is also created to service a specfic guest domain, it is unnecessary and inefficient to notify all QEMU processes. Only the QEMU process associated with the same guest domain need receive the notification. This patch re-factors the watch registration code such that notifications are targetted appropriately. Reported-by: Jerome Leseinne Signed-off-by: Paul Durrant Reviewed-by: Anthony PERARD Message-Id: <20201001081500.1026-1-paul@xen.org> Signed-off-by: Anthony PERARD --- hw/xen/xen-backend.c | 11 ++++++++++ hw/xen/xen-bus.c | 40 ++++++++++++++++++++++++++++-------- include/hw/xen/xen-backend.h | 1 + include/hw/xen/xen-bus.h | 3 ++- 4 files changed, 46 insertions(+), 9 deletions(-) diff --git a/hw/xen/xen-backend.c b/hw/xen/xen-backend.c index 10199fb58d10..5b0fb76eaeb3 100644 --- a/hw/xen/xen-backend.c +++ b/hw/xen/xen-backend.c @@ -41,6 +41,12 @@ static void xen_backend_table_add(XenBackendImpl *impl) g_hash_table_insert(xen_backend_table_get(), (void *)impl->type, impl); } +static const char **xen_backend_table_keys(unsigned int *count) +{ + return (const char **)g_hash_table_get_keys_as_array( + xen_backend_table_get(), count); +} + static const XenBackendImpl *xen_backend_table_lookup(const char *type) { return g_hash_table_lookup(xen_backend_table_get(), type); @@ -70,6 +76,11 @@ void xen_backend_register(const XenBackendInfo *info) xen_backend_table_add(impl); } +const char **xen_backend_get_types(unsigned int *count) +{ + return xen_backend_table_keys(count); +} + static QLIST_HEAD(, XenBackendInstance) backend_list; static void xen_backend_list_add(XenBackendInstance *backend) diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index 9ce1c9540b9e..8c588920d9fc 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -430,7 +430,15 @@ static void xen_bus_unrealize(BusState *bus) trace_xen_bus_unrealize(); if (xenbus->backend_watch) { - xen_bus_remove_watch(xenbus, xenbus->backend_watch, NULL); + unsigned int i; + + for (i = 0; i < xenbus->backend_types; i++) { + if (xenbus->backend_watch[i]) { + xen_bus_remove_watch(xenbus, xenbus->backend_watch[i], NULL); + } + } + + g_free(xenbus->backend_watch); xenbus->backend_watch = NULL; } @@ -446,8 +454,11 @@ static void xen_bus_unrealize(BusState *bus) static void xen_bus_realize(BusState *bus, Error **errp) { + char *key = g_strdup_printf("%u", xen_domid); XenBus *xenbus = XEN_BUS(bus); unsigned int domid; + const char **type; + unsigned int i; Error *local_err = NULL; trace_xen_bus_realize(); @@ -469,19 +480,32 @@ static void xen_bus_realize(BusState *bus, Error **errp) module_call_init(MODULE_INIT_XEN_BACKEND); - xenbus->backend_watch = - xen_bus_add_watch(xenbus, "", /* domain root node */ - "backend", xen_bus_backend_changed, &local_err); - if (local_err) { - /* This need not be treated as a hard error so don't propagate */ - error_reportf_err(local_err, - "failed to set up enumeration watch: "); + type = xen_backend_get_types(&xenbus->backend_types); + xenbus->backend_watch = g_new(XenWatch *, xenbus->backend_types); + + for (i = 0; i < xenbus->backend_types; i++) { + char *node = g_strdup_printf("backend/%s", type[i]); + + xenbus->backend_watch[i] = + xen_bus_add_watch(xenbus, node, key, xen_bus_backend_changed, + &local_err); + if (local_err) { + /* This need not be treated as a hard error so don't propagate */ + error_reportf_err(local_err, + "failed to set up '%s' enumeration watch: ", + type[i]); + } + + g_free(node); } + g_free(type); + g_free(key); return; fail: xen_bus_unrealize(bus); + g_free(key); } static void xen_bus_unplug_request(HotplugHandler *hotplug, diff --git a/include/hw/xen/xen-backend.h b/include/hw/xen/xen-backend.h index 010d71263876..aac2fd454d44 100644 --- a/include/hw/xen/xen-backend.h +++ b/include/hw/xen/xen-backend.h @@ -31,6 +31,7 @@ void xen_backend_set_device(XenBackendInstance *backend, XenDevice *xen_backend_get_device(XenBackendInstance *backend); void xen_backend_register(const XenBackendInfo *info); +const char **xen_backend_get_types(unsigned int *nr); void xen_backend_device_create(XenBus *xenbus, const char *type, const char *name, QDict *opts, Error **errp); diff --git a/include/hw/xen/xen-bus.h b/include/hw/xen/xen-bus.h index 3df696136f7b..6bdbf3ff8220 100644 --- a/include/hw/xen/xen-bus.h +++ b/include/hw/xen/xen-bus.h @@ -66,7 +66,8 @@ struct XenBus { domid_t backend_id; struct xs_handle *xsh; XenWatchList *watch_list; - XenWatch *backend_watch; + unsigned int backend_types; + XenWatch **backend_watch; QLIST_HEAD(, XenDevice) inactive_devices; }; From patchwork Tue Oct 20 10:02:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 11846233 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 3A895157C for ; Tue, 20 Oct 2020 10:08:18 +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 DD30722253 for ; Tue, 20 Oct 2020 10:08:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="GMS6Lb7v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD30722253 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.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]:35146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUoYy-0006mi-SY for patchwork-qemu-devel@patchwork.kernel.org; Tue, 20 Oct 2020 06:08:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTw-0008AL-Rq for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:04 -0400 Received: from esa4.hc3370-68.iphmx.com ([216.71.155.144]:49475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUoTu-0007Eg-W1 for qemu-devel@nongnu.org; Tue, 20 Oct 2020 06:03:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1603188182; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3eqI4wA+3uMajVVyTgFTOFTM3SrnL7w/R6m8eV3YUOc=; b=GMS6Lb7vn6sNGvLz9uihv+y3Kzey7twX4ojqYKsbd26MRZvgsOATghTu lLMlehsgssLhfqNihQBDFPxdrgnT9+PaQEiyuyq3c154y0rcJtBo5XFNf aO9PuVm7MBSPNrfX97Uoy7WYRCX9VrdmVJJIAqaNZdmWEUEVOYQwLyFIg s=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: IrOYJOs2fXFA5tGCOikbfFkm1HJ60nzd3zCJuRzXMwTvfdLsq/CsC5pNoDuW8zn0LAFy638Gi5 tgl8ZJ8xkG6AXCWBkzQU1rh4+J1gFrDOUS+BBHLv70dyd5rtVfustp4iwHJqDI69nsuGAkXKAp GHMM8YoD1LxCVGOvWD7qnb0UOso52rvtPYuO8LkQ2R5KqXCEakRXMzcIi8Fyo4Dpoyy1Rcawwg oEGKNSxVBJ0+7db9YfKc4rx3BbuT3pEn1a9Qc48BCUuPc0Y00JzCC7ei3U/SLsqAST1PAieogo HDY= X-SBRS: None X-MesageID: 30419948 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,396,1596513600"; d="scan'208";a="30419948" To: CC: Peter Maydell , Jason Andryuk , Anthony PERARD Subject: [PULL 4/4] hw/xen: Set suppress-vmdesc for Xen machines Date: Tue, 20 Oct 2020 11:02:39 +0100 Message-ID: <20201020100239.272748-5-anthony.perard@citrix.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201020100239.272748-1-anthony.perard@citrix.com> References: <20201020100239.272748-1-anthony.perard@citrix.com> MIME-Version: 1.0 Received-SPF: pass client-ip=216.71.155.144; envelope-from=anthony.perard@citrix.com; helo=esa4.hc3370-68.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/20 06:02:54 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Anthony PERARD X-Patchwork-Original-From: Anthony PERARD via From: Anthony PERARD From: Jason Andryuk xen-save-devices-state doesn't currently generate a vmdesc, so restore always triggers "Expected vmdescription section, but got 0". This is not a problem when restore comes from a file. However, when QEMU runs in a linux stubdom and comes over a console, EOF is not received. This causes a delay restoring - though it does restore. Setting suppress-vmdesc skips looking for the vmdesc during restore and avoids the wait. The other approach would be generate a vmdesc in qemu_save_device_state. Since COLO shared that function, and the vmdesc is just discarded on restore, we choose to skip it. Reported-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Anthony PERARD Message-Id: <20201013190506.3325-1-jandryuk@gmail.com> Signed-off-by: Anthony PERARD --- hw/i386/pc_piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3c2ae0612b23..0cf22a57ad14 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -987,7 +987,7 @@ static void xenfv_4_2_machine_options(MachineClass *m) pc_i440fx_4_2_machine_options(m); m->desc = "Xen Fully-virtualized PC"; m->max_cpus = HVM_MAX_VCPUS; - m->default_machine_opts = "accel=xen"; + m->default_machine_opts = "accel=xen,suppress-vmdesc=on"; } DEFINE_PC_MACHINE(xenfv_4_2, "xenfv-4.2", pc_xen_hvm_init, @@ -999,7 +999,7 @@ static void xenfv_3_1_machine_options(MachineClass *m) m->desc = "Xen Fully-virtualized PC"; m->alias = "xenfv"; m->max_cpus = HVM_MAX_VCPUS; - m->default_machine_opts = "accel=xen"; + m->default_machine_opts = "accel=xen,suppress-vmdesc=on"; } DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,