From nobody Fri May 3 21:17:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1611702010; cv=none; d=zohomail.com; s=zohoarc; b=JBfSAD6eaqy1RDHnixSfzjZLbs8e0unaoQFhMYkYB+kmaId1LVnJAn+X/yow9b+Qu+Okz7uwOd63TLG+0T1Dd1+VdVgxIEUeUdNcGJEMQ8juPE2FzAfGQyV+3ySSWLT9FGK+l2MbiVAgGjp1AH5W2o6mbQdTHBvdAm/xS7ayb2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611702010; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ainrdAT5vsb2ZgXfvXrnWHpiIIoUXLNRi7b+EfnsCxQ=; b=DfKU07ulE7/5W/HYRnb6LUau/aMj0pDa/9OXG1/soT5XN1KydZHiUTioVZFVxYShV0AcSkiI5y64q+6dbdzxp5GA8WdDB6yppRVGS/cgveZiHGWUCDVHVhh5oWkA+tsBjWWvEiWNqOPCe1rISkjk8BNjw/eDfoqip7fQOHX7lV8= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1611702010882579.278322763952; Tue, 26 Jan 2021 15:00:10 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.75667.136298 (Exim 4.92) (envelope-from ) id 1l4XJW-000497-S3; Tue, 26 Jan 2021 22:59:58 +0000 Received: by outflank-mailman (output) from mailman id 75667.136298; Tue, 26 Jan 2021 22:59:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l4XJW-00048z-OI; Tue, 26 Jan 2021 22:59:58 +0000 Received: by outflank-mailman (input) for mailman id 75667; Tue, 26 Jan 2021 22:59:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l4X9T-0001QY-P5 for xen-devel@lists.xenproject.org; Tue, 26 Jan 2021 22:49:35 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b40d2d58-3ede-4a86-b922-8919b5c9e937; Tue, 26 Jan 2021 22:48:38 +0000 (UTC) Received: from asim.lip6.fr (asim.lip6.fr [132.227.86.2]) by isis.lip6.fr (8.15.2/8.15.2) with ESMTP id 10QMmXTj009957; Tue, 26 Jan 2021 23:48:33 +0100 (CET) Received: from borneo.soc.lip6.fr (borneo [132.227.103.47]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10QMmXFQ015864; Tue, 26 Jan 2021 23:48:33 +0100 (MET) Received: by borneo.soc.lip6.fr (Postfix, from userid 373) id 2AFD5AA8C7; Tue, 26 Jan 2021 23:48:33 +0100 (MET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b40d2d58-3ede-4a86-b922-8919b5c9e937 From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v2] libs/light: Switch NetBSD to QEMU_XEN Date: Tue, 26 Jan 2021 23:47:54 +0100 Message-Id: <20210126224800.1246-8-bouyer@netbsd.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126224800.1246-1-bouyer@netbsd.org> References: <20210126224800.1246-1-bouyer@netbsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Tue, 26 Jan 2021 23:48:33 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 Switch NetBSD to QEMU_XEN. All 3 versions of libxl__default_device_model() now return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN, so remove it and just set b_info->device_model_version to LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN in libxl__domain_build_info_setdefault(). Signed-off-by: Manuel Bouyer Reviewed-by: Roger Pau Monn=C3=A9 --- tools/libs/light/libxl_create.c | 2 +- tools/libs/light/libxl_freebsd.c | 5 ----- tools/libs/light/libxl_internal.h | 2 -- tools/libs/light/libxl_linux.c | 5 ----- tools/libs/light/libxl_netbsd.c | 5 ----- 5 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index 86f4a8369d..8616113e72 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -102,7 +102,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { - b_info->device_model_version =3D libxl__default_device_mod= el(gc); + b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSIO= N_QEMU_XEN; } } else { b_info->device_model_version =3D diff --git a/tools/libs/light/libxl_freebsd.c b/tools/libs/light/libxl_free= bsd.c index f7ef4a8910..422c6b3b79 100644 --- a/tools/libs/light/libxl_freebsd.c +++ b/tools/libs/light/libxl_freebsd.c @@ -229,11 +229,6 @@ out: return rc; } =20 -libxl_device_model_version libxl__default_device_model(libxl__gc *gc) -{ - return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; -} - int libxl__pci_numdevs(libxl__gc *gc) { return ERROR_NI; diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_int= ernal.h index c79523ba92..6c8b7d71a9 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -2309,8 +2309,6 @@ _hidden char *libxl__json_object_to_json(libxl__gc *g= c, /* Based on /local/domain/$domid/dm-version xenstore key * default is qemu xen traditional */ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t do= mid); - /* Return the system-wide default device model */ -_hidden libxl_device_model_version libxl__default_device_model(libxl__gc *= gc); =20 static inline bool libxl__stubdomain_is_linux_running(libxl__gc *gc, uint32_t domid) diff --git a/tools/libs/light/libxl_linux.c b/tools/libs/light/libxl_linux.c index 873b0271af..8d62dfd255 100644 --- a/tools/libs/light/libxl_linux.c +++ b/tools/libs/light/libxl_linux.c @@ -241,11 +241,6 @@ out: return rc; } =20 -libxl_device_model_version libxl__default_device_model(libxl__gc *gc) -{ - return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; -} - int libxl__pci_numdevs(libxl__gc *gc) { DIR *dir; diff --git a/tools/libs/light/libxl_netbsd.c b/tools/libs/light/libxl_netbs= d.c index e66a393d7f..6ad4ed34c2 100644 --- a/tools/libs/light/libxl_netbsd.c +++ b/tools/libs/light/libxl_netbsd.c @@ -108,11 +108,6 @@ out: return rc; } =20 -libxl_device_model_version libxl__default_device_model(libxl__gc *gc) -{ - return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; -} - int libxl__pci_numdevs(libxl__gc *gc) { return ERROR_NI; --=20 2.29.2