xl: update check-xl-disk-parse to handle backend_domname

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
index 9c0b438bc0b784b82b40b3a214f84d2063bb4595..e15a49f69cad997bc5d42632f1e573b4d6e6d0ee 100644 (file)
--- a/docs/man/xl.cfg.pod.5
+++ b/docs/man/xl.cfg.pod.5
@@ -1252,7 +1252,7 @@ host:USBID, where USBID is of the form xxxx:yyyy.  The USBID can
 typically be found by using lsusb or usb-devices.
 
 If you wish to use the "host:bus.addr" format, remove any leading '0' from the
-bus and addr. For example, for the USB device on bus 008 dev 002, you will
+bus and addr. For example, for the USB device on bus 008 dev 002, you should
 write "host:8.2".
 
 The form usbdevice=DEVICE is also accepted for backwards compatibility.

diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse
index 41fb7afa2ab258f7e94465efdc14987503727ddc..797277ced5055b7737af745107e089907423f93c 100755 (executable)
--- a/tools/libxl/check-xl-disk-parse
+++ b/tools/libxl/check-xl-disk-parse
@@ -53,6 +53,7 @@ one $e foo
 expected <<END
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": "/dev/vg/guest-volume",
     "vdev": "hda",
     "backend": "unknown",
@@ -73,6 +74,7 @@ one 0 raw:/dev/vg/guest-volume,hda,w
 expected <<END
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": "/root/image.iso",
     "vdev": "hdc",
     "backend": "unknown",
@@ -94,6 +96,7 @@ one 0 raw:/root/image.iso,hdc:cdrom,ro
 expected <<EOF
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": "/dev/vg/guest-volume",
     "vdev": "xvdb",
     "backend": "phy",
@@ -110,6 +113,7 @@ one 0 backendtype=phy,vdev=xvdb,access=w,target=/dev/vg/guest-volume
 expected <<EOF
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": "",
     "vdev": "hdc",
     "backend": "unknown",
@@ -130,6 +134,7 @@ one 0 ,empty,hdc:cdrom,r
 expected <<EOF
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": null,
     "vdev": "hdc",
     "backend": "unknown",
@@ -147,6 +152,7 @@ one 0 vdev=hdc,access=r,devtype=cdrom
 expected <<EOF
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": "iqn.2001-05.com.equallogic:0-8a0906-23fe93404-c82797962054a96d-examplehost",
     "vdev": "xvda",
     "backend": "unknown",
@@ -166,6 +172,7 @@ one 0 vdev=xvda,access=w,script=block-iscsi,target=iqn.2001-05.com.equallogic:0-
 expected <<EOF
 disk: {
     "backend_domid": 0,
+    "backend_domname": null,
     "pdev_path": "app01",
     "vdev": "hda",
     "backend": "unknown",