mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
qemu_process.c: use g_autoptr()
Change all feasible pointers to use g_autoptr(). Reviewed-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza
Cole Robinson
parent
906d653297
commit
d234efc59a
@ -107,7 +107,7 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver,
|
||||
char ebuf[1024];
|
||||
g_autofree char *file = NULL;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
file = g_strdup_printf("%s/%s.xml", cfg->stateDir, vm->def->name);
|
||||
|
||||
@ -120,8 +120,6 @@ qemuProcessRemoveDomainStatus(virQEMUDriverPtr driver,
|
||||
errno != ENOENT)
|
||||
VIR_WARN("Failed to remove PID file for %s: %s",
|
||||
vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf)));
|
||||
|
||||
virObjectUnref(cfg);
|
||||
}
|
||||
|
||||
|
||||
@ -401,7 +399,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event;
|
||||
qemuDomainObjPrivatePtr priv;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
int ret = -1;
|
||||
|
||||
virObjectLock(vm);
|
||||
@ -438,7 +436,6 @@ qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
cleanup:
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -457,7 +454,7 @@ qemuProcessFakeReboot(void *opaque)
|
||||
virDomainObjPtr vm = opaque;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverPtr driver = priv->driver;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
virDomainRunningReason reason = VIR_DOMAIN_RUNNING_BOOTED;
|
||||
int ret = -1, rc;
|
||||
|
||||
@ -507,7 +504,6 @@ qemuProcessFakeReboot(void *opaque)
|
||||
if (ret == -1)
|
||||
ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE));
|
||||
virDomainObjEndAPI(&vm);
|
||||
virObjectUnref(cfg);
|
||||
}
|
||||
|
||||
|
||||
@ -570,7 +566,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
qemuDomainObjPrivatePtr priv;
|
||||
virObjectEventPtr event = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
int detail = 0;
|
||||
|
||||
VIR_DEBUG("vm=%p", vm);
|
||||
@ -627,7 +623,6 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
unlock:
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -642,7 +637,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virObjectEventPtr event = NULL;
|
||||
virDomainPausedReason reason;
|
||||
virDomainEventSuspendedDetailType detail;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
|
||||
virObjectLock(vm);
|
||||
@ -688,7 +683,6 @@ qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -701,7 +695,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
{
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
qemuDomainObjPrivatePtr priv;
|
||||
virDomainRunningReason reason = VIR_DOMAIN_RUNNING_UNPAUSED;
|
||||
virDomainEventResumedDetailType eventDetail;
|
||||
@ -734,7 +728,6 @@ qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -746,7 +739,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
{
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
|
||||
@ -778,7 +771,6 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virObjectUnlock(vm);
|
||||
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -792,7 +784,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr watchdogEvent = NULL;
|
||||
virObjectEventPtr lifecycleEvent = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
watchdogEvent = virDomainEventWatchdogNewFromObj(vm, action);
|
||||
@ -840,7 +832,6 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virObjectEventStateQueue(driver->domainEventState, watchdogEvent);
|
||||
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
|
||||
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -861,7 +852,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
const char *srcPath;
|
||||
const char *devAlias;
|
||||
virDomainDiskDefPtr disk;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
|
||||
@ -912,7 +903,6 @@ qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virObjectEventStateQueue(driver->domainEventState, ioErrorEvent);
|
||||
virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2);
|
||||
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1136,7 +1126,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virDomainDiskDefPtr disk;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, devid);
|
||||
@ -1159,7 +1149,6 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1171,7 +1160,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virObjectEventPtr lifecycleEvent = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
event = virDomainEventPMWakeupNewFromObj(vm);
|
||||
@ -1198,7 +1187,6 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1210,7 +1198,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virObjectEventPtr lifecycleEvent = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
event = virDomainEventPMSuspendNewFromObj(vm);
|
||||
@ -1240,7 +1228,6 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1252,7 +1239,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
{
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
event = virDomainEventBalloonChangeNewFromObj(vm, actual);
|
||||
@ -1267,7 +1254,6 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virObjectUnlock(vm);
|
||||
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1279,7 +1265,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virObjectEventPtr lifecycleEvent = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
virObjectLock(vm);
|
||||
event = virDomainEventPMSuspendDiskNewFromObj(vm);
|
||||
@ -1309,7 +1295,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
|
||||
virObjectUnref(cfg);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1637,7 +1622,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
qemuDomainObjPrivatePtr priv;
|
||||
virQEMUDriverPtr driver = opaque;
|
||||
virObjectEventPtr event = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
int reason;
|
||||
|
||||
virObjectLock(vm);
|
||||
@ -1676,7 +1661,6 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED,
|
||||
cleanup:
|
||||
virObjectUnlock(vm);
|
||||
virObjectEventStateQueue(driver->domainEventState, event);
|
||||
virObjectUnref(cfg);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2721,7 +2705,7 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
|
||||
{
|
||||
int ret = -1;
|
||||
size_t i = 0;
|
||||
virCapsPtr caps = NULL;
|
||||
g_autoptr(virCaps) caps = NULL;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
|
||||
if (!vm->def->nresctrls)
|
||||
@ -2752,7 +2736,6 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virObjectUnref(caps);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -2826,13 +2809,13 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm)
|
||||
{
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverPtr driver = priv->driver;
|
||||
virQEMUDriverConfigPtr cfg;
|
||||
g_autoptr(virQEMUDriverConfig) cfg = NULL;
|
||||
int errfd = -1;
|
||||
g_autofree char *pidfile = NULL;
|
||||
int pidfd = -1;
|
||||
g_autofree char *socketPath = NULL;
|
||||
pid_t cpid = -1;
|
||||
virCommandPtr cmd = NULL;
|
||||
g_autoptr(virCommand) cmd = NULL;
|
||||
virTimeBackOffVar timebackoff;
|
||||
const unsigned long long timeout = 500000; /* ms */
|
||||
int ret = -1;
|
||||
@ -2935,10 +2918,8 @@ qemuProcessStartManagedPRDaemon(virDomainObjPtr vm)
|
||||
if (pidfile)
|
||||
unlink(pidfile);
|
||||
}
|
||||
virCommandFree(cmd);
|
||||
VIR_FORCE_CLOSE(pidfd);
|
||||
VIR_FORCE_CLOSE(errfd);
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -2949,7 +2930,7 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver,
|
||||
int asyncJob)
|
||||
{
|
||||
int ret = 0;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < vm->def->ngraphics; ++i) {
|
||||
@ -2973,7 +2954,6 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver,
|
||||
}
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -3034,7 +3014,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver,
|
||||
ssize_t i;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virDomainVideoDefPtr video = NULL;
|
||||
virQEMUDriverConfigPtr cfg = NULL;
|
||||
g_autoptr(virQEMUDriverConfig) cfg = NULL;
|
||||
|
||||
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
|
||||
return -1;
|
||||
@ -3093,7 +3073,6 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver,
|
||||
|
||||
cfg = virQEMUDriverGetConfig(driver);
|
||||
ret = virDomainObjSave(vm, driver->xmlopt, cfg->stateDir);
|
||||
virObjectUnref(cfg);
|
||||
|
||||
return ret;
|
||||
|
||||
@ -3198,7 +3177,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
|
||||
{
|
||||
int ret = -1;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
/* Bring up netdevs before starting CPUs */
|
||||
if (qemuInterfaceStartDevices(vm->def) < 0)
|
||||
@ -3233,7 +3212,6 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm,
|
||||
*/
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
|
||||
release:
|
||||
@ -3295,7 +3273,7 @@ static void
|
||||
qemuProcessNotifyNets(virDomainDefPtr def)
|
||||
{
|
||||
size_t i;
|
||||
virConnectPtr conn = NULL;
|
||||
g_autoptr(virConnect) conn = NULL;
|
||||
|
||||
for (i = 0; i < def->nnets; i++) {
|
||||
virDomainNetDefPtr net = def->nets[i];
|
||||
@ -3313,8 +3291,6 @@ qemuProcessNotifyNets(virDomainDefPtr def)
|
||||
virDomainNetNotifyActualDevice(conn, def, net);
|
||||
}
|
||||
}
|
||||
|
||||
virObjectUnref(conn);
|
||||
}
|
||||
|
||||
/* Attempt to instantiate the filters. Ignore failures because it's
|
||||
@ -3863,7 +3839,8 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr driver,
|
||||
virDomainMemoryDefPtr mem,
|
||||
bool build)
|
||||
{
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
size_t i;
|
||||
bool shouldBuildHP = false;
|
||||
bool shouldBuildMB = false;
|
||||
@ -3900,7 +3877,6 @@ qemuProcessBuildDestroyMemoryPaths(virQEMUDriverPtr driver,
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -3910,7 +3886,7 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm,
|
||||
virDomainMemoryDefPtr mem)
|
||||
{
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autofree char *path = NULL;
|
||||
int ret = -1;
|
||||
|
||||
@ -3925,7 +3901,6 @@ qemuProcessDestroyMemoryBackingPath(virQEMUDriverPtr driver,
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -3965,7 +3940,7 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver,
|
||||
virDomainGraphicsDefPtr graphics,
|
||||
bool allocate)
|
||||
{
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
unsigned short port = 0;
|
||||
unsigned short tlsPort;
|
||||
size_t i;
|
||||
@ -4050,7 +4025,6 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver,
|
||||
ret = 0;
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -4340,23 +4314,19 @@ qemuProcessFetchCPUDefinitions(virQEMUDriverPtr driver,
|
||||
virDomainCapsCPUModelsPtr *cpuModels)
|
||||
{
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virDomainCapsCPUModelsPtr models = NULL;
|
||||
g_autoptr(virDomainCapsCPUModels) models = NULL;
|
||||
int rc;
|
||||
|
||||
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
|
||||
goto error;
|
||||
return -1;
|
||||
|
||||
rc = virQEMUCapsFetchCPUModels(priv->mon, vm->def->os.arch, &models);
|
||||
|
||||
if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
|
||||
goto error;
|
||||
return -1;
|
||||
|
||||
*cpuModels = models;
|
||||
*cpuModels = g_steal_pointer(&models);
|
||||
return 0;
|
||||
|
||||
error:
|
||||
virObjectUnref(models);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
@ -4367,7 +4337,7 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver,
|
||||
{
|
||||
virCPUDataPtr cpu = NULL;
|
||||
virCPUDataPtr disabled = NULL;
|
||||
virDomainCapsCPUModelsPtr models = NULL;
|
||||
g_autoptr(virDomainCapsCPUModels) models = NULL;
|
||||
int ret = -1;
|
||||
|
||||
/* The host CPU model comes from host caps rather than QEMU caps so
|
||||
@ -4390,7 +4360,6 @@ qemuProcessUpdateCPU(virQEMUDriverPtr driver,
|
||||
cleanup:
|
||||
virCPUDataFree(cpu);
|
||||
virCPUDataFree(disabled);
|
||||
virObjectUnref(models);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -4737,9 +4706,9 @@ static int
|
||||
qemuProcessGetNetworkAddress(const char *netname,
|
||||
char **netaddr)
|
||||
{
|
||||
virConnectPtr conn = NULL;
|
||||
g_autoptr(virConnect) conn = NULL;
|
||||
int ret = -1;
|
||||
virNetworkPtr net;
|
||||
g_autoptr(virNetwork) net = NULL;
|
||||
virNetworkDefPtr netdef = NULL;
|
||||
virNetworkIPDefPtr ipdef;
|
||||
virSocketAddr addr;
|
||||
@ -4825,8 +4794,6 @@ qemuProcessGetNetworkAddress(const char *netname,
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virNetworkDefFree(netdef);
|
||||
virObjectUnref(net);
|
||||
virObjectUnref(conn);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -4863,7 +4830,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver,
|
||||
virDomainObjPtr vm)
|
||||
{
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
const char *type = virDomainGraphicsTypeToString(graphics->type);
|
||||
char *listenAddr = NULL;
|
||||
bool useSocket = false;
|
||||
@ -4937,7 +4904,6 @@ qemuProcessGraphicsSetupListen(virQEMUDriverPtr driver,
|
||||
ret = 0;
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -5656,7 +5622,7 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr driver,
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
int ret = -1;
|
||||
size_t i;
|
||||
virConnectPtr conn = NULL;
|
||||
g_autoptr(virConnect) conn = NULL;
|
||||
|
||||
for (i = 0; i < def->nnets; i++) {
|
||||
virDomainNetDefPtr net = def->nets[i];
|
||||
@ -5709,7 +5675,6 @@ qemuProcessNetworkPrepareDevices(virQEMUDriverPtr driver,
|
||||
}
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virObjectUnref(conn);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -6249,7 +6214,7 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
|
||||
int ret = -1;
|
||||
size_t i;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
priv->machineName = qemuDomainGetMachineName(vm);
|
||||
if (!priv->machineName)
|
||||
@ -6353,7 +6318,6 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver,
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -6512,7 +6476,7 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver,
|
||||
int ret = -1;
|
||||
unsigned int hostdev_flags = 0;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
if (qemuPrepareNVRAM(cfg, vm) < 0)
|
||||
goto cleanup;
|
||||
@ -6601,7 +6565,6 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver,
|
||||
|
||||
ret = 0;
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -6712,11 +6675,11 @@ qemuProcessLaunch(virConnectPtr conn,
|
||||
int ret = -1;
|
||||
int rv;
|
||||
int logfile = -1;
|
||||
qemuDomainLogContextPtr logCtxt = NULL;
|
||||
g_autoptr(qemuDomainLogContext) logCtxt = NULL;
|
||||
qemuDomainObjPrivatePtr priv = vm->privateData;
|
||||
virCommandPtr cmd = NULL;
|
||||
g_autoptr(virCommand) cmd = NULL;
|
||||
struct qemuProcessHookData hookData;
|
||||
virQEMUDriverConfigPtr cfg;
|
||||
g_autoptr(virQEMUDriverConfig) cfg = NULL;
|
||||
size_t nnicindexes = 0;
|
||||
g_autofree int *nicindexes = NULL;
|
||||
size_t i;
|
||||
@ -7022,9 +6985,6 @@ qemuProcessLaunch(virConnectPtr conn,
|
||||
if (ret < 0)
|
||||
qemuExtDevicesStop(driver, vm);
|
||||
qemuDomainSecretDestroy(vm);
|
||||
virCommandFree(cmd);
|
||||
virObjectUnref(logCtxt);
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -7081,8 +7041,8 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver,
|
||||
bool startCPUs,
|
||||
virDomainPausedReason pausedReason)
|
||||
{
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
int ret = -1;
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
|
||||
if (startCPUs) {
|
||||
VIR_DEBUG("Starting domain CPUs");
|
||||
@ -7110,7 +7070,6 @@ qemuProcessFinishStartup(virQEMUDriverPtr driver,
|
||||
ret = 0;
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(cfg);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -7346,8 +7305,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
|
||||
const virNetDevVPortProfile *vport = NULL;
|
||||
size_t i;
|
||||
g_autofree char *timestamp = NULL;
|
||||
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
|
||||
virConnectPtr conn = NULL;
|
||||
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||||
g_autoptr(virConnect) conn = NULL;
|
||||
|
||||
VIR_DEBUG("Shutting down vm=%p name=%s id=%d pid=%lld, "
|
||||
"reason=%s, asyncJob=%s, flags=0x%x",
|
||||
@ -7662,8 +7621,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
|
||||
|
||||
cleanup:
|
||||
virErrorRestore(&orig_err);
|
||||
virObjectUnref(conn);
|
||||
virObjectUnref(cfg);
|
||||
}
|
||||
|
||||
|
||||
@ -7977,7 +7934,7 @@ qemuProcessReconnect(void *opaque)
|
||||
qemuDomainJobObj oldjob;
|
||||
int state;
|
||||
int reason;
|
||||
virQEMUDriverConfigPtr cfg;
|
||||
g_autoptr(virQEMUDriverConfig) cfg = NULL;
|
||||
size_t i;
|
||||
unsigned int stopFlags = 0;
|
||||
bool jobStarted = false;
|
||||
@ -8225,7 +8182,6 @@ qemuProcessReconnect(void *opaque)
|
||||
qemuDomainRemoveInactiveJob(driver, obj);
|
||||
}
|
||||
virDomainObjEndAPI(&obj);
|
||||
virObjectUnref(cfg);
|
||||
virNWFilterUnlockFilterUpdates();
|
||||
virIdentitySetCurrent(NULL);
|
||||
return;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user