From nobody Fri May 3 01:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569855305; cv=none; d=zoho.com; s=zohoarc; b=nTFm7HzNYkxvIuB5mY7jhqO6K/1qlkbxf2V+UOqNPVYIDOkH2zMvFH+C/OctdRSU7H3FPXu7+HM8NPaddUbShko9z2AQR1roi4EDlJjFXqepQ0TwWo0j6xsKeavIqo74Y0fNFt+x1A1igznA4uwHxVCbgQ5ag/M9YpgcrsbvGxU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569855305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=z9DMg4sZgYKw4/HXzARegCFeDVW60ylEtbLaXACuI/w=; b=JxXzyCpiv6kWRQVMclnGGSk3Cf1yAoSQ+Ko8aKsTPMHzwZ8v3vKiq0iAHimmGHOoql6TqDnln44v2oO9POHB6lrjSP+RN7c5iHVrejYQWhic6ZBqrV1l0fc9opUGQt6v/BRqhBnNLgHqk+J1n+KCzpMJU3m86Fyoq/0Mbc3fbP8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569855305531544.7630338326005; Mon, 30 Sep 2019 07:55:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 49A9E85362; Mon, 30 Sep 2019 14:55:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 11E1B5D6D0; Mon, 30 Sep 2019 14:55:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 997D64EBDD; Mon, 30 Sep 2019 14:55:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8U6tTdk013569 for ; Mon, 30 Sep 2019 02:55:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 835B660126; Mon, 30 Sep 2019 06:55:29 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7D65D600CC for ; Mon, 30 Sep 2019 06:55:27 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF13D308FC20 for ; Mon, 30 Sep 2019 06:55:23 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id a2so5028227pfo.10 for ; Sun, 29 Sep 2019 23:55:23 -0700 (PDT) Received: from 31_216.localdomain ([23.97.74.121]) by smtp.gmail.com with ESMTPSA id 202sm12370446pfu.161.2019.09.29.23.55.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Sep 2019 23:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:content-transfer-encoding; bh=agu1nref5Zog5nOJkq37d1o0erWPMr3qyjNlhpe3BFg=; b=RoZrlS8rdrL/L+6Br9Yyk+ao6qJVC787ZiTxxb3RXQf1WdUW1CHBCpJfY2TT7OF+wx UsCMfklTEY6W+OnUXUMxLsF0gkxEg4ZWeTnzYetxm8BU7aE4pcjT94b2rcp2lDmdrZfC 8t2rZYef96JeDCNYBLNouKZUlLMKrygLehuPpqJ7q9GgWIqdA3MptfJVCCsmNa32Z589 PaZiMGc5CvyQR6W8s/6P+qTB2DCQqm3bkVAUgMve5b1BD5ECJruuRgWvtMPqEe4JGmuh WdvapHgZJYnxgmmWjRhHL6eEd7Zbm5HHN2NMzzXQ3JVk5UpHWoRKWkJ1kLF4R+vptZUu NK2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:content-transfer-encoding; bh=agu1nref5Zog5nOJkq37d1o0erWPMr3qyjNlhpe3BFg=; b=Ribt27WYkIfBekEl4aBLLtK5EPcCTNRPQ9rjucR4MnetQ+BKOJd6rGRhREANqWA34S m0wmJsDCumkJmPnHhM3nmHqMmfMUjabKZIIfU4aqwdbS7ss+hMtzrLSE39mwyfs7Lxyi Q299ZlRoLc1HLdxE1cqrOBb8B+W6+io+fabrgHR7Ah9hM5fIqucn6NLmf1ZK/utgF105 HzBW/c5cgvYW0OSHvkT75QUxClZOainnkjj7OlKoRyZA0u5VO27M6L5d+VRPTYaKSuTQ HBdVNlvNRhH9LkAlJx8HO0zDiBWLfovTM7XBYI5362CfcDd8mrtc8Ntd0hdSyZ+4y8qH RwtQ== MIME-Version: 1.0 X-Gm-Message-State: APjAAAVEQQPZTywl+lHv2XXohWKM9rZf7E6pV0WbCWgAv1FkIJBhp8no P/7sV06wzZx584RzOLn/JFJVE4w8TSd2BO7Dl+41+1INaf66M0BW11Mth6E+qktWpTxL+A7mB0t wul4IGyl9CfYUJIsIUA== X-Google-Smtp-Source: APXvYqx3JcjeSWw0sqGgo96tLOnf3msDgOP6ZBMvT48QgkLyWKUiHUfig7f3tTAd8OTqQYGpbFFTag== X-Received: by 2002:a62:7d54:: with SMTP id y81mr19667355pfc.86.1569826522460; Sun, 29 Sep 2019 23:55:22 -0700 (PDT) From: Li Feng To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:54:20 +0800 Message-Id: <20190930065422.59782-2-fengli@smartx.com> In-Reply-To: <20190930065422.59782-1-fengli@smartx.com> References: <20190930065422.59782-1-fengli@smartx.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 30 Sep 2019 06:55:23 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 30 Sep 2019 06:55:23 +0000 (UTC) for IP:'209.85.210.193' DOMAIN:'mail-pf1-f193.google.com' HELO:'mail-pf1-f193.google.com' FROM:'fengli@smartx.com' RCPT:'' X-RedHat-Spam-Score: 0.001 (DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE) 209.85.210.193 mail-pf1-f193.google.com 209.85.210.193 mail-pf1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id x8U6tTdk013569 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Mon, 30 Sep 2019 10:55:01 -0400 Cc: Li Feng Subject: [libvirt] [PATCH 1/3] qemu: Add vhost-user-scsi/blk support X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 30 Sep 2019 14:55:04 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Vhost-user-scsi and vhost-user-blk is supported in Qemu, this patch add support in libvirt. Hotplug is also support here. Usage like this: Signed-off-by: Li Feng --- src/conf/domain_conf.c | 79 ++++++++++++++++- src/conf/domain_conf.h | 9 ++ src/qemu/qemu_alias.c | 16 ++++ src/qemu/qemu_command.c | 98 ++++++++++++++++++= ++++ src/qemu/qemu_domain.c | 2 + .../vhost-user-blk.x86_64-latest.args | 37 ++++++++ tests/qemuxml2argvdata/vhost-user-blk.xml | 37 ++++++++ .../vhost-user-scsi.x86_64-latest.args | 37 ++++++++ tests/qemuxml2argvdata/vhost-user-scsi.xml | 37 ++++++++ tests/qemuxml2argvtest.c | 3 + 10 files changed, 354 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-user-blk.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-scsi.x86_64-latest.ar= gs create mode 100644 tests/qemuxml2argvdata/vhost-user-scsi.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5d090876f8..fd53fab271 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -619,6 +619,8 @@ VIR_ENUM_IMPL(virDomainChrDevice, "serial", "console", "channel", + "vhost-user-scsi-pci", + "vhost-user-blk-pci", ); =20 VIR_ENUM_IMPL(virDomainChr, @@ -4182,6 +4184,16 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr d= ef, if ((rc =3D cb(def, &device, &def->channels[i]->info, opaque)) != =3D 0) return rc; } + for (i =3D 0; i < def->n_vhost_user_blk; i++) { + device.data.chr =3D def->vhost_user_blk[i]; + if ((rc =3D cb(def, &device, &def->vhost_user_blk[i]->info, opaque= )) !=3D 0) + return rc; + } + for (i =3D 0; i < def->n_vhost_user_scsi; i++) { + device.data.chr =3D def->vhost_user_scsi[i]; + if ((rc =3D cb(def, &device, &def->vhost_user_scsi[i]->info, opaqu= e)) !=3D 0) + return rc; + } for (i =3D 0; i < def->nconsoles; i++) { bool all =3D iteratorFlags & DOMAIN_DEVICE_ITERATE_ALL_CONSOLES; =20 @@ -12284,6 +12296,8 @@ virDomainChrDefaultTargetType(int devtype) case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: /* No target type yet*/ @@ -12315,6 +12329,8 @@ virDomainChrTargetTypeFromString(int devtype, ret =3D virDomainChrSerialTargetTypeFromString(targetType); break; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: /* No target type yet*/ @@ -12339,6 +12355,8 @@ virDomainChrTargetModelFromString(int devtype, ret =3D virDomainChrSerialTargetModelTypeFromString(targetModel); break; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: @@ -16410,7 +16428,9 @@ virDomainDeviceDefParse(const char *xmlStr, if (virXMLNodeNameEqual(node, "channel") || virXMLNodeNameEqual(node, "console") || virXMLNodeNameEqual(node, "parallel") || - virXMLNodeNameEqual(node, "serial")) { + virXMLNodeNameEqual(node, "serial") || + virXMLNodeNameEqual(node, "vhost-user-blk-pci") || + virXMLNodeNameEqual(node, "vhost-user-scsi-pci")) { dev->type =3D VIR_DOMAIN_DEVICE_CHR; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -17486,6 +17506,11 @@ virDomainChrEquals(virDomainChrDefPtr src, =20 ATTRIBUTE_FALLTHROUGH; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: + return STREQ_NULLABLE(src->source->data.nix.path, + tgt->source->data.nix.path); + case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: return src->target.port =3D=3D tgt->target.port; @@ -17545,6 +17570,14 @@ virDomainChrGetDomainPtrsInternal(virDomainDefPtr = vmdef, *arrPtr =3D &vmdef->channels; *cntPtr =3D &vmdef->nchannels; return 0; + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: + *arrPtr =3D &vmdef->vhost_user_blk; + *cntPtr =3D &vmdef->n_vhost_user_blk; + return 0; + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + *arrPtr =3D &vmdef->vhost_user_scsi; + *cntPtr =3D &vmdef->n_vhost_user_scsi; + return 0; =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: break; @@ -21045,6 +21078,46 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); =20 + if ((n =3D virXPathNodeSet("./devices/vhost-user-blk-pci", ctxt, &node= s)) < 0) + goto error; + + if (n && VIR_ALLOC_N(def->vhost_user_blk, n) < 0) + goto error; + + for (i =3D 0; i < n; i++) { + virDomainChrDefPtr chr =3D virDomainChrDefParseXML(xmlopt, + ctxt, + nodes[i], + def->seclabels, + def->nseclabels, + flags); + if (!chr) + goto error; + + def->vhost_user_blk[def->n_vhost_user_blk++] =3D chr; + } + VIR_FREE(nodes); + + if ((n =3D virXPathNodeSet("./devices/vhost-user-scsi-pci", ctxt, &nod= es)) < 0) + goto error; + + if (n && VIR_ALLOC_N(def->vhost_user_scsi, n) < 0) + goto error; + + for (i =3D 0; i < n; i++) { + virDomainChrDefPtr chr =3D virDomainChrDefParseXML(xmlopt, + ctxt, + nodes[i], + def->seclabels, + def->nseclabels, + flags); + if (!chr) + goto error; + + def->vhost_user_scsi[def->n_vhost_user_scsi++] =3D chr; + } + VIR_FREE(nodes); + =20 /* analysis of the input devices */ if ((n =3D virXPathNodeSet("./devices/input", ctxt, &nodes)) < 0) @@ -26008,6 +26081,10 @@ virDomainChrTargetDefFormat(virBufferPtr buf, def->target.port); break; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: + break; + case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected char device type %d"), diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2884af49d8..d05c1e0e1a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1038,6 +1038,9 @@ typedef enum { VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE, VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL, =20 + VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI, + VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK, + VIR_DOMAIN_CHR_DEVICE_TYPE_LAST } virDomainChrDeviceType; =20 @@ -2475,6 +2478,12 @@ struct _virDomainDef { size_t nconsoles; virDomainChrDefPtr *consoles; =20 + size_t n_vhost_user_blk; + virDomainChrDefPtr *vhost_user_blk; + + size_t n_vhost_user_scsi; + virDomainChrDefPtr *vhost_user_scsi; + size_t nleases; virDomainLeaseDefPtr *leases; =20 diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index d294963d35..0aa48eb5ed 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -107,6 +107,14 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, prefix =3D "channel"; break; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + prefix =3D "vhost-user-scsi-disk"; + break; + + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: + prefix =3D "vhost-user-blk-disk"; + break; + case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: return -1; } @@ -642,6 +650,14 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCa= psPtr qemuCaps) if (qemuAssignDeviceChrAlias(def, def->consoles[i], i) < 0) return -1; } + for (i =3D 0; i < def->n_vhost_user_blk; i++) { + if (qemuAssignDeviceChrAlias(def, def->vhost_user_blk[i], i) < 0) + return -1; + } + for (i =3D 0; i < def->n_vhost_user_scsi; i++) { + if (qemuAssignDeviceChrAlias(def, def->vhost_user_scsi[i], i) < 0) + return -1; + } for (i =3D 0; i < def->nhubs; i++) { if (qemuAssignDeviceHubAlias(def->hubs[i], i) < 0) return -1; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 77470a6037..336ca3f729 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9397,6 +9397,60 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logMana= ger, return 0; } =20 +static int +qemuBuildVhostUserDisksCommandLine(virLogManagerPtr logManager, + virSecurityManagerPtr secManager, + virCommandPtr cmd, + virQEMUDriverConfigPtr cfg, + const virDomainDef *def, + virQEMUCapsPtr qemuCaps, + bool chardevStdioLogd) +{ + size_t i; + unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT | + QEMU_BUILD_CHARDEV_UNIX_FD_PASS; + if (chardevStdioLogd) + cdevflags |=3D QEMU_BUILD_CHARDEV_FILE_LOGD; + + for (i =3D 0; i < def->n_vhost_user_blk; i++) { + virDomainChrDefPtr vhostuserdisk =3D def->vhost_user_blk[i]; + char *devstr; + + + if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, + vhostuserdisk->source, + vhostuserdisk->info.alias, + qemuCaps, cdevflags))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + + if (qemuBuildChrDeviceCommandLine(cmd, def, vhostuserdisk, qemuCap= s) < 0) + return -1; + } + + for (i =3D 0; i < def->n_vhost_user_scsi; i++) { + virDomainChrDefPtr vhostuserdisk =3D def->vhost_user_scsi[i]; + char *devstr; + + + if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, + cmd, cfg, def, + vhostuserdisk->source, + vhostuserdisk->info.alias, + qemuCaps, cdevflags))) + return -1; + virCommandAddArg(cmd, "-chardev"); + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + + if (qemuBuildChrDeviceCommandLine(cmd, def, vhostuserdisk, qemuCap= s) < 0) + return -1; + } + return 0; +} =20 char * qemuBuildRedirdevDevStr(const virDomainDef *def, @@ -10430,6 +10484,11 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, chardevStdioLogd) < 0) return NULL; =20 + if (qemuBuildVhostUserDisksCommandLine(logManager, secManager, cmd, cf= g, def, qemuCaps, + chardevStdioLogd) < 0) + return NULL; + + if (qemuBuildTPMCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 @@ -10656,6 +10715,40 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, return 0; } =20 +/* This function generates the correct '-device' string for character + * devices of each architecture. + */ +static int +qemuBuildVhostUserChrDeviceStr(char **deviceStr, + const virDomainDef *def, + virDomainChrDefPtr vhostuser, + virQEMUCapsPtr qemuCaps) +{ + VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; + const char* device_type; + + if ((virDomainChrDeviceType)vhostuser->deviceType =3D=3D VIR_DOMAIN_CH= R_DEVICE_TYPE_VHOST_USER_SCSI) { + device_type =3D "vhost-user-scsi-pci"; + } else if ((virDomainChrDeviceType)vhostuser->deviceType =3D=3D VIR_DO= MAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK) { + device_type =3D "vhost-user-blk-pci"; + } else { + return -1; + } + virBufferAsprintf(&buf, "%s,chardev=3Dchar%s,id=3D%s", + device_type, + vhostuser->info.alias, vhostuser->info.alias); + + if (qemuBuildDeviceAddressStr(&buf, def, &vhostuser->info, qemuCaps) <= 0) + return -1; + + if (virBufferCheckError(&buf) < 0) + return -1; + + *deviceStr =3D virBufferContentAndReset(&buf); + return 0; +} + + int qemuBuildChrDeviceStr(char **deviceStr, const virDomainDef *vmdef, @@ -10681,6 +10774,11 @@ qemuBuildChrDeviceStr(char **deviceStr, ret =3D qemuBuildConsoleChrDeviceStr(deviceStr, vmdef, chr); break; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: + ret =3D qemuBuildVhostUserChrDeviceStr(deviceStr, vmdef, chr, qemu= Caps); + break; + case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: return ret; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e8e895d9aa..f107cf2601 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5220,6 +5220,8 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef = *chr) } break; =20 + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_SCSI: + case VIR_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK: case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: diff --git a/tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args new file mode 100644 index 0000000000..4c67be1863 --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-chardev socket,id=3Dcharvhost-user-blk-disk0,path=3D/tmp/vhost-blk.sock,\ +reconnect=3D1 \ +-device vhost-user-blk-pci,chardev=3Dcharvhost-user-blk-disk0,\ +id=3Dvhost-user-blk-disk0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-blk.xml b/tests/qemuxml2argv= data/vhost-user-blk.xml new file mode 100644 index 0000000000..c9ff7650cb --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-user-blk.xml @@ -0,0 +1,37 @@ + + test + bba65c0e-c049-934f-b6aa-4e2c0582acdf + 1048576 + 1048576 + 1 + + hvm + + + + + destroy + restart + restart + + /usr/bin/qemu-system-x86_64 + +
+ + +
+ + +
+ + + + + + + + + + + + diff --git a/tests/qemuxml2argvdata/vhost-user-scsi.x86_64-latest.args b/te= sts/qemuxml2argvdata/vhost-user-scsi.x86_64-latest.args new file mode 100644 index 0000000000..78da36da85 --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-user-scsi.x86_64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-chardev socket,id=3Dcharvhost-user-scsi-disk0,path=3D/tmp/vhost-scsi.sock= ,\ +reconnect=3D0 \ +-device vhost-user-scsi-pci,chardev=3Dcharvhost-user-scsi-disk0,\ +id=3Dvhost-user-scsi-disk0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-scsi.xml b/tests/qemuxml2arg= vdata/vhost-user-scsi.xml new file mode 100644 index 0000000000..ca0f719ff5 --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-user-scsi.xml @@ -0,0 +1,37 @@ + + test + bba65c0e-c049-934f-b6aa-4e2c0582acdf + 1048576 + 1048576 + 1 + + hvm + + + + + destroy + restart + restart + + /usr/bin/qemu-system-x86_64 + +
+ + +
+ + +
+ + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5bbac1c8b8..93c6a487b3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2981,6 +2981,9 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x"); =20 + DO_TEST_CAPS_LATEST("vhost-user-blk"); + DO_TEST_CAPS_LATEST("vhost-user-scsi"); + DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); =20 DO_TEST("riscv64-virt", --=20 2.11.0 --=20 The SmartX email address is only for business purpose. Any sent message=20 that is not related to the business is not authorized or permitted by=20 SmartX. =E6=9C=AC=E9=82=AE=E7=AE=B1=E4=B8=BA=E5=8C=97=E4=BA=AC=E5=BF=97=E5=87=8C=E6= =B5=B7=E7=BA=B3=E7=A7=91=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=EF=BC= =88SmartX=EF=BC=89=E5=B7=A5=E4=BD=9C=E9=82=AE=E7=AE=B1. =E5=A6=82=E6=9C=AC= =E9=82=AE=E7=AE=B1=E5=8F=91=E5=87=BA=E7=9A=84=E9=82=AE=E4=BB=B6=E4=B8=8E=E5= =B7=A5=E4=BD=9C=E6=97=A0=E5=85=B3,=E8=AF=A5=E9=82=AE=E4=BB=B6=E6=9C=AA=E5= =BE=97=E5=88=B0=E6=9C=AC=E5=85=AC=E5=8F=B8=E4=BB=BB=E4=BD=95=E7=9A=84=E6=98= =8E=E7=A4=BA=E6=88=96=E9=BB=98=E7=A4=BA=E7=9A=84=E6=8E=88=E6=9D=83. -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 01:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569855311; cv=none; d=zoho.com; s=zohoarc; b=FVQfIlAEzF4pTuX0SkHYgdeMqDJ7A9ioyQYZ2lc0t+NtoVMVK78FGC3qZWbFT+GbqwynZibacIWihFVQpR0+Z6KXwjziX37ySEi3jNDhgm60yioFdsdA93LiFZ0e8zl5NqfGvPmBvIov277fIb2QzSR9xWcxdW0XpwRoz8AhX3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569855311; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZwEsm1pGesEgDXoYt/I3gO6CnVMUvOfP589yNkHVLCg=; b=BFAooDNsX0DvALswimy9EKSipsdcng+uXj9a5J6miHmVHgAJ7Kb2VcQEwpeK5tujfRuiQAoNHxO6g3UyN20YH/Ecw5PztHFY6QrMQLrVLyap0GVbZVd9XNScJ1gReYvNkDZ8tbB8SMo8U1yOYCBiqpdktwiS4+5ujN4pxqfOsdU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 156985531151810.228577438861862; Mon, 30 Sep 2019 07:55:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B59F3307D853; Mon, 30 Sep 2019 14:55:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 88CFA60E1C; Mon, 30 Sep 2019 14:55:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 394904EE68; Mon, 30 Sep 2019 14:55:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8U6tTWJ013570 for ; Mon, 30 Sep 2019 02:55:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 96CFA60623; Mon, 30 Sep 2019 06:55:29 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 922956061E for ; Mon, 30 Sep 2019 06:55:27 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3856190B0A for ; Mon, 30 Sep 2019 06:55:26 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id f21so3512476plj.10 for ; Sun, 29 Sep 2019 23:55:26 -0700 (PDT) Received: from 31_216.localdomain ([23.97.74.121]) by smtp.gmail.com with ESMTPSA id 202sm12370446pfu.161.2019.09.29.23.55.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Sep 2019 23:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:content-transfer-encoding; bh=4vpongwQ6IELNMBzDrNrHnG5xaAuWznFPIis6gZk5/g=; b=wLLtgm0S/QtznaXc9fJr+mfTi10BDdqBPcCuU7PXGK9dk8Dwb3zFwssD3HNPEGqaj9 nL+Lk9UGInBlQNvM/37y4L4phMt3pH3oRnrD91cnC49P9WZMngaZedjkahq6egXwXZY4 VOpPeWLZytqNgWZ7wxhdr+TjS8YuzUonw4TZjyvlTIau2PMjGARbQSKcCeSIvBfjEmTK o2bYpZC4oHPo2GElgLVKWVndm0scCPmO0UFyMZoaOE5NCGpIiinkDk0udAkekb3g7QLP +bMeZHu2abIhVLKLb13Ep1cO6rQVYrbQkTFGLHPK0AH/2idqJpRkstFuOMeKWiho6nvn rISQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:content-transfer-encoding; bh=4vpongwQ6IELNMBzDrNrHnG5xaAuWznFPIis6gZk5/g=; b=oFEDsFAZMqf8WDwQ2Ai9rqa4/CCgtM+Gb7GnSqqCOQTK579tMg9cZivqfF0W8BLnBW j+o6eQfMQSBF8Zt8Mgi+eC3IDi2jLRYsJMyqGIwk/Tm1A1+COMuYl9baouJQg+t6xUFP /tFh8Xe/BEk3QYI27fU15fhSinmKWiAagi2hSYV8mSkZrVcKCk3q/l+2//eNgtBVUFEx B7IiYLcUe8N3m4Piv9DKluFd2WSn+JTtqrkD0C9j80WXuEsDB9fYhm/xL63PGRZNeBtX 5g3+OSZLWKOqwLIv1BdRDKHPbBhX2FXMAteVPM43WcTf3T+spEia9/z/d1i3URxjJNuJ zXQw== MIME-Version: 1.0 X-Gm-Message-State: APjAAAXG/xyIAg+1GhiE+25CT+pyqV/EMIIyHhK2ybHmyP+WcUnyO+7T bLPfkQKGjEay3dO2rpG2WgQN9uHmiRod/BLlj+54PhFCImtSF3Sdyb+50J6bFKVkgb/QoTg1kXj Lj6GjtvZWOVL+9RCgeQ== X-Google-Smtp-Source: APXvYqyoBIHy2+GqEUvDwWxtWfR25W7FTwOt9CPVCOXiqIGZYsj+9m3/sfQ5uPk0brGTrbEBZ7uXWg== X-Received: by 2002:a17:902:201:: with SMTP id 1mr17343985plc.276.1569826525260; Sun, 29 Sep 2019 23:55:25 -0700 (PDT) From: Li Feng To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:54:21 +0800 Message-Id: <20190930065422.59782-3-fengli@smartx.com> In-Reply-To: <20190930065422.59782-1-fengli@smartx.com> References: <20190930065422.59782-1-fengli@smartx.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 30 Sep 2019 06:55:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 30 Sep 2019 06:55:26 +0000 (UTC) for IP:'209.85.214.175' DOMAIN:'mail-pl1-f175.google.com' HELO:'mail-pl1-f175.google.com' FROM:'fengli@smartx.com' RCPT:'' X-RedHat-Spam-Score: 0.002 (DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE) 209.85.214.175 mail-pl1-f175.google.com 209.85.214.175 mail-pl1-f175.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id x8U6tTWJ013570 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Mon, 30 Sep 2019 10:55:01 -0400 Cc: Li Feng Subject: [libvirt] [PATCH 2/3] vhost-user-scsi/blk: add xml validation check X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 30 Sep 2019 14:55:10 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add vhost-user-scsi/blk xml schema to validate the correctness when editing the xml for the new chardev. Signed-off-by: Li Feng --- docs/schemas/domaincommon.rng | 48 +++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 48 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 40eb4a2d75..63c629d117 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4375,6 +4375,52 @@ =20 + + + + + + unix + + + + + + + + + + + + + + + + + + + + + + + unix + + + + + + + + + + + + + + + + + @@ -4973,6 +5019,8 @@ + + --=20 2.11.0 --=20 The SmartX email address is only for business purpose. Any sent message=20 that is not related to the business is not authorized or permitted by=20 SmartX. =E6=9C=AC=E9=82=AE=E7=AE=B1=E4=B8=BA=E5=8C=97=E4=BA=AC=E5=BF=97=E5=87=8C=E6= =B5=B7=E7=BA=B3=E7=A7=91=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=EF=BC= =88SmartX=EF=BC=89=E5=B7=A5=E4=BD=9C=E9=82=AE=E7=AE=B1. =E5=A6=82=E6=9C=AC= =E9=82=AE=E7=AE=B1=E5=8F=91=E5=87=BA=E7=9A=84=E9=82=AE=E4=BB=B6=E4=B8=8E=E5= =B7=A5=E4=BD=9C=E6=97=A0=E5=85=B3,=E8=AF=A5=E9=82=AE=E4=BB=B6=E6=9C=AA=E5= =BE=97=E5=88=B0=E6=9C=AC=E5=85=AC=E5=8F=B8=E4=BB=BB=E4=BD=95=E7=9A=84=E6=98= =8E=E7=A4=BA=E6=88=96=E9=BB=98=E7=A4=BA=E7=9A=84=E6=8E=88=E6=9D=83. -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 01:12:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569855305; cv=none; d=zoho.com; s=zohoarc; b=RczP+AYSvd0WABP8o2dR8LC8d0bGu2hVOCWi9AZ1DyjRqgYMsGK/LocwhPk0A5zT/TfJgcgxtOxFcje+flv9f4Zf+3zheObxV/LvkONm5nkmwQeJjTDciBK8Ah10s9eBxHpigo4hXnNkv92WX7z3PCrfbHAYiIMj2fUk2UiZflE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569855305; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1HeRmYyJ+/JkVMbfiGwDrmNJK9talaAaFXXp6I75GHs=; b=kkEsgomDfDD4wPls8TnfQuAqk0m4cS1O+MrPU7D8tOD1Rl1RNJj6yLXO6PMN3zx4hi+sDeN9C9Ei/nnVHLGA2T+Ap6Tv49Ko0KOycf1BCF3Wr2OJfYE6V5Cfe3O00qHFqORtRuXKBfOeENXlqQw1hqMNdIqazU1wTRzZ5amBrJA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569855304958381.1425657956097; Mon, 30 Sep 2019 07:55:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4EC559449; Mon, 30 Sep 2019 14:55:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 85E2B6012A; Mon, 30 Sep 2019 14:55:02 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 21A0F4E58C; Mon, 30 Sep 2019 14:55:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8U6tV0n013582 for ; Mon, 30 Sep 2019 02:55:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id BB8B15D9CA; Mon, 30 Sep 2019 06:55:31 +0000 (UTC) Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6EC75D9C9 for ; Mon, 30 Sep 2019 06:55:29 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 58EF8C057EC6 for ; Mon, 30 Sep 2019 06:55:28 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id u20so3532815plq.4 for ; Sun, 29 Sep 2019 23:55:28 -0700 (PDT) Received: from 31_216.localdomain ([23.97.74.121]) by smtp.gmail.com with ESMTPSA id 202sm12370446pfu.161.2019.09.29.23.55.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Sep 2019 23:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:content-transfer-encoding; bh=IWZIh5neO3DKwLF9TaOBsnohQsw1UvXlvePyo/iYcGM=; b=nBnoNP4s7QIaFSwduwj2XOiUMWvo4gxIQeXGNWvs8FTRyW3qfAtmpJyNfOZK9XEZ1I MTyC+Ye9KERAw2CqQDACtu5uG5ZTuvXWF9h3y54xIJJGNCkVZk1N8pheXWgPFMKc4+23 c8lAMUyRT7F2CFADi21jrCcRX4IRNCUzD7poIvSVxNiKPdgGDyLOcYFnIU88V6W+TlFH +Am6e+rtCor/RUU51FaZo4vliFihhM/ez8N0IhDvrhpFArJtnDdo4OaLKPdi6ELHdsFL eaiHcQp45Nt+iurJ0AyNPNokOKDzzHWRfDUvr+6HQHYw8PrJRJM9c5c0/39OiM8DNXif vdtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:content-transfer-encoding; bh=IWZIh5neO3DKwLF9TaOBsnohQsw1UvXlvePyo/iYcGM=; b=BbCS+BxHuTj10qDCEHp3FKytDvdDG8JE0CzPfoMbInL/L5G/HzNoN6LCrH5xSLms// UpaUCk5WTG0bdNxciZKEKZpmD+v1RgdXqY5qxIkN/vZ1uxdl2d7jR1w6AvwU/Atucjby uQAUJvnyAl6zxsRZmoE4Bhvv1YUIWZNXgHWsqamvm0KLBhjezXH8zps7GSBBtgGHIPWO Q/k1A1lHzlgcNEfKxiD5IQRc2pKlew2pxmVRAx1+CzcDC5YIhMjNz8Sdrd2jtZuCj1wR zvWDigH1l80VeclA2zWkV4U/fgzRYMHs6CB+38z2A7ZymKpahpYGCE1FbZhUWIzEdJpw +wmQ== MIME-Version: 1.0 X-Gm-Message-State: APjAAAX/m1jCKaAV1COBK7Dl1uTc+dW2D/o2JoxQlT9AL2tvUSDWe++G hqVBBUZuW1R/I1p4gnI/vFlT7bxUQj9s+xxSVie3DA6JiKV3FAjr1mPBfZ7XsBTcXJx6oAriG/n R2pk7vCl8WMv5R6zNNg== X-Google-Smtp-Source: APXvYqyo2n7DpT0OVHi3G4mmQvRXvIPMEqa2ArO1ZiIWRCuR8U4BRcTJt+6zWRJEmm4U7H58Shb9Rw== X-Received: by 2002:a17:902:6e17:: with SMTP id u23mr18569407plk.205.1569826527468; Sun, 29 Sep 2019 23:55:27 -0700 (PDT) From: Li Feng To: libvir-list@redhat.com Date: Mon, 30 Sep 2019 14:54:22 +0800 Message-Id: <20190930065422.59782-4-fengli@smartx.com> In-Reply-To: <20190930065422.59782-1-fengli@smartx.com> References: <20190930065422.59782-1-fengli@smartx.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 30 Sep 2019 06:55:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 30 Sep 2019 06:55:28 +0000 (UTC) for IP:'209.85.214.194' DOMAIN:'mail-pl1-f194.google.com' HELO:'mail-pl1-f194.google.com' FROM:'fengli@smartx.com' RCPT:'' X-RedHat-Spam-Score: 0.001 (DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE) 209.85.214.194 mail-pl1-f194.google.com 209.85.214.194 mail-pl1-f194.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id x8U6tV0n013582 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Mon, 30 Sep 2019 10:55:01 -0400 Cc: Li Feng Subject: [libvirt] [PATCH 3/3] qemu: Add multiqueue support for vhost-user-scsi/blk X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 30 Sep 2019 14:55:03 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The format like this: Signed-off-by: Li Feng --- src/conf/device_conf.h | 5 +++++ src/conf/domain_conf.c | 14 ++++++++++++= ++ src/qemu/qemu_command.c | 7 +++++++ tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-user-blk.xml | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index d0854925e3..c3c722edd3 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -179,6 +179,11 @@ struct _virDomainDeviceInfo { * cases we might want to prevent that from happening by * locking the isolation group */ bool isolationGroupLocked; + + /* vhost-user-scsi/blk/nvme support multiqueue, parse the queue + * num from xml. + */ + unsigned int num_queues; }; =20 void virDomainDeviceInfoClear(virDomainDeviceInfoPtr info); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fd53fab271..eeed88e41e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7483,10 +7483,12 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr x= mlopt ATTRIBUTE_UNUSED, xmlNodePtr alias =3D NULL; xmlNodePtr boot =3D NULL; xmlNodePtr rom =3D NULL; + xmlNodePtr queue =3D NULL; int ret =3D -1; VIR_AUTOFREE(char *) romenabled =3D NULL; VIR_AUTOFREE(char *) rombar =3D NULL; VIR_AUTOFREE(char *) aliasStr =3D NULL; + VIR_AUTOFREE(char *) queueStr =3D NULL; =20 virDomainDeviceInfoClear(info); =20 @@ -7510,6 +7512,9 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xml= opt ATTRIBUTE_UNUSED, (flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) && virXMLNodeNameEqual(cur, "rom")) { rom =3D cur; + } else if (queue =3D=3D NULL && + virXMLNodeNameEqual(cur, "queue")) { + queue =3D cur; } } cur =3D cur->next; @@ -7563,6 +7568,15 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xm= lopt ATTRIBUTE_UNUSED, virDomainDeviceAddressParseXML(address, info) < 0) goto cleanup; =20 + if (queue) { + queueStr =3D virXMLPropString(queue, "num"); + if (virStrToLong_uip(queueStr, NULL, 10, &info->num_queues) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Cannot parse 'num' attribute '%s'"),= queueStr); + + goto cleanup; + } + } =20 ret =3D 0; cleanup: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 336ca3f729..7a3c695ac1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10737,6 +10737,13 @@ qemuBuildVhostUserChrDeviceStr(char **deviceStr, virBufferAsprintf(&buf, "%s,chardev=3Dchar%s,id=3D%s", device_type, vhostuser->info.alias, vhostuser->info.alias); + if (vhostuser->info.num_queues > 0) { + if ((virDomainChrDeviceType)vhostuser->deviceType =3D=3D VIR_DOMAI= N_CHR_DEVICE_TYPE_VHOST_USER_SCSI) { + virBufferAsprintf(&buf, ",num_queues=3D%d", vhostuser->info.nu= m_queues); + } else if ((virDomainChrDeviceType)vhostuser->deviceType =3D=3D VI= R_DOMAIN_CHR_DEVICE_TYPE_VHOST_USER_BLK) { + virBufferAsprintf(&buf, ",num-queues=3D%d", vhostuser->info.nu= m_queues); + } + } =20 if (qemuBuildDeviceAddressStr(&buf, def, &vhostuser->info, qemuCaps) <= 0) return -1; diff --git a/tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args index 4c67be1863..ea99f5949d 100644 --- a/tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-blk.x86_64-latest.args @@ -31,7 +31,7 @@ file=3D/tmp/lib/domain--1-test/master-key.aes \ -chardev socket,id=3Dcharvhost-user-blk-disk0,path=3D/tmp/vhost-blk.sock,\ reconnect=3D1 \ -device vhost-user-blk-pci,chardev=3Dcharvhost-user-blk-disk0,\ -id=3Dvhost-user-blk-disk0 \ +id=3Dvhost-user-blk-disk0,num-queues=3D4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-blk.xml b/tests/qemuxml2argv= data/vhost-user-blk.xml index c9ff7650cb..276fea14b5 100644 --- a/tests/qemuxml2argvdata/vhost-user-blk.xml +++ b/tests/qemuxml2argvdata/vhost-user-blk.xml @@ -32,6 +32,7 @@ + --=20 2.11.0 --=20 The SmartX email address is only for business purpose. Any sent message=20 that is not related to the business is not authorized or permitted by=20 SmartX. =E6=9C=AC=E9=82=AE=E7=AE=B1=E4=B8=BA=E5=8C=97=E4=BA=AC=E5=BF=97=E5=87=8C=E6= =B5=B7=E7=BA=B3=E7=A7=91=E6=8A=80=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=EF=BC= =88SmartX=EF=BC=89=E5=B7=A5=E4=BD=9C=E9=82=AE=E7=AE=B1. =E5=A6=82=E6=9C=AC= =E9=82=AE=E7=AE=B1=E5=8F=91=E5=87=BA=E7=9A=84=E9=82=AE=E4=BB=B6=E4=B8=8E=E5= =B7=A5=E4=BD=9C=E6=97=A0=E5=85=B3,=E8=AF=A5=E9=82=AE=E4=BB=B6=E6=9C=AA=E5= =BE=97=E5=88=B0=E6=9C=AC=E5=85=AC=E5=8F=B8=E4=BB=BB=E4=BD=95=E7=9A=84=E6=98= =8E=E7=A4=BA=E6=88=96=E9=BB=98=E7=A4=BA=E7=9A=84=E6=8E=88=E6=9D=83. -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list