|
 |
e99ab7 |
From d4a11d8f8a0b7990c9d349da2306c7f4103a43e0 Mon Sep 17 00:00:00 2001
|
|
|
e99ab7 |
From: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
|
|
|
e99ab7 |
Date: Mon, 31 May 2021 21:54:26 +0200
|
|
|
e99ab7 |
Subject: [PATCH] virt-xml: add support for mediated devices
|
|
|
e99ab7 |
|
|
|
e99ab7 |
Provide support to add/remove MDEV in a guest domain, which is in
|
|
|
e99ab7 |
shut-off or running state (hotplug/unplug). Also support update of
|
|
|
e99ab7 |
already existing MDEV device, when the guest domain is in shut-off
|
|
|
e99ab7 |
state. Please note that libvirt does not support update of MDEV
|
|
|
e99ab7 |
device, when the guest domain is in running state.
|
|
|
e99ab7 |
|
|
|
e99ab7 |
Reviewed-by: Cole Robinson <crobinso@redhat.com>
|
|
|
e99ab7 |
Signed-off-by: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
|
|
|
e99ab7 |
|
|
|
e99ab7 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1995131
|
|
|
e99ab7 |
|
|
|
e99ab7 |
(cherry picked from commit 9363e1e692bb0d01184ecc7991d61c95542f690b)
|
|
|
e99ab7 |
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
|
|
|
e99ab7 |
---
|
|
|
e99ab7 |
virtinst/nodedev.py | 20 ++++++++++++++++++++
|
|
|
e99ab7 |
1 file changed, 20 insertions(+)
|
|
|
e99ab7 |
|
|
|
e99ab7 |
diff --git a/virtinst/nodedev.py b/virtinst/nodedev.py
|
|
|
e99ab7 |
index 97841794..f54a311c 100644
|
|
|
e99ab7 |
--- a/virtinst/nodedev.py
|
|
|
e99ab7 |
+++ b/virtinst/nodedev.py
|
|
|
e99ab7 |
@@ -5,6 +5,7 @@
|
|
|
e99ab7 |
# See the COPYING file in the top-level directory.
|
|
|
e99ab7 |
|
|
|
e99ab7 |
import os
|
|
|
e99ab7 |
+import uuid
|
|
|
e99ab7 |
|
|
|
e99ab7 |
from .logger import log
|
|
|
e99ab7 |
from .xmlbuilder import XMLBuilder, XMLProperty, XMLChildProperty
|
|
|
e99ab7 |
@@ -25,6 +26,16 @@ def _compare_int(nodedev_val, hostdev_val):
|
|
|
e99ab7 |
return (nodedev_val == hostdev_val or hostdev_val == -1)
|
|
|
e99ab7 |
|
|
|
e99ab7 |
|
|
|
e99ab7 |
+def _compare_uuid(nodedev_val, hostdev_val):
|
|
|
e99ab7 |
+ try:
|
|
|
e99ab7 |
+ nodedev_val = uuid.UUID(nodedev_val)
|
|
|
e99ab7 |
+ hostdev_val = uuid.UUID(hostdev_val)
|
|
|
e99ab7 |
+ except Exception: # pragma: no cover
|
|
|
e99ab7 |
+ return -1
|
|
|
e99ab7 |
+
|
|
|
e99ab7 |
+ return (nodedev_val == hostdev_val)
|
|
|
e99ab7 |
+
|
|
|
e99ab7 |
+
|
|
|
e99ab7 |
class DevNode(XMLBuilder):
|
|
|
e99ab7 |
XML_NAME = "devnode"
|
|
|
e99ab7 |
|
|
|
e99ab7 |
@@ -82,6 +93,9 @@ class NodeDevice(XMLBuilder):
|
|
|
e99ab7 |
parent = XMLProperty("./parent")
|
|
|
e99ab7 |
device_type = XMLProperty("./capability/@type")
|
|
|
e99ab7 |
|
|
|
e99ab7 |
+ def get_mdev_uuid(self):
|
|
|
e99ab7 |
+ return self.name[5:].replace('_', '-')
|
|
|
e99ab7 |
+
|
|
|
e99ab7 |
def compare_to_hostdev(self, hostdev):
|
|
|
e99ab7 |
if self.device_type == "pci":
|
|
|
e99ab7 |
if hostdev.type != "pci":
|
|
|
e99ab7 |
@@ -101,6 +115,12 @@ class NodeDevice(XMLBuilder):
|
|
|
e99ab7 |
_compare_int(self.bus, hostdev.bus) and
|
|
|
e99ab7 |
_compare_int(self.device, hostdev.device))
|
|
|
e99ab7 |
|
|
|
e99ab7 |
+ if self.device_type == "mdev":
|
|
|
e99ab7 |
+ if hostdev.type != "mdev":
|
|
|
e99ab7 |
+ return False
|
|
|
e99ab7 |
+
|
|
|
e99ab7 |
+ return _compare_uuid(self.get_mdev_uuid(), hostdev.uuid)
|
|
|
e99ab7 |
+
|
|
|
e99ab7 |
return False
|
|
|
e99ab7 |
|
|
|
e99ab7 |
|
|
|
e99ab7 |
--
|
|
|
e99ab7 |
2.31.1
|
|
|
e99ab7 |
|