From: Manuel Bouyer <bouyer@netbsd.org>
To: xen-devel@lists.xenproject.org
Cc: "Manuel Bouyer" <bouyer@netbsd.org>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Ian Jackson" <iwj@xenproject.org>, "Wei Liu" <wl@xen.org>,
"Anthony PERARD" <anthony.perard@citrix.com>
Subject: [PATCH v2] libs/light: Switch NetBSD to QEMU_XEN
Date: Tue, 26 Jan 2021 23:47:54 +0100 [thread overview]
Message-ID: <20210126224800.1246-8-bouyer@netbsd.org> (raw)
In-Reply-To: <20210126224800.1246-1-bouyer@netbsd.org>
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 <bouyer@netbsd.org>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---
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 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 =
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;
--
2.29.2
next prev parent reply other threads:[~2021-01-26 23:00 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 22:47 [PATCH v2] Fix error: array subscript has type 'char' Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] NetBSD hotplug: Introduce locking functions Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] NetBSD hotplug: fix block unconfigure on destroy Manuel Bouyer
2021-01-28 11:45 ` Roger Pau Monné
2021-01-29 11:00 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] NetBSD: use system-provided headers Manuel Bouyer
2021-01-28 11:21 ` Roger Pau Monné
2021-01-29 10:57 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/call: fix build on NetBSD Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/foreignmemory: Implement " Manuel Bouyer
2021-01-27 20:15 ` Andrew Cooper
2021-01-28 10:48 ` Roger Pau Monné
2021-01-28 10:52 ` Andrew Cooper
2021-01-28 11:42 ` Andrew Cooper
2021-01-29 10:51 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/gnttab: implement " Manuel Bouyer
2021-01-28 11:14 ` Roger Pau Monné
2021-01-26 22:47 ` Manuel Bouyer [this message]
2021-01-26 22:47 ` [PATCH v2] libs/light: fix tv_sec printf format Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: fix uuid on NetBSD Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: make it build without setresuid() Manuel Bouyer
2021-01-28 11:06 ` Ian Jackson
2021-01-29 22:51 ` Andrew Cooper
2021-01-29 23:01 ` Manuel Bouyer
2021-01-29 23:05 ` Andrew Cooper
2021-01-29 23:16 ` Manuel Bouyer
2021-01-30 18:28 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/light: pass some infos to qemu Manuel Bouyer
2021-01-28 11:08 ` Roger Pau Monné
2021-01-29 10:46 ` Manuel Bouyer
2021-01-29 14:52 ` Roger Pau Monné
2021-01-30 23:07 ` Manuel Bouyer
2021-01-30 11:50 ` Manuel Bouyer
2021-02-01 8:06 ` Roger Pau Monné
2021-02-01 9:39 ` Manuel Bouyer
2021-02-01 10:54 ` Roger Pau Monné
2021-02-01 11:21 ` Manuel Bouyer
2021-01-26 22:47 ` [PATCH v2] libs/store: make build without PTHREAD_STACK_MIN Manuel Bouyer
2021-01-28 10:57 ` Roger Pau Monné
2021-01-28 11:08 ` Andrew Cooper
2021-01-29 10:43 ` Manuel Bouyer
2021-01-26 22:48 ` [PATCH v2] xenpmd.c: use dynamic allocation Manuel Bouyer
2021-01-28 10:34 ` Roger Pau Monné
2021-01-27 19:30 ` [PATCH v2] Fix error: array subscript has type 'char' Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210126224800.1246-8-bouyer@netbsd.org \
--to=bouyer@netbsd.org \
--cc=anthony.perard@citrix.com \
--cc=iwj@xenproject.org \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).