|
 |
99cbc7 |
From a69ce7395989807eefad14ff7c66540d621bd303 Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <a69ce7395989807eefad14ff7c66540d621bd303@dist-git>
|
|
|
99cbc7 |
From: Laine Stump <laine@laine.org>
|
|
|
99cbc7 |
Date: Thu, 11 Apr 2019 15:14:49 -0400
|
|
|
99cbc7 |
Subject: [PATCH] qemu_hotplug: new function qemuDomainRemoveAuditDevice()
|
|
|
99cbc7 |
|
|
|
99cbc7 |
This function can be called with a virDomainDevicePtr and whether or
|
|
|
99cbc7 |
not the removal was successful, and it will call the appropriate
|
|
|
99cbc7 |
virDomainAudit*() function with the appropriate args for whatever type
|
|
|
99cbc7 |
of device it's given (or do nothing, if that's appropriate). This
|
|
|
99cbc7 |
permits generalizing some code that currently has a separate copy for
|
|
|
99cbc7 |
each type of device.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
NB: Although the function initially will be called only with
|
|
|
99cbc7 |
success=false, that has been made an argument so that in the future
|
|
|
99cbc7 |
(when the qemuDomainRemove*Device() functions have had their common
|
|
|
99cbc7 |
functionality consolidated into qemuDomainRemoveDevice()), this new
|
|
|
99cbc7 |
common code can call qemuDomainRemoveAuditDevice() for all types.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Laine Stump <laine@laine.org>
|
|
|
99cbc7 |
ACKed-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit b914e0eca385b52ede39b1b046bc9bf7a4fbbc2a)
|
|
|
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-38-laine@redhat.com>
|
|
|
99cbc7 |
Acked-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_hotplug.c | 55 +++++++++++++++++++++++++++++++++++++++++
|
|
|
99cbc7 |
1 file changed, 55 insertions(+)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
index dea881fd0b..482111c46e 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_hotplug.c
|
|
|
99cbc7 |
@@ -4650,6 +4650,61 @@ qemuDomainRemoveRedirdevDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
}
|
|
|
99cbc7 |
|
|
|
99cbc7 |
|
|
|
99cbc7 |
+static void ATTRIBUTE_UNUSED
|
|
|
99cbc7 |
+qemuDomainRemoveAuditDevice(virDomainObjPtr vm,
|
|
|
99cbc7 |
+ virDomainDeviceDefPtr detach,
|
|
|
99cbc7 |
+ bool success)
|
|
|
99cbc7 |
+{
|
|
|
99cbc7 |
+ switch ((virDomainDeviceType)detach->type) {
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_DISK:
|
|
|
99cbc7 |
+ virDomainAuditDisk(vm, detach->data.disk->src, NULL, "detach", success);
|
|
|
99cbc7 |
+ break;
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_NET:
|
|
|
99cbc7 |
+ virDomainAuditNet(vm, detach->data.net, NULL, "detach", success);
|
|
|
99cbc7 |
+ break;
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_HOSTDEV:
|
|
|
99cbc7 |
+ virDomainAuditHostdev(vm, detach->data.hostdev, "detach", success);
|
|
|
99cbc7 |
+ break;
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_INPUT:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_CHR:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_RNG:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_MEMORY:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_SHMEM:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_REDIRDEV:
|
|
|
99cbc7 |
+ /*
|
|
|
99cbc7 |
+ * These devices are supposed to be audited, but current code
|
|
|
99cbc7 |
+ * doesn't audit on failure to remove the device.
|
|
|
99cbc7 |
+ */
|
|
|
99cbc7 |
+ break;
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_LEASE:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_CONTROLLER:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_WATCHDOG:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_VSOCK:
|
|
|
99cbc7 |
+ /* These devices don't have associated audit logs */
|
|
|
99cbc7 |
+ break;
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_FS:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_SOUND:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_VIDEO:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_GRAPHICS:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_HUB:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_SMARTCARD:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_MEMBALLOON:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_NVRAM:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_NONE:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_TPM:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_PANIC:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_IOMMU:
|
|
|
99cbc7 |
+ case VIR_DOMAIN_DEVICE_LAST:
|
|
|
99cbc7 |
+ /* libvirt doesn't yet support detaching these devices */
|
|
|
99cbc7 |
+ break;
|
|
|
99cbc7 |
+ }
|
|
|
99cbc7 |
+}
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
int
|
|
|
99cbc7 |
qemuDomainRemoveDevice(virQEMUDriverPtr driver,
|
|
|
99cbc7 |
virDomainObjPtr vm,
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.21.0
|
|
|
99cbc7 |
|