openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bhyve: fix indentation 

Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ryan Moeller 2020-02-22 01:38:43 -05:00 committed by Ján Tomko
parent dc9fdd23f9
commit a11a6b7cd4
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/bhyve/bhyve_command.c
View File

@ -196,10 +196,10 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def,
if ((disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) &&
(disk_source == NULL)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("cdrom device without source path "
"not supported"));
goto error;
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("cdrom device without source path "
"not supported"));
goto error;
}
switch (disk->device) {
@ -276,8 +276,8 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def,
static int
bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED,
virDomainDiskDefPtr disk,
virCommandPtr cmd)
virDomainDiskDefPtr disk,
virCommandPtr cmd)
{
const char *disk_source;
@ -550,26 +550,26 @@ virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver,
virDomainControllerDefPtr controller = def->controllers[i];
switch (controller->type) {
case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
if (controller->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("unsupported PCI controller model: only PCI root supported"));
goto error;
}
break;
if (controller->model != VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("unsupported PCI controller model: only PCI root supported"));
goto error;
}
break;
case VIR_DOMAIN_CONTROLLER_TYPE_SATA:
if (bhyveBuildAHCIControllerArgStr(def, controller, driver, cmd) < 0)
goto error;
break;
if (bhyveBuildAHCIControllerArgStr(def, controller, driver, cmd) < 0)
goto error;
break;
case VIR_DOMAIN_CONTROLLER_TYPE_USB:
if (++nusbcontrollers > 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("only single USB controller is supported"));
goto error;
}
if (++nusbcontrollers > 1) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s", _("only single USB controller is supported"));
goto error;
}
if (bhyveBuildUSBControllerArgStr(def, controller, cmd) < 0)
goto error;
break;
if (bhyveBuildUSBControllerArgStr(def, controller, cmd) < 0)
goto error;
break;
}
}
for (i = 0; i < def->nnets; i++) {

4
src/bhyve/bhyve_monitor.c
View File

@ -77,8 +77,8 @@ bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque)
if (kev.filter == EVFILT_PROC && (kev.fflags & NOTE_EXIT) != 0) {
if ((pid_t)kev.ident != vm->pid) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("event from unexpected proc %ju!=%ju"),
(uintmax_t)vm->pid, (uintmax_t)kev.ident);
_("event from unexpected proc %ju!=%ju"),
(uintmax_t)vm->pid, (uintmax_t)kev.ident);
return;
}