[libvirt] [PATCH 12/12] qemu-command: Move qemuAssign*Alias* API's into their own module
John Ferlan
jferlan at redhat.com
Mon Feb 15 19:37:26 UTC 2016
Create a new module qemu_assign_alias.c to handle the qemuAssign*Alias* APIs
Signed-off-by: John Ferlan <jferlan at redhat.com>
---
po/POTFILES.in | 1 +
src/Makefile.am | 1 +
src/qemu/qemu_assign_alias.c | 468 +++++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_assign_alias.h | 60 ++++++
src/qemu/qemu_command.c | 427 +--------------------------------------
src/qemu/qemu_command.h | 16 --
src/qemu/qemu_driver.c | 1 +
src/qemu/qemu_hotplug.c | 1 +
src/qemu/qemu_process.c | 1 +
tests/qemuhotplugtest.c | 1 +
tests/qemuxml2argvtest.c | 1 +
11 files changed, 536 insertions(+), 442 deletions(-)
create mode 100644 src/qemu/qemu_assign_alias.c
create mode 100644 src/qemu/qemu_assign_alias.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0ca9757..93b09b6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -120,6 +120,7 @@ src/vz/vz_utils.c
src/vz/vz_utils.h
src/phyp/phyp_driver.c
src/qemu/qemu_agent.c
+src/qemu/qemu_assign_alias.c
src/qemu/qemu_capabilities.c
src/qemu/qemu_cgroup.c
src/qemu/qemu_command.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f857e59..91a66c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -791,6 +791,7 @@ VBOX_DRIVER_EXTRA_DIST = \
QEMU_DRIVER_SOURCES = \
qemu/qemu_agent.c qemu/qemu_agent.h \
+ qemu/qemu_assign_alias.c qemu/qemu_assign_alias.h \
qemu/qemu_blockjob.c qemu/qemu_blockjob.h \
qemu/qemu_capabilities.c qemu/qemu_capabilities.h \
qemu/qemu_command.c qemu/qemu_command.h \
diff --git a/src/qemu/qemu_assign_alias.c b/src/qemu/qemu_assign_alias.c
new file mode 100644
index 0000000..8aee2a5
--- /dev/null
+++ b/src/qemu/qemu_assign_alias.c
@@ -0,0 +1,468 @@
+/*
+ * qemu_assign_alias.c: QEMU assign aliases
+ *
+ * Copyright (C) 2006-2016 Red Hat, Inc.
+ * Copyright (C) 2006 Daniel P. Berrange
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#include <config.h>
+
+#include "qemu_assign_alias.h"
+#include "viralloc.h"
+#include "virlog.h"
+#include "virstring.h"
+
+#define VIR_FROM_THIS VIR_FROM_QEMU
+
+VIR_LOG_INIT("qemu.qemu_assign_alias");
+
+static ssize_t
+qemuGetNextChrDevIndex(virDomainDefPtr def,
+ virDomainChrDefPtr chr,
+ const char *prefix)
+{
+ const virDomainChrDef **arrPtr;
+ size_t cnt;
+ size_t i;
+ ssize_t idx = 0;
+ const char *prefix2 = NULL;
+
+ if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE)
+ prefix2 = "serial";
+
+ virDomainChrGetDomainPtrs(def, chr->deviceType, &arrPtr, &cnt);
+
+ for (i = 0; i < cnt; i++) {
+ ssize_t thisidx;
+ if (((thisidx = qemuDomainDeviceAliasIndex(&arrPtr[i]->info, prefix)) < 0) &&
+ (prefix2 &&
+ (thisidx = qemuDomainDeviceAliasIndex(&arrPtr[i]->info, prefix2)) < 0)) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Unable to determine device index for character device"));
+ return -1;
+ }
+ if (thisidx >= idx)
+ idx = thisidx + 1;
+ }
+
+ return idx;
+}
+
+
+int
+qemuAssignDeviceChrAlias(virDomainDefPtr def,
+ virDomainChrDefPtr chr,
+ ssize_t idx)
+{
+ const char *prefix = NULL;
+
+ switch ((virDomainChrDeviceType) chr->deviceType) {
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
+ prefix = "parallel";
+ break;
+
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
+ prefix = "serial";
+ break;
+
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+ prefix = "console";
+ break;
+
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
+ prefix = "channel";
+ break;
+
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
+ return -1;
+ }
+
+ if (idx == -1 && (idx = qemuGetNextChrDevIndex(def, chr, prefix)) < 0)
+ return -1;
+
+ return virAsprintf(&chr->info.alias, "%s%zd", prefix, idx);
+}
+
+
+int
+qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
+ virQEMUCapsPtr qemuCaps,
+ virDomainControllerDefPtr controller)
+{
+ const char *prefix = virDomainControllerTypeToString(controller->type);
+
+ if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
+ if (!virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) {
+ /* qemus that don't support multiple PCI buses have
+ * hardcoded the name of their single PCI controller as
+ * "pci".
+ */
+ return VIR_STRDUP(controller->info.alias, "pci");
+ } else if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) {
+ /* The pcie-root controller on Q35 machinetypes uses a
+ * different naming convention ("pcie.0"), because it is
+ * hardcoded that way in qemu.
+ */
+ return virAsprintf(&controller->info.alias, "pcie.%d", controller->idx);
+ }
+ /* All other PCI controllers use the consistent "pci.%u"
+ * (including the hardcoded pci-root controller on
+ * multibus-capable qemus).
+ */
+ return virAsprintf(&controller->info.alias, "pci.%d", controller->idx);
+ } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) {
+ /* for any machine based on e.g. I440FX or G3Beige, the
+ * first (and currently only) IDE controller is an integrated
+ * controller hardcoded with id "ide"
+ */
+ if (qemuDomainMachineHasBuiltinIDE(domainDef) &&
+ controller->idx == 0)
+ return VIR_STRDUP(controller->info.alias, "ide");
+ } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) {
+ /* for any Q35 machine, the first SATA controller is the
+ * integrated one, and it too is hardcoded with id "ide"
+ */
+ if (qemuDomainMachineIsQ35(domainDef) && controller->idx == 0)
+ return VIR_STRDUP(controller->info.alias, "ide");
+ } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) {
+ /* first USB device is "usb", others are normal "usb%d" */
+ if (controller->idx == 0)
+ return VIR_STRDUP(controller->info.alias, "usb");
+ }
+ /* all other controllers use the default ${type}${index} naming
+ * scheme for alias/id.
+ */
+ return virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx);
+}
+
+
+/* Names used before -drive supported the id= option */
+static int
+qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
+{
+ int busid, devid;
+ int ret;
+ char *dev_name;
+
+ if (virDiskNameToBusDeviceIndex(disk, &busid, &devid) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("cannot convert disk '%s' to bus/device index"),
+ disk->dst);
+ return -1;
+ }
+
+ switch (disk->bus) {
+ case VIR_DOMAIN_DISK_BUS_IDE:
+ if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
+ ret = virAsprintf(&dev_name, "ide%d-hd%d", busid, devid);
+ else
+ ret = virAsprintf(&dev_name, "ide%d-cd%d", busid, devid);
+ break;
+ case VIR_DOMAIN_DISK_BUS_SCSI:
+ if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
+ ret = virAsprintf(&dev_name, "scsi%d-hd%d", busid, devid);
+ else
+ ret = virAsprintf(&dev_name, "scsi%d-cd%d", busid, devid);
+ break;
+ case VIR_DOMAIN_DISK_BUS_FDC:
+ ret = virAsprintf(&dev_name, "floppy%d", devid);
+ break;
+ case VIR_DOMAIN_DISK_BUS_VIRTIO:
+ ret = virAsprintf(&dev_name, "virtio%d", devid);
+ break;
+ case VIR_DOMAIN_DISK_BUS_XEN:
+ ret = virAsprintf(&dev_name, "xenblk%d", devid);
+ break;
+ case VIR_DOMAIN_DISK_BUS_SD:
+ ret = virAsprintf(&dev_name, "sd%d", devid);
+ break;
+ case VIR_DOMAIN_DISK_BUS_USB:
+ ret = virAsprintf(&dev_name, "usb%d", devid);
+ break;
+ default:
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Unsupported disk name mapping for bus '%s'"),
+ virDomainDiskBusTypeToString(disk->bus));
+ return -1;
+ }
+
+ if (ret == -1)
+ return -1;
+
+ disk->info.alias = dev_name;
+
+ return 0;
+}
+
+
+/* Our custom -drive naming scheme used with id= */
+static int
+qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def,
+ virDomainDiskDefPtr disk,
+ virQEMUCapsPtr qemuCaps)
+{
+ const char *prefix = virDomainDiskBusTypeToString(disk->bus);
+ int controllerModel = -1;
+
+ if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
+ if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
+ controllerModel =
+ virDomainDeviceFindControllerModel(def, &disk->info,
+ VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
+
+ if ((qemuDomainSetSCSIControllerModel(def, qemuCaps,
+ &controllerModel)) < 0)
+ return -1;
+ }
+
+ if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI ||
+ controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
+ if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix,
+ disk->info.addr.drive.controller,
+ disk->info.addr.drive.bus,
+ disk->info.addr.drive.unit) < 0)
+ return -1;
+ } else {
+ if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix,
+ disk->info.addr.drive.controller,
+ disk->info.addr.drive.bus,
+ disk->info.addr.drive.target,
+ disk->info.addr.drive.unit) < 0)
+ return -1;
+ }
+ } else {
+ int idx = virDiskNameToIndex(disk->dst);
+ if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0)
+ return -1;
+ }
+
+ return 0;
+}
+
+
+int
+qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
+ virDomainDiskDefPtr def,
+ virQEMUCapsPtr qemuCaps)
+{
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
+ return qemuAssignDeviceDiskAliasCustom(vmdef, def, qemuCaps);
+ else
+ return qemuAssignDeviceDiskAliasFixed(def);
+}
+
+
+int
+qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
+ virDomainHostdevDefPtr hostdev,
+ int idx)
+{
+ if (idx == -1) {
+ size_t i;
+ idx = 0;
+ for (i = 0; i < def->nhostdevs; i++) {
+ int thisidx;
+ if ((thisidx = qemuDomainDeviceAliasIndex(def->hostdevs[i]->info, "hostdev")) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Unable to determine device index for hostdev device"));
+ return -1;
+ }
+ if (thisidx >= idx)
+ idx = thisidx + 1;
+ }
+ }
+
+ if (virAsprintf(&hostdev->info->alias, "hostdev%d", idx) < 0)
+ return -1;
+
+ return 0;
+}
+
+
+int
+qemuAssignDeviceNetAlias(virDomainDefPtr def,
+ virDomainNetDefPtr net,
+ int idx)
+{
+ if (idx == -1) {
+ size_t i;
+ idx = 0;
+ for (i = 0; i < def->nnets; i++) {
+ int thisidx;
+
+ if (virDomainNetGetActualType(def->nets[i])
+ == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
+ /* type='hostdev' interfaces have a hostdev%d alias */
+ continue;
+ }
+ if ((thisidx = qemuDomainDeviceAliasIndex(&def->nets[i]->info, "net")) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Unable to determine device index for network device"));
+ return -1;
+ }
+ if (thisidx >= idx)
+ idx = thisidx + 1;
+ }
+ }
+
+ if (virAsprintf(&net->info.alias, "net%d", idx) < 0)
+ return -1;
+ return 0;
+}
+
+
+int
+qemuAssignDeviceRedirdevAlias(virDomainDefPtr def,
+ virDomainRedirdevDefPtr redirdev,
+ int idx)
+{
+ if (idx == -1) {
+ size_t i;
+ idx = 0;
+ for (i = 0; i < def->nredirdevs; i++) {
+ int thisidx;
+ if ((thisidx = qemuDomainDeviceAliasIndex(&def->redirdevs[i]->info, "redir")) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Unable to determine device index for redirected device"));
+ return -1;
+ }
+ if (thisidx >= idx)
+ idx = thisidx + 1;
+ }
+ }
+
+ if (virAsprintf(&redirdev->info.alias, "redir%d", idx) < 0)
+ return -1;
+ return 0;
+}
+
+
+int
+qemuAssignDeviceRNGAlias(virDomainRNGDefPtr rng,
+ size_t idx)
+{
+ if (virAsprintf(&rng->info.alias, "rng%zu", idx) < 0)
+ return -1;
+
+ return 0;
+}
+
+
+int
+qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
+{
+ size_t i;
+
+ for (i = 0; i < def->ndisks; i++) {
+ if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nnets; i++) {
+ /* type='hostdev' interfaces are also on the hostdevs list,
+ * and will have their alias assigned with other hostdevs.
+ */
+ if (virDomainNetGetActualType(def->nets[i])
+ != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
+ qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0) {
+ return -1;
+ }
+ }
+
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
+ return 0;
+
+ for (i = 0; i < def->nfss; i++) {
+ if (virAsprintf(&def->fss[i]->info.alias, "fs%zu", i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nsounds; i++) {
+ if (virAsprintf(&def->sounds[i]->info.alias, "sound%zu", i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nhostdevs; i++) {
+ if (qemuAssignDeviceHostdevAlias(def, def->hostdevs[i], i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nredirdevs; i++) {
+ if (qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nvideos; i++) {
+ if (virAsprintf(&def->videos[i]->info.alias, "video%zu", i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->ncontrollers; i++) {
+ if (qemuAssignDeviceControllerAlias(def, qemuCaps, def->controllers[i]) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->ninputs; i++) {
+ if (virAsprintf(&def->inputs[i]->info.alias, "input%zu", i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nparallels; i++) {
+ if (qemuAssignDeviceChrAlias(def, def->parallels[i], i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nserials; i++) {
+ if (qemuAssignDeviceChrAlias(def, def->serials[i], i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nchannels; i++) {
+ if (qemuAssignDeviceChrAlias(def, def->channels[i], i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nconsoles; i++) {
+ if (qemuAssignDeviceChrAlias(def, def->consoles[i], i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nhubs; i++) {
+ if (virAsprintf(&def->hubs[i]->info.alias, "hub%zu", i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nshmems; i++) {
+ if (virAsprintf(&def->shmems[i]->info.alias, "shmem%zu", i) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nsmartcards; i++) {
+ if (virAsprintf(&def->smartcards[i]->info.alias, "smartcard%zu", i) < 0)
+ return -1;
+ }
+ if (def->watchdog) {
+ if (virAsprintf(&def->watchdog->info.alias, "watchdog%d", 0) < 0)
+ return -1;
+ }
+ if (def->memballoon) {
+ if (virAsprintf(&def->memballoon->info.alias, "balloon%d", 0) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nrngs; i++) {
+ if (qemuAssignDeviceRNGAlias(def->rngs[i], i) < 0)
+ return -1;
+ }
+ if (def->tpm) {
+ if (virAsprintf(&def->tpm->info.alias, "tpm%d", 0) < 0)
+ return -1;
+ }
+ for (i = 0; i < def->nmems; i++) {
+ if (virAsprintf(&def->mems[i]->info.alias, "dimm%zu", i) < 0)
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/src/qemu/qemu_assign_alias.h b/src/qemu/qemu_assign_alias.h
new file mode 100644
index 0000000..7fc418c
--- /dev/null
+++ b/src/qemu/qemu_assign_alias.h
@@ -0,0 +1,60 @@
+/*
+ * qemu_assign_alias.h: QEMU assign aliases
+ *
+ * Copyright (C) 2006-2016 Red Hat, Inc.
+ * Copyright (C) 2006 Daniel P. Berrange
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Author: Daniel P. Berrange <berrange at redhat.com>
+ */
+
+#ifndef __QEMU_ASSIGN_ALIAS_H__
+# define __QEMU_ASSIGN_ALIAS_H__
+
+# include "domain_conf.h"
+
+# include "qemu_capabilities.h"
+# include "qemu_domain.h"
+
+int qemuAssignDeviceChrAlias(virDomainDefPtr def,
+ virDomainChrDefPtr chr,
+ ssize_t idx);
+
+int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
+ virQEMUCapsPtr qemuCaps,
+ virDomainControllerDefPtr controller);
+
+int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
+ virDomainDiskDefPtr def,
+ virQEMUCapsPtr qemuCaps);
+
+int qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
+ virDomainHostdevDefPtr hostdev,
+ int idx);
+
+int qemuAssignDeviceNetAlias(virDomainDefPtr def,
+ virDomainNetDefPtr net,
+ int idx);
+
+int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def,
+ virDomainRedirdevDefPtr redirdev,
+ int idx);
+
+int qemuAssignDeviceRNGAlias(virDomainRNGDefPtr rng,
+ size_t idx);
+
+int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
+#endif /* __QEMU_ASSIGN_ALIAS_H__*/
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index edc5379..22d25df 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -27,6 +27,7 @@
#include "qemu_hostdev.h"
#include "qemu_capabilities.h"
#include "qemu_interface.h"
+#include "qemu_assign_alias.h"
#include "cpu/cpu.h"
#include "dirname.h"
#include "viralloc.h"
@@ -272,432 +273,6 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
}
-/* Names used before -drive supported the id= option */
-static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
-{
- int busid, devid;
- int ret;
- char *dev_name;
-
- if (virDiskNameToBusDeviceIndex(disk, &busid, &devid) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("cannot convert disk '%s' to bus/device index"),
- disk->dst);
- return -1;
- }
-
- switch (disk->bus) {
- case VIR_DOMAIN_DISK_BUS_IDE:
- if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
- ret = virAsprintf(&dev_name, "ide%d-hd%d", busid, devid);
- else
- ret = virAsprintf(&dev_name, "ide%d-cd%d", busid, devid);
- break;
- case VIR_DOMAIN_DISK_BUS_SCSI:
- if (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
- ret = virAsprintf(&dev_name, "scsi%d-hd%d", busid, devid);
- else
- ret = virAsprintf(&dev_name, "scsi%d-cd%d", busid, devid);
- break;
- case VIR_DOMAIN_DISK_BUS_FDC:
- ret = virAsprintf(&dev_name, "floppy%d", devid);
- break;
- case VIR_DOMAIN_DISK_BUS_VIRTIO:
- ret = virAsprintf(&dev_name, "virtio%d", devid);
- break;
- case VIR_DOMAIN_DISK_BUS_XEN:
- ret = virAsprintf(&dev_name, "xenblk%d", devid);
- break;
- case VIR_DOMAIN_DISK_BUS_SD:
- ret = virAsprintf(&dev_name, "sd%d", devid);
- break;
- case VIR_DOMAIN_DISK_BUS_USB:
- ret = virAsprintf(&dev_name, "usb%d", devid);
- break;
- default:
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Unsupported disk name mapping for bus '%s'"),
- virDomainDiskBusTypeToString(disk->bus));
- return -1;
- }
-
- if (ret == -1)
- return -1;
-
- disk->info.alias = dev_name;
-
- return 0;
-}
-
-/* Our custom -drive naming scheme used with id= */
-static int
-qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def,
- virDomainDiskDefPtr disk,
- virQEMUCapsPtr qemuCaps)
-{
- const char *prefix = virDomainDiskBusTypeToString(disk->bus);
- int controllerModel = -1;
-
- if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
- if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
- controllerModel =
- virDomainDeviceFindControllerModel(def, &disk->info,
- VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
-
- if ((qemuDomainSetSCSIControllerModel(def, qemuCaps,
- &controllerModel)) < 0)
- return -1;
- }
-
- if (disk->bus != VIR_DOMAIN_DISK_BUS_SCSI ||
- controllerModel == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC) {
- if (virAsprintf(&disk->info.alias, "%s%d-%d-%d", prefix,
- disk->info.addr.drive.controller,
- disk->info.addr.drive.bus,
- disk->info.addr.drive.unit) < 0)
- return -1;
- } else {
- if (virAsprintf(&disk->info.alias, "%s%d-%d-%d-%d", prefix,
- disk->info.addr.drive.controller,
- disk->info.addr.drive.bus,
- disk->info.addr.drive.target,
- disk->info.addr.drive.unit) < 0)
- return -1;
- }
- } else {
- int idx = virDiskNameToIndex(disk->dst);
- if (virAsprintf(&disk->info.alias, "%s-disk%d", prefix, idx) < 0)
- return -1;
- }
-
- return 0;
-}
-
-
-int
-qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
- virDomainDiskDefPtr def,
- virQEMUCapsPtr qemuCaps)
-{
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
- return qemuAssignDeviceDiskAliasCustom(vmdef, def, qemuCaps);
- else
- return qemuAssignDeviceDiskAliasFixed(def);
-}
-
-
-int
-qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx)
-{
- if (idx == -1) {
- size_t i;
- idx = 0;
- for (i = 0; i < def->nnets; i++) {
- int thisidx;
-
- if (virDomainNetGetActualType(def->nets[i])
- == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
- /* type='hostdev' interfaces have a hostdev%d alias */
- continue;
- }
- if ((thisidx = qemuDomainDeviceAliasIndex(&def->nets[i]->info, "net")) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unable to determine device index for network device"));
- return -1;
- }
- if (thisidx >= idx)
- idx = thisidx + 1;
- }
- }
-
- if (virAsprintf(&net->info.alias, "net%d", idx) < 0)
- return -1;
- return 0;
-}
-
-
-int
-qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx)
-{
- if (idx == -1) {
- size_t i;
- idx = 0;
- for (i = 0; i < def->nhostdevs; i++) {
- int thisidx;
- if ((thisidx = qemuDomainDeviceAliasIndex(def->hostdevs[i]->info, "hostdev")) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unable to determine device index for hostdev device"));
- return -1;
- }
- if (thisidx >= idx)
- idx = thisidx + 1;
- }
- }
-
- if (virAsprintf(&hostdev->info->alias, "hostdev%d", idx) < 0)
- return -1;
-
- return 0;
-}
-
-
-int
-qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx)
-{
- if (idx == -1) {
- size_t i;
- idx = 0;
- for (i = 0; i < def->nredirdevs; i++) {
- int thisidx;
- if ((thisidx = qemuDomainDeviceAliasIndex(&def->redirdevs[i]->info, "redir")) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unable to determine device index for redirected device"));
- return -1;
- }
- if (thisidx >= idx)
- idx = thisidx + 1;
- }
- }
-
- if (virAsprintf(&redirdev->info.alias, "redir%d", idx) < 0)
- return -1;
- return 0;
-}
-
-
-int
-qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
- virQEMUCapsPtr qemuCaps,
- virDomainControllerDefPtr controller)
-{
- const char *prefix = virDomainControllerTypeToString(controller->type);
-
- if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
- if (!virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) {
- /* qemus that don't support multiple PCI buses have
- * hardcoded the name of their single PCI controller as
- * "pci".
- */
- return VIR_STRDUP(controller->info.alias, "pci");
- } else if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) {
- /* The pcie-root controller on Q35 machinetypes uses a
- * different naming convention ("pcie.0"), because it is
- * hardcoded that way in qemu.
- */
- return virAsprintf(&controller->info.alias, "pcie.%d", controller->idx);
- }
- /* All other PCI controllers use the consistent "pci.%u"
- * (including the hardcoded pci-root controller on
- * multibus-capable qemus).
- */
- return virAsprintf(&controller->info.alias, "pci.%d", controller->idx);
- } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) {
- /* for any machine based on e.g. I440FX or G3Beige, the
- * first (and currently only) IDE controller is an integrated
- * controller hardcoded with id "ide"
- */
- if (qemuDomainMachineHasBuiltinIDE(domainDef) &&
- controller->idx == 0)
- return VIR_STRDUP(controller->info.alias, "ide");
- } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) {
- /* for any Q35 machine, the first SATA controller is the
- * integrated one, and it too is hardcoded with id "ide"
- */
- if (qemuDomainMachineIsQ35(domainDef) && controller->idx == 0)
- return VIR_STRDUP(controller->info.alias, "ide");
- } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) {
- /* first USB device is "usb", others are normal "usb%d" */
- if (controller->idx == 0)
- return VIR_STRDUP(controller->info.alias, "usb");
- }
- /* all other controllers use the default ${type}${index} naming
- * scheme for alias/id.
- */
- return virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx);
-}
-
-static ssize_t
-qemuGetNextChrDevIndex(virDomainDefPtr def,
- virDomainChrDefPtr chr,
- const char *prefix)
-{
- const virDomainChrDef **arrPtr;
- size_t cnt;
- size_t i;
- ssize_t idx = 0;
- const char *prefix2 = NULL;
-
- if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE)
- prefix2 = "serial";
-
- virDomainChrGetDomainPtrs(def, chr->deviceType, &arrPtr, &cnt);
-
- for (i = 0; i < cnt; i++) {
- ssize_t thisidx;
- if (((thisidx = qemuDomainDeviceAliasIndex(&arrPtr[i]->info, prefix)) < 0) &&
- (prefix2 &&
- (thisidx = qemuDomainDeviceAliasIndex(&arrPtr[i]->info, prefix2)) < 0)) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unable to determine device index for character device"));
- return -1;
- }
- if (thisidx >= idx)
- idx = thisidx + 1;
- }
-
- return idx;
-}
-
-
-int
-qemuAssignDeviceRNGAlias(virDomainRNGDefPtr rng,
- size_t idx)
-{
- if (virAsprintf(&rng->info.alias, "rng%zu", idx) < 0)
- return -1;
-
- return 0;
-}
-
-
-int
-qemuAssignDeviceChrAlias(virDomainDefPtr def,
- virDomainChrDefPtr chr,
- ssize_t idx)
-{
- const char *prefix = NULL;
-
- switch ((virDomainChrDeviceType) chr->deviceType) {
- case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
- prefix = "parallel";
- break;
-
- case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
- prefix = "serial";
- break;
-
- case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
- prefix = "console";
- break;
-
- case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
- prefix = "channel";
- break;
-
- case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
- return -1;
- }
-
- if (idx == -1 && (idx = qemuGetNextChrDevIndex(def, chr, prefix)) < 0)
- return -1;
-
- return virAsprintf(&chr->info.alias, "%s%zd", prefix, idx);
-}
-
-int
-qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps)
-{
- size_t i;
-
- for (i = 0; i < def->ndisks; i++) {
- if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0)
- return -1;
- }
- for (i = 0; i < def->nnets; i++) {
- /* type='hostdev' interfaces are also on the hostdevs list,
- * and will have their alias assigned with other hostdevs.
- */
- if (virDomainNetGetActualType(def->nets[i])
- != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
- qemuAssignDeviceNetAlias(def, def->nets[i], i) < 0) {
- return -1;
- }
- }
-
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
- return 0;
-
- for (i = 0; i < def->nfss; i++) {
- if (virAsprintf(&def->fss[i]->info.alias, "fs%zu", i) < 0)
- return -1;
- }
- for (i = 0; i < def->nsounds; i++) {
- if (virAsprintf(&def->sounds[i]->info.alias, "sound%zu", i) < 0)
- return -1;
- }
- for (i = 0; i < def->nhostdevs; i++) {
- if (qemuAssignDeviceHostdevAlias(def, def->hostdevs[i], i) < 0)
- return -1;
- }
- for (i = 0; i < def->nredirdevs; i++) {
- if (qemuAssignDeviceRedirdevAlias(def, def->redirdevs[i], i) < 0)
- return -1;
- }
- for (i = 0; i < def->nvideos; i++) {
- if (virAsprintf(&def->videos[i]->info.alias, "video%zu", i) < 0)
- return -1;
- }
- for (i = 0; i < def->ncontrollers; i++) {
- if (qemuAssignDeviceControllerAlias(def, qemuCaps, def->controllers[i]) < 0)
- return -1;
- }
- for (i = 0; i < def->ninputs; i++) {
- if (virAsprintf(&def->inputs[i]->info.alias, "input%zu", i) < 0)
- return -1;
- }
- for (i = 0; i < def->nparallels; i++) {
- if (qemuAssignDeviceChrAlias(def, def->parallels[i], i) < 0)
- return -1;
- }
- for (i = 0; i < def->nserials; i++) {
- if (qemuAssignDeviceChrAlias(def, def->serials[i], i) < 0)
- return -1;
- }
- for (i = 0; i < def->nchannels; i++) {
- if (qemuAssignDeviceChrAlias(def, def->channels[i], i) < 0)
- return -1;
- }
- for (i = 0; i < def->nconsoles; i++) {
- if (qemuAssignDeviceChrAlias(def, def->consoles[i], i) < 0)
- return -1;
- }
- for (i = 0; i < def->nhubs; i++) {
- if (virAsprintf(&def->hubs[i]->info.alias, "hub%zu", i) < 0)
- return -1;
- }
- for (i = 0; i < def->nshmems; i++) {
- if (virAsprintf(&def->shmems[i]->info.alias, "shmem%zu", i) < 0)
- return -1;
- }
- for (i = 0; i < def->nsmartcards; i++) {
- if (virAsprintf(&def->smartcards[i]->info.alias, "smartcard%zu", i) < 0)
- return -1;
- }
- if (def->watchdog) {
- if (virAsprintf(&def->watchdog->info.alias, "watchdog%d", 0) < 0)
- return -1;
- }
- if (def->memballoon) {
- if (virAsprintf(&def->memballoon->info.alias, "balloon%d", 0) < 0)
- return -1;
- }
- for (i = 0; i < def->nrngs; i++) {
- if (qemuAssignDeviceRNGAlias(def->rngs[i], i) < 0)
- return -1;
- }
- if (def->tpm) {
- if (virAsprintf(&def->tpm->info.alias, "tpm%d", 0) < 0)
- return -1;
- }
- for (i = 0; i < def->nmems; i++) {
- if (virAsprintf(&def->mems[i]->info.alias, "dimm%zu", i) < 0)
- return -1;
- }
-
- return 0;
-}
-
-
static int
qemuBuildDeviceAddressStr(virBufferPtr buf,
virDomainDefPtr domainDef,
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 61a0212..ec45e15 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -226,22 +226,6 @@ char *qemuBuildRedirdevDevStr(virDomainDefPtr def,
int qemuNetworkPrepareDevices(virDomainDefPtr def);
-int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps);
-int qemuAssignDeviceNetAlias(virDomainDefPtr def, virDomainNetDefPtr net, int idx);
-int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
- virDomainDiskDefPtr def,
- virQEMUCapsPtr qemuCaps);
-int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, virDomainHostdevDefPtr hostdev, int idx);
-int
-qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
- virQEMUCapsPtr qemuCaps,
- virDomainControllerDefPtr controller);
-int qemuAssignDeviceRedirdevAlias(virDomainDefPtr def, virDomainRedirdevDefPtr redirdev, int idx);
-int qemuAssignDeviceChrAlias(virDomainDefPtr def,
- virDomainChrDefPtr chr,
- ssize_t idx);
-int qemuAssignDeviceRNGAlias(virDomainRNGDefPtr rng, size_t idx);
-
int qemuGetDriveSourceString(virStorageSourcePtr src,
virConnectPtr conn,
char **source);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2bbc724..9405b65 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -48,6 +48,7 @@
#include "qemu_agent.h"
#include "qemu_conf.h"
#include "qemu_capabilities.h"
+#include "qemu_assign_alias.h"
#include "qemu_command.h"
#include "qemu_parse_command.h"
#include "qemu_cgroup.h"
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 71cfc79..f11e8ba 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -31,6 +31,7 @@
#include "qemu_command.h"
#include "qemu_hostdev.h"
#include "qemu_interface.h"
+#include "qemu_assign_alias.h"
#include "domain_audit.h"
#include "netdev_bandwidth_conf.h"
#include "domain_nwfilter.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c4a15ac..f698392 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -39,6 +39,7 @@
#include "qemu_capabilities.h"
#include "qemu_monitor.h"
#include "qemu_command.h"
+#include "qemu_assign_alias.h"
#include "qemu_hostdev.h"
#include "qemu_hotplug.h"
#include "qemu_migration.h"
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 1f711dd..3e4233b 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -20,6 +20,7 @@
#include <config.h>
#include "qemu/qemu_conf.h"
+#include "qemu/qemu_assign_alias.h"
#include "qemu/qemu_hotplug.h"
#include "qemu/qemu_hotplugpriv.h"
#include "qemumonitortestutils.h"
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3c7693b..5b8421b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -16,6 +16,7 @@
# include "viralloc.h"
# include "qemu/qemu_capabilities.h"
# include "qemu/qemu_command.h"
+# include "qemu/qemu_assign_alias.h"
# include "qemu/qemu_domain.h"
# include "qemu/qemu_migration.h"
# include "qemu/qemu_process.h"
--
2.5.0
More information about the libvir-list
mailing list