From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Wei Liu <wei.liu2@citrix.com>,
boris.ostrovsky@oracle.com,
Roger Pau Monne <roger.pau@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [PATCH 07/19] libxl: add PVH support to domain creation
Date: Tue, 22 Aug 2017 10:49:08 +0100 [thread overview]
Message-ID: <20170822094920.70151-8-roger.pau@citrix.com> (raw)
In-Reply-To: <20170822094920.70151-1-roger.pau@citrix.com>
Remove the device model "none" support from domain creation and
introduce support for PVH.
This requires changing some of the HVM checks to be applied for both
HVM and PVH.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_create.c | 69 ++++++++++++++++++++++++----------------------
1 file changed, 36 insertions(+), 33 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 75e85f8086..3988944994 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -35,7 +35,7 @@ int libxl__domain_create_info_setdefault(libxl__gc *gc,
return ERROR_INVAL;
}
- if (c_info->type == LIBXL_DOMAIN_TYPE_HVM) {
+ if (c_info->type != LIBXL_DOMAIN_TYPE_PV) {
libxl_defbool_setdefault(&c_info->hap, true);
libxl_defbool_setdefault(&c_info->oos, true);
}
@@ -65,7 +65,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
int i;
if (b_info->type != LIBXL_DOMAIN_TYPE_HVM &&
- b_info->type != LIBXL_DOMAIN_TYPE_PV) {
+ b_info->type != LIBXL_DOMAIN_TYPE_PV &&
+ b_info->type != LIBXL_DOMAIN_TYPE_PVH) {
LOG(ERROR, "invalid domain type");
return ERROR_INVAL;
}
@@ -120,8 +121,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
b_info->u.hvm.bios = LIBXL_BIOS_TYPE_ROMBIOS; break;
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
b_info->u.hvm.bios = LIBXL_BIOS_TYPE_SEABIOS; break;
- case LIBXL_DEVICE_MODEL_VERSION_NONE:
- break;
default:
LOG(ERROR, "unknown device model version");
return ERROR_INVAL;
@@ -141,8 +140,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
return ERROR_INVAL;
}
break;
- case LIBXL_DEVICE_MODEL_VERSION_NONE:
- break;
default:abort();
}
@@ -222,10 +219,7 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
b_info->u.hvm.mmio_hole_memkb = 0;
if (b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_UNKNOWN) {
- if (b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE)
- b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_NONE;
- else
- b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS;
+ b_info->u.hvm.vga.kind = LIBXL_VGA_INTERFACE_TYPE_CIRRUS;
}
if (!b_info->u.hvm.hdtype)
@@ -259,12 +253,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
break;
}
break;
- case LIBXL_DEVICE_MODEL_VERSION_NONE:
- if (b_info->u.hvm.vga.kind != LIBXL_VGA_INTERFACE_TYPE_NONE) {
- LOG(ERROR,
- "guests without a device model cannot have an emulated video card");
- return ERROR_INVAL;
- }
b_info->video_memkb = 0;
break;
case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
@@ -401,6 +389,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,
b_info->u.pv.cmdline = NULL;
}
break;
+ case LIBXL_DOMAIN_TYPE_PVH:
+ break;
default:
LOG(ERROR, "invalid domain type %s in create info",
libxl_domain_type_to_string(b_info->type));
@@ -519,6 +509,17 @@ int libxl__domain_build(libxl__gc *gc,
}
break;
+ case LIBXL_DOMAIN_TYPE_PVH:
+ ret = libxl__build_hvm(gc, domid, d_config, state);
+ if (ret)
+ goto out;
+
+ vments = libxl__calloc(gc, 3, sizeof(char *));
+ vments[0] = "start_time";
+ vments[1] = GCSPRINTF("%lu.%02d", start_time.tv_sec,
+ (int)start_time.tv_usec/10000);
+
+ break;
default:
ret = ERROR_INVAL;
goto out;
@@ -553,7 +554,7 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config,
}
flags = 0;
- if (info->type == LIBXL_DOMAIN_TYPE_HVM) {
+ if (info->type != LIBXL_DOMAIN_TYPE_PV) {
flags |= XEN_DOMCTL_CDF_hvm_guest;
flags |= libxl_defbool_val(info->hap) ? XEN_DOMCTL_CDF_hap : 0;
flags |= libxl_defbool_val(info->oos) ? 0 : XEN_DOMCTL_CDF_oos_off;
@@ -880,7 +881,7 @@ static void initiate_domain_create(libxl__egc *egc,
/* If target_memkb is smaller than max_memkb, the subsequent call
* to libxc when building HVM domain will enable PoD mode.
*/
- pod_enabled = (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM) &&
+ pod_enabled = (d_config->c_info.type != LIBXL_DOMAIN_TYPE_PV) &&
(d_config->b_info.target_memkb < d_config->b_info.max_memkb);
/* We cannot have PoD and PCI device assignment at the same time
@@ -889,7 +890,7 @@ static void initiate_domain_create(libxl__egc *egc,
* guest. To stay on the safe side, we disable PCI device
* assignment when PoD is enabled.
*/
- if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
+ if (d_config->c_info.type != LIBXL_DOMAIN_TYPE_PV &&
d_config->num_pcidevs && pod_enabled) {
ret = ERROR_INVAL;
LOGD(ERROR, domid,
@@ -928,18 +929,20 @@ static void initiate_domain_create(libxl__egc *egc,
goto error_out;
}
- if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
+ if (d_config->c_info.type != LIBXL_DOMAIN_TYPE_PV &&
(libxl_defbool_val(d_config->b_info.nested_hvm) &&
- (libxl_defbool_val(d_config->b_info.u.hvm.altp2m) ||
+ ((d_config->c_info.type != LIBXL_DOMAIN_TYPE_HVM &&
+ libxl_defbool_val(d_config->b_info.u.hvm.altp2m)) ||
(d_config->b_info.altp2m != LIBXL_ALTP2M_MODE_DISABLED)))) {
ret = ERROR_INVAL;
LOGD(ERROR, domid, "nestedhvm and altp2mhvm cannot be used together");
goto error_out;
}
- if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
- (libxl_defbool_val(d_config->b_info.u.hvm.altp2m) ||
- (d_config->b_info.altp2m != LIBXL_ALTP2M_MODE_DISABLED)) &&
+ if (((d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
+ libxl_defbool_val(d_config->b_info.u.hvm.altp2m)) ||
+ (d_config->c_info.type != LIBXL_DOMAIN_TYPE_PV &&
+ d_config->b_info.altp2m != LIBXL_ALTP2M_MODE_DISABLED)) &&
pod_enabled) {
ret = ERROR_INVAL;
LOGD(ERROR, domid, "Cannot enable PoD and ALTP2M at the same time");
@@ -1122,7 +1125,7 @@ static void domcreate_bootloader_done(libxl__egc *egc,
crs->domid = domid;
crs->send_back_fd = dcs->send_back_fd;
crs->recv_fd = restore_fd;
- crs->hvm = (info->type == LIBXL_DOMAIN_TYPE_HVM);
+ crs->hvm = (info->type != LIBXL_DOMAIN_TYPE_PV);
crs->callback = libxl__colo_restore_setup_done;
libxl__colo_restore_setup(egc, crs);
break;
@@ -1203,6 +1206,12 @@ static void domcreate_stream_done(libxl__egc *egc,
vments[i++] = (char *) state->pv_cmdline;
}
break;
+ case LIBXL_DOMAIN_TYPE_PVH:
+ vments = libxl__calloc(gc, 3, sizeof(char *));
+ vments[0] = "start_time";
+ vments[1] = GCSPRINTF("%lu.%02d", start_time.tv_sec,
+ (int)start_time.tv_usec/10000);
+ break;
default:
ret = ERROR_INVAL;
goto out;
@@ -1367,12 +1376,6 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,
libxl__device_console_add(gc, domid, &console, state, &device);
libxl__device_console_dispose(&console);
- if (d_config->b_info.device_model_version ==
- LIBXL_DEVICE_MODEL_VERSION_NONE) {
- domcreate_devmodel_started(egc, &dcs->sdss.dm, 0);
- return;
- }
-
libxl_device_vkb_init(&vkb);
libxl__device_vkb_add(gc, domid, &vkb);
libxl_device_vkb_dispose(&vkb);
@@ -1394,6 +1397,7 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev,
return;
}
case LIBXL_DOMAIN_TYPE_PV:
+ case LIBXL_DOMAIN_TYPE_PVH:
{
libxl__device_console console;
libxl__device device;
@@ -1700,8 +1704,7 @@ static void domain_soft_reset_cb(libxl__egc *egc,
goto error;
}
- if (cdcs->dcs.guest_config->b_info.device_model_version !=
- LIBXL_DEVICE_MODEL_VERSION_NONE) {
+ if (cdcs->dcs.guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) {
savefile = GCSPRINTF(LIBXL_DEVICE_MODEL_SAVE_FILE".%d", dds->domid);
restorefile = GCSPRINTF(LIBXL_DEVICE_MODEL_RESTORE_FILE".%d",
dds->domid);
--
2.11.0 (Apple Git-81)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-08-22 9:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 9:49 [PATCH 00/19] libxl/xl: add PVH guest type Roger Pau Monne
2017-08-22 9:49 ` [PATCH 01/19] libxl/xl: move some HVM/PV specific fields of libxl_domain_build_info Roger Pau Monne
2017-08-24 11:27 ` Wei Liu
2017-08-24 11:47 ` Roger Pau Monne
2017-08-22 9:49 ` [PATCH 02/19] xl: introduce a domain type option Roger Pau Monne
2017-08-24 11:28 ` Wei Liu
2017-08-22 9:49 ` [PATCH 03/19] xl: introduce a firmware option Roger Pau Monne
2017-08-24 11:31 ` Wei Liu
2017-08-22 9:49 ` [PATCH 04/19] libxl: introduce a PVH guest type Roger Pau Monne
2017-08-24 11:42 ` Wei Liu
2017-08-24 11:52 ` Roger Pau Monne
2017-08-22 9:49 ` [PATCH 05/19] libxl: allow PVH guests to use a bootloader Roger Pau Monne
2017-08-22 9:49 ` [PATCH 06/19] libxl: set PVH guests to use the PV console Roger Pau Monne
2017-08-22 9:49 ` Roger Pau Monne [this message]
2017-08-22 9:49 ` [PATCH 08/19] libxl: remove device model "none" support from disk related functions Roger Pau Monne
2017-08-22 9:49 ` [PATCH 09/19] libxl: set device model for PVH guests Roger Pau Monne
2017-08-22 9:49 ` [PATCH 10/19] libxl: add PVH support to domain building Roger Pau Monne
2017-08-22 9:49 ` [PATCH 11/19] libxl: add PVH support to domain save/suspend Roger Pau Monne
2017-08-22 9:49 ` [PATCH 12/19] libxl: add PVH support to vpcu hotplug, domain destruction/pause and domain configuration Roger Pau Monne
2017-08-22 9:49 ` [PATCH 13/19] libxl: add PVH support to memory functions Roger Pau Monne
2017-08-22 9:49 ` [PATCH 14/19] libxl: PVH guests use PV nics Roger Pau Monne
2017-08-22 9:49 ` [PATCH 15/19] libxl: remove device model "none" support from stream functions Roger Pau Monne
2017-08-22 9:49 ` [PATCH 16/19] libxl: add PVH support to USB Roger Pau Monne
2017-08-22 9:49 ` [PATCH 17/19] libxl: add PVH support to x86 functions Roger Pau Monne
2017-08-22 9:49 ` [PATCH 18/19] xl: add PVH as a guest type Roger Pau Monne
2017-08-22 9:49 ` [PATCH 19/19] libxl: remove device model "none" from IDL Roger Pau Monne
2017-08-22 11:24 ` [PATCH 00/19] libxl/xl: add PVH guest type Andrew Cooper
2017-08-22 11:30 ` Roger Pau Monne
2017-08-22 12:33 ` Andrew Cooper
2017-08-22 12:56 ` Roger Pau Monne
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=20170822094920.70151-8-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--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).