11:26 a.m.
This is in preparation of the enablement of s390 guests with virtio devices.
The assignment of device addresses happens in different places, i.e. the
qemu driver and process modules as well as in the unit tests in slightly
different flavors. Currently, these are PPC spapr-vio and PCI
devices, virtio-s390 (not PCI based) will follow.
By optionally passing to qemuDomainAssignAddresses the domain
object and the capabilities it is now possible to call the function
from most of the places (except for hotplug) where address assignment
is done.
Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com>
---
src/qemu/qemu_command.c | 42 +++++++++++++++++++++++++++++++++---------
src/qemu/qemu_command.h | 6 ++++--
src/qemu/qemu_driver.c | 14 +++++++-------
src/qemu/qemu_process.c | 42 ++++--------------------------------------
4 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bd4f96a..bee48e1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -941,16 +941,23 @@ cleanup:
int
-qemuDomainAssignPCIAddresses(virDomainDefPtr def)
+qemuDomainAssignPCIAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps,
+ virDomainObjPtr obj)
{
int ret = -1;
- virBitmapPtr qemuCaps = NULL;
+ virBitmapPtr localCaps = NULL;
qemuDomainPCIAddressSetPtr addrs = NULL;
+ qemuDomainObjPrivatePtr priv = NULL;
- if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch,
- NULL,
- &qemuCaps) < 0)
- goto cleanup;
+
+ if (!qemuCaps) {
+ /* need to get information from real environment */
+ if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch,
+ NULL,
+ &localCaps) < 0)
+ goto cleanup;
+ qemuCaps = localCaps;
+ }
if (qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
if (!(addrs = qemuDomainPCIAddressSetCreate(def)))
@@ -960,16 +967,33 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def)
goto cleanup;
}
+ if (obj && obj->privateData) {
+ priv = obj->privateData;
+ if (addrs) {
+ /* if this is the live domain object, we persist the PCI addresses*/
+ if (priv->pciaddrs) {
+ qemuDomainPCIAddressSetFree(priv->pciaddrs);
+ priv->pciaddrs = NULL;
+ }
+ priv->persistentAddrs = 1;
+ priv->pciaddrs = addrs;
+ addrs = NULL;
+ } else {
+ priv->persistentAddrs = 0;
+ }
+ }
+
ret = 0;
cleanup:
- qemuCapsFree(qemuCaps);
+ qemuCapsFree(localCaps);
qemuDomainPCIAddressSetFree(addrs);
return ret;
}
-int qemuDomainAssignAddresses(virDomainDefPtr def)
+int qemuDomainAssignAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps,
+ virDomainObjPtr obj)
{
int rc;
@@ -977,7 +1001,7 @@ int qemuDomainAssignAddresses(virDomainDefPtr def)
if (rc)
return rc;
- return qemuDomainAssignPCIAddresses(def);
+ return qemuDomainAssignPCIAddresses(def, qemuCaps, obj);
}
static void
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 1eafeb3..dd104d6 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -175,10 +175,12 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps,
virDomainChrSourceDefPtr *monConfig,
bool *monJSON);
-int qemuDomainAssignAddresses(virDomainDefPtr def);
+int qemuDomainAssignAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps,
+ virDomainObjPtr);
int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def);
-int qemuDomainAssignPCIAddresses(virDomainDefPtr def);
+int qemuDomainAssignPCIAddresses(virDomainDefPtr def, virBitmapPtr qemuCaps,
+ virDomainObjPtr obj);
qemuDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def);
int qemuDomainPCIAddressReserveFunction(qemuDomainPCIAddressSetPtr addrs,
int slot, int function);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2177c30..7f53444 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1404,7 +1404,7 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char
*xml,
if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup;
- if (qemuDomainAssignAddresses(def) < 0)
+ if (qemuDomainAssignAddresses(def, NULL, NULL) < 0)
goto cleanup;
if (!(vm = virDomainAssignDef(driver->caps,
@@ -5069,7 +5069,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char
*xml) {
if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup;
- if (qemuDomainAssignAddresses(def) < 0)
+ if (qemuDomainAssignAddresses(def, NULL, NULL) < 0)
goto cleanup;
if (!(vm = virDomainAssignDef(driver->caps,
@@ -5547,7 +5547,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
if (virDomainDefAddImplicitControllers(vmdef) < 0)
return -1;
- if (qemuDomainAssignAddresses(vmdef) < 0)
+ if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0)
return -1;
break;
@@ -5565,7 +5565,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1;
}
dev->data.net = NULL;
- if (qemuDomainAssignAddresses(vmdef) < 0)
+ if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0)
return -1;
break;
@@ -5581,7 +5581,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1;
}
dev->data.hostdev = NULL;
- if (qemuDomainAssignAddresses(vmdef) < 0)
+ if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0)
return -1;
break;
@@ -5735,7 +5735,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
vmdef->nets[pos] = net;
dev->data.net = NULL;
- if (qemuDomainAssignAddresses(vmdef) < 0)
+ if (qemuDomainAssignAddresses(vmdef, NULL, NULL) < 0)
return -1;
break;
@@ -11733,7 +11733,7 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn,
if (qemudCanonicalizeMachine(driver, def) < 0)
goto cleanup;
- if (qemuDomainAssignAddresses(def) < 0)
+ if (qemuDomainAssignAddresses(def, NULL, NULL) < 0)
goto cleanup;
if (!(vm = virDomainAssignDef(driver->caps,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 1df3637..e8461b3 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3090,13 +3090,8 @@ qemuProcessReconnect(void *opaque)
goto endjob;
}
- if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
- priv->persistentAddrs = 1;
-
- if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(obj->def)) ||
- qemuAssignDevicePCISlots(obj->def, priv->pciaddrs) < 0)
- goto error;
- }
+ if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE))
+ qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj);
if (virSecurityManagerReserveLabel(driver->securityManager, obj->def,
obj->pid) < 0)
goto error;
@@ -3539,22 +3534,7 @@ int qemuProcessStart(virConnectPtr conn,
*/
if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
VIR_DEBUG("Assigning domain PCI addresses");
- /* Populate cache with current addresses */
- if (priv->pciaddrs) {
- qemuDomainPCIAddressSetFree(priv->pciaddrs);
- priv->pciaddrs = NULL;
- }
- if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(vm->def)))
- goto cleanup;
-
-
- /* Assign any remaining addresses */
- if (qemuAssignDevicePCISlots(vm->def, priv->pciaddrs) < 0)
- goto cleanup;
-
- priv->persistentAddrs = 1;
- } else {
- priv->persistentAddrs = 0;
+ qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm);
}
VIR_DEBUG("Building emulator command line");
@@ -4236,21 +4216,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED,
*/
if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
VIR_DEBUG("Assigning domain PCI addresses");
- /* Populate cache with current addresses */
- if (priv->pciaddrs) {
- qemuDomainPCIAddressSetFree(priv->pciaddrs);
- priv->pciaddrs = NULL;
- }
- if (!(priv->pciaddrs = qemuDomainPCIAddressSetCreate(vm->def)))
- goto cleanup;
-
- /* Assign any remaining addresses */
- if (qemuAssignDevicePCISlots(vm->def, priv->pciaddrs) < 0)
- goto cleanup;
-
- priv->persistentAddrs = 1;
- } else {
- priv->persistentAddrs = 0;
+ qemuDomainAssignAddresses(vm->def, priv->qemuCaps, vm);
}
if ((timestamp = virTimeStringNow()) == NULL) {
--
1.7.0.4
--
Mit freundlichen Grüßen/Kind Regards
Viktor Mihajlovski
IBM Deutschland Research & Development GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294