|
 |
397dc2 |
From 606da680fb4c7ee0f8a7ecc76057592433ea6ac9 Mon Sep 17 00:00:00 2001
|
|
|
397dc2 |
Message-Id: <606da680fb4c7ee0f8a7ecc76057592433ea6ac9@dist-git>
|
|
|
397dc2 |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
397dc2 |
Date: Fri, 2 Oct 2020 13:39:12 +0200
|
|
|
397dc2 |
Subject: [PATCH] virDomainNetFindIdx: add support for CCW addresses
|
|
|
397dc2 |
MIME-Version: 1.0
|
|
|
397dc2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
397dc2 |
Content-Transfer-Encoding: 8bit
|
|
|
397dc2 |
|
|
|
397dc2 |
Allow to match with CCW addresses in addition to PCI addresses
|
|
|
397dc2 |
(and MAC addresses).
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
397dc2 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
397dc2 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
397dc2 |
(cherry picked from commit 2fefbd03ab09f32b1b15d093096fa44870817751)
|
|
|
397dc2 |
|
|
|
397dc2 |
https://bugzilla.redhat.com/show_bug.cgi?id=1837495
|
|
|
397dc2 |
|
|
|
397dc2 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
397dc2 |
Message-Id: <a53fc421152b209c5a7fe69d4d5714a2f35077a8.1601638699.git.jtomko@redhat.com>
|
|
|
397dc2 |
Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
397dc2 |
---
|
|
|
397dc2 |
src/conf/device_conf.c | 12 ++++++++++++
|
|
|
397dc2 |
src/conf/device_conf.h | 3 +++
|
|
|
397dc2 |
src/conf/domain_conf.c | 23 ++++++++++++++++++++++-
|
|
|
397dc2 |
src/libvirt_private.syms | 1 +
|
|
|
397dc2 |
4 files changed, 38 insertions(+), 1 deletion(-)
|
|
|
397dc2 |
|
|
|
397dc2 |
diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
|
|
|
397dc2 |
index 4dbd5c1ac9..9e96d08394 100644
|
|
|
397dc2 |
--- a/src/conf/device_conf.c
|
|
|
397dc2 |
+++ b/src/conf/device_conf.c
|
|
|
397dc2 |
@@ -370,6 +370,18 @@ virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
|
|
|
397dc2 |
return ret;
|
|
|
397dc2 |
}
|
|
|
397dc2 |
|
|
|
397dc2 |
+bool
|
|
|
397dc2 |
+virDomainDeviceCCWAddressEqual(virDomainDeviceCCWAddressPtr addr1,
|
|
|
397dc2 |
+ virDomainDeviceCCWAddressPtr addr2)
|
|
|
397dc2 |
+{
|
|
|
397dc2 |
+ if (addr1->cssid == addr2->cssid &&
|
|
|
397dc2 |
+ addr1->ssid == addr2->ssid &&
|
|
|
397dc2 |
+ addr1->devno == addr2->devno) {
|
|
|
397dc2 |
+ return true;
|
|
|
397dc2 |
+ }
|
|
|
397dc2 |
+ return false;
|
|
|
397dc2 |
+}
|
|
|
397dc2 |
+
|
|
|
397dc2 |
int
|
|
|
397dc2 |
virDomainDeviceDriveAddressParseXML(xmlNodePtr node,
|
|
|
397dc2 |
virDomainDeviceDriveAddressPtr addr)
|
|
|
397dc2 |
diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
|
|
|
397dc2 |
index e091d7cfe2..7a8227e743 100644
|
|
|
397dc2 |
--- a/src/conf/device_conf.h
|
|
|
397dc2 |
+++ b/src/conf/device_conf.h
|
|
|
397dc2 |
@@ -208,6 +208,9 @@ void virPCIDeviceAddressFormat(virBufferPtr buf,
|
|
|
397dc2 |
bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr);
|
|
|
397dc2 |
int virDomainDeviceCCWAddressParseXML(xmlNodePtr node,
|
|
|
397dc2 |
virDomainDeviceCCWAddressPtr addr);
|
|
|
397dc2 |
+bool virDomainDeviceCCWAddressEqual(virDomainDeviceCCWAddressPtr addr1,
|
|
|
397dc2 |
+ virDomainDeviceCCWAddressPtr addr2);
|
|
|
397dc2 |
+#define VIR_CCW_DEVICE_ADDRESS_FMT "%x.%x.%04x"
|
|
|
397dc2 |
|
|
|
397dc2 |
int virDomainDeviceDriveAddressParseXML(xmlNodePtr node,
|
|
|
397dc2 |
virDomainDeviceDriveAddressPtr addr);
|
|
|
397dc2 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
397dc2 |
index 60962ee7c1..306926b64c 100644
|
|
|
397dc2 |
--- a/src/conf/domain_conf.c
|
|
|
397dc2 |
+++ b/src/conf/domain_conf.c
|
|
|
397dc2 |
@@ -17385,6 +17385,8 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
|
|
|
397dc2 |
bool MACAddrSpecified = !net->mac_generated;
|
|
|
397dc2 |
bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info,
|
|
|
397dc2 |
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI);
|
|
|
397dc2 |
+ bool CCWAddrSpecified = virDomainDeviceAddressIsValid(&net->info,
|
|
|
397dc2 |
+ VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW);
|
|
|
397dc2 |
|
|
|
397dc2 |
for (i = 0; i < def->nnets; i++) {
|
|
|
397dc2 |
if (MACAddrSpecified &&
|
|
|
397dc2 |
@@ -17396,9 +17398,14 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
|
|
|
397dc2 |
&net->info.addr.pci))
|
|
|
397dc2 |
continue;
|
|
|
397dc2 |
|
|
|
397dc2 |
+ if (CCWAddrSpecified &&
|
|
|
397dc2 |
+ !virDomainDeviceCCWAddressEqual(&def->nets[i]->info.addr.ccw,
|
|
|
397dc2 |
+ &net->info.addr.ccw))
|
|
|
397dc2 |
+ continue;
|
|
|
397dc2 |
+
|
|
|
397dc2 |
if (matchidx >= 0) {
|
|
|
397dc2 |
/* there were multiple matches on mac address, and no
|
|
|
397dc2 |
- * qualifying guest-side PCI address was given, so we must
|
|
|
397dc2 |
+ * qualifying guest-side PCI/CCW address was given, so we must
|
|
|
397dc2 |
* fail (NB: a USB address isn't adequate, since it may
|
|
|
397dc2 |
* specify only vendor and product ID, and there may be
|
|
|
397dc2 |
* multiples of those.
|
|
|
397dc2 |
@@ -17428,6 +17435,14 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
|
|
|
397dc2 |
net->info.addr.pci.bus,
|
|
|
397dc2 |
net->info.addr.pci.slot,
|
|
|
397dc2 |
net->info.addr.pci.function);
|
|
|
397dc2 |
+ } else if (MACAddrSpecified && CCWAddrSpecified) {
|
|
|
397dc2 |
+ virReportError(VIR_ERR_DEVICE_MISSING,
|
|
|
397dc2 |
+ _("no device matching MAC address %s found on "
|
|
|
397dc2 |
+ VIR_CCW_DEVICE_ADDRESS_FMT),
|
|
|
397dc2 |
+ virMacAddrFormat(&net->mac, mac),
|
|
|
397dc2 |
+ net->info.addr.ccw.cssid,
|
|
|
397dc2 |
+ net->info.addr.ccw.ssid,
|
|
|
397dc2 |
+ net->info.addr.ccw.devno);
|
|
|
397dc2 |
} else if (PCIAddrSpecified) {
|
|
|
397dc2 |
virReportError(VIR_ERR_DEVICE_MISSING,
|
|
|
397dc2 |
_("no device found on " VIR_PCI_DEVICE_ADDRESS_FMT),
|
|
|
397dc2 |
@@ -17435,6 +17450,12 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net)
|
|
|
397dc2 |
net->info.addr.pci.bus,
|
|
|
397dc2 |
net->info.addr.pci.slot,
|
|
|
397dc2 |
net->info.addr.pci.function);
|
|
|
397dc2 |
+ } else if (CCWAddrSpecified) {
|
|
|
397dc2 |
+ virReportError(VIR_ERR_DEVICE_MISSING,
|
|
|
397dc2 |
+ _("no device found on " VIR_CCW_DEVICE_ADDRESS_FMT),
|
|
|
397dc2 |
+ net->info.addr.ccw.cssid,
|
|
|
397dc2 |
+ net->info.addr.ccw.ssid,
|
|
|
397dc2 |
+ net->info.addr.ccw.devno);
|
|
|
397dc2 |
} else if (MACAddrSpecified) {
|
|
|
397dc2 |
virReportError(VIR_ERR_DEVICE_MISSING,
|
|
|
397dc2 |
_("no device matching MAC address %s found"),
|
|
|
397dc2 |
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
|
397dc2 |
index 9e290c7bdf..130828706a 100644
|
|
|
397dc2 |
--- a/src/libvirt_private.syms
|
|
|
397dc2 |
+++ b/src/libvirt_private.syms
|
|
|
397dc2 |
@@ -128,6 +128,7 @@ virDeviceInfoPCIAddressIsWanted;
|
|
|
397dc2 |
virDomainDeviceAddressIsValid;
|
|
|
397dc2 |
virDomainDeviceAddressTypeToString;
|
|
|
397dc2 |
virDomainDeviceCcidAddressParseXML;
|
|
|
397dc2 |
+virDomainDeviceCCWAddressEqual;
|
|
|
397dc2 |
virDomainDeviceCCWAddressIsValid;
|
|
|
397dc2 |
virDomainDeviceCCWAddressParseXML;
|
|
|
397dc2 |
virDomainDeviceDriveAddressParseXML;
|
|
|
397dc2 |
--
|
|
|
397dc2 |
2.28.0
|
|
|
397dc2 |
|