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