From patchwork Mon Oct 2 09:49:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksandr Grytsov X-Patchwork-Id: 9980573 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 2B79560384 for ; Mon, 2 Oct 2017 09:51:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C82F26E97 for ; Mon, 2 Oct 2017 09:51:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1115228979; Mon, 2 Oct 2017 09:51:59 +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 6BA7426E97 for ; Mon, 2 Oct 2017 09:51:58 +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 1dyxM3-0005qN-KS; Mon, 02 Oct 2017 09:49:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dyxM2-0005pL-4W for xen-devel@lists.xenproject.org; Mon, 02 Oct 2017 09:49:38 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 27/C3-02037-1BB02D95; Mon, 02 Oct 2017 09:49:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBIsWRWlGSWpSXmKPExsVyMfS6k+4G7ku RBmvPqll83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlLPv5jLtjgWLH5PHsD4xWDLkYuDiGBaYwS vy6tYQNxWAReskgs2dvLDOJICPSzSrS+nMLSxcgB5GRJ7Lto0cXICWSmSWw9u4wRwi6TuNzcy QZiCwnISxxsucwONZVJYlLrShaQBJuAlsT92yvAikQElCTurZrMBGIzC6RI7F3XBjZIWEBPYt KUiWA1LAKqEvsPz2EHsXkFHCRu7TzABLFMTuLmuU5mEJtTwFFix8r1LBCLHSR+NjawTmAUXMD IsIpRvTi1qCy1SNdIL6koMz2jJDcxM0fX0MBULze1uDgxPTUnMalYLzk/dxMjMNwYgGAH4/c/ TocYJTmYlER5/3NcihTiS8pPqcxILM6ILyrNSS0+xKjBwSHw8+nfFkYplrz8vFQlCd4HXEB1g kWp6akVaZk5wIiAKZXg4FES4Z0MkuYtLkjMLc5Mh0idYrTnuHDn0h8mjmObLgPJA3tuAcmOm3 f/MAmBTZUS590B0iYA0pZRmgc3FBbBlxhlpYR5GYFOFuIpSC3KzSxBlX/FKM7BqCTMexFkCk9 mXgnc7ldAZzEBnTWn6wLIWSWJCCmpBkb71nNisbuX6f9RXjFZy6SgIbUxXe1viGepp0w50//U vYG///Y4imVxCi34FcM2r+jlTIEotucihbUGb3/Orp7kGfMl9vHluYVvY92sWeds4V8cNM1rU 53Ax51HK9Xds3z+WQs5c3eKJtSd+/f0MEeSjnrip72v2C6YMgVlzFoZFLVw3go3JyWW4oxEQy 3mouJEAJjFq5PbAgAA X-Env-Sender: al1img@gmail.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1506937776!77832886!1 X-Originating-IP: [209.85.215.66] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29175 invoked from network); 2 Oct 2017 09:49:36 -0000 Received: from mail-lf0-f66.google.com (HELO mail-lf0-f66.google.com) (209.85.215.66) by server-12.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 2 Oct 2017 09:49:36 -0000 Received: by mail-lf0-f66.google.com with SMTP id c8so2006777lfe.2 for ; Mon, 02 Oct 2017 02:49:36 -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=vFuUfv6uX2TzWyWqAjZPs/quU17fIaiL1a578GiZIkQ=; b=AnP1eqd3rHvXHYIvr2ReRcHxio6GAiu27R3drjGWJja/ZJdtkZCTPG202+OAYP6Eml dRwn3zfNS/26XYaubrzRzFb8a4GLbohrHTazDeGXkScKB/m5sEgmAvIhjjfi+MOjBVfF yPAnWsffpI71q3Mw4ppQxwVG5/juh3jMEE8Os9cPhUTqsBtiC6d7PUFb6ovIHO2Dsv0W JjMP6R5WvNG3MJcBaZsVzeuK603LAJvE72wnpPvnDD2fsnDdbIIrmxKITFdQfIANMTOy weLU7+UjzfAylHttXgJvTYLmW/E/kT+tA45vqubviEw8BC+wCj03sSnJ9AXMwgNkksh2 ZuJQ== 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=vFuUfv6uX2TzWyWqAjZPs/quU17fIaiL1a578GiZIkQ=; b=FX7BNdMkXct0Unt1gC/Apea3CSS7tbD/svGCnHY5NJf04Ftehj4S1MN0QdEGDXJERK kjpq3ajohapq3PBRFKw4H8fCWF5ZfZdrIRvsgnDr2Um6iqYg3vpl4WP8drKfcGX+b6cD tlvhKNAF1SbyUrfI2pTipFT5s03cADXyOMn7N6y+KmKILew2dRFq//gbJxZWMOgqr9mf BT4SzoOMHzhEyzYcqgF73Y/QWAuhO9rWm7i083a1JmPj3Nsq5r6dRFOkyCNsk/ZyJzpn cs6Wyna41iCqd54JLFBDTP0ySVb8EhX/MCjfw7wLCxBUvvoW0QS/FTZCU+eNnDbgZK7z cmXA== X-Gm-Message-State: AMCzsaWk3UlrEp4ZESrURVfNeVtzkWxIKIg2meodmNfqi7PYa8syh+wM b2xmgz5onM7yyV7NozS6hug4Zw== X-Google-Smtp-Source: AOwi7QBNm5widbjHB6Q+4iSEb0ADxqQTKrEhZ4nKWeZtzFotj2eFldMSPh4QVDFMrl7r5EF03VeiKQ== X-Received: by 10.46.21.81 with SMTP id 17mr6984408ljv.68.1506937775598; Mon, 02 Oct 2017 02:49:35 -0700 (PDT) Received: from al1-pc.kyiv.epam.com (ll-74.141.223.85.sovam.net.ua. [85.223.141.74]) by smtp.gmail.com with ESMTPSA id b10sm2217504lje.15.2017.10.02.02.49.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 02:49:35 -0700 (PDT) From: Oleksandr Grytsov To: xen-devel@lists.xenproject.org Date: Mon, 2 Oct 2017 12:49:23 +0300 Message-Id: <1506937764-30329-5-git-send-email-al1img@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506937764-30329-1-git-send-email-al1img@gmail.com> References: <1506937764-30329-1-git-send-email-al1img@gmail.com> Cc: ian.jackson@eu.citrix.com, wei.liu2@citrix.com, Oleksandr Grytsov Subject: [Xen-devel] [PATCH 4/5] xl: add vsnd CLI 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 Add CLI commands to attach, detach and list virtual sound devices Signed-off-by: Oleksandr Grytsov Acked-by: Wei Liu --- tools/xl/Makefile | 2 +- tools/xl/xl.h | 3 + tools/xl/xl_cmdtable.c | 15 ++++ tools/xl/xl_vsnd.c | 203 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 222 insertions(+), 1 deletion(-) create mode 100644 tools/xl/xl_vsnd.c diff --git a/tools/xl/Makefile b/tools/xl/Makefile index a5117ab..66bdbde 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -22,7 +22,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_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 += xl_vdispl.o xl_vsnd.o $(XL_OBJS): CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index 31d660b..703caa6 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -170,6 +170,9 @@ 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_vsndattach(int argc, char **argv); +int main_vsndlist(int argc, char **argv); +int main_vsnddetach(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 c304a85..8e162ce 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -397,6 +397,21 @@ struct cmd_spec cmd_table[] = { "Destroy a domain's virtual display device", " ", }, + { "vsnd-attach", + &main_vsndattach, 1, 1, + "Create a new virtual sound device", + " ...", + }, + { "vsnd-list", + &main_vsndlist, 0, 0, + "List virtual display devices for a domain", + "", + }, + { "vsnd-detach", + &main_vsnddetach, 0, 1, + "Destroy a domain's virtual sound device", + " ", + }, { "uptime", &main_uptime, 0, 0, "Print uptime for all/some domains", diff --git a/tools/xl/xl_vsnd.c b/tools/xl/xl_vsnd.c new file mode 100644 index 0000000..5e27a5d --- /dev/null +++ b/tools/xl/xl_vsnd.c @@ -0,0 +1,203 @@ +/* + * 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_vsndattach(int argc, char **argv) +{ + int opt; + int rc; + uint32_t domid; + libxl_device_vsnd vsnd; + + SWITCH_FOREACH_OPT(opt, "", NULL, "vsnd-attach", 2) { + /* No options */ + } + + libxl_device_vsnd_init(&vsnd); + domid = find_domain(argv[optind++]); + + for (argv += optind, argc -= optind; argc > 0; ++argv, --argc) { + rc = parse_vsnd_item(&vsnd, *argv); + if (rc) goto out; + } + + if (dryrun_only) { + char *json = libxl_device_vsnd_to_json(ctx, &vsnd); + printf("vsnd: %s\n", json); + free(json); + goto out; + } + + if (libxl_device_vsnd_add(ctx, domid, &vsnd, 0)) { + fprintf(stderr, "libxl_device_vsnd_add failed.\n"); + rc = ERROR_FAIL; goto out; + } + + rc = 0; + +out: + libxl_device_vsnd_dispose(&vsnd); + return rc; +} + +static void print_params(libxl_vsnd_params *params) +{ + int i; + + if (params->channels_min) { + printf(", channels-min: %u", params->channels_min); + } + + if (params->channels_max) { + printf(", channels-max: %u", params->channels_max); + } + + if (params->buffer_size) { + printf(", buffer-size: %u", params->buffer_size); + } + + if (params->num_sample_rates) { + printf(", sample-rates: "); + for (i = 0; i < params->num_sample_rates - 1; i++) { + printf("%u;", params->sample_rates[i]); + } + printf("%u", params->sample_rates[i]); + } + + if (params->num_sample_formats) { + printf(", sample-formats: "); + for (i = 0; i < params->num_sample_formats - 1; i++) { + printf("%s;", libxl_vsnd_pcm_format_to_string(params->sample_formats[i])); + } + printf("%s", libxl_vsnd_pcm_format_to_string(params->sample_formats[i])); + } + + printf("\n"); +} + +int main_vsndlist(int argc, char **argv) +{ + int opt; + int i, j, k, n; + libxl_device_vsnd *vsnds; + libxl_vsndinfo vsndinfo; + + SWITCH_FOREACH_OPT(opt, "", NULL, "vsnd-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; + } + + vsnds = libxl_device_vsnd_list(ctx, domid, &n); + + if (!vsnds) continue; + + for (i = 0; i < n; i++) { + libxl_vsndinfo_init(&vsndinfo); + if (libxl_device_vsnd_getinfo(ctx, domid, &vsnds[i], + &vsndinfo) == 0) { + printf("\ndevid: %d, be-domid: %d, handle: %d, state: %d, " + "be-path: %s, fe-path: %s\n", + vsndinfo.devid, vsndinfo.backend_id, + vsndinfo.frontend_id, vsndinfo.state, + vsndinfo.backend, vsndinfo.frontend); + + printf("short-name: \"%s\", long-name: \"%s\"", + vsnds[i].short_name, vsnds[i].long_name); + print_params(&vsnds[i].params); + + for (j = 0; j < vsndinfo.num_vsnd_pcms; j++) { + libxl_vsnd_pcm *pcm = &vsnds[i].pcms[j]; + + printf("\tpcm: %d, name: \"%s\"", j, pcm->name); + print_params(&pcm->params); + + for(k = 0; k < vsnds[i].pcms[j].num_vsnd_streams; k++) { + libxl_vsnd_stream *stream = &vsnds[i].pcms[j].streams[k]; + libxl_streaminfo *info = &vsndinfo.pcms[j].streams[k]; + + printf("\t\tstream: %d, id: %u, type: %s", + k, stream->id, + libxl_vsnd_stream_type_to_string(stream->type)); + print_params(&stream->params); + printf("\t\t\tevent-channel: %d, ring-ref: %d\n", + info->req_evtch, info->req_rref); + } + } + } + libxl_vsndinfo_dispose(&vsndinfo); + } + libxl_device_vsnd_list_free(vsnds, n); + } + return 0; +} + +int main_vsnddetach(int argc, char **argv) +{ + uint32_t domid, devid; + int opt, rc; + libxl_device_vsnd vsnd; + + SWITCH_FOREACH_OPT(opt, "", NULL, "vsnd-detach", 2) { + /* No options */ + } + + domid = find_domain(argv[optind++]); + devid = atoi(argv[optind++]); + + libxl_device_vsnd_init(&vsnd); + + if (libxl_devid_to_device_vsnd(ctx, domid, devid, &vsnd)) { + fprintf(stderr, "Error: Device %d not connected.\n", devid); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl_device_vsnd_remove(ctx, domid, &vsnd, 0); + if (rc) { + fprintf(stderr, "libxl_device_vsnd_remove failed.\n"); + rc = ERROR_FAIL; + goto out; + } + + rc = 0; + +out: + libxl_device_vsnd_dispose(&vsnd); + return rc; +} + + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */