From patchwork Thu May 25 12:17:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Grytsov X-Patchwork-Id: 9748317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1CC456032C for ; Thu, 25 May 2017 12:19:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09D4427D4A for ; Thu, 25 May 2017 12:19:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F236A27EE2; Thu, 25 May 2017 12:19:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3636E27D4A for ; Thu, 25 May 2017 12:19:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDri4-0000ev-LL; Thu, 25 May 2017 12:17:44 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dDri3-0000eL-MG for xen-devel@lists.xenproject.org; Thu, 25 May 2017 12:17:43 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 08/C0-31580-66BC6295; Thu, 25 May 2017 12:17:42 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrEIsWRWlGSWpSXmKPExsXiVRvkpJt2Wi3 SYPZhIYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNaOtaSpjwbS4imcPDrM3MB506WLk4hASmMEo 8aR3NzuIwyLwkkViyeEtLCCOhEA/q8S92weYuhg5gZw4iabLy1kh7CqJHT/ugNlCAvISB1sus 0OMmsokcf3nMbAGNgEtifu3V7CB2CICShL3Vk0GizMLGEm8fLWcHcQWFrCSmHzsEFgNi4CqxN kZ78DivAL2EidPfmWDWCYncfNcJzOIzSngILF69yRmiMX2EtNO7mSawCiwgJFhFaN6cWpRWWq RrrleUlFmekZJbmJmjq6hgbFebmpxcWJ6ak5iUrFecn7uJkZgaDEAwQ7Gxu9OhxglOZiURHnF 56pFCvEl5adUZiQWZ8QXleakFh9i1ODgEPj59G8LoxRLXn5eqpIE76eTQHWCRanpqRVpmTnA4 IcpleDgURLhbQBJ8xYXJOYWZ6ZDpE4xGnNsWL3+CxPHpAPbvzAJgU2SEuc1BSkVACnNKM2DGw SLykuMslLCvIxAZwrxFKQW5WaWoMq/YhTnYFQS5hU/BTSFJzOvBG7fK6BTmIBOcb2rDHJKSSJ CSqqBseaPSe9BjVo980+lW93fdn53DLx0+r7Fq5cF37VfTPrJ1td57vN/F/YJcxQ832/+sv3o lHNnrFgihcq+dezvTnvBfmHmk5bdvW3TNisq3ZrD2Nzr6DylxnYBF5vEng/PZ37L3j3z99R2n qcM0yu3TA2J445R+7lm0d+zdf6arKarj0w/5uVWlaHEUpyRaKjFXFScCABz3POTxQIAAA== X-Env-Sender: al1img@gmail.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1495714662!90799491!1 X-Originating-IP: [74.125.82.66] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60010 invoked from network); 25 May 2017 12:17:42 -0000 Received: from mail-wm0-f66.google.com (HELO mail-wm0-f66.google.com) (74.125.82.66) by server-2.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 May 2017 12:17:42 -0000 Received: by mail-wm0-f66.google.com with SMTP id k15so51414225wmh.3 for ; Thu, 25 May 2017 05:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XZYe2lAthybx2DYAEBv0he7qIODLQtlrOtrkfy4G9HM=; b=UYj8JZFY1gks2oKxQf7r7pR42h+PIakb9tAyW5Jhm0tWwwpWZyvZn99aEACbwE5HNa 2Z47xwqVtJDCTd4V2CzqxXTD+ueq4SG6af8ayom7Y7nYIzIRy33PkedF3Qc80vo+8jIL Lxqq5zPIdC+r0MrBCDSDuPIWaolnzefvP48b5w/Q8KMTmSdLCTQrLLp2CDInKSODGTLz hJQrMIaTKtuSo5GgL9iWVHaR/okRDUqbMWwcjB95ASmzLPve0nU+yvrLoD79UD1PBw0G TYIiq8qJhHkJPgEW8cUr/dO5QldW7t4ZnPuZaf9KHFazhOFh6Zbj4aZXpMNZlAb+B9XF bSjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XZYe2lAthybx2DYAEBv0he7qIODLQtlrOtrkfy4G9HM=; b=fuLdeFaxHAnoLxgM1YxotTrEjwkGHkjHbOzr96fmIJnAHmCrY2H1qwzEc/s7QaoLfI sdephZzvNlyP6Jer25Yvwj3YHUMm3uvnndgwXrfrEbYdub1VOHo6BG8vlg19Zt0gjt/Z 7cA5Jxt1XCjqhWusIHUwoXXNvU/Ijv10f+k4WZszAgpChTjLOHFAzOY75UMLee05zQj1 3y95zCPbzNiSA/WCeJGO0YsnphIM+9yaI6BORKoaSqcuT+j8nvOqHxWM4Z2hjSJcMAqI fB5A7cLIy2gIuX1D2zahhHz9myvkVphWThh+v6WaTaGIjzs/G07AjHYKtIeWToxeoxWb wPdw== X-Gm-Message-State: AODbwcDpLSzGsEU4THWC/FOBNY/uxFGe7BNUmh/8WeRB7/ZyBHtVQfZX vHKpk7zaknFNdg== X-Received: by 10.223.134.46 with SMTP id 43mr27270744wrv.123.1495714661763; Thu, 25 May 2017 05:17:41 -0700 (PDT) Received: from al1-pc.kyiv.epam.com (ll-51.209.223.85.sovam.net.ua. [85.223.209.51]) by smtp.gmail.com with ESMTPSA id e73sm9256070wmd.1.2017.05.25.05.17.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 May 2017 05:17:40 -0700 (PDT) From: Oleksandr Grytsov To: xen-devel@lists.xenproject.org Date: Thu, 25 May 2017 15:17:30 +0300 Message-Id: <1495714651-2676-3-git-send-email-al1img@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495714651-2676-1-git-send-email-al1img@gmail.com> References: <1495714651-2676-1-git-send-email-al1img@gmail.com> Cc: Oleksandr Grytsov Subject: [Xen-devel] [PATCH v2 2/3] xl: add PV display device commands X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Oleksandr Grytsov Signed-off-by: Oleksandr Grytsov --- tools/xl/Makefile | 1 + tools/xl/xl.h | 3 + tools/xl/xl_cmdtable.c | 19 ++++++ tools/xl/xl_parse.c | 77 ++++++++++++++++++++++- tools/xl/xl_parse.h | 2 +- tools/xl/xl_vdispl.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 266 insertions(+), 2 deletions(-) create mode 100644 tools/xl/xl_vdispl.c diff --git a/tools/xl/Makefile b/tools/xl/Makefile index e16f877..5c784b5 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 aa95b77..d361241 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -166,6 +166,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 7d97811..9f92663 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -372,6 +372,25 @@ struct cmd_spec cmd_table[] = { "Destroy a domain's virtual TPM device", " ", }, + { "vdispl-attach", + &main_vdisplattach, 1, 1, + "Create a new virtual display device", + " [devId=] [backend=] [beAlloc=] [connectors='']", + " BackAlloc - set to 1 to allow backend allocated 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", + "", + }, + { "vdispl-detach", + &main_vdispldetach, 0, 1, + "Destroy a domain's virtual display device", + " ", + }, { "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 b72f990..6ed040a 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -803,6 +803,53 @@ 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("devId", token, oparg)) { + vdispl->devid = atoi(oparg); + } else if (MATCH_OPTION("beAlloc", 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, @@ -812,7 +859,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; + *usbctrls, *usbdevs, *vdispls; XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs; int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian; int pci_power_mgmt = 0; @@ -1390,6 +1437,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..104512b --- /dev/null +++ b/tools/xl/xl_vdispl.c @@ -0,0 +1,166 @@ +/* + * 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 + +#include +#include +#include + +#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: + */