|
 |
99cbc7 |
From a3a6757726ad16eb0bdb528c700f982f3145a483 Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <a3a6757726ad16eb0bdb528c700f982f3145a483@dist-git>
|
|
|
99cbc7 |
From: Laine Stump <laine@laine.org>
|
|
|
99cbc7 |
Date: Thu, 11 Apr 2019 15:14:48 -0400
|
|
|
99cbc7 |
Subject: [PATCH] qemu_hotplug: rename Chr and Lease Detach functions
|
|
|
99cbc7 |
|
|
|
99cbc7 |
qemuDomainDetachDeviceChr and qemuDomainDetachDeviceLease are more
|
|
|
99cbc7 |
consistent with each other.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Laine Stump <laine@laine.org>
|
|
|
99cbc7 |
ACKed-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit e1949c7045377e7b32f0f8ed7c76539b1b5d50da)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Partially-Resolves: https://bugzilla.redhat.com/1658198
|
|
|
99cbc7 |
Signed-off-by: Laine Stump <laine@redhat.com>
|
|
|
99cbc7 |
Signed-off-by: Laine Stump <laine@laine.org>
|
|
|
99cbc7 |
Message-Id: <20190411191453.24055-37-laine@redhat.com>
|
|
|
99cbc7 |
Acked-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_hotplug.c | 12 ++++++------
|
|
|
99cbc7 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
index 693b8878b5..dea881fd0b 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
@@ -5392,7 +5392,7 @@ qemuDomainDetachPrepNet(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static int
|
|
|
99cbc7 |
-qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
+qemuDomainDetachDeviceChr(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
virDomainObjPtr vm,
|
|
|
99cbc7 |
virDomainChrDefPtr chr,
|
|
|
99cbc7 |
bool async)
|
|
|
99cbc7 |
@@ -5636,9 +5636,9 @@ qemuDomainDetachPrepVsock(virDomainObjPtr vm,
|
|
|
99cbc7 |
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static int
|
|
|
99cbc7 |
-qemuDomainDetachLease(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
- virDomainObjPtr vm,
|
|
|
99cbc7 |
- virDomainLeaseDefPtr lease)
|
|
|
99cbc7 |
+qemuDomainDetachDeviceLease(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
+ virDomainObjPtr vm,
|
|
|
99cbc7 |
+ virDomainLeaseDefPtr lease)
|
|
|
99cbc7 |
{
|
|
|
99cbc7 |
virDomainLeaseDefPtr det_lease;
|
|
|
99cbc7 |
int idx;
|
|
|
99cbc7 |
@@ -5675,10 +5675,10 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
|
|
|
99cbc7 |
* Detach functions.
|
|
|
99cbc7 |
*/
|
|
|
99cbc7 |
case VIR_DOMAIN_DEVICE_LEASE:
|
|
|
99cbc7 |
- return qemuDomainDetachLease(driver, vm, match->data.lease);
|
|
|
99cbc7 |
+ return qemuDomainDetachDeviceLease(driver, vm, match->data.lease);
|
|
|
99cbc7 |
|
|
|
99cbc7 |
case VIR_DOMAIN_DEVICE_CHR:
|
|
|
99cbc7 |
- return qemuDomainDetachChrDevice(driver, vm, match->data.chr, async);
|
|
|
99cbc7 |
+ return qemuDomainDetachDeviceChr(driver, vm, match->data.chr, async);
|
|
|
99cbc7 |
|
|
|
99cbc7 |
/*
|
|
|
99cbc7 |
* All the other device types follow a very similar pattern -
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|