diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 77242f0339164ee3802e3897f1957e25e8ee8ba5..efd7a5fcc2564f2c96a3c376b47f921348f1b65b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3296,6 +3296,11 @@ or "handle", but no formats. Virtuozzo driver supports a type of "ploop" with a format of "ploop". +
  • + For virtio-backed devices, + Virtio-specific options can also be + set. (Since 3.5.0) +
  • diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1d4639227df7eb79e93e9060a8b3155ff849a490..8ff553d3fd292c57030a1a04f252038905c2fe30 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2256,6 +2256,7 @@ immediate + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a3c06c95b5ff3eb15e50004175cc76f44db96e73..9c71c8a3962280acd8c7d07d0a64f5d5352217e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1918,6 +1918,7 @@ void virDomainFSDefFree(virDomainFSDefPtr def) virStorageSourceFree(def->src); VIR_FREE(def->dst); virDomainDeviceInfoClear(&def->info); + VIR_FREE(def->virtio); VIR_FREE(def); } @@ -9478,6 +9479,9 @@ virDomainFSDefParseXML(xmlNodePtr node, goto error; } + if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) + goto error; + def->src->path = source; source = NULL; def->dst = target; @@ -19272,6 +19276,10 @@ virDomainFsDefCheckABIStability(virDomainFSDefPtr src, return false; } + if (src->virtio && dst->virtio && + !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) + return false; + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; @@ -21757,6 +21765,8 @@ virDomainFSDefFormat(virBufferPtr buf, } + virDomainVirtioOptionsFormat(&driverBuf, def->virtio); + if (virBufferUse(&driverBuf)) { virBufferAddLit(buf, " +
    - +