Again, most likely a bad merge.
Signed-off-by: Anthony Liguori <[EMAIL PROTECTED]>
diff --git a/qemu/block-vmdk.c b/qemu/block-vmdk.c
index 67dd2f1..843bf86 100644
--- a/qemu/block-vmdk.c
+++ b/qemu/block-vmdk.c
@@ -93,6 +93,7 @@ typedef struct ActiveBDRVState{
static ActiveBDRVState activeBDRV;
+
static int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename)
{
uint32_t magic;
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
