8:58 a.m.
hostdevs have a link back to the original network device. This is fairly
generic accepting any type of device, however, we don't intend to make
use of this approach in future. It can thus be specialized to network
devices.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/conf/domain_conf.c | 18 ++++++++----------
src/conf/domain_conf.h | 8 +++++++-
src/libxl/libxl_driver.c | 4 ++--
src/network/bridge_driver.c | 3 +--
src/qemu/qemu_command.c | 3 +--
src/qemu/qemu_domain_address.c | 4 ++--
src/qemu/qemu_driver.c | 2 +-
src/qemu/qemu_hotplug.c | 14 ++++++--------
src/qemu/qemu_hotplug.h | 2 +-
src/util/virhostdev.c | 17 ++++++++---------
10 files changed, 37 insertions(+), 38 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3320a03572..2181940144 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2614,7 +2614,7 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def)
/* If there is a parent device object, it will handle freeing
* def->info.
*/
- if (def->parent.type == VIR_DOMAIN_DEVICE_NONE)
+ if (!def->parent)
virDomainDeviceInfoFree(def->info);
switch (def->mode) {
@@ -2685,7 +2685,7 @@ void virDomainHostdevDefFree(virDomainHostdevDefPtr def)
/* If there is a parent device object, it will handle freeing
* the memory.
*/
- if (def->parent.type == VIR_DOMAIN_DEVICE_NONE)
+ if (!def->parent)
VIR_FREE(def);
}
@@ -5061,7 +5061,7 @@ virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED,
return 0;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
- dev->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE) {
+ dev->data.hostdev->parent) {
/* This hostdev is a child of a higher level device
* (e.g. interface), and thus already being counted on the
* list for the other device type.
@@ -5902,7 +5902,7 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def,
return 0;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
- dev->data.hostdev->parent.type == VIR_DOMAIN_DEVICE_NET) {
+ dev->data.hostdev->parent) {
/* This hostdev is a copy of some previous interface.
* Aliases are duplicated. */
return 0;
@@ -10842,8 +10842,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
} else if (actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
virDomainHostdevDefPtr hostdev = &actual->data.hostdev.def;
- hostdev->parent.type = VIR_DOMAIN_DEVICE_NET;
- hostdev->parent.data.net = parent;
+ hostdev->parent = parent;
hostdev->info = &parent->info;
/* The helper function expects type to already be found and
* passed in as a string, since it is in a different place in
@@ -11499,8 +11498,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
case VIR_DOMAIN_NET_TYPE_HOSTDEV:
hostdev = &def->data.hostdev.def;
- hostdev->parent.type = VIR_DOMAIN_DEVICE_NET;
- hostdev->parent.data.net = def;
+ hostdev->parent = def;
hostdev->info = &def->info;
/* The helper function expects type to already be found and
* passed in as a string, since it is in a different place in
@@ -28656,11 +28654,11 @@ virDomainDefFormatInternal(virDomainDefPtr def,
}
for (n = 0; n < def->nhostdevs; n++) {
- /* If parent.type != NONE, this is just a pointer to the
+ /* If parent != NONE, this is just a pointer to the
* hostdev in a higher-level device (e.g. virDomainNetDef),
* and will have already been formatted there.
*/
- if (def->hostdevs[n]->parent.type == VIR_DOMAIN_DEVICE_NONE &&
+ if (!def->hostdevs[n]->parent &&
virDomainHostdevDefFormat(buf, def->hostdevs[n], flags) < 0) {
goto error;
}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e611457314..829d7cd83e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -444,7 +444,13 @@ struct _virDomainHostdevCaps {
/* basic device for direct passthrough */
struct _virDomainHostdevDef {
- virDomainDeviceDef parent; /* higher level Def containing this */
+ /* If 'parent' is non-NULL it means this host dev was
+ * not originally present in the XML. It was copied from
+ * a network interface for convenience when handling
+ * hostdevs internally. This hostdev should never be
+ * visible to the user except as part of the interface
+ */
+ virDomainNetDefPtr parent;
int mode; /* enum virDomainHostdevMode */
int startupPolicy; /* enum virDomainStartupPolicy */
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index faebb40d31..1690400db6 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3921,9 +3921,9 @@ libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver,
/* If this is a network hostdev, we need to use the higher-level
* detach function so that mac address / virtualport are reset
*/
- if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET)
+ if (hostdev->parent)
ret = libxlDomainDetachNetDevice(driver, vm,
- hostdev->parent.data.net);
+ hostdev->parent);
else
ret = libxlDomainDetachHostDevice(driver, vm, hostdev);
break;
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index f3cdf40bfb..b5aac9350b 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -4570,8 +4570,7 @@ networkAllocateActualDevice(virNetworkPtr net,
netdef->name);
goto error;
}
- iface->data.network.actual->data.hostdev.def.parent.type =
VIR_DOMAIN_DEVICE_NET;
- iface->data.network.actual->data.hostdev.def.parent.data.net = iface;
+ iface->data.network.actual->data.hostdev.def.parent = iface;
iface->data.network.actual->data.hostdev.def.info = &iface->info;
iface->data.network.actual->data.hostdev.def.mode =
VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
iface->data.network.actual->data.hostdev.def.managed =
netdef->forward.managed ? 1 : 0;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 66a4a35184..8bce416d83 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5466,8 +5466,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
/* bootNet will be non-0 if boot order was set and no other
* net devices were encountered
*/
- if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET &&
- bootIndex == 0) {
+ if (hostdev->parent && bootIndex == 0) {
bootIndex = *bootHostdevNet;
*bootHostdevNet = 0;
}
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index bd6c4031e0..73d53e08a9 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -1436,7 +1436,7 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
if (!virDeviceInfoPCIAddressIsPresent(info) ||
((device->type == VIR_DOMAIN_DEVICE_HOSTDEV) &&
- (device->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE))) {
+ device->data.hostdev->parent)) {
/* If a hostdev has a parent, its info will be a part of the
* parent, and will have its address collected during the scan
* of the parent's device type.
@@ -1531,7 +1531,7 @@ qemuDomainCollectPCIAddressExtension(virDomainDefPtr def
ATTRIBUTE_UNUSED,
if (!virDeviceInfoPCIAddressExtensionIsPresent(info) ||
((device->type == VIR_DOMAIN_DEVICE_HOSTDEV) &&
- (device->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE))) {
+ device->data.hostdev->parent)) {
/* If a hostdev has a parent, its info will be a part of the
* parent, and will have its address collected during the scan
* of the parent's device type.
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ea316f61d1..b69db58a44 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8023,7 +8023,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
ret = qemuDomainDetachLease(driver, vm, dev->data.lease);
break;
case VIR_DOMAIN_DEVICE_NET:
- ret = qemuDomainDetachNetDevice(driver, vm, dev, async);
+ ret = qemuDomainDetachNetDevice(driver, vm, dev->data.net, async);
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:
ret = qemuDomainDetachHostDevice(driver, vm, dev, async);
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 575c5854d3..c7c26e7685 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4601,11 +4601,9 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
event = virDomainEventDeviceRemovedNewFromObj(vm, hostdev->info->alias);
virObjectEventStateQueue(driver->domainEventState, event);
- if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET) {
- net = hostdev->parent.data.net;
-
+ if (hostdev->parent) {
for (i = 0; i < vm->def->nnets; i++) {
- if (vm->def->nets[i] == net) {
+ if (vm->def->nets[i] == hostdev->parent) {
virDomainNetRemove(vm->def, i);
break;
}
@@ -5797,8 +5795,8 @@ int qemuDomainDetachHostDevice(virQEMUDriverPtr driver,
/* If this is a network hostdev, we need to use the higher-level detach
* function so that mac address / virtualport are reset
*/
- if (detach->parent.type == VIR_DOMAIN_DEVICE_NET)
- return qemuDomainDetachNetDevice(driver, vm, &detach->parent, async);
+ if (detach->parent)
+ return qemuDomainDetachNetDevice(driver, vm, detach->parent, async);
else
return qemuDomainDetachThisHostDevice(driver, vm, detach, async);
}
@@ -5978,14 +5976,14 @@ qemuDomainDetachRedirdevDevice(virQEMUDriverPtr driver,
int
qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm,
- virDomainDeviceDefPtr dev,
+ virDomainNetDefPtr net,
bool async)
{
int detachidx, ret = -1;
virDomainNetDefPtr detach = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData;
- if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0)
+ if ((detachidx = virDomainNetFindIdx(vm->def, net)) < 0)
goto cleanup;
detach = vm->def->nets[detachidx];
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 7ac03b7810..d3fa588aac 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -109,7 +109,7 @@ int qemuDomainDetachControllerDevice(virQEMUDriverPtr driver,
bool async);
int qemuDomainDetachNetDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm,
- virDomainDeviceDefPtr dev,
+ virDomainNetDefPtr net,
bool async);
int qemuDomainDetachHostDevice(virQEMUDriverPtr driver,
virDomainObjPtr vm,
diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c
index 41d4e8d936..4a1e760984 100644
--- a/src/util/virhostdev.c
+++ b/src/util/virhostdev.c
@@ -333,8 +333,7 @@ virHostdevIsPCINetDevice(virDomainHostdevDefPtr hostdev)
{
return hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
- hostdev->parent.type == VIR_DOMAIN_DEVICE_NET &&
- hostdev->parent.data.net;
+ hostdev->parent != NULL;
}
@@ -427,7 +426,7 @@ virHostdevSaveNetConfig(virDomainHostdevDefPtr hostdev,
int vf = -1;
if (!virHostdevIsPCINetDevice(hostdev) ||
- virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net))
+ virDomainNetGetActualVirtPortProfile(hostdev->parent))
return 0;
if (virHostdevIsVirtualFunction(hostdev) != 1) {
@@ -474,8 +473,8 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
if (virHostdevNetDevice(hostdev, -1, &linkdev, &vf) < 0)
return -1;
- vlan = virDomainNetGetActualVlan(hostdev->parent.data.net);
- virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net);
+ vlan = virDomainNetGetActualVlan(hostdev->parent);
+ virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent);
if (virtPort) {
if (vlan) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -485,11 +484,11 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
return -1;
}
if (virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
- &hostdev->parent.data.net->mac,
+ &hostdev->parent->mac,
uuid, port_profile_associate) < 0)
return -1;
} else {
- if (virNetDevSetNetConfig(linkdev, vf, &hostdev->parent.data.net->mac,
+ if (virNetDevSetNetConfig(linkdev, vf, &hostdev->parent->mac,
vlan, NULL, true) < 0)
return -1;
}
@@ -535,10 +534,10 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
if (virHostdevNetDevice(hostdev, 0, &linkdev, &vf) < 0)
return -1;
- virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent.data.net);
+ virtPort = virDomainNetGetActualVirtPortProfile(hostdev->parent);
if (virtPort) {
return virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
-
&hostdev->parent.data.net->mac,
+ &hostdev->parent->mac,
NULL,
port_profile_associate);
} else {
--
2.19.2