Merge remote-tracking branch 'remotes/xtensa/tags/20190122-xtensa' into staging

[qemu.git] / block / vpc.c

diff --git a/block/vpc.c b/block/vpc.c
index 984187cadd0b445f08cf6c45831bec6b8f97ba37..d886465b7e29f8e732d5a05454f6eadc11e86cdb 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -187,7 +187,7 @@ static uint32_t vpc_checksum(uint8_t* buf, size_t size)
 static int vpc_probe(const uint8_t *buf, int buf_size, const char *filename)
 {
     if (buf_size >= 8 && !strncmp((char *)buf, "conectix", 8))
-       return 100;
+        return 100;
     return 0;
 }
 
@@ -456,10 +456,12 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     qemu_co_mutex_init(&s->lock);
+    qemu_opts_del(opts);
 
     return 0;
 
 fail:
+    qemu_opts_del(opts);
     qemu_vfree(s->pagetable);
 #ifdef CACHE
     g_free(s->pageentry_u8);