shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-09-01 14:17:33 +03:00
Code Releases Activity

qemu: properly set/use device alias for pci controllers

Browse Source 
We had been setting the device alias in the devinceinfo for pci
controllers to "pci%u", but then hardcoding "pci.%u" when creating the
device address for other devices using that pci bus. This all worked
just fine until we encountered the built-in "pcie.0" bus (the PCIe
root complex) in Q35 machines.

In order to create the correct commandline for this one case, this
patch:

1) sets the alias for PCI controllers correctly, to "pci.%u" (or
"pcie.%u" for the pcie-root controller)

2) eliminates the hardcoded "pci.%u" for pci controllers when
generatuing device address strings, and instead uses the controller's
alias.

3) plumbs a pointer to the virDomainDef all the way down to
qemuBuildDeviceAddressStr. This was necessary in order to make the
aliase of the controller *used by a device* available (previously
qemuBuildDeviceAddressStr only had the deviceinfo of the device
itself, *not* of the controller it was connecting to). This made for a
larger than desired diff, but at least in the future we won't have to
do it again, since all the information we could possibly ever need for
future enhancements is in the virDomainDef. (right?)

This should be done for *all* controllers, but for now we just do it
in the case of PCI controllers, to reduce the likelyhood of
regression.
This commit is contained in:
Laine Stump
2013-08-02 13:48:50 -04:00
parent c27b0bb171
commit 01b8812765
5 changed files with 136 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
src/qemu/qemu_command.c
View File

@ -860,10 +860,18 @@ qemuAssignDeviceControllerAlias(virDomainControllerDefPtr controller)
{ {
const char *prefix = virDomainControllerTypeToString(controller->type); const char *prefix = virDomainControllerTypeToString(controller->type);
if (virAsprintf(&controller->info.alias, "%s%d", prefix, if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI) {
controller->idx) < 0) /* only pcie-root uses a different naming convention
return -1; * ("pcie.0"), because it is hardcoded that way in qemu. All
return 0; * other buses use the consistent "pci.%u".
*/
if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT)
return virAsprintf(&controller->info.alias, "pcie.%d", controller->idx);
else
return virAsprintf(&controller->info.alias, "pci.%d", controller->idx);
}
return virAsprintf(&controller->info.alias, "%s%d", prefix, controller->idx);
} }
static ssize_t static ssize_t
@ -2793,22 +2801,57 @@ qemuUsbId(virBufferPtr buf, int idx)
static int static int
qemuBuildDeviceAddressStr(virBufferPtr buf, qemuBuildDeviceAddressStr(virBufferPtr buf,
virDomainDefPtr domainDef,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
int ret = -1;
char *devStr = NULL;
if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) {
const char *contAlias = NULL;
size_t i;
if (!(devStr = qemuDomainPCIAddressAsString(&info->addr.pci)))
goto cleanup;
for (i = 0; i < domainDef->ncontrollers; i++) {
virDomainControllerDefPtr cont = domainDef->controllers[i];
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
cont->idx == info->addr.pci.bus) {
contAlias = cont->info.alias;
if (!contAlias) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Device alias was not set for PCI "
"controller with index %u required "
"for device at address %s"),
info->addr.pci.bus, devStr);
goto cleanup;
}
break;
}
}
if (!contAlias) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Could not find PCI "
"controller with index %u required "
"for device at address %s"),
info->addr.pci.bus, devStr);
goto cleanup;
}
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIFUNCTION)) {
if (info->addr.pci.function != 0) { if (info->addr.pci.function != 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Only PCI device addresses with function=0 " _("Only PCI device addresses with function=0 "
"are supported with this QEMU binary")); "are supported with this QEMU binary"));
return -1; goto cleanup;
} }
if (info->addr.pci.multi == VIR_DEVICE_ADDRESS_PCI_MULTI_ON) { if (info->addr.pci.multi == VIR_DEVICE_ADDRESS_PCI_MULTI_ON) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("'multifunction=on' is not supported with " _("'multifunction=on' is not supported with "
"this QEMU binary")); "this QEMU binary"));
return -1; goto cleanup;
} }
} }
@ -2822,19 +2865,20 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
*/ */
if (info->addr.pci.bus != 0) { if (info->addr.pci.bus != 0) {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCI_BRIDGE)) {
virBufferAsprintf(buf, ",bus=pci.%u", info->addr.pci.bus); virBufferAsprintf(buf, ",bus=%s", contAlias);
} else { } else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Multiple PCI buses are not supported " _("Multiple PCI buses are not supported "
"with this QEMU binary")); "with this QEMU binary"));
return -1; goto cleanup;
} }
} else { } else {
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS)) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS)) {
virBufferAddLit(buf, ",bus=pci.0"); virBufferAsprintf(buf, ",bus=%s", contAlias);
else } else {
virBufferAddLit(buf, ",bus=pci"); virBufferAddLit(buf, ",bus=pci");
} }
}
if (info->addr.pci.multi == VIR_DEVICE_ADDRESS_PCI_MULTI_ON) if (info->addr.pci.multi == VIR_DEVICE_ADDRESS_PCI_MULTI_ON)
virBufferAddLit(buf, ",multifunction=on"); virBufferAddLit(buf, ",multifunction=on");
else if (info->addr.pci.multi == VIR_DEVICE_ADDRESS_PCI_MULTI_OFF) else if (info->addr.pci.multi == VIR_DEVICE_ADDRESS_PCI_MULTI_OFF)
@ -2857,7 +2901,10 @@ qemuBuildDeviceAddressStr(virBufferPtr buf,
info->addr.ccw.devno); info->addr.ccw.devno);
} }
return 0; ret = 0;
cleanup:
VIR_FREE(devStr);
return ret;
} }
static int static int
@ -4191,13 +4238,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
(disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN)
? "on" : "off"); ? "on" : "off");
} }
if (qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < 0)
goto error; goto error;
break; break;
case VIR_DOMAIN_DISK_BUS_USB: case VIR_DOMAIN_DISK_BUS_USB:
virBufferAddLit(&opt, "usb-storage"); virBufferAddLit(&opt, "usb-storage");
if (qemuBuildDeviceAddressStr(&opt, &disk->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < 0)
goto error; goto error;
break; break;
default: default:
@ -4321,7 +4368,8 @@ error:
char * char *
qemuBuildFSDevStr(virDomainFSDefPtr fs, qemuBuildFSDevStr(virDomainDefPtr def,
virDomainFSDefPtr fs,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer opt = VIR_BUFFER_INITIALIZER; virBuffer opt = VIR_BUFFER_INITIALIZER;
@ -4337,7 +4385,7 @@ qemuBuildFSDevStr(virDomainFSDefPtr fs,
virBufferAsprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); virBufferAsprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias);
virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst);
if (qemuBuildDeviceAddressStr(&opt, &fs->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&opt)) { if (virBufferError(&opt)) {
@ -4557,7 +4605,7 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef,
if (def->queues) if (def->queues)
virBufferAsprintf(&buf, ",num_queues=%u", def->queues); virBufferAsprintf(&buf, ",num_queues=%u", def->queues);
if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -4595,7 +4643,8 @@ qemuBuildNicStr(virDomainNetDefPtr net,
char * char *
qemuBuildNicDevStr(virDomainNetDefPtr net, qemuBuildNicDevStr(virDomainDefPtr def,
virDomainNetDefPtr net,
int vlan, int vlan,
int bootindex, int bootindex,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
@ -4657,7 +4706,7 @@ qemuBuildNicDevStr(virDomainNetDefPtr net,
virBufferAsprintf(&buf, ",id=%s", net->info.alias); virBufferAsprintf(&buf, ",id=%s", net->info.alias);
virBufferAsprintf(&buf, ",mac=%s", virBufferAsprintf(&buf, ",mac=%s",
virMacAddrFormat(&net->mac, macaddr)); virMacAddrFormat(&net->mac, macaddr));
if (qemuBuildDeviceAddressStr(&buf, &net->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0)
goto error; goto error;
if (qemuBuildRomStr(&buf, &net->info, qemuCaps) < 0) if (qemuBuildRomStr(&buf, &net->info, qemuCaps) < 0)
goto error; goto error;
@ -4812,7 +4861,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
char * char *
qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, qemuBuildWatchdogDevStr(virDomainDefPtr def,
virDomainWatchdogDefPtr dev,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -4825,7 +4875,7 @@ qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev,
} }
virBufferAsprintf(&buf, "%s,id=%s", model, dev->info.alias); virBufferAsprintf(&buf, "%s,id=%s", model, dev->info.alias);
if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -4842,7 +4892,8 @@ error:
char * char *
qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, qemuBuildMemballoonDevStr(virDomainDefPtr def,
virDomainMemballoonDefPtr dev,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -4862,7 +4913,7 @@ qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev,
} }
virBufferAsprintf(&buf, ",id=%s", dev->info.alias); virBufferAsprintf(&buf, ",id=%s", dev->info.alias);
if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -4905,7 +4956,8 @@ error:
} }
char * char *
qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, qemuBuildUSBInputDevStr(virDomainDefPtr def,
virDomainInputDefPtr dev,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -4914,7 +4966,7 @@ qemuBuildUSBInputDevStr(virDomainInputDefPtr dev,
dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ? dev->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ?
"usb-mouse" : "usb-tablet", dev->info.alias); "usb-mouse" : "usb-tablet", dev->info.alias);
if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -4931,7 +4983,8 @@ error:
char * char *
qemuBuildSoundDevStr(virDomainSoundDefPtr sound, qemuBuildSoundDevStr(virDomainDefPtr def,
virDomainSoundDefPtr sound,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -4952,7 +5005,7 @@ qemuBuildSoundDevStr(virDomainSoundDefPtr sound,
model = "intel-hda"; model = "intel-hda";
virBufferAsprintf(&buf, "%s,id=%s", model, sound->info.alias); virBufferAsprintf(&buf, "%s,id=%s", model, sound->info.alias);
if (qemuBuildDeviceAddressStr(&buf, &sound->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &sound->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -5012,7 +5065,8 @@ error:
} }
static char * static char *
qemuBuildDeviceVideoStr(virDomainVideoDefPtr video, qemuBuildDeviceVideoStr(virDomainDefPtr def,
virDomainVideoDefPtr video,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
bool primary) bool primary)
{ {
@ -5066,7 +5120,7 @@ qemuBuildDeviceVideoStr(virDomainVideoDefPtr video,
virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024);
} }
if (qemuBuildDeviceAddressStr(&buf, &video->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -5106,7 +5160,9 @@ qemuOpenPCIConfig(virDomainHostdevDefPtr dev)
} }
char * char *
qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, const char *configfd, qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev,
const char *configfd,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -5126,7 +5182,7 @@ qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, const char *configfd,
virBufferAsprintf(&buf, ",id=%s", dev->info->alias); virBufferAsprintf(&buf, ",id=%s", dev->info->alias);
if (dev->info->bootIndex) if (dev->info->bootIndex)
virBufferAsprintf(&buf, ",bootindex=%d", dev->info->bootIndex); virBufferAsprintf(&buf, ",bootindex=%d", dev->info->bootIndex);
if (qemuBuildDeviceAddressStr(&buf, dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
goto error; goto error;
if (qemuBuildRomStr(&buf, dev->info, qemuCaps) < 0) if (qemuBuildRomStr(&buf, dev->info, qemuCaps) < 0)
goto error; goto error;
@ -5232,7 +5288,7 @@ qemuBuildRedirdevDevStr(virDomainDefPtr def,
virBufferAsprintf(&buf, ",bootindex=%d", dev->info.bootIndex); virBufferAsprintf(&buf, ",bootindex=%d", dev->info.bootIndex);
} }
if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -5248,7 +5304,8 @@ error:
} }
char * char *
qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, qemuBuildUSBHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -5271,7 +5328,7 @@ qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev,
if (dev->info->bootIndex) if (dev->info->bootIndex)
virBufferAsprintf(&buf, ",bootindex=%d", dev->info->bootIndex); virBufferAsprintf(&buf, ",bootindex=%d", dev->info->bootIndex);
if (qemuBuildDeviceAddressStr(&buf, dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -5288,7 +5345,8 @@ error:
char * char *
qemuBuildHubDevStr(virDomainHubDefPtr dev, qemuBuildHubDevStr(virDomainDefPtr def,
virDomainHubDefPtr dev,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
@ -5308,7 +5366,7 @@ qemuBuildHubDevStr(virDomainHubDefPtr dev,
virBufferAddLit(&buf, "usb-hub"); virBufferAddLit(&buf, "usb-hub");
virBufferAsprintf(&buf, ",id=%s", dev->info.alias); virBufferAsprintf(&buf, ",id=%s", dev->info.alias);
if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto error; goto error;
if (virBufferError(&buf)) { if (virBufferError(&buf)) {
@ -5829,6 +5887,7 @@ cleanup:
static int static int
qemuBuildRNGDeviceArgs(virCommandPtr cmd, qemuBuildRNGDeviceArgs(virCommandPtr cmd,
virDomainDefPtr def,
virDomainRNGDefPtr dev, virDomainRNGDefPtr dev,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
@ -5858,7 +5917,7 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd,
virBufferAddLit(&buf, ",period=1000"); virBufferAddLit(&buf, ",period=1000");
} }
if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0)
goto cleanup; goto cleanup;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
@ -7133,7 +7192,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd,
virCommandAddArgList(cmd, "-netdev", host, NULL); virCommandAddArgList(cmd, "-netdev", host, NULL);
} }
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
if (!(nic = qemuBuildNicDevStr(net, vlan, bootindex, qemuCaps))) if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, qemuCaps)))
goto cleanup; goto cleanup;
virCommandAddArgList(cmd, "-device", nic, NULL); virCommandAddArgList(cmd, "-device", nic, NULL);
} else { } else {
@ -7881,7 +7940,7 @@ qemuBuildCommandLine(virConnectPtr conn,
char *optstr; char *optstr;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(optstr = qemuBuildHubDevStr(hub, qemuCaps))) if (!(optstr = qemuBuildHubDevStr(def, hub, qemuCaps)))
goto error; goto error;
virCommandAddArg(cmd, optstr); virCommandAddArg(cmd, optstr);
VIR_FREE(optstr); VIR_FREE(optstr);
@ -8102,7 +8161,7 @@ qemuBuildCommandLine(virConnectPtr conn,
VIR_FREE(optstr); VIR_FREE(optstr);
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(optstr = qemuBuildFSDevStr(fs, qemuCaps))) if (!(optstr = qemuBuildFSDevStr(def, fs, qemuCaps)))
goto error; goto error;
virCommandAddArg(cmd, optstr); virCommandAddArg(cmd, optstr);
VIR_FREE(optstr); VIR_FREE(optstr);
@ -8460,7 +8519,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
char *optstr; char *optstr;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(optstr = qemuBuildUSBInputDevStr(input, qemuCaps))) if (!(optstr = qemuBuildUSBInputDevStr(def, input, qemuCaps)))
goto error; goto error;
virCommandAddArg(cmd, optstr); virCommandAddArg(cmd, optstr);
VIR_FREE(optstr); VIR_FREE(optstr);
@ -8517,7 +8576,7 @@ qemuBuildCommandLine(virConnectPtr conn,
for (i = 0; i < def->nvideos; i++) { for (i = 0; i < def->nvideos; i++) {
char *str; char *str;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(str = qemuBuildDeviceVideoStr(def->videos[i], qemuCaps, !i))) if (!(str = qemuBuildDeviceVideoStr(def, def->videos[i], qemuCaps, !i)))
goto error; goto error;
virCommandAddArg(cmd, str); virCommandAddArg(cmd, str);
@ -8591,7 +8650,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(str = qemuBuildDeviceVideoStr(def->videos[i], qemuCaps, false))) if (!(str = qemuBuildDeviceVideoStr(def, def->videos[i], qemuCaps, false)))
goto error; goto error;
virCommandAddArg(cmd, str); virCommandAddArg(cmd, str);
@ -8655,7 +8714,7 @@ qemuBuildCommandLine(virConnectPtr conn,
virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL); virCommandAddArgList(cmd, "-soundhw", "pcspk", NULL);
} else { } else {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(str = qemuBuildSoundDevStr(sound, qemuCaps))) if (!(str = qemuBuildSoundDevStr(def, sound, qemuCaps)))
goto error; goto error;
virCommandAddArg(cmd, str); virCommandAddArg(cmd, str);
@ -8731,7 +8790,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
optstr = qemuBuildWatchdogDevStr(watchdog, qemuCaps); optstr = qemuBuildWatchdogDevStr(def, watchdog, qemuCaps);
if (!optstr) if (!optstr)
goto error; goto error;
} else { } else {
@ -8844,7 +8903,7 @@ qemuBuildCommandLine(virConnectPtr conn,
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
if (!(devstr = qemuBuildUSBHostdevDevStr(hostdev, qemuCaps))) if (!(devstr = qemuBuildUSBHostdevDevStr(def, hostdev, qemuCaps)))
goto error; goto error;
virCommandAddArg(cmd, devstr); virCommandAddArg(cmd, devstr);
VIR_FREE(devstr); VIR_FREE(devstr);
@ -8892,7 +8951,7 @@ qemuBuildCommandLine(virConnectPtr conn,
} }
} }
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
devstr = qemuBuildPCIHostdevDevStr(hostdev, configfd_name, qemuCaps); devstr = qemuBuildPCIHostdevDevStr(def, hostdev, configfd_name, qemuCaps);
VIR_FREE(configfd_name); VIR_FREE(configfd_name);
if (!devstr) if (!devstr)
goto error; goto error;
@ -9021,7 +9080,7 @@ qemuBuildCommandLine(virConnectPtr conn,
char *optstr; char *optstr;
virCommandAddArg(cmd, "-device"); virCommandAddArg(cmd, "-device");
optstr = qemuBuildMemballoonDevStr(def->memballoon, qemuCaps); optstr = qemuBuildMemballoonDevStr(def, def->memballoon, qemuCaps);
if (!optstr) if (!optstr)
goto error; goto error;
virCommandAddArg(cmd, optstr); virCommandAddArg(cmd, optstr);
@ -9037,7 +9096,7 @@ qemuBuildCommandLine(virConnectPtr conn,
goto error; goto error;
/* add the device */ /* add the device */
if (qemuBuildRNGDeviceArgs(cmd, def->rng, qemuCaps) < 0) if (qemuBuildRNGDeviceArgs(cmd, def, def->rng, qemuCaps) < 0)
goto error; goto error;
} }
@ -9115,6 +9174,7 @@ error:
*/ */
static int static int
qemuBuildSerialChrDeviceStr(char **deviceStr, qemuBuildSerialChrDeviceStr(char **deviceStr,
virDomainDefPtr def,
virDomainChrDefPtr serial, virDomainChrDefPtr serial,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virArch arch, virArch arch,
@ -9127,7 +9187,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",
serial->info.alias); serial->info.alias);
if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0)
goto error; goto error;
} }
} else { } else {
@ -9149,7 +9209,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
goto error; goto error;
} }
if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0)
goto error; goto error;
} }
} }
@ -9264,7 +9324,7 @@ qemuBuildChrDeviceStr(char **deviceStr,
switch ((enum virDomainChrDeviceType) chr->deviceType) { switch ((enum virDomainChrDeviceType) chr->deviceType) {
case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL: case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
ret = qemuBuildSerialChrDeviceStr(deviceStr, chr, qemuCaps, ret = qemuBuildSerialChrDeviceStr(deviceStr, vmdef, chr, qemuCaps,
vmdef->os.arch, vmdef->os.arch,
vmdef->os.machine); vmdef->os.machine);
break; break;

28
src/qemu/qemu_command.h
View File

@ -98,7 +98,8 @@ char * qemuBuildNicStr(virDomainNetDefPtr net,
int vlan); int vlan);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildNicDevStr(virDomainNetDefPtr net, char * qemuBuildNicDevStr(virDomainDefPtr def,
virDomainNetDefPtr net,
int vlan, int vlan,
int bootindex, int bootindex,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
@ -119,7 +120,8 @@ char * qemuBuildDriveDevStr(virDomainDefPtr def,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
int bootindex, int bootindex,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildFSDevStr(virDomainFSDefPtr fs, char * qemuBuildFSDevStr(virDomainDefPtr domainDef,
virDomainFSDefPtr fs,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildControllerDevStr(virDomainDefPtr domainDef, char * qemuBuildControllerDevStr(virDomainDefPtr domainDef,
@ -127,22 +129,27 @@ char * qemuBuildControllerDevStr(virDomainDefPtr domainDef,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
int *nusbcontroller); int *nusbcontroller);
char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildWatchdogDevStr(virDomainDefPtr domainDef,
virDomainWatchdogDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainDefPtr domainDef,
virDomainMemballoonDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, char * qemuBuildUSBInputDevStr(virDomainDefPtr domainDef,
virDomainInputDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildSoundDevStr(virDomainSoundDefPtr sound, char * qemuBuildSoundDevStr(virDomainDefPtr domainDef,
virDomainSoundDefPtr sound,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev); char * qemuBuildPCIHostdevPCIDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildPCIHostdevDevStr(virDomainHostdevDefPtr dev, char * qemuBuildPCIHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev,
const char *configfd, const char *configfd,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
@ -151,7 +158,8 @@ int qemuOpenPCIConfig(virDomainHostdevDefPtr dev);
/* Legacy, pre device support */ /* Legacy, pre device support */
char * qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev); char * qemuBuildUSBHostdevUsbDevStr(virDomainHostdevDefPtr dev);
/* Current, best practice */ /* Current, best practice */
char * qemuBuildUSBHostdevDevStr(virDomainHostdevDefPtr dev, char * qemuBuildUSBHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev, char * qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev,
@ -162,7 +170,9 @@ char * qemuBuildSCSIHostdevDevStr(virDomainDefPtr def,
virDomainHostdevDefPtr dev, virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);
char * qemuBuildHubDevStr(virDomainHubDefPtr dev, virQEMUCapsPtr qemuCaps); char * qemuBuildHubDevStr(virDomainDefPtr def,
virDomainHubDefPtr dev,
virQEMUCapsPtr qemuCaps);
char * qemuBuildRedirdevDevStr(virDomainDefPtr def, char * qemuBuildRedirdevDevStr(virDomainDefPtr def,
virDomainRedirdevDefPtr dev, virDomainRedirdevDefPtr dev,
virQEMUCapsPtr qemuCaps); virQEMUCapsPtr qemuCaps);

6
src/qemu/qemu_hotplug.c
View File

@ -859,7 +859,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn,
} }
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
if (!(nicstr = qemuBuildNicDevStr(net, vlan, 0, priv->qemuCaps))) if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, priv->qemuCaps)))
goto try_remove; goto try_remove;
} else { } else {
if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) if (!(nicstr = qemuBuildNicStr(net, NULL, vlan)))
@ -1057,7 +1057,7 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver,
goto error; goto error;
} }
if (!(devstr = qemuBuildPCIHostdevDevStr(hostdev, configfd_name, if (!(devstr = qemuBuildPCIHostdevDevStr(vm->def, hostdev, configfd_name,
priv->qemuCaps))) priv->qemuCaps)))
goto error; goto error;
@ -1302,7 +1302,7 @@ int qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver,
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0) if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0)
goto cleanup; goto cleanup;
if (!(devstr = qemuBuildUSBHostdevDevStr(hostdev, priv->qemuCaps))) if (!(devstr = qemuBuildUSBHostdevDevStr(vm->def, hostdev, priv->qemuCaps)))
goto cleanup; goto cleanup;
} }

2
tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args
View File

@ -1,5 +1,5 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/libexec/qemu-kvm \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/libexec/qemu-kvm \
-S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
-device i82801b11-bridge,id=pci.1,bus=pci.0,addr=0x2 \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1

2
tests/qemuxml2argvdata/qemuxml2argv-q35.args
View File

@ -1,6 +1,6 @@
LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
/usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \ /usr/libexec/qemu-kvm -S -M q35 -m 2048 -smp 2 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \
-device i82801b11-bridge,id=pci.1,bus=pci.0,addr=0x2 \ -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x2 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 -vga qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368