diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 31c132b94eced3236d62396684b7d969490dad49..9ade5072bdb3725337f546376dcba5961f97b1c8 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1992,8 +1992,9 @@
the type attribute selects the primary
backend driver name, while the format
attribute provides the format type. For example, LXC
- supports a type of "loop", with a format of "raw". QEMU
- supports a type of "path" or "handle", but no formats.
+ supports a type of "loop", with a format of "raw" or
+ "nbd" with any format. QEMU supports a type of "path"
+ or "handle", but no formats.
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 6078b7a7588673e0ec6a87532581b9facd18e93b..800442896e7cb56e1308abb18bf99358e7b1c1c3 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1675,6 +1675,7 @@
pathhandleloop
+ nbd
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ddf9ace16e7654e6d562cbef91d710ff42cd150d..862b9970cbf008023e74b8b410d9d84e09ae4685 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -343,7 +343,8 @@ VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
"default",
"path",
"handle",
- "loop")
+ "loop",
+ "nbd")
VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST,
"passthrough",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b5a0db83d23a9b6827bfeecdd51efda098ede74f..a9d34105d9470699237f7f5865ac089459b4899a 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -801,6 +801,7 @@ enum virDomainFSDriverType {
VIR_DOMAIN_FS_DRIVER_TYPE_PATH,
VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE,
VIR_DOMAIN_FS_DRIVER_TYPE_LOOP,
+ VIR_DOMAIN_FS_DRIVER_TYPE_NBD,
VIR_DOMAIN_FS_DRIVER_TYPE_LAST
};
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 372e1a3215301e2ee82dfda139e76bdb31060db0..eddc2636800dd07e4b8a5d2df7bced475f26f7ca 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -140,6 +140,7 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
"local",
"local",
"handle",
+ NULL,
NULL);
diff --git a/tests/lxcxml2xmldata/lxc-disk-formats.xml b/tests/lxcxml2xmldata/lxc-disk-formats.xml
index da53cf22b0e1ee35b4dadd3d7c9a7e5e76c59dc2..e9530650b414d66b022f8bfa98a2509813cb4ccd 100644
--- a/tests/lxcxml2xmldata/lxc-disk-formats.xml
+++ b/tests/lxcxml2xmldata/lxc-disk-formats.xml
@@ -19,6 +19,11 @@
+
+
+
+
+