On 19.08.2014 22:11, Giuseppe Scrivano wrote:
Signed-off-by: Giuseppe Scrivano <gscrivan@xxxxxxxxxx>
---
docs/formatdomain.html.in | 6 ++++++
docs/schemas/domaincommon.rng | 13 +++++++++++++
src/conf/domain_conf.c | 26 ++++++++++++++++++++++++++
src/conf/domain_conf.h | 11 +++++++++++
tests/domainconfdata/getfilesystem.xml | 5 +++++
tests/domainconftest.c | 1 +
6 files changed, 62 insertions(+)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index ed17389..d0c1ce2 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2300,6 +2300,8 @@
<driver type='path' wrpolicy='immediate'/>
<source dir='/export/to/guest'/>
<target dir='/import/from/host'/>
+ <model type='9p'/>
+ <model type='mtp'/>
No. Having two <model/> elements is not supported. Just choose one and
describe other in the paragraph below (like you did).
<readonly/>
</filesystem>
<filesystem type='file' accessmode='passthrough'>
@@ -2337,6 +2339,10 @@
while the value <code>immediate</code> means that a host writeback
is immediately triggered for all pages touched during a guest file
write operation <span class="since">(since 0.9.10)</span>.
+ A "filesystem" element has an optional
+ attribute <code>model</code><span class="since"> (since
+ 1.2.8)</span>, which is one of "9p", "mtp" (used by QEMU/KVM),
+ if this element is not specified the default is "9p".
</dd>
<dt><code>type='template'</code></dt>
<dd>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 033f2f6..684acec 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1937,6 +1937,19 @@
</element>
</optional>
</interleave>
+ <interleave>
+ <optional>
+ <element name="model">
+ <attribute name="type">
+ <choice>
+ <value>9p</value>
+ <value>mtp</value>
+ </choice>
+ </attribute>
+ <empty/>
+ </element>
+ </optional>
+ </interleave>
</element>
</define>
<define name="fsDriver">
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 14338ba..98dbe14 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -344,6 +344,11 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST,
"ram",
"bind")
+VIR_ENUM_IMPL(virDomainFSModel, VIR_DOMAIN_FS_MODEL_LAST,
+ "default",
+ "9p",
+ "mtp")
+
VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
"default",
"path",
@@ -6459,6 +6464,7 @@ virDomainFSDefParseXML(xmlNodePtr node,
virDomainFSDefPtr def;
xmlNodePtr cur, save_node = ctxt->node;
char *type = NULL;
+ char *model = NULL;
char *fsdriver = NULL;
char *source = NULL;
char *target = NULL;
@@ -6536,6 +6542,9 @@ virDomainFSDefParseXML(xmlNodePtr node,
wrpolicy = virXMLPropString(cur, "wrpolicy");
if (!format)
format = virXMLPropString(cur, "format");
+ } else if (!model &&
+ xmlStrEqual(cur->name, BAD_CAST "model")) {
+ model = virXMLPropString(cur, "type");
}
}
cur = cur->next;
@@ -6557,6 +6566,14 @@ virDomainFSDefParseXML(xmlNodePtr node,
}
}
+ if (model) {
+ if ((def->model = virDomainFSModelTypeFromString(model)) <= 0) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("unknown model value '%s'"), model);
+ goto error;
+ }
+ }
+
if (wrpolicy) {
if ((def->wrpolicy = virDomainFSWrpolicyTypeFromString(wrpolicy)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -6616,6 +6633,7 @@ virDomainFSDefParseXML(xmlNodePtr node,
VIR_FREE(usage);
VIR_FREE(units);
VIR_FREE(format);
+ VIR_FREE(model);
Maybe a nitpick, but I'd love to keep an ordering here. I see two
possible ways of doing free over multiple variables. Either the same
oder in which they are declared, or the reverse one. So this VIR_FREE()
needs to go in between VIR_FREE(type) and VIR_FREE(fsdriver).
return def;
@@ -15786,6 +15804,14 @@ virDomainFSDefFormat(virBufferPtr buf,
switch (def->type) {
case VIR_DOMAIN_FS_TYPE_MOUNT:
+ virBufferEscapeString(buf, "<source dir='%s'/>\n",
+ def->src);
+ if (def->model) {
+ virBufferEscapeString(buf, "<model type='%s'/>\n",
+ virDomainFSModelTypeToString(def->model));
+ }
+ break;
+
case VIR_DOMAIN_FS_TYPE_BIND:
virBufferEscapeString(buf, "<source dir='%s'/>\n",
def->src);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4cf56c9..df7d019 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -764,6 +764,15 @@ typedef enum {
VIR_DOMAIN_FS_TYPE_LAST
} virDomainFSType;
+/* Filesystem model */
+typedef enum {
+ VIR_DOMAIN_FS_MODEL_DEFAULT = 0,
+ VIR_DOMAIN_FS_MODEL_9P, /* 9P network filesystem */
+ VIR_DOMAIN_FS_MODEL_MTP, /* MTP usb filesystem */
+
+ VIR_DOMAIN_FS_MODEL_LAST
+} virDomainFSModel;
+
/* Filesystem driver type */
typedef enum {
VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0,
@@ -808,6 +817,7 @@ struct _virDomainFSDef {
virDomainDeviceInfo info;
unsigned long long space_hard_limit; /* in bytes */
unsigned long long space_soft_limit; /* in bytes */
+ int model; /* enum virDomainFSModel */
};
@@ -2585,6 +2595,7 @@ VIR_ENUM_DECL(virDomainControllerModelPCI)
VIR_ENUM_DECL(virDomainControllerModelSCSI)
VIR_ENUM_DECL(virDomainControllerModelUSB)
VIR_ENUM_DECL(virDomainFS)
+VIR_ENUM_DECL(virDomainFSModel)
VIR_ENUM_DECL(virDomainFSDriver)
VIR_ENUM_DECL(virDomainFSAccessMode)
VIR_ENUM_DECL(virDomainFSWrpolicy)
diff --git a/tests/domainconfdata/getfilesystem.xml b/tests/domainconfdata/getfilesystem.xml
index 2ee78b4..3203666 100644
--- a/tests/domainconfdata/getfilesystem.xml
+++ b/tests/domainconfdata/getfilesystem.xml
@@ -21,6 +21,11 @@
<source dir='/'/>
<target dir='/dev'/>
</filesystem>
+ <filesystem type='mount'>
+ <model type="mtp"/>
+ <source dir='/'/>
+ <target dir='mtp share'/>
+ </filesystem>
<console type='pty'>
<target type='lxc' port='0'/>
</console>
diff --git a/tests/domainconftest.c b/tests/domainconftest.c
index 3d6ebe1..6b65f09 100644
--- a/tests/domainconftest.c
+++ b/tests/domainconftest.c
@@ -111,6 +111,7 @@ mymain(void)
DO_TEST_GET_FS("/dev", true);
DO_TEST_GET_FS("/dev/pts", false);
DO_TEST_GET_FS("/doesnotexist", false);
+ DO_TEST_GET_FS("mtp share", true);
virObjectUnref(caps);
virObjectUnref(xmlopt);
ACK with this and nits pointed out by Daniel fixed.
Michal
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list