External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Drop driver parameter from qemuDomainSetFakeReboot

Browse Source 
And its callers. The parameter is no longer used since virDomainObjSave
was replaced with qemuDomainSaveStatus wrapper.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Jiri Denemark 2021-12-14 16:36:15 +01:00
parent 38fb9106ed
commit 7ab39cf04b
5 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_domain.c
View File

@ -7161,8 +7161,7 @@ qemuDomainRemoveInactiveJobLocked(virQEMUDriver *driver,
void void
qemuDomainSetFakeReboot(virQEMUDriver *driver G_GNUC_UNUSED, qemuDomainSetFakeReboot(virDomainObj *vm,
virDomainObj *vm,
bool value) bool value)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;

3
src/qemu/qemu_domain.h
View File

@ -641,8 +641,7 @@ int qemuDomainSnapshotDiscardAllMetadata(virQEMUDriver *driver,
void qemuDomainRemoveInactive(virQEMUDriver *driver, void qemuDomainRemoveInactive(virQEMUDriver *driver,
virDomainObj *vm); virDomainObj *vm);
void qemuDomainSetFakeReboot(virQEMUDriver *driver, void qemuDomainSetFakeReboot(virDomainObj *vm,
virDomainObj *vm,
bool value); bool value);
int qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver, int qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver,

14
src/qemu/qemu_driver.c
View File

@ -1902,7 +1902,7 @@ qemuDomainShutdownFlagsAgent(virQEMUDriver *driver,
if (!qemuDomainAgentAvailable(vm, reportError)) if (!qemuDomainAgentAvailable(vm, reportError))
goto endjob; goto endjob;
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(vm, false);
agent = qemuDomainObjEnterAgent(vm); agent = qemuDomainObjEnterAgent(vm);
ret = qemuAgentShutdown(agent, agentFlag); ret = qemuAgentShutdown(agent, agentFlag);
qemuDomainObjExitAgent(vm, agent); qemuDomainObjExitAgent(vm, agent);
@ -1932,7 +1932,7 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriver *driver,
goto endjob; goto endjob;
} }
qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainSetFakeReboot(vm, isReboot);
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorSystemPowerdown(priv->mon); ret = qemuMonitorSystemPowerdown(priv->mon);
qemuDomainObjExitMonitor(driver, vm); qemuDomainObjExitMonitor(driver, vm);
@ -2031,7 +2031,7 @@ qemuDomainRebootAgent(virQEMUDriver *driver,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(vm, false);
agent = qemuDomainObjEnterAgent(vm); agent = qemuDomainObjEnterAgent(vm);
ret = qemuAgentShutdown(agent, agentFlag); ret = qemuAgentShutdown(agent, agentFlag);
qemuDomainObjExitAgent(vm, agent); qemuDomainObjExitAgent(vm, agent);
@ -2057,7 +2057,7 @@ qemuDomainRebootMonitor(virQEMUDriver *driver,
if (virDomainObjCheckActive(vm) < 0) if (virDomainObjCheckActive(vm) < 0)
goto endjob; goto endjob;
qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainSetFakeReboot(vm, isReboot);
qemuDomainObjEnterMonitor(driver, vm); qemuDomainObjEnterMonitor(driver, vm);
ret = qemuMonitorSystemPowerdown(priv->mon); ret = qemuMonitorSystemPowerdown(priv->mon);
qemuDomainObjExitMonitor(driver, vm); qemuDomainObjExitMonitor(driver, vm);
@ -2213,7 +2213,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
goto endjob; goto endjob;
} }
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(vm, false);
if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED;
@ -3613,8 +3613,8 @@ processGuestPanicEvent(virQEMUDriver *driver,
G_GNUC_FALLTHROUGH; G_GNUC_FALLTHROUGH;
case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART:
qemuDomainSetFakeReboot(driver, vm, true); qemuDomainSetFakeReboot(vm, true);
qemuProcessShutdownOrReboot(driver, vm); qemuProcessShutdownOrReboot(vm);
break; break;
case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE:

13
src/qemu/qemu_process.c
View File

@ -498,7 +498,7 @@ qemuProcessFakeReboot(void *opaque)
cleanup: cleanup:
priv->pausedShutdown = false; priv->pausedShutdown = false;
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(vm, false);
if (ret == -1) if (ret == -1)
ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE));
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -506,8 +506,7 @@ qemuProcessFakeReboot(void *opaque)
void void
qemuProcessShutdownOrReboot(virQEMUDriver *driver, qemuProcessShutdownOrReboot(virDomainObj *vm)
virDomainObj *vm)
{ {
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
@ -526,7 +525,7 @@ qemuProcessShutdownOrReboot(virQEMUDriver *driver,
VIR_ERROR(_("Failed to create reboot thread, killing domain")); VIR_ERROR(_("Failed to create reboot thread, killing domain"));
ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_NOWAIT)); ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_NOWAIT));
priv->pausedShutdown = false; priv->pausedShutdown = false;
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(vm, false);
virObjectUnref(vm); virObjectUnref(vm);
} }
} else { } else {
@ -622,7 +621,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
if (priv->agent) if (priv->agent)
qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SHUTDOWN); qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SHUTDOWN);
qemuProcessShutdownOrReboot(driver, vm); qemuProcessShutdownOrReboot(vm);
unlock: unlock:
virObjectUnlock(vm); virObjectUnlock(vm);
@ -5630,7 +5629,7 @@ qemuProcessInit(virQEMUDriver *driver,
} }
} else { } else {
vm->def->id = qemuDriverAllocateID(driver); vm->def->id = qemuDriverAllocateID(driver);
qemuDomainSetFakeReboot(driver, vm, false); qemuDomainSetFakeReboot(vm, false);
virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STARTING_UP); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STARTING_UP);
if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback) if (g_atomic_int_add(&driver->nactive, 1) == 0 && driver->inhibitCallback)
@ -8866,7 +8865,7 @@ qemuProcessReconnect(void *opaque)
reason == VIR_DOMAIN_PAUSED_USER)) { reason == VIR_DOMAIN_PAUSED_USER)) {
VIR_DEBUG("Finishing shutdown sequence for domain %s", VIR_DEBUG("Finishing shutdown sequence for domain %s",
obj->def->name); obj->def->name);
qemuProcessShutdownOrReboot(driver, obj); qemuProcessShutdownOrReboot(obj);
goto cleanup; goto cleanup;
} }

3
src/qemu/qemu_process.h
View File

@ -168,8 +168,7 @@ typedef enum {
int qemuProcessKill(virDomainObj *vm, unsigned int flags); int qemuProcessKill(virDomainObj *vm, unsigned int flags);
void qemuProcessShutdownOrReboot(virQEMUDriver *driver, void qemuProcessShutdownOrReboot(virDomainObj *vm);
virDomainObj *vm);
int qemuProcessAutoDestroyInit(virQEMUDriver *driver); int qemuProcessAutoDestroyInit(virQEMUDriver *driver);
void qemuProcessAutoDestroyShutdown(virQEMUDriver *driver); void qemuProcessAutoDestroyShutdown(virQEMUDriver *driver);