Signed-off-by: Ryan Moeller <ryan(a)iXsystems.com>
---
src/bhyve/bhyve_command.c | 46 +++++++++++++++++++--------------------
src/bhyve/bhyve_monitor.c | 4 ++--
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index a1078d1460..7e420165aa 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -200,10 +200,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) {
@@ -280,8 +280,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;
@@ -554,26 +554,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++) {
diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c
index ad6977e562..b9ad4520d9 100644
--- a/src/bhyve/bhyve_monitor.c
+++ b/src/bhyve/bhyve_monitor.c
@@ -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;
}
--
2.24.1