提交 fd93d466 编写于 作者: A Adam Litke 提交者: Eric Blake

storage_file: Add a new flag to mark backing files that are safe to probe

Signed-off-by: NAdam Litke <agl@us.ibm.com>
上级 5dca07e2
...@@ -8230,6 +8230,10 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, ...@@ -8230,6 +8230,10 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
if (format == VIR_STORAGE_FILE_AUTO && if (format == VIR_STORAGE_FILE_AUTO &&
!allowProbing) !allowProbing)
format = VIR_STORAGE_FILE_RAW; /* Stops further recursion */ format = VIR_STORAGE_FILE_RAW; /* Stops further recursion */
/* Allow probing for image formats that are safe */
if (format == VIR_STORAGE_FILE_AUTO_SAFE)
format = VIR_STORAGE_FILE_AUTO;
} while (nextpath); } while (nextpath);
ret = 0; ret = 0;
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
VIR_ENUM_IMPL(virStorageFileFormat, VIR_ENUM_IMPL(virStorageFileFormat,
VIR_STORAGE_FILE_LAST, VIR_STORAGE_FILE_LAST,
"raw", "dir", "bochs", "raw", "probe", "dir", "bochs",
"cloop", "cow", "dmg", "iso", "cloop", "cow", "dmg", "iso",
"qcow", "qcow2", "qed", "vmdk", "vpc") "qcow", "qcow2", "qed", "vmdk", "vpc")
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
enum virStorageFileFormat { enum virStorageFileFormat {
VIR_STORAGE_FILE_AUTO = -1, VIR_STORAGE_FILE_AUTO = -1,
VIR_STORAGE_FILE_RAW = 0, VIR_STORAGE_FILE_RAW = 0,
VIR_STORAGE_FILE_AUTO_SAFE,
VIR_STORAGE_FILE_DIR, VIR_STORAGE_FILE_DIR,
VIR_STORAGE_FILE_BOCHS, VIR_STORAGE_FILE_BOCHS,
VIR_STORAGE_FILE_CLOOP, VIR_STORAGE_FILE_CLOOP,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册