diff --git a/block/bochs.c b/block/bochs.c
index 2f010ab40a..ff9d48162e 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -83,8 +83,9 @@ static int bochs_probe(const uint8_t *buf, int buf_size, const char *filename)
 {
     const struct bochs_header *bochs = (const void *)buf;

-    if (buf_size < HEADER_SIZE)
+    if (buf_size < HEADER_SIZE) {
         return 0;
+    }

     if (!strcmp(bochs->magic, HEADER_MAGIC) &&
         !strcmp(bochs->type, REDOLOG_TYPE) &&
@@ -156,8 +157,9 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
         goto fail;
     }

-    for (i = 0; i < s->catalog_size; i++)
+    for (i = 0; i < s->catalog_size; i++) {
         le32_to_cpus(&s->catalog_bitmap[i]);
+    }

     s->data_offset = le32_to_cpu(bochs.header) + (s->catalog_size * 4);
diff --git a/block/commit.c b/block/commit.c
index 1e85c306cc..727037a5d0 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -439,8 +439,9 @@ int bdrv_commit(BlockDriverState *bs)
     uint8_t *buf = NULL;
     Error *local_err = NULL;

-    if (!drv)
+    if (!drv) {
         return -ENOMEDIUM;
+    }

     backing_file_bs = bdrv_cow_bs(bs);
diff --git a/block/curl.c b/block/curl.c
index 4f907c47be..d2d8d5d94b 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -282,15 +281,17 @@ static bool curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len,
     uint64_t clamped_end = MIN(end, s->len);
     uint64_t clamped_len = clamped_end - start;

-        if (!state->orig_buf)
+        if (!state->orig_buf) {
             continue;
-        if (!state->buf_off)
+        }
+        if (!state->buf_off) {
             continue;
+        }

         // Does the existing buffer cover our section?
         if ((start >= state->buf_start) &&
@@ -344,8 +345,9 @@ static void curl_multi_check_completion(BDRVCURLState *s)
         msg = curl_multi_info_read(s->multi, &msgs_in_queue);

         /* Quit when there are no more completions */
-        if (!msg)
+        if (!msg) {
             break;
+        }

         if (msg->msg == CURLMSG_DONE) {
             int i;
@@ -538,8 +540,9 @@ static void curl_clean_state(CURLState *s)
         assert(!s->acb[j]);
     }

-    if (s->s->multi)
+    if (s->s->multi) {
         curl_multi_remove_handle(s->s->multi, s->curl);
+    }

     while (!QLIST_EMPTY(&s->sockets)) {
         CURLSocket *socket = QLIST_FIRST(&s->sockets);
@@ -791,8 +794,9 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
     curl_easy_setopt(state->curl, CURLOPT_HEADERFUNCTION,
                      curl_header_cb);
     curl_easy_setopt(state->curl, CURLOPT_HEADERDATA, s);
-    if (curl_easy_perform(state->curl))
+    if (curl_easy_perform(state->curl)) {
         goto out;
+    }
     if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) {
         goto out;
     }
diff --git a/block/file-posix.c b/block/file-posix.c
index c63926d592..7b9990e02a 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -1978,8 +1978,9 @@ static int coroutine_fn raw_co_prw(BlockDriverState *bs, uint64_t offset,
     BDRVRawState *s = bs->opaque;
     RawPosixAIOData acb;

-    if (fd_open(bs) < 0)
+    if (fd_open(bs) < 0) {
         return -EIO;
+    }

     /*
      * When using O_DIRECT, the request must be aligned to be able to use
@@ -2206,17 +2207,20 @@ static int64_t raw_getlength(BlockDriverState *bs)
     int fd = s->fd;
     struct stat st;

-    if (fstat(fd, &st))
+    if (fstat(fd, &st)) {
         return -errno;
+    }
     if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
         struct disklabel dl;

-        if (ioctl(fd, DIOCGDINFO, &dl))
+        if (ioctl(fd, DIOCGDINFO, &dl)) {
             return -errno;
+        }
         return (uint64_t)dl.d_secsize *
             dl.d_partitions[DISKPART(st.st_rdev)].p_size;
-    } else
+    } else {
         return st.st_size;
+    }
 }
 #elif defined(__NetBSD__)
 static int64_t raw_getlength(BlockDriverState *bs)
@@ -2225,8 +2229,9 @@ static int64_t raw_getlength(BlockDriverState *bs)
     int fd = s->fd;
     struct stat st;

-    if (fstat(fd, &st))
+    if (fstat(fd, &st)) {
         return -errno;
+    }
     if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
         struct dkwedge_info dkw;

@@ -2235,13 +2240,15 @@ static int64_t raw_getlength(BlockDriverState *bs)
         } else {
             struct disklabel dl;

-            if (ioctl(fd, DIOCGDINFO, &dl))
+            if (ioctl(fd, DIOCGDINFO, &dl)) {
                 return -errno;
+            }
             return (uint64_t)dl.d_secsize *
                 dl.d_partitions[DISKPART(st.st_rdev)].p_size;
         }
-    } else
+    } else {
         return st.st_size;
+    }
 }
 #elif defined(__sun__)
 static int64_t raw_getlength(BlockDriverState *bs)
@@ -2281,16 +2288,17 @@ static int64_t raw_getlength(BlockDriverState *bs)
     ret = fd_open(bs);
-    if (ret < 0)
+    if (ret < 0) {
         return ret;
+    }
@@ -2298,11 +2306,12 @@ again:
         if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
 #elif defined(DIOCGPART)
         {
-                struct partinfo pi;
-                if (ioctl(fd, DIOCGPART, &pi) == 0)
-                        size = pi.media_size;
-                else
-                        size = 0;
+            struct partinfo pi;
+            if (ioctl(fd, DIOCGPART, &pi) == 0) {
+                size = pi.media_size;
+            } else {
+                size = 0;
+            }
         }
         if (size == 0)
 #endif
@@ -2328,11 +2337,12 @@ again:
         }
 #endif
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
         switch(s->type) {
         case FTYPE_CD:
             /* XXX FreeBSD acd returns UINT_MAX sectors for an empty drive */
-            if (size == 2048LL * (unsigned)-1)
+            if (size == 2048LL * (unsigned)-1) {
                 size = 0;
+            }
             /* XXX no disc?  maybe we need to reopen... */
             if (size <= 0 && !reopened && cdrom_reopen(bs) >= 0) {
                 reopened = 1;
diff --git a/block/file-win32.c b/block/file-win32.c
index 2642088bd6..e3cca0fede 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -175,8 +175,9 @@ int qemu_ftruncate64(int fd, int64_t length)
     HANDLE h;
     BOOL res;

-    if ((GetVersion() & 0x80000000UL) && (length >> 32) != 0)
+    if ((GetVersion() & 0x80000000UL) && (length >> 32) != 0) {
         return -1;
+    }

     h = (HANDLE)_get_osfhandle(fd);
@@ -530,15 +531,17 @@ static int64_t raw_getlength(BlockDriverState *bs)
     DWORD count;
     BOOL status;

-    switch(s->type) {
+    switch (s->type) {
     case FTYPE_FILE:
-        l.LowPart = GetFileSize(s->hfile, (PDWORD)&l.HighPart);
-        if (l.LowPart == 0xffffffffUL && GetLastError() != NO_ERROR)
+        l.LowPart = GetFileSize(s->hfile, (PDWORD) & l.HighPart);
+        if (l.LowPart == 0xffffffffUL && GetLastError() != NO_ERROR) {
             return -EIO;
+        }
         break;
     case FTYPE_CD:
-        if (!GetDiskFreeSpaceEx(s->drive_path, &available, &total, &total_free))
+        if (!GetDiskFreeSpaceEx(s->drive_path, &available, &total, &total_free)) {
             return -EIO;
+        }
         l.QuadPart = total.QuadPart;
         break;
     case FTYPE_HARDDISK:
@@ -702,8 +705,9 @@ static int find_device_type(BlockDriverState *bs, const char *filename)

     if (strstart(filename, "\\\\.\\", &p) ||
         strstart(filename, "//./", &p)) {
-        if (stristart(p, "PhysicalDrive", NULL))
+        if (stristart(p, "PhysicalDrive", NULL)) {
             return FTYPE_HARDDISK;
+        }
         snprintf(s->drive_path, sizeof(s->drive_path), "%c:\\", p[0]);
         type = GetDriveType(s->drive_path);
         switch (type) {
diff --git a/block/qcow2.c b/block/qcow2.c
index b6cb4db8bb..2a06d70f2f 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -220,8 +220,9 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset,

 #ifdef DEBUG_EXT
         /* Sanity check */
-        if (offset > s->cluster_size)
+        if (offset > s->cluster_size) {
             printf("qcow2_read_extension: suspicious offset %lu\n", offset);
+        }

         printf("attempting to read extended header in offset %lu\n", offset);
 #endif
