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

QED: Basic support for QED images

Add an entry in fileTypeInfo for QED image files.
Signed-off-by: NAdam Litke <agl@us.ibm.com>
Cc: Stefan Hajnoczi <stefan.hajnoczi@uk.ibm.com>
Cc: Anthony Liguori <aliguori@linux.vnet.ibm.com>
上级 5a2a474e
...@@ -44,7 +44,7 @@ VIR_ENUM_IMPL(virStorageFileFormat, ...@@ -44,7 +44,7 @@ VIR_ENUM_IMPL(virStorageFileFormat,
VIR_STORAGE_FILE_LAST, VIR_STORAGE_FILE_LAST,
"raw", "dir", "bochs", "raw", "dir", "bochs",
"cloop", "cow", "dmg", "iso", "cloop", "cow", "dmg", "iso",
"qcow", "qcow2", "vmdk", "vpc") "qcow", "qcow2", "qed", "vmdk", "vpc")
enum lv_endian { enum lv_endian {
LV_LITTLE_ENDIAN = 1, /* 1234 */ LV_LITTLE_ENDIAN = 1, /* 1234 */
...@@ -105,6 +105,8 @@ static int vmdk4GetBackingStore(char **, int *, ...@@ -105,6 +105,8 @@ static int vmdk4GetBackingStore(char **, int *,
#define QCOW2_HDR_EXTENSION_END 0 #define QCOW2_HDR_EXTENSION_END 0
#define QCOW2_HDR_EXTENSION_BACKING_FORMAT 0xE2792ACA #define QCOW2_HDR_EXTENSION_BACKING_FORMAT 0xE2792ACA
#define QED_HDR_IMAGE_SIZE (4+4+4+4+8+8+8)
/* VMDK needs at least this to find backing store, /* VMDK needs at least this to find backing store,
* other formats need less */ * other formats need less */
#define STORAGE_MAX_HEAD (20*512) #define STORAGE_MAX_HEAD (20*512)
...@@ -152,6 +154,12 @@ static struct FileTypeInfo const fileTypeInfo[] = { ...@@ -152,6 +154,12 @@ static struct FileTypeInfo const fileTypeInfo[] = {
LV_BIG_ENDIAN, 4, 2, LV_BIG_ENDIAN, 4, 2,
QCOWX_HDR_IMAGE_SIZE, 8, 1, QCOW2_HDR_CRYPT, qcow2GetBackingStore, QCOWX_HDR_IMAGE_SIZE, 8, 1, QCOW2_HDR_CRYPT, qcow2GetBackingStore,
}, },
[VIR_STORAGE_FILE_QED] = {
/* http://wiki.qemu.org/Features/QED */
"QED\0", NULL,
LV_LITTLE_ENDIAN, -1, -1,
QED_HDR_IMAGE_SIZE, 8, 1, -1, NULL,
},
[VIR_STORAGE_FILE_VMDK] = { [VIR_STORAGE_FILE_VMDK] = {
"KDMV", NULL, "KDMV", NULL,
LV_LITTLE_ENDIAN, 4, 1, LV_LITTLE_ENDIAN, 4, 1,
......
...@@ -38,6 +38,7 @@ enum virStorageFileFormat { ...@@ -38,6 +38,7 @@ enum virStorageFileFormat {
VIR_STORAGE_FILE_ISO, VIR_STORAGE_FILE_ISO,
VIR_STORAGE_FILE_QCOW, VIR_STORAGE_FILE_QCOW,
VIR_STORAGE_FILE_QCOW2, VIR_STORAGE_FILE_QCOW2,
VIR_STORAGE_FILE_QED,
VIR_STORAGE_FILE_VMDK, VIR_STORAGE_FILE_VMDK,
VIR_STORAGE_FILE_VPC, VIR_STORAGE_FILE_VPC,
VIR_STORAGE_FILE_LAST, VIR_STORAGE_FILE_LAST,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册