- Devel - libvirt List Archives

[libvirt] [PATCH v1] domain_conf: add the support for disk I/O throttle setting
by Zhi Yong Wu 07 Sep '11

07 Sep '11

The first patch is only used to see if it is suitable for exteeding blkiotune to implement disk I/O throttling. As you have known, when blkiotune is issued without options, it will display current tuning parameters; If we exceed it, without options, what should it display? both info will? or should one new option be added to separately display them? Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 11 +++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cce9955..d9108fa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2225,6 +2225,7 @@ cleanup: static virDomainDiskDefPtr virDomainDiskDefParseXML(virCapsPtr caps, xmlNodePtr node, + xmlXPathContextPtr ctxt, virBitmapPtr bootMap, unsigned int flags) { @@ -2266,7 +2267,9 @@ virDomainDiskDefParseXML(virCapsPtr caps, } cur = node->children; + xmlNodePtr oldnode = ctxt->node; while (cur != NULL) { + ctxt->node = cur; if (cur->type == XML_ELEMENT_NODE) { if ((source == NULL && hosts == NULL) && (xmlStrEqual(cur->name, BAD_CAST "source"))) { @@ -2362,6 +2365,36 @@ virDomainDiskDefParseXML(virCapsPtr caps, iotag = virXMLPropString(cur, "io"); ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); + } else if (xmlStrEqual(cur->name, BAD_CAST "blkiothrottle")) { + if (virXPathULongLong("string(./blkiothrottle/bps)", ctxt, + &def->blkiothrottle.bps) < 0) { + def->blkiothrottle.bps = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/bps_rd)", ctxt, + &def->blkiothrottle.bps_rd) < 0) { + def->blkiothrottle.bps_rd = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/bps_wr)", ctxt, + &def->blkiothrottle.bps_wr) < 0) { + def->blkiothrottle.bps_wr = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/iops)", ctxt, + &def->blkiothrottle.iops) < 0) { + def->blkiothrottle.iops = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/iops_rd)", ctxt, + &def->blkiothrottle.iops_rd) < 0) { + def->blkiothrottle.iops_rd = 0; + } + + if (virXPathULongLong("string(./blkiothrottle/iops_wr)", ctxt, + &def->blkiothrottle.iops_wr) < 0) { + def->blkiothrottle.iops_wr = 0; + } } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -2387,6 +2420,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } cur = cur->next; } + ctxt->node = oldnode; device = virXMLPropString(node, "device"); if (device) { @@ -5684,9 +5718,13 @@ virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps, if (xmlStrEqual(node->name, BAD_CAST "disk")) { dev->type = VIR_DOMAIN_DEVICE_DISK; - if (!(dev->data.disk = virDomainDiskDefParseXML(caps, node, - NULL, flags))) + xmlNodePtr oldnode = ctxt->node; + if (!(dev->data.disk = virDomainDiskDefParseXML(caps, node, ctxt, + NULL, flags))) { + ctxt->node = oldnode; goto error; + } + ctxt->node = oldnode; } else if (xmlStrEqual(node->name, BAD_CAST "lease")) { dev->type = VIR_DOMAIN_DEVICE_LEASE; if (!(dev->data.lease = virDomainLeaseDefParseXML(node))) @@ -6725,11 +6763,16 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } if (n && VIR_ALLOC_N(def->disks, n) < 0) goto no_memory; + + xmlNodePtr oldnode = ctxt->node; for (i = 0 ; i < n ; i++) { + ctxt->node = nodes[i]; virDomainDiskDefPtr disk = virDomainDiskDefParseXML(caps, nodes[i], + ctxt, bootMap, flags); + ctxt->node = oldnode; if (!disk) goto error; @@ -9065,6 +9108,29 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkio.blkiothrottle.bps + || def->blkio.blkiothrottle.bps_rd + || def->blkio.blkiothrottle.bps_wr + || def->blkio.blkiothrottle.iops + || def->blkio.blkiothrottle.iops_rd + || def->blkio.blkiothrottle.iops_wr) { + virBufferAsprintf(&buf, " <blkiothrottle>\n"); + virBufferAsprintf(&buf, " <bps>%llu</bps>\n", + def->blkiothrottle.bps); + virBufferAsprintf(&buf, " <bps_rd>%llu</bps_rd>\n", + def->blkiothrottle.bps_rd); + virBufferAsprintf(&buf, " <bps_wr>%llu</bps_wr>\n", + def->blkiothrottle.bps_wr); + virBufferAsprintf(&buf, " <iops>%llu</iops>\n", + def->blkiothrottle.iops); + virBufferAsprintf(&buf, " <iops_rd>%llu</iops_rd>\n", + def->blkiothrottle.iops_rd); + virBufferAsprintf(&buf, " <iops_wr>%llu</iops_wr>\n", + def->blkiothrottle.iops_wr); + virBufferAsprintf(&buf, " </blkiothrottle>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e218a30..5902377 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -258,6 +258,17 @@ struct _virDomainDiskDef { virDomainDiskHostDefPtr hosts; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long bps; + unsigned long long bps_rd; + unsigned long long bps_wr; + unsigned long long iops; + unsigned long long iops_rd; + unsigned long long iops_wr; + } blkiothrottle; + char *serial; int cachemode; int error_policy; -- 1.7.6

1 0

[libvirt] [PATCH v1] domain_conf: add the support for disk I/O throttle setting
by Zhi Yong Wu 07 Sep '11

07 Sep '11

The first patch is only used to see if it is suitable for exteeding blkiotune to implement disk I/O throttling. As you have known, when blkiotune is issued without options, it will display current tuning parameters; If we exceed it, without options, what should it display? both info will? or should one new option be added to separately display them? Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 18 ++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cce9955..7dd350a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9065,6 +9065,24 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkio.blkiothrottle) { + virBufferAsprintf(&buf, " <blkiothrottle>\n"); + virBufferAsprintf(&buf, " <bps>%llu</bps>\n", + def->blkiothrottle.bps); + virBufferAsprintf(&buf, " <bps_rd>%llu</bps_rd>\n", + def->blkiothrottle.bps_rd); + virBufferAsprintf(&buf, " <bps_wr>%llu</bps_wr>\n", + def->blkiothrottle.bps_wr); + virBufferAsprintf(&buf, " <iops>%llu</iops>\n", + def->blkiothrottle.iops); + virBufferAsprintf(&buf, " <iops_rd>%llu</iops_rd>\n", + def->blkiothrottle.iops_rd); + virBufferAsprintf(&buf, " <iops_wr>%llu</iops_wr>\n", + def->blkiothrottle.iops_wr); + virBufferAsprintf(&buf, " </blkiothrottle>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e218a30..5902377 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -258,6 +258,17 @@ struct _virDomainDiskDef { virDomainDiskHostDefPtr hosts; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long bps; + unsigned long long bps_rd; + unsigned long long bps_wr; + unsigned long long iops; + unsigned long long iops_rd; + unsigned long long iops_wr; + } blkiothrottle; + char *serial; int cachemode; int error_policy; -- 1.7.6

1 1

[libvirt] [RFC] netlink monitor thread
by D. Herrendoerfer 07 Sep '11

07 Sep '11

Hello, I'm trying to get libvirt to recognize port profile disassociations, i.e. when the switch removes a port profile because lldpad has unexpectedly quit or the profile has been changed in the switches profile database, or when something went wrong otherwise. My take on this for testing was to have an external deamon log port profiles and changes to them, and tell lldpad to set them again if needed. But this is not really practical. I would like to find a way to have the libvitrd monitor netlink and take appropriate measures if, for example, a port profile is removed unexpectedly, that is: to call the VMs network setup again if macvtap/VEPA is used. There would be other benefits, like the detection if a link goes down on a used interface, or a device is unexpectedly configured down by another component. Looking at the deamon code I'm unclear on how to do this properly, this is a very linux specific thing, and the asynchronous nature of the request handling makes starting the monitor thread later on difficult. Thoughts, ideas ? D. Herrendoerfer

1 0

[libvirt] [PATCH] Add test case update_devflag.py for update device flag
by Nan Zhang 07 Sep '11

07 Sep '11

--- repos/domain/update_devflag.py | 163 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) create mode 100644 repos/domain/update_devflag.py diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py new file mode 100644 index 0000000..30f75b0 --- /dev/null +++ b/repos/domain/update_devflag.py @@ -0,0 +1,163 @@ +#!/usr/bin/evn python +"""Update virtual device to guest from an XML file +""" + +__author__ = 'Nan Zhang: nzhang(a)redhat.com' +__date__ = 'Fri Sep 2, 2011' +__version__ = '0.1.0' +__credits__ = 'Copyright (C) 2011 Red Hat, Inc.' +__all__ = ['usage', 'update_devflag'] + +import os +import re +import sys +import commands +from xml.dom import minidom + +def append_path(path): + """Append root path of package""" + if path in sys.path: + pass + else: + sys.path.append(path) + +pwd = os.getcwd() +result = re.search('(.*)libvirt-test-API', pwd) +append_path(result.group(0)) + +from lib import connectAPI +from lib import domainAPI +from utils.Python import utils +from utils.Python import xmlbuilder +from exception import LibvirtAPI + +def usage(): + print '''usage: mandatory arguments: + guestname + devtype + ''' + +def check_params(params): + """Verify inputing parameter dictionary""" + logger = params['logger'] + keys = ['guestname', 'devtype'] + for key in keys: + if key not in params: + logger.error("%s is required" %key) + usage() + return 1 + return 0 + +def create_image(params, img_name, img_size): + """Create an image file""" + logger = params['logger'] + stat, ret = commands.getstatusoutput("dd if=/dev/zero of=%s bs=1 \ + count=1 seek=%s" % (img_name, img_size)) + if stat == 0: + logger.debug("create image result:\n%s" % ret) + return True + else: + return False + +def check_updated_device(params, guestname, domobj, srcfile): + """Check if the device is updated""" + logger = params['logger'] + xmlobj = domobj.get_xml_desc(guestname) + domxml = minidom.parseString(xmlobj) + + for diskTag in domxml.getElementsByTagName("source"): + if diskTag.parentNode.getAttribute("device") == 'cdrom': + upfile = diskTag.getAttribute("file") + elif diskTag.parentNode.getAttribute('device') == 'floppy': + upfile = diskTag.getAttribute("file") + + if upfile == srcfile: + return False, upfile + else: + return True, upfile + +def update_devflag(params): + """Update virtual device to a domain from xml""" + + # Initiate and check parameters + params_check_result = check_params(params) + if params_check_result: + return 1 + logger = params['logger'] + guestname = params['guestname'] + devtype = params['devtype'] + if devtype == 'cdrom': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['guesttype'] = 'kvm' + xmlargs['hdmodel'] = 'ide' + xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img' + srcfile = xmlargs['bootcd'] + create_image(params, srcfile, '100M') + elif devtype == 'floppy': + xmlargs = {} + xmlargs['guestname'] = guestname + xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img' + srcfile = xmlargs['floppysource'] + create_image(params, srcfile, '2M') + else: + srcfile = None + logger.error("Wrong device type was specified.") + return 1 + + if not params.has_key('flag'): + flag = domainAPI.VIR_DOMAIN_AFFECT_CONFIG + + # Connect to local hypervisor connection URI + util = utils.Utils() + uri = util.get_uri('127.0.0.1') + conn = connectAPI.ConnectAPI() + virconn = conn.open(uri) + + caps = conn.get_caps() + logger.debug(caps) + + # Generate device XML for updating + domobj = domainAPI.DomainAPI(virconn) + newxmlobj = xmlbuilder.XmlBuilder() + + if devtype == 'cdrom': + newdevxml = newxmlobj.build_cdrom(xmlargs) + elif devtype == 'floppy': + newdevxml = newxmlobj.build_floppy(xmlargs) + + logger.debug("block device xml desc:\n%s" %newdevxml) + + try: + try: + domobj.update_device_flag(guestname, newdevxml, flag) + res, upfile = check_updated_device(params, guestname, \ + domobj, srcfile) + if res: + logger.info("success to update '%s' device: %s\n" % \ + (devtype, upfile)) + else: + logger.error("fail to update '%s' device: %s\n" % \ + (devtype, upfile)) + except LibvirtAPI, e: + logger.error("API error message: %s, error code is %s" % + (e.response()['message'], e.response()['code'])) + conn.close() + logger.info("closed hypervisor connection") + return 1 + finally: + conn.close() + logger.info("closed hypervisor connection") + + return 0 + +def update_devflag_clean(params): + """Clean testing environment""" + logger = params['logger'] + + if params['devtype'] == 'cdrom': + os.system('rm -f /var/lib/libvirt/boot/cdrom.img') + elif params['devtype'] == 'floppy': + os.system('rm -f /var/lib/libvirt/boot/floppy.img') + else: + logger.debug("image file was not found.") -- 1.7.4.4

1 1

[libvirt] [PATCH] esx: Support folders in the path of vpx:// connection URIs
by Matthias Bolte 06 Sep '11

06 Sep '11

Allow the datacenter and compute resource parts of the path to be prefixed with folders. Therefore, the way the path is parsed has changed. Before, it was split in 2 or 3 items and the items' meanings were determined by their positions. Now the path can have 2 or more items and the the vCenter server is asked whether a folder, datacenter of compute resource with the specified name exists at the current hierarchy level. Before the datacenter and compute resource lookup automatically traversed folders during lookup. This is logic got removed and folders have to be specified explicitly. The proper datacenter path including folders is now used when accessing a datastore over HTTPS. This makes virsh dumpxml and define work for datacenters in folders. https://bugzilla.redhat.com/show_bug.cgi?id=732676 --- docs/drvesx.html.in | 10 ++- src/esx/esx_driver.c | 14 ++-- src/esx/esx_util.c | 19 +--- src/esx/esx_util.h | 1 + src/esx/esx_vi.c | 223 ++++++++++++++++++++++++++++++++++------ src/esx/esx_vi_generator.input | 4 + 6 files changed, 215 insertions(+), 56 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index da9d2a1..aa8ecd4 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -56,7 +56,7 @@ esx://example-esx.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the s URIs have this general form (<code>[...]</code> marks an optional part). </p> <pre> -type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters] +type://[username@]hostname[:port]/[[folder/...]datacenter/[folder/...][cluster/]server][?extraparameters] </pre> <p> The <code>type://</code> is either <code>esx://</code> or @@ -80,6 +80,14 @@ type://[username@]hostname[:port]/[datacenter[/cluster]/server][?extraparameters <pre> vpx://example-vcenter.com/dc1/cluster1/example-esx.com </pre> + <p> + Datacenters and clusters can be organized in folders, those have to be + specified as well. The driver can handle folders + <span class="since">since 0.9.5</span>. + </p> +<pre> +vpx://example-vcenter.com/folder1/dc1/folder2/example-esx.com +</pre> <h4><a name="extraparams">Extra parameters</a></h4> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f1102ea..fd83a9c 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -802,8 +802,7 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, char *url = NULL; if (hostSystemIpAddress == NULL && - (priv->parsedUri->path_datacenter == NULL || - priv->parsedUri->path_computeResource == NULL)) { + (priv->parsedUri->path == NULL || STREQ(priv->parsedUri->path, "/"))) { ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", _("Path has to specify the datacenter and compute resource")); return -1; @@ -890,8 +889,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, /* - * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter> ...] - * <path> = <datacenter>/<computeresource>[/<hostsystem>] + * URI format: {vpx|esx|gsx}://[<username>@]<hostname>[:<port>]/[<path>][?<query parameter>...] + * <path> = [<folder>/...]<datacenter>/[<folder>/...]<computeresource>[/<hostsystem>] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: @@ -905,7 +904,8 @@ esxConnectToVCenter(esxPrivate *priv, virConnectAuthPtr auth, * For a vpx:// connection <path> references a host managed by the vCenter. * In case the host is part of a cluster then <computeresource> is the cluster * name. Otherwise <computeresource> and <hostsystem> are equal and the later - * can be omitted. + * can be omitted. As datacenters and computeresources can be organized in + * folders those have to be included in <path>. * * Optional query parameters: * - transport={http|https} @@ -2744,7 +2744,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) domain->conn->uri->server, domain->conn->uri->port); virBufferURIEncodeString(&buffer, directoryAndFileName); virBufferAddLit(&buffer, "?dcPath="); - virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); + virBufferURIEncodeString(&buffer, priv->parsedUri->path_datacenter); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); @@ -3212,7 +3212,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) virBufferURIEncodeString(&buffer, escapedName); virBufferAddLit(&buffer, ".vmx?dcPath="); - virBufferURIEncodeString(&buffer, priv->primary->datacenter->name); + virBufferURIEncodeString(&buffer, priv->parsedUri->path_datacenter); virBufferAddLit(&buffer, "&dsName="); virBufferURIEncodeString(&buffer, datastoreName); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index c14179d..5243a0e 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -51,7 +51,6 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) int noVerify; int autoAnswer; char *tmp; - char *saveptr; if (parsedUri == NULL || *parsedUri != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -184,26 +183,13 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, xmlURIPtr uri) } } - /* Expected format: [/]<datacenter>/<computeresource>[/<hostsystem>] */ if (uri->path != NULL) { - tmp = strdup(uri->path); + (*parsedUri)->path = strdup(uri->path); - if (tmp == NULL) { + if ((*parsedUri)->path == NULL) { virReportOOMError(); goto cleanup; } - - if (esxVI_String_DeepCopyValue(&(*parsedUri)->path_datacenter, - strtok_r(tmp, "/", &saveptr)) < 0 || - esxVI_String_DeepCopyValue(&(*parsedUri)->path_computeResource, - strtok_r(NULL, "/", &saveptr)) < 0 || - esxVI_String_DeepCopyValue(&(*parsedUri)->path_hostSystem, - strtok_r(NULL, "", &saveptr)) < 0) { - VIR_FREE(tmp); - goto cleanup; - } - - VIR_FREE(tmp); } if ((*parsedUri)->transport == NULL) { @@ -242,6 +228,7 @@ esxUtil_FreeParsedUri(esxUtil_ParsedUri **parsedUri) VIR_FREE((*parsedUri)->transport); VIR_FREE((*parsedUri)->vCenter); VIR_FREE((*parsedUri)->proxy_hostname); + VIR_FREE((*parsedUri)->path); VIR_FREE((*parsedUri)->path_datacenter); VIR_FREE((*parsedUri)->path_computeResource); VIR_FREE((*parsedUri)->path_hostSystem); diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 39fdb6d..4d7dccb 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -37,6 +37,7 @@ struct _esxUtil_ParsedUri { int proxy_type; char *proxy_hostname; int proxy_port; + char *path; char *path_datacenter; char *path_computeResource; char *path_hostSystem; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index f4033eb..6f4f9ee 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -770,55 +770,214 @@ int esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, esxUtil_ParsedUri *parsedUri) { - char *hostSystemName = NULL; + int result = -1; + char *path = NULL; + char *saveptr = NULL; + char *previousItem = NULL; + char *item = NULL; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + esxVI_ManagedObjectReference *root = NULL; + esxVI_Folder *folder = NULL; + + path = strdup(parsedUri->path); + + if (path == NULL) { + virReportOOMError(); + goto cleanup; + } + /* Lookup Datacenter */ - if (esxVI_LookupDatacenter(ctx, parsedUri->path_datacenter, - ctx->service->rootFolder, NULL, &ctx->datacenter, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + item = strtok_r(path, "/", &saveptr); + + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a datacenter"), + parsedUri->path); + goto cleanup; + } + + root = ctx->service->rootFolder; + + while (ctx->datacenter == NULL && item != NULL) { + esxVI_Folder_Free(&folder); + + /* Try to lookup item as a folder */ + if (esxVI_LookupFolder(ctx, item, root, NULL, &folder, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (folder != NULL) { + /* It's a folder, use it as new lookup root */ + if (root != ctx->service->rootFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = folder->_reference; + folder->_reference = NULL; + } else { + /* Try to lookup item as a datacenter */ + if (esxVI_LookupDatacenter(ctx, item, root, NULL, &ctx->datacenter, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + /* Build path_datacenter */ + if (virBufferUse(&buffer) > 0) { + virBufferAddChar(&buffer, '/'); + } + + virBufferAdd(&buffer, item, -1); + + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (ctx->datacenter == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find datacenter specified in '%s'"), + parsedUri->path); + goto cleanup; } + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; + } + + parsedUri->path_datacenter = virBufferContentAndReset(&buffer); + /* Lookup (Cluster)ComputeResource */ - if (esxVI_LookupComputeResource(ctx, parsedUri->path_computeResource, - ctx->datacenter->hostFolder, NULL, - &ctx->computeResource, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a compute resource"), + parsedUri->path); + goto cleanup; + } + + if (root != ctx->service->rootFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = ctx->datacenter->hostFolder; + + while (ctx->computeResource == NULL && item != NULL) { + esxVI_Folder_Free(&folder); + + /* Try to lookup item as a folder */ + if (esxVI_LookupFolder(ctx, item, root, NULL, &folder, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + + if (folder != NULL) { + /* It's a folder, use it as new lookup root */ + if (root != ctx->datacenter->hostFolder) { + esxVI_ManagedObjectReference_Free(&root); + } + + root = folder->_reference; + folder->_reference = NULL; + } else { + /* Try to lookup item as a compute resource */ + if (esxVI_LookupComputeResource(ctx, item, root, NULL, + &ctx->computeResource, + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; + } + } + + /* Build path_computeResource */ + if (virBufferUse(&buffer) > 0) { + virBufferAddChar(&buffer, '/'); + } + + virBufferAdd(&buffer, item, -1); + + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); + } + + if (ctx->computeResource == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find compute resource specified in '%s'"), + parsedUri->path); + goto cleanup; } if (ctx->computeResource->resourcePool == NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve resource pool")); - return -1; + goto cleanup; + } + + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; } + parsedUri->path_computeResource = virBufferContentAndReset(&buffer); + /* Lookup HostSystem */ - if (parsedUri->path_hostSystem == NULL && - STREQ(ctx->computeResource->_reference->type, + if (STREQ(ctx->computeResource->_reference->type, "ClusterComputeResource")) { - ESX_VI_ERROR(VIR_ERR_INVALID_ARG, "%s", - _("Path has to specify the host system")); - return -1; + if (item == NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' does not specify a host system"), + parsedUri->path); + goto cleanup; + } + + /* The path specified a cluster, it has to specify a host system too */ + previousItem = item; + item = strtok_r(NULL, "/", &saveptr); } - if (parsedUri->path_hostSystem != NULL || - (parsedUri->path_computeResource != NULL && - parsedUri->path_hostSystem == NULL)) { - if (parsedUri->path_hostSystem != NULL) { - hostSystemName = parsedUri->path_hostSystem; - } else { - hostSystemName = parsedUri->path_computeResource; - } + if (item != NULL) { + ESX_VI_ERROR(VIR_ERR_INVALID_ARG, + _("Path '%s' ends with an excess item"), + parsedUri->path); + goto cleanup; + } + + parsedUri->path_hostSystem = strdup(previousItem); + + if (parsedUri->path_hostSystem == NULL) { + virReportOOMError(); + goto cleanup; } - if (esxVI_LookupHostSystem(ctx, hostSystemName, + if (esxVI_LookupHostSystem(ctx, parsedUri->path_hostSystem, ctx->computeResource->_reference, NULL, &ctx->hostSystem, - esxVI_Occurrence_RequiredItem) < 0) { - return -1; + esxVI_Occurrence_OptionalItem) < 0) { + goto cleanup; } - return 0; + if (ctx->hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Could not find host system specified in '%s'"), + parsedUri->path); + goto cleanup; + } + + result = 0; + + cleanup: + if (result < 0) { + virBufferFreeAndReset(&buffer); + } + + if (root != ctx->service->rootFolder && + (ctx->datacenter == NULL || root != ctx->datacenter->hostFolder)) { + esxVI_ManagedObjectReference_Free(&root); + } + + VIR_FREE(path); + esxVI_Folder_Free(&folder); + + return result; } int @@ -1469,8 +1628,7 @@ esxVI_BuildSelectSetCollection(esxVI_Context *ctx) /* Folder -> childEntity (ManagedEntity) */ if (esxVI_BuildSelectSet(&ctx->selectSet_folderToChildEntity, "folderToChildEntity", - "Folder", "childEntity", - "folderToChildEntity\0") < 0) { + "Folder", "childEntity", NULL) < 0) { return -1; } @@ -1667,9 +1825,10 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->obj = root; objectSpec->skip = esxVI_Boolean_False; - if (STRNEQ(root->type, type)) { + if (STRNEQ(root->type, type) || STREQ(root->type, "Folder")) { if (STREQ(root->type, "Folder")) { - if (STREQ(type, "Datacenter") || STREQ(type, "ComputeResource") || + if (STREQ(type, "Folder") || STREQ(type, "Datacenter") || + STREQ(type, "ComputeResource") || STREQ(type, "ClusterComputeResource")) { objectSpec->selectSet = ctx->selectSet_folderToChildEntity; } else { diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 361a6e7..1a67a8c 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -755,6 +755,10 @@ managed object Datacenter extends ManagedEntity end +managed object Folder extends ManagedEntity +end + + managed object HostSystem extends ManagedEntity HostConfigManager configManager r end -- 1.7.4.1

1 0

[libvirt] [PATCH] mingw: Don't use interface as an identifier
by Matthias Bolte 06 Sep '11

06 Sep '11

Because it's a define use in MSCOM and its usage as identifier results in a compile error. --- tools/virsh.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 629233f..0f00463 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1256,9 +1256,8 @@ static const vshCmdOptDef opts_domif_setlink[] = { static bool cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; - const char *interface; + const char *iface; const char *state; const char *mac; const char *desc; @@ -1266,21 +1265,19 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) bool ret = false; unsigned int flags = 0; int i; - xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; xmlXPathObjectPtr obj = NULL; xmlNodePtr cur = NULL; xmlBufferPtr xml_buf = NULL; - if (!vshConnectionUsability(ctl, ctl->conn)) return false; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "interface", &interface) <= 0) + if (vshCommandOptString(cmd, "interface", &iface) <= 0) goto cleanup; if (vshCommandOptString(cmd, "state", &state) <= 0) @@ -1332,7 +1329,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) xmlStrEqual(cur->name, BAD_CAST "mac")) { mac = virXMLPropString(cur, "address"); - if (STRCASEEQ(mac, interface)) { + if (STRCASEEQ(mac, iface)) { VIR_FREE(mac); goto hit; } @@ -1342,7 +1339,7 @@ cmdDomIfSetLink (vshControl *ctl, const vshCmd *cmd) } } - vshError(ctl, _("interface with address '%s' not found"), interface); + vshError(ctl, _("interface with address '%s' not found"), iface); goto cleanup; hit: @@ -1424,13 +1421,12 @@ static bool cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - const char *interface = NULL; + const char *iface = NULL; int flags = 0; char *state = NULL; char *mac = NULL; bool ret = false; int i; - char *desc; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -1443,7 +1439,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain (ctl, cmd, NULL))) return false; - if (vshCommandOptString (cmd, "interface", &interface) <= 0) { + if (vshCommandOptString (cmd, "interface", &iface) <= 0) { virDomainFree(dom); return false; } @@ -1481,7 +1477,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) mac = virXMLPropString(cur, "address"); - if (STRCASEEQ(mac, interface)){ + if (STRCASEEQ(mac, iface)){ VIR_FREE(mac); goto hit; } @@ -1490,7 +1486,7 @@ cmdDomIfGetLink (vshControl *ctl, const vshCmd *cmd) } } - vshError(ctl, _("Interface with address '%s' not found."), interface); + vshError(ctl, _("Interface with address '%s' not found."), iface); goto cleanup; hit: @@ -1500,7 +1496,7 @@ hit: xmlStrEqual(cur->name, BAD_CAST "link")) { state = virXMLPropString(cur, "state"); - vshPrint(ctl, "%s %s", interface, state); + vshPrint(ctl, "%s %s", iface, state); VIR_FREE(state); goto cleanup; @@ -1509,7 +1505,7 @@ hit: } /* attribute not found */ - vshPrint(ctl, "%s default", interface); + vshPrint(ctl, "%s default", iface); cleanup: xmlXPathFreeObject(obj); -- 1.7.4.1

2 2

[libvirt] [PATCH v2] virsh: Add more human-friendly output of domblkstat command
by Peter Krempa 06 Sep '11

06 Sep '11

Users of virsh complain that output of the domblkstat command is not intuitive enough. This patch adds explanation of fields returned by this command to the help section for domblkstat and the man page of virsh. Also a switch --human is added for domblkstat that prints the fields with more descriptive texts. https://bugzilla.redhat.com/show_bug.cgi?id=731656 Changes to v1: -Rebased to current head --- tools/virsh.c | 52 +++++++++++++++++++++++++++++++++++++++++----------- tools/virsh.pod | 11 ++++++++++- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c7240e5..09337cb 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1054,13 +1054,21 @@ cleanup: */ static const vshCmdInfo info_domblkstat[] = { {"help", N_("get device block stats for a domain")}, - {"desc", N_("Get device block stats for a running domain.")}, + {"desc", N_("Get device block stats for a running domain.\n\n" + " Explanation of fields:\n" + " rd_req - count of read requests\n" + " rd_bytes - count of read bytes\n" + " wr_req - count of write requests\n" + " wr_bytes - count of written bytes\n" + " errs - error count")}, {NULL,NULL} }; static const vshCmdOptDef opts_domblkstat[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"device", VSH_OT_DATA, VSH_OFLAG_REQ, N_("block device")}, + {"human", VSH_OT_BOOL, 0, N_("print a more human readable output")}, + {NULL, 0, 0, NULL} }; @@ -1070,6 +1078,7 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; const char *name = NULL, *device = NULL; struct _virDomainBlockStats stats; + int humanReadable = vshCommandOptBool(cmd, "human"); if (!vshConnectionUsability (ctl, ctl->conn)) return false; @@ -1088,20 +1097,41 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) return false; } - if (stats.rd_req >= 0) - vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + if (humanReadable) { + /* human friendly output */ + vshPrint(ctl, N_("Device: %s\n"), device); + + if (stats.rd_req >= 0) + vshPrint (ctl, N_("read request count: %lld\n"), stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, N_("number of read bytes: %lld\n"), stats.rd_bytes); + + if (stats.wr_req >= 0) + vshPrint (ctl, N_("write request count: %lld\n"), stats.wr_req); - if (stats.rd_bytes >= 0) - vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); + if (stats.wr_bytes >= 0) + vshPrint (ctl, N_("number of written bytes: %lld\n"), stats.wr_bytes); - if (stats.wr_req >= 0) - vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); + if (stats.errs >= 0) + vshPrint (ctl, N_("error count: %lld\n"), stats.errs); + } else { + /* script friendly output */ + if (stats.rd_req >= 0) + vshPrint (ctl, "%s rd_req %lld\n", device, stats.rd_req); + + if (stats.rd_bytes >= 0) + vshPrint (ctl, "%s rd_bytes %lld\n", device, stats.rd_bytes); - if (stats.wr_bytes >= 0) - vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + if (stats.wr_req >= 0) + vshPrint (ctl, "%s wr_req %lld\n", device, stats.wr_req); - if (stats.errs >= 0) - vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + if (stats.wr_bytes >= 0) + vshPrint (ctl, "%s wr_bytes %lld\n", device, stats.wr_bytes); + + if (stats.errs >= 0) + vshPrint (ctl, "%s errs %lld\n", device, stats.errs); + } virDomainFree(dom); return true; diff --git a/tools/virsh.pod b/tools/virsh.pod index 30c0721..c333b2a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -501,10 +501,19 @@ be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. -=item B<domblkstat> I<domain> I<block-device> +=item B<domblkstat> I<domain> I<block-device> [I<--human>] Get device block stats for a running domain. +Use I<--human> for a more human readable output. + +B<Explanation of fields:> + rd_req - count of read requests + rd_bytes - count of read bytes + wr_req - count of write requests + wr_bytes - count of written bytes + errs - error count + =item B<domifstat> I<domain> I<interface-device> Get network interface stats for a running domain. -- 1.7.3.4

2 2

[libvirt] [PATCH RFC 0/2] XML: Improve XML parse error reporting
by Peter Krempa 06 Sep '11

06 Sep '11

First patch modifies the error reporting function on parse errors of XML files. A new, more informative message is presented to the user, containing filename of the offending file, error description and context of the error in libxml2 style. Second patch changes default filenames used while parsing XML strings in memory to NULL, so that the error reporting function does not print bougus filename. src/conf/domain_conf.c - change "domain.xml" to NULL src/security/virt-aa-helper.c - change "domain.xml" to NULL src/util/xml.c - modify error reporting function Peter Krempa (2): XML: Improve XML parsing error messages XML: Suppress printing "domain.xml" for parse errors on XML strings src/conf/domain_conf.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/xml.c | 88 +++++++++++++++++++++++++++++++++++------ 3 files changed, 78 insertions(+), 14 deletions(-) -- 1.7.3.4

3 9

[libvirt] [PATCH v3 0/5] Virtual interface link state modification
by Peter Krempa 06 Sep '11

06 Sep '11

This patchset adds the ability for libvirt users to control interface link state of the virtual network devices provided by hypervisors. Modification of the link state is accomplished by adding a new XML element <link state"up"> or "down" to the domain XML. The corresponding network interface is thereafter initialised with the desired state. Live modification of the link state is achieved by calling virDomainUpdateDeviceFlags containing a modified interface configuration. Yet, users may modify only link state of an interface. This feature allows propagation of network topology changes to guests, testing scenarios in complex virtual networks, etc ... Future upgrade: - add support for VirtualBox Modifications to v2: - Rebase to curent HEAD Modifications to v1: - use virUpdateDeviceFlags instead of dedicated API - incorporate helpful comments by Eric Blake https://bugzilla.redhat.com/show_bug.cgi?id=643373 Peter Krempa (5): link-state: util: Add equality comparision functions for structures link-state: conf: Add element to XML for controling link state link-state: qemu: Add monitor handling for link state modification link-state: qemu: Add net intf modification to virUpdateDeviceFlags link-state: virsh: Add wrapper commands for changing link state docs/formatdomain.html.in | 21 +++ docs/schemas/network.rng | 11 ++ src/conf/domain_conf.c | 24 ++++ src/conf/domain_conf.h | 11 ++ src/qemu/qemu_driver.c | 24 ++++ src/qemu/qemu_hotplug.c | 176 ++++++++++++++++++++++++++ src/qemu/qemu_hotplug.h | 8 ++ src/qemu/qemu_monitor.c | 19 +++ src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 ++++ src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_monitor_text.c | 46 +++++++ src/qemu/qemu_monitor_text.h | 4 + src/qemu/qemu_process.c | 47 +++++++- src/util/network.c | 62 +++++++++ src/util/network.h | 5 + tools/virsh.c | 286 ++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 11 ++ 18 files changed, 785 insertions(+), 1 deletions(-) -- 1.7.3.4

2 10

[libvirt] [PATCH] redirdev: allows to specify device address
by Marc-André Lureau 06 Sep '11

06 Sep '11

It is important to be able to attach USB redirected devices to a particular controller (one that supports USB2 for instance). Without this patch, only the default bus was used. <redirdev bus='usb' type='spicevmc'> <address type='usb' bus='0' port='4'/> </redirdev> --- docs/formatdomain.html.in | 19 +++++++++++++------ docs/schemas/domaincommon.rng | 3 +++ src/conf/domain_conf.c | 14 ++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 1 + 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b960381..399388f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1417,14 +1417,21 @@ tunnel; <code>type='tcp'</code> or <code>type='spicevmc'</code> (which uses the usbredir channel of a <a href="#elementsGraphics">SPICE graphics - device</a>) are typical. Further sub-elements, such - as <code><source></code>, may be required according to - the given type, although a <code><target></code> - sub-element is not required (since the consumer of the - character device is the hypervisor itself, rather than a - device visible in the guest).</dd> + device</a>) are typical.</dd> </dl> + <p> + The redirdev element has an optional sub-element + <code><address></code> which can tie the device to a + particular controller. + </p> + <p> + Further sub-elements, such as <code><source></code>, may + be required according to the given type, although + a <code><target></code> sub-element is not required (since + the consumer of the character device is the hypervisor itself, + rather than a device visible in the guest). + </p> <h4><a name="elementsSmartcard">Smartcard devices</a></h4> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8e7fd63..02c3c7f 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1986,6 +1986,9 @@ <ref name="qemucdevSrcTypeChoice"/> </attribute> <ref name="qemucdevSrcDef"/> + <optional> + <ref name="address"/> + </optional> </element> </define> <define name="hostdev"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cce9955..706f445 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5518,6 +5518,18 @@ virDomainRedirdevDefParseXML(const xmlNodePtr node, def->source.chr.data.spicevmc = VIR_DOMAIN_CHR_SPICEVMC_USBREDIR; } + if (virDomainDeviceInfoParseXML(node, &def->info, flags) < 0) + goto error; + + if (def->bus == VIR_DOMAIN_REDIRDEV_BUS_USB && + def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE && + def->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { + virDomainReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid address for a USB device")); + goto error; + } + + cleanup: VIR_FREE(bus); VIR_FREE(type); @@ -10274,6 +10286,8 @@ virDomainRedirdevDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <redirdev bus='%s'", bus); if (virDomainChrSourceDefFormat(buf, &def->source.chr, false, flags) < 0) return -1; + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; virBufferAddLit(buf, " </redirdev>\n"); return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args index 4d4f30a..f6270d5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args @@ -6,5 +6,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -chardev socket,id=charredir0,host=localhost,port=4000 \ -device usb-redir,chardev=charredir0,id=redir0 \ -chardev spicevmc,id=charredir1,name=usbredir \ --device usb-redir,chardev=charredir1,id=redir1 \ +-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,multifunction=on,addr=0x3.0x0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml index c73e569..1dac3fb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml @@ -34,6 +34,7 @@ <protocol type='raw'/> </redirdev> <redirdev bus='usb' type='spicevmc'> + <address type='usb' bus='0' port='4'/> </redirdev> <memballoon model='virtio'/> </devices> -- 1.7.6

2 1