External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: remove redundant parameter to virBhyveProcessStart()

Browse Source 
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:42 -05:00 committed by Ján Tomko
parent b4a076ea78
commit dc9fdd23f9
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bhyve/bhyve_driver.c
View File

@ -89,7 +89,7 @@ bhyveAutostartDomain(virDomainObjPtr vm, void *opaque)
virObjectLock(vm);
if (vm->autostart && !virDomainObjIsActive(vm)) {
virResetLastError();
ret = virBhyveProcessStart(data->conn, data->driver, vm,
ret = virBhyveProcessStart(data->conn, vm,
VIR_DOMAIN_RUNNING_BOOTED, 0);
if (ret < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -861,7 +861,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom,
goto cleanup;
}
ret = virBhyveProcessStart(dom->conn, privconn, vm,
ret = virBhyveProcessStart(dom->conn, vm,
VIR_DOMAIN_RUNNING_BOOTED,
start_flags);
@ -920,7 +920,7 @@ bhyveDomainCreateXML(virConnectPtr conn,
goto cleanup;
def = NULL;
if (virBhyveProcessStart(conn, privconn, vm,
if (virBhyveProcessStart(conn, vm,
VIR_DOMAIN_RUNNING_BOOTED,
start_flags) < 0) {
/* If domain is not persistent, remove its data */

18
src/bhyve/bhyve_process.c
View File

@ -94,7 +94,6 @@ virBhyveFormatDevMapFile(const char *vm_name, char **fn_out)
int
virBhyveProcessStart(virConnectPtr conn,
bhyveConnPtr driver,
virDomainObjPtr vm,
virDomainRunningReason reason,
unsigned int flags)
@ -107,12 +106,11 @@ virBhyveProcessStart(virConnectPtr conn,
char ebuf[1024];
virCommandPtr cmd = NULL;
virCommandPtr load_cmd = NULL;
bhyveConnPtr privconn = conn->privateData;
bhyveConnPtr driver = conn->privateData;
bhyveDomainObjPrivatePtr priv = vm->privateData;
int ret = -1, rc;
logfile = g_strdup_printf("%s/%s.log", BHYVE_LOG_DIR, vm->def->name);
if ((logfd = open(logfile, O_WRONLY | O_APPEND | O_CREAT,
S_IRUSR | S_IWUSR)) < 0) {
virReportSystemError(errno,
@ -121,19 +119,19 @@ virBhyveProcessStart(virConnectPtr conn,
goto cleanup;
}
VIR_FREE(privconn->pidfile);
if (!(privconn->pidfile = virPidFileBuildPath(BHYVE_STATE_DIR,
vm->def->name))) {
VIR_FREE(driver->pidfile);
if (!(driver->pidfile = virPidFileBuildPath(BHYVE_STATE_DIR,
vm->def->name))) {
virReportSystemError(errno,
"%s", _("Failed to build pidfile path"));
goto cleanup;
}
if (unlink(privconn->pidfile) < 0 &&
if (unlink(driver->pidfile) < 0 &&
errno != ENOENT) {
virReportSystemError(errno,
_("Cannot remove state PID file %s"),
privconn->pidfile);
driver->pidfile);
goto cleanup;
}
@ -147,7 +145,7 @@ virBhyveProcessStart(virConnectPtr conn,
virCommandSetOutputFD(cmd, &logfd);
virCommandSetErrorFD(cmd, &logfd);
virCommandWriteArgLog(cmd, logfd);
virCommandSetPidFile(cmd, privconn->pidfile);
virCommandSetPidFile(cmd, driver->pidfile);
virCommandDaemonize(cmd);
if (vm->def->os.loader == NULL) {
@ -189,7 +187,7 @@ virBhyveProcessStart(virConnectPtr conn,
if (virCommandRun(cmd, NULL) < 0)
goto cleanup;
if (virPidFileReadPath(privconn->pidfile, &vm->pid) < 0) {
if (virPidFileReadPath(driver->pidfile, &vm->pid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Domain %s didn't show up"), vm->def->name);
goto cleanup;

1
src/bhyve/bhyve_process.h
View File

@ -24,7 +24,6 @@
#include "bhyve_utils.h"
int virBhyveProcessStart(virConnectPtr conn,
bhyveConnPtr driver,
virDomainObjPtr vm,
virDomainRunningReason reason,
unsigned int flags);