|
 |
99cbc7 |
From 9ab3c57972a8a9f762a3905216478e576f0966cf Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <9ab3c57972a8a9f762a3905216478e576f0966cf@dist-git>
|
|
|
99cbc7 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Date: Thu, 11 Apr 2019 15:14:21 -0400
|
|
|
99cbc7 |
Subject: [PATCH] qemu_hotplug: Don't build device string in
|
|
|
99cbc7 |
qemuDomainDetachChrDevice
|
|
|
99cbc7 |
|
|
|
99cbc7 |
This is basically an old artefact from 24b0821926e when the idea
|
|
|
99cbc7 |
was:
|
|
|
99cbc7 |
|
|
|
99cbc7 |
1) Build device string only to see if chardev has any -device
|
|
|
99cbc7 |
associated with it and thus if device_del is needed
|
|
|
99cbc7 |
2) Detach chardev using chardev_del
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Now, that DEVICE and DEVICE_DELETED capabilities are assumed for
|
|
|
99cbc7 |
every domain 1) does not make sense anymore.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 0c17685760a3ec8bf06c793d47d82dd51428451a)
|
|
|
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-10-laine@redhat.com>
|
|
|
99cbc7 |
Acked-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_hotplug.c | 7 +------
|
|
|
99cbc7 |
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
index 43dec329b6..d4444bbb5d 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
@@ -5592,7 +5592,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
qemuDomainObjPrivatePtr priv = vm->privateData;
|
|
|
99cbc7 |
virDomainDefPtr vmdef = vm->def;
|
|
|
99cbc7 |
virDomainChrDefPtr tmpChr;
|
|
|
99cbc7 |
- char *devstr = NULL;
|
|
|
99cbc7 |
bool guestfwd = false;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
if (!(tmpChr = virDomainChrFind(vmdef, chr))) {
|
|
|
99cbc7 |
@@ -5613,9 +5612,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
|
|
|
99cbc7 |
sa_assert(tmpChr->info.alias);
|
|
|
99cbc7 |
|
|
|
99cbc7 |
- if (qemuBuildChrDeviceStr(&devstr, vmdef, tmpChr, priv->qemuCaps) < 0)
|
|
|
99cbc7 |
- goto cleanup;
|
|
|
99cbc7 |
-
|
|
|
99cbc7 |
if (!async && !guestfwd)
|
|
|
99cbc7 |
qemuDomainMarkDeviceForRemoval(vm, &tmpChr->info);
|
|
|
99cbc7 |
|
|
|
99cbc7 |
@@ -5626,7 +5622,7 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
} else {
|
|
|
99cbc7 |
- if (devstr && qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) {
|
|
|
99cbc7 |
+ if (qemuMonitorDelDevice(priv->mon, tmpChr->info.alias) < 0) {
|
|
|
99cbc7 |
ignore_value(qemuDomainObjExitMonitor(driver, vm));
|
|
|
99cbc7 |
goto cleanup;
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
@@ -5646,7 +5642,6 @@ int qemuDomainDetachChrDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
cleanup:
|
|
|
99cbc7 |
if (!async)
|
|
|
99cbc7 |
qemuDomainResetDeviceRemoval(vm);
|
|
|
99cbc7 |
- VIR_FREE(devstr);
|
|
|
99cbc7 |
return ret;
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|