From patchwork Tue Jan 12 18:12:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manuel Bouyer X-Patchwork-Id: 12014407 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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 C8D94C433E0 for ; Tue, 12 Jan 2021 18:19:11 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (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 7AD6322DFA for ; Tue, 12 Jan 2021 18:19:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AD6322DFA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=antioche.eu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65863.116738 (Exim 4.92) (envelope-from ) id 1kzOG0-0004es-Up; Tue, 12 Jan 2021 18:19:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65863.116738; Tue, 12 Jan 2021 18:19:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOG0-0004eZ-QO; Tue, 12 Jan 2021 18:19:04 +0000 Received: by outflank-mailman (input) for mailman id 65863; Tue, 12 Jan 2021 18:19:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kzOBv-0003Yo-0K for xen-devel@lists.xenproject.org; Tue, 12 Jan 2021 18:14:51 +0000 Received: from isis.lip6.fr (unknown [2001:660:3302:283c::2]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id baa42764-ca05-45fb-b71c-b635a6c0f1e4; Tue, 12 Jan 2021 18:13:43 +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 10CIDe8U007695; Tue, 12 Jan 2021 19:13:40 +0100 (CET) Received: from armandeche.soc.lip6.fr (armandeche [132.227.63.133]) by asim.lip6.fr (8.15.2/8.14.4) with ESMTP id 10CIDdjr023609; Tue, 12 Jan 2021 19:13:39 +0100 (MET) Received: by armandeche.soc.lip6.fr (Postfix, from userid 20331) id 12B8C7218; Tue, 12 Jan 2021 19:13:39 +0100 (MET) 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: baa42764-ca05-45fb-b71c-b635a6c0f1e4 From: Manuel Bouyer To: xen-devel@lists.xenproject.org Cc: Manuel Bouyer , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH] libs/light: Switch NetBSD to QEMU_XEN Date: Tue, 12 Jan 2021 19:12:33 +0100 Message-Id: <20210112181242.1570-13-bouyer@antioche.eu.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210112181242.1570-1-bouyer@antioche.eu.org> References: <20210112181242.1570-1-bouyer@antioche.eu.org> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (isis.lip6.fr [132.227.60.2]); Tue, 12 Jan 2021 19:13:40 +0100 (CET) X-Scanned-By: MIMEDefang 2.78 on 132.227.60.2 From: Manuel Bouyer 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é --- 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_create.c index 7199a79778..9848d65f36 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 = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; } else { - b_info->device_model_version = libxl__default_device_model(gc); + b_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; } } else { b_info->device_model_version = diff --git a/tools/libs/light/libxl_freebsd.c b/tools/libs/light/libxl_freebsd.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; } -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_internal.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 *gc, /* 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 domid); - /* Return the system-wide default device model */ -_hidden libxl_device_model_version libxl__default_device_model(libxl__gc *gc); 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; } -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_netbsd.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; } -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;