yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-blockdev-fix-coding-style-issues-in-drive_backup_pre.patch

902636
From d56b53cd75c4146eae7a06d1cc30ab823a9bde93 Mon Sep 17 00:00:00 2001
902636
From: Sergio Lopez Pascual <slp@redhat.com>
902636
Date: Fri, 7 Feb 2020 11:27:41 +0000
902636
Subject: [PATCH 08/18] blockdev: fix coding style issues in
902636
 drive_backup_prepare
902636
MIME-Version: 1.0
902636
Content-Type: text/plain; charset=UTF-8
902636
Content-Transfer-Encoding: 8bit
902636
902636
RH-Author: Sergio Lopez Pascual <slp@redhat.com>
902636
Message-id: <20200207112749.25073-2-slp@redhat.com>
902636
Patchwork-id: 93754
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 1/9] blockdev: fix coding style issues in drive_backup_prepare
902636
Bugzilla: 1745606 1746217 1773517 1779036 1782111 1782175 1783965
902636
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
902636
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
902636
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
902636
RH-Acked-by: Max Reitz <mreitz@redhat.com>
902636
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
902636
902636
Fix a couple of minor coding style issues in drive_backup_prepare.
902636
902636
Signed-off-by: Sergio Lopez <slp@redhat.com>
902636
Reviewed-by: Max Reitz <mreitz@redhat.com>
902636
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
902636
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
902636
(cherry picked from commit 471ded690e19689018535e3f48480507ed073e22)
902636
Signed-off-by: Sergio Lopez <slp@redhat.com>
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 blockdev.c | 8 +++++---
902636
 1 file changed, 5 insertions(+), 3 deletions(-)
902636
902636
diff --git a/blockdev.c b/blockdev.c
902636
index 8e029e9..553e315 100644
902636
--- a/blockdev.c
902636
+++ b/blockdev.c
902636
@@ -3620,7 +3620,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
902636
 
902636
     if (!backup->has_format) {
902636
         backup->format = backup->mode == NEW_IMAGE_MODE_EXISTING ?
902636
-                         NULL : (char*) bs->drv->format_name;
902636
+                         NULL : (char *) bs->drv->format_name;
902636
     }
902636
 
902636
     /* Early check to avoid creating target */
902636
@@ -3630,8 +3630,10 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
902636
 
902636
     flags = bs->open_flags | BDRV_O_RDWR;
902636
 
902636
-    /* See if we have a backing HD we can use to create our new image
902636
-     * on top of. */
902636
+    /*
902636
+     * See if we have a backing HD we can use to create our new image
902636
+     * on top of.
902636
+     */
902636
     if (backup->sync == MIRROR_SYNC_MODE_TOP) {
902636
         source = backing_bs(bs);
902636
         if (!source) {
902636
-- 
902636
1.8.3.1
902636