|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v5 04/12] xl: add PV display device commands
From: Oleksandr Grytsov <oleksandr_grytsov@xxxxxxxx>
Add commands: vdispl-attach, vdispl-list, vdispl-detach
and domain config vdispl parser
Signed-off-by: Oleksandr Grytsov <oleksandr_grytsov@xxxxxxxx>
Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
tools/xl/Makefile | 1 +
tools/xl/xl.h | 3 +
tools/xl/xl_cmdtable.c | 19 ++++++
tools/xl/xl_parse.c | 75 ++++++++++++++++++++++-
tools/xl/xl_parse.h | 2 +-
tools/xl/xl_vdispl.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 261 insertions(+), 2 deletions(-)
create mode 100644 tools/xl/xl_vdispl.c
diff --git a/tools/xl/Makefile b/tools/xl/Makefile
index c868899..41a09ed 100644
--- a/tools/xl/Makefile
+++ b/tools/xl/Makefile
@@ -21,6 +21,7 @@ XL_OBJS += xl_vtpm.o xl_block.o xl_nic.o xl_usb.o
XL_OBJS += xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o
XL_OBJS += xl_psr.o xl_info.o xl_console.o xl_misc.o
XL_OBJS += xl_vmcontrol.o xl_saverestore.o xl_migrate.o
+XL_OBJS += xl_vdispl.o
$(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog)
$(XL_OBJS): CFLAGS += $(CFLAGS_XL)
diff --git a/tools/xl/xl.h b/tools/xl/xl.h
index 5d3d2a4..98d62e9 100644
--- a/tools/xl/xl.h
+++ b/tools/xl/xl.h
@@ -167,6 +167,9 @@ int main_blockdetach(int argc, char **argv);
int main_vtpmattach(int argc, char **argv);
int main_vtpmlist(int argc, char **argv);
int main_vtpmdetach(int argc, char **argv);
+int main_vdisplattach(int argc, char **argv);
+int main_vdispllist(int argc, char **argv);
+int main_vdispldetach(int argc, char **argv);
int main_usbctrl_attach(int argc, char **argv);
int main_usbctrl_detach(int argc, char **argv);
int main_usbdev_attach(int argc, char **argv);
diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c
index ba0159d..d0330cd 100644
--- a/tools/xl/xl_cmdtable.c
+++ b/tools/xl/xl_cmdtable.c
@@ -377,6 +377,25 @@ struct cmd_spec cmd_table[] = {
"Destroy a domain's virtual TPM device",
"<Domain> <DevId|uuid>",
},
+ { "vdispl-attach",
+ &main_vdisplattach, 1, 1,
+ "Create a new virtual display device",
+ "<Domain> [backend=<BackDomain>] [be-alloc=<BackAlloc>]
[connectors='<Connectors>']",
+ " BackAlloc - set to 1 to if backend allocates display buffers\n"
+ " Connectors - list of connector's description in ID:WxH format,\n"
+ " where: ID - unique connector ID, W - connector
width,\n"
+ " H - connector height:
connectors='id0:800x600;id1:1024x768'\n"
+ },
+ { "vdispl-list",
+ &main_vdispllist, 0, 0,
+ "List virtual display devices for a domain",
+ "<Domain(s)>",
+ },
+ { "vdispl-detach",
+ &main_vdispldetach, 0, 1,
+ "Destroy a domain's virtual display device",
+ "<Domain> <DevId>",
+ },
{ "uptime",
&main_uptime, 0, 0,
"Print uptime for all/some domains",
diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c
index 02ddd2e..9965b83 100644
--- a/tools/xl/xl_parse.c
+++ b/tools/xl/xl_parse.c
@@ -804,6 +804,51 @@ int parse_usbdev_config(libxl_device_usbdev *usbdev, char
*token)
return 0;
}
+int parse_vdispl_config(libxl_device_vdispl *vdispl, char *token)
+{
+ char *oparg;
+ libxl_string_list connectors = NULL;
+ int i;
+ int rc;
+
+ if (MATCH_OPTION("backend", token, oparg)) {
+ vdispl->backend_domname = strdup(oparg);
+ } else if (MATCH_OPTION("be-alloc", token, oparg)) {
+ vdispl->be_alloc = strtoul(oparg, NULL, 0);
+ } else if (MATCH_OPTION("connectors", token, oparg)) {
+ split_string_into_string_list(oparg, ";", &connectors);
+
+ vdispl->num_connectors = libxl_string_list_length(&connectors);
+ vdispl->connectors = calloc(vdispl->num_connectors,
+ sizeof(*vdispl->connectors));
+
+ for(i = 0; i < vdispl->num_connectors; i++)
+ {
+ char *resolution;
+
+ rc = split_string_into_pair(connectors[i], ":",
+ &vdispl->connectors[i].id,
+ &resolution);
+
+ rc= sscanf(resolution, "%ux%u", &vdispl->connectors[i].width,
+ &vdispl->connectors[i].height);
+ if (rc != 2) {
+ fprintf(stderr, "Can't parse connector resolution\n");
+ goto out;
+ }
+ }
+ } else {
+ fprintf(stderr, "Unknown string \"%s\" in vdispl spec\n", token);
+ rc = 1; goto out;
+ }
+
+ rc = 0;
+
+out:
+ libxl_string_list_dispose(&connectors);
+ return rc;
+}
+
void parse_config_data(const char *config_source,
const char *config_data,
int config_len,
@@ -813,7 +858,7 @@ void parse_config_data(const char *config_source,
long l, vcpus = 0;
XLU_Config *config;
XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms,
- *usbctrls, *usbdevs, *p9devs;
+ *usbctrls, *usbdevs, *p9devs, *vdispls;
XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs,
*mca_caps;
int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian, num_mca_caps;
@@ -1489,6 +1534,34 @@ void parse_config_data(const char *config_source,
}
}
+ if (!xlu_cfg_get_list(config, "vdispl", &vdispls, 0, 0)) {
+ d_config->num_vdispls = 0;
+ d_config->vdispls = NULL;
+ while ((buf = xlu_cfg_get_listitem(vdispls, d_config->num_vdispls)) !=
NULL) {
+ libxl_device_vdispl *vdispl;
+ char * buf2 = strdup(buf);
+ char *p;
+ vdispl = ARRAY_EXTEND_INIT(d_config->vdispls,
+ d_config->num_vdispls,
+ libxl_device_vdispl_init);
+ p = strtok (buf2, ",");
+ while (p != NULL)
+ {
+ while (*p == ' ') p++;
+ if (parse_vdispl_config(vdispl, p)) {
+ free(buf2);
+ exit(1);
+ }
+ p = strtok (NULL, ",");
+ }
+ free(buf2);
+ if (vdispl->num_connectors == 0) {
+ fprintf(stderr, "At least one connector should be
specified.\n");
+ exit(1);
+ }
+ }
+ }
+
if (!xlu_cfg_get_list (config, "channel", &channels, 0, 0)) {
d_config->num_channels = 0;
d_config->channels = NULL;
diff --git a/tools/xl/xl_parse.h b/tools/xl/xl_parse.h
index db8bc3f..cc459fb 100644
--- a/tools/xl/xl_parse.h
+++ b/tools/xl/xl_parse.h
@@ -33,7 +33,7 @@ int parse_usbctrl_config(libxl_device_usbctrl *usbctrl, char
*token);
int parse_usbdev_config(libxl_device_usbdev *usbdev, char *token);
int parse_cpurange(const char *cpu, libxl_bitmap *cpumap);
int parse_nic_config(libxl_device_nic *nic, XLU_Config **config, char *token);
-
+int parse_vdispl_config(libxl_device_vdispl *vdispl, char *token);
int match_option_size(const char *prefix, size_t len,
char *arg, char **argopt);
diff --git a/tools/xl/xl_vdispl.c b/tools/xl/xl_vdispl.c
new file mode 100644
index 0000000..3cc99b6
--- /dev/null
+++ b/tools/xl/xl_vdispl.c
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2016 EPAM Systems Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
+#include <stdlib.h>
+
+#include <libxl.h>
+#include <libxl_utils.h>
+#include <libxlutil.h>
+
+#include "xl.h"
+#include "xl_utils.h"
+#include "xl_parse.h"
+
+int main_vdisplattach(int argc, char **argv)
+{
+ int opt;
+ int rc;
+ uint32_t domid;
+ libxl_device_vdispl vdispl;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "vdispl-attach", 1) {
+ /* No options */
+ }
+
+ libxl_device_vdispl_init(&vdispl);
+ domid = find_domain(argv[optind++]);
+
+ for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) {
+ rc = parse_vdispl_config(&vdispl, *argv);
+ if (rc) goto out;
+ }
+
+ if (vdispl.num_connectors == 0) {
+ fprintf(stderr, "At least one connector should be specified.\n");
+ rc = ERROR_FAIL; goto out;
+ }
+
+ if (dryrun_only) {
+ char *json = libxl_device_vdispl_to_json(ctx, &vdispl);
+ printf("vdispl: %s\n", json);
+ free(json);
+ goto out;
+ }
+
+ if (libxl_device_vdispl_add(ctx, domid, &vdispl, 0)) {
+ fprintf(stderr, "libxl_device_vdispl_add failed.\n");
+ rc = ERROR_FAIL; goto out;
+ }
+
+ rc = 0;
+
+out:
+ libxl_device_vdispl_dispose(&vdispl);
+ return rc;
+}
+
+int main_vdispllist(int argc, char **argv)
+{
+ int opt;
+ int i, j, n;
+ libxl_device_vdispl *vdispls;
+ libxl_vdisplinfo vdisplinfo;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "vdispl-list", 1) {
+ /* No options */
+ }
+
+ for (argv += optind, argc -= optind; argc > 0; --argc, ++argv) {
+ uint32_t domid;
+
+ if (libxl_domain_qualifier_to_domid(ctx, *argv, &domid) < 0) {
+ fprintf(stderr, "%s is an invalid domain identifier\n", *argv);
+ continue;
+ }
+
+ vdispls = libxl_device_vdispl_list(ctx, domid, &n);
+
+ if (!vdispls) continue;
+
+ for (i = 0; i < n; i++) {
+ libxl_vdisplinfo_init(&vdisplinfo);
+ if (libxl_device_vdispl_getinfo(ctx, domid, &vdispls[i],
+ &vdisplinfo) == 0) {
+ printf("DevId: %d, BE: %d, handle: %d, state: %d, "
+ "be-alloc: %d, BE-path: %s, FE-path: %s\n",
+ vdisplinfo.devid, vdisplinfo.backend_id,
+ vdisplinfo.frontend_id,
+ vdisplinfo.state, vdisplinfo.be_alloc,
+ vdisplinfo.backend, vdisplinfo.frontend);
+
+ for (j = 0; j < vdisplinfo.num_connectors; j++) {
+ printf("\tConnector: %d, id: %s, width: %d, height: %d, "
+ "req-rref: %d, req-evtch: %d, "
+ "evt-rref: %d, evt-evtch: %d\n",
+ j, vdisplinfo.connectors[j].id,
+ vdisplinfo.connectors[j].width,
+ vdisplinfo.connectors[j].height,
+ vdisplinfo.connectors[j].req_rref,
+ vdisplinfo.connectors[j].req_evtch,
+ vdisplinfo.connectors[j].evt_rref,
+ vdisplinfo.connectors[j].evt_evtch);
+ }
+ }
+ libxl_vdisplinfo_dispose(&vdisplinfo);
+ }
+ libxl_device_vdispl_list_free(vdispls, n);
+ }
+ return 0;
+}
+
+int main_vdispldetach(int argc, char **argv)
+{
+ uint32_t domid, devid;
+ int opt, rc;
+ libxl_device_vdispl vdispl;
+
+ SWITCH_FOREACH_OPT(opt, "", NULL, "vdispl-detach", 2) {
+ /* No options */
+ }
+
+ domid = find_domain(argv[optind++]);
+ devid = atoi(argv[optind++]);
+
+ libxl_device_vdispl_init(&vdispl);
+
+ if (libxl_devid_to_device_vdispl(ctx, domid, devid, &vdispl)) {
+ fprintf(stderr, "Error: Device %d not connected.\n", devid);
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ rc = libxl_device_vdispl_remove(ctx, domid, &vdispl, 0);
+ if (rc) {
+ fprintf(stderr, "libxl_device_vdispl_remove failed.\n");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
+ rc = 0;
+
+out:
+ libxl_device_vdispl_dispose(&vdispl);
+ return rc;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
https://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |