qemuBlockStorageSourceGetBackendProps: Unify ordering of fields

Use the same ordering of the relevant fields as we do for the format
layer -blockdev so that later they can be refactored without test
fallout.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

tests/qemublocktestdata/xml2json/dir-fat-cache.json

@@ -14,10 +14,10 @@
   "floppy": false,
   "rw": false,
   "node-name": "node-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/file-backing_basic-cache-directsync.json

@@ -13,12 +13,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/a",
   "node-name": "node-a-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-b-f",
@@ -35,12 +35,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/b",
   "node-name": "node-b-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-c-f",
@@ -65,12 +65,12 @@
     }
   ],
   "node-name": "node-c-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-d-f",
@@ -86,10 +86,10 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/d",
   "node-name": "node-d-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/file-backing_basic-cache-none.json

@@ -13,12 +13,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/a",
   "node-name": "node-a-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-b-f",
@@ -35,12 +35,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/b",
   "node-name": "node-b-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-c-f",
@@ -65,12 +65,12 @@
     }
   ],
   "node-name": "node-c-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-d-f",
@@ -86,10 +86,10 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/d",
   "node-name": "node-d-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/file-backing_basic-cache-unsafe.json

@@ -13,12 +13,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/a",
   "node-name": "node-a-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": true
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-b-f",
@@ -35,12 +35,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/b",
   "node-name": "node-b-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": true
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-c-f",
@@ -65,12 +65,12 @@
     }
   ],
   "node-name": "node-c-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": true
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-d-f",
@@ -86,10 +86,10 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/d",
   "node-name": "node-d-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": true
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/file-backing_basic-cache-writeback.json

@@ -13,12 +13,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/a",
   "node-name": "node-a-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-b-f",
@@ -35,12 +35,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/b",
   "node-name": "node-b-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-c-f",
@@ -65,12 +65,12 @@
     }
   ],
   "node-name": "node-c-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-d-f",
@@ -86,10 +86,10 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/d",
   "node-name": "node-d-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/file-backing_basic-cache-writethrough.json

@@ -13,12 +13,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/a",
   "node-name": "node-a-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-b-f",
@@ -35,12 +35,12 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/b",
   "node-name": "node-b-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-c-f",
@@ -65,12 +65,12 @@
     }
   ],
   "node-name": "node-c-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-d-f",
@@ -86,10 +86,10 @@
   "driver": "file",
   "filename": "/var/lib/libvirt/images/d",
   "node-name": "node-d-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/file-raw-aio_native.json

@@ -13,10 +13,10 @@
   "filename": "/path/to/i.img",
   "aio": "native",
   "node-name": "test2",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": true,
     "no-flush": false
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }

tests/qemublocktestdata/xml2json/network-qcow2-backing-chain-cache-unsafe.json

@@ -30,12 +30,12 @@
   ],
   "key-secret": "node-a-s-secalias",
   "node-name": "node-a-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": true
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }
 {
   "node-name": "node-b-f",
@@ -55,10 +55,10 @@
   "lun": 1,
   "transport": "tcp",
   "node-name": "node-b-s",
+  "auto-read-only": true,
+  "discard": "unmap",
   "cache": {
     "direct": false,
     "no-flush": true
-  },
-  "auto-read-only": true,
-  "discard": "unmap"
+  }
 }