Blame SOURCES/libvirt-qemu-Remove-unnecessary-label-and-its-only-reference.patch
|
 |
6ae9ed |
From 9dc18e55f33d5148c5a08510dcf3a64ce21a910e Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <9dc18e55f33d5148c5a08510dcf3a64ce21a910e@dist-git>
|
|
|
6ae9ed |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6ae9ed |
Date: Tue, 2 Aug 2016 13:32:34 +0200
|
|
|
6ae9ed |
Subject: [PATCH] qemu: Remove unnecessary label and its only reference
|
|
|
6ae9ed |
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1168453
|
|
|
6ae9ed |
|
|
|
6ae9ed |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6ae9ed |
(cherry picked from commit 779a4ea9066560b92b0df462b5a6d5c127c15920)
|
|
|
6ae9ed |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_domain.c | 8 ++------
|
|
|
6ae9ed |
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
6ae9ed |
index 383356d..c74033b 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_domain.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_domain.c
|
|
|
6ae9ed |
@@ -4114,7 +4114,6 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver,
|
|
|
6ae9ed |
virDomainObjPtr vm,
|
|
|
6ae9ed |
bool cold_boot)
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
- int ret = -1;
|
|
|
6ae9ed |
size_t i;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
VIR_DEBUG("Checking for disk presence");
|
|
|
6ae9ed |
@@ -4141,13 +4140,10 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver,
|
|
|
6ae9ed |
if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= 0)
|
|
|
6ae9ed |
continue;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
- goto error;
|
|
|
6ae9ed |
+ return -1;
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
|
|
|
6ae9ed |
- ret = 0;
|
|
|
6ae9ed |
-
|
|
|
6ae9ed |
- error:
|
|
|
6ae9ed |
- return ret;
|
|
|
6ae9ed |
+ return 0;
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
|
|
|
6ae9ed |
/*
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|