3:11 a.m.
In the future, some aliases might be already parsed therefore we
should avoid overwriting them.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_alias.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++--
src/qemu/qemu_hotplug.c | 6 ++----
2 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 33bd4c10d..7a3983afa 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -93,6 +93,9 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def,
{
const char *prefix = NULL;
+ if (chr->info.alias)
+ return 0;
+
switch ((virDomainChrDeviceType) chr->deviceType) {
case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
prefix = "parallel";
@@ -128,6 +131,9 @@ qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
{
const char *prefix = virDomainControllerTypeToString(controller->type);
+ if (controller->info.alias)
+ return 0;
+
if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
if (!virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) {
/* qemus that don't support multiple PCI buses have
@@ -182,6 +188,9 @@ qemuAssignDeviceDiskAlias(virDomainDefPtr def,
const char *prefix = virDomainDiskBusTypeToString(disk->bus);
int controllerModel = -1;
+ if (disk->info.alias)
+ return 0;
+
if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
controllerModel =
@@ -223,6 +232,9 @@ qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
char **alias,
int idx)
{
+ if (*alias)
+ return 0;
+
if (idx == -1) {
size_t i;
@@ -259,6 +271,9 @@ qemuAssignDeviceNetAlias(virDomainDefPtr def,
int idx)
{
+ if (net->info.alias)
+ return 0;
+
/* <interface type='hostdev'> uses "hostdevN" as the alias
* We must use "-1" as the index because the caller doesn't know
* that we're now looking for a unique hostdevN rather than netN
@@ -290,6 +305,9 @@ static int
qemuAssignDeviceFSAlias(virDomainFSDefPtr fss,
int idx)
{
+ if (fss->info.alias)
+ return 0;
+
return virAsprintf(&fss->info.alias, "fs%d", idx);
}
@@ -298,6 +316,9 @@ static int
qemuAssignDeviceSoundAlias(virDomainSoundDefPtr sound,
int idx)
{
+ if (sound->info.alias)
+ return 0;
+
return virAsprintf(&sound->info.alias, "sound%d", idx);
}
@@ -306,6 +327,9 @@ static int
qemuAssignDeviceVideoAlias(virDomainVideoDefPtr video,
int idx)
{
+ if (video->info.alias)
+ return 0;
+
return virAsprintf(&video->info.alias, "video%d", idx);
}
@@ -314,6 +338,9 @@ static int
qemuAssignDeviceInputAlias(virDomainInputDefPtr input,
int idx)
{
+ if (input->info.alias)
+ return 0;
+
return virAsprintf(&input->info.alias, "input%d", idx);
}
@@ -322,6 +349,9 @@ static int
qemuAssignDeviceHubAlias(virDomainHubDefPtr hub,
int idx)
{
+ if (hub->info.alias)
+ return 0;
+
return virAsprintf(&hub->info.alias, "hub%d", idx);
}
@@ -330,6 +360,9 @@ static int
qemuAssignDeviceSmartcardAlias(virDomainSmartcardDefPtr smartcard,
int idx)
{
+ if (smartcard->info.alias)
+ return 0;
+
return virAsprintf(&smartcard->info.alias, "smartcard%d", idx);
}
@@ -338,6 +371,9 @@ static int
qemuAssingDeviceMemballoonAlias(virDomainMemballoonDefPtr memballoon,
int idx)
{
+ if (memballoon->info.alias)
+ return 0;
+
return virAsprintf(&memballoon->info.alias, "balloon%d", idx);
}
@@ -346,6 +382,9 @@ static int
qemuAssignDeviceTPMAlias(virDomainTPMDefPtr tpm,
int idx)
{
+ if (tpm->info.alias)
+ return 0;
+
return virAsprintf(&tpm->info.alias, "tpm%d", idx);
}
@@ -355,6 +394,9 @@ qemuAssignDeviceRedirdevAlias(virDomainDefPtr def,
virDomainRedirdevDefPtr redirdev,
int idx)
{
+ if (redirdev->info.alias)
+ return 0;
+
if (idx == -1) {
size_t i;
idx = 0;
@@ -384,6 +426,9 @@ qemuAssignDeviceRNGAlias(virDomainDefPtr def,
int maxidx = 0;
int idx;
+ if (rng->info.alias)
+ return 0;
+
for (i = 0; i < def->nrngs; i++) {
if ((idx = qemuDomainDeviceAliasIndex(&def->rngs[i]->info,
"rng")) >= maxidx)
maxidx = idx + 1;
@@ -418,6 +463,9 @@ qemuAssignDeviceMemoryAlias(virDomainDefPtr def,
int idx;
const char *prefix;
+ if (mem->info.alias)
+ return 0;
+
if (mem->model == VIR_DOMAIN_MEMORY_MODEL_DIMM)
prefix = "dimm";
else
@@ -444,6 +492,9 @@ qemuAssignDeviceShmemAlias(virDomainDefPtr def,
virDomainShmemDefPtr shmem,
int idx)
{
+ if (shmem->info.alias)
+ return 0;
+
if (idx == -1) {
size_t i;
idx = 0;
@@ -474,6 +525,9 @@ qemuAssignDeviceWatchdogAlias(virDomainWatchdogDefPtr watchdog)
{
/* Currently, there's just one watchdog per domain */
+ if (watchdog->info.alias)
+ return 0;
+
if (VIR_STRDUP(watchdog->info.alias, "watchdog0") < 0)
return -1;
return 0;
@@ -508,8 +562,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
* linked to a NetDef, they will share an info and the alias
* will already be set, so don't try to set it again.
*/
- if (!def->hostdevs[i]->info->alias &&
- qemuAssignDeviceHostdevAlias(def,
&def->hostdevs[i]->info->alias, -1) < 0)
+ if (qemuAssignDeviceHostdevAlias(def,
&def->hostdevs[i]->info->alias, -1) < 0)
return -1;
}
for (i = 0; i < def->nredirdevs; i++) {
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 0288986d8..d556c9be0 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4980,10 +4980,8 @@ qemuDomainDetachThisHostDevice(virQEMUDriverPtr driver,
{
int ret = -1;
- if (!detach->info->alias) {
- if (qemuAssignDeviceHostdevAlias(vm->def, &detach->info->alias, -1)
< 0)
- return -1;
- }
+ if (qemuAssignDeviceHostdevAlias(vm->def, &detach->info->alias, -1) <
0)
+ return -1;
switch (detach->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
--
2.13.6