mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
bhyve: stop opening & passing connection to bhyveProcessStart
A connection object is not required because autostarted domains are never marked for autodestroy. The comment about needing a connection for the network driver is obsolete since we can auto-open a connection on demand. Reviewed-by: Peter Krempa <pkrempa@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
2eb1de2a16
commit
354b455ec6
@ -73,13 +73,13 @@ struct _bhyveConn *bhyve_driver = NULL;
|
||||
static int
|
||||
bhyveAutostartDomain(virDomainObj *vm, void *opaque)
|
||||
{
|
||||
const struct bhyveAutostartData *data = opaque;
|
||||
bhyveConn *driver = opaque;
|
||||
int ret = 0;
|
||||
VIR_LOCK_GUARD lock = virObjectLockGuard(vm);
|
||||
|
||||
if (vm->autostart && !virDomainObjIsActive(vm)) {
|
||||
virResetLastError();
|
||||
ret = virBhyveProcessStart(data->driver, data->conn, vm,
|
||||
ret = virBhyveProcessStart(driver, NULL, vm,
|
||||
VIR_DOMAIN_RUNNING_BOOTED, 0);
|
||||
if (ret < 0) {
|
||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||
@ -93,19 +93,7 @@ bhyveAutostartDomain(virDomainObj *vm, void *opaque)
|
||||
static void
|
||||
bhyveAutostartDomains(struct _bhyveConn *driver)
|
||||
{
|
||||
/* XXX: Figure out a better way todo this. The domain
|
||||
* startup code needs a connection handle in order
|
||||
* to lookup the bridge associated with a virtual
|
||||
* network
|
||||
*/
|
||||
virConnectPtr conn = virConnectOpen("bhyve:///system");
|
||||
/* Ignoring NULL conn which is mostly harmless here */
|
||||
|
||||
struct bhyveAutostartData data = { driver, conn };
|
||||
|
||||
virDomainObjListForEach(driver->domains, false, bhyveAutostartDomain, &data);
|
||||
|
||||
virObjectUnref(conn);
|
||||
virDomainObjListForEach(driver->domains, false, bhyveAutostartDomain, driver);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -66,8 +66,3 @@ struct _bhyveConn {
|
||||
};
|
||||
|
||||
typedef struct _bhyveConn bhyveConn;
|
||||
|
||||
struct bhyveAutostartData {
|
||||
struct _bhyveConn *driver;
|
||||
virConnectPtr conn;
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user