From nobody Sun May 5 15:09:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639498960; cv=none; d=zohomail.com; s=zohoarc; b=HHrGUei3JDld6eT5URmzxVuDLaE9aRjPrbK99Pu6BTyZoERdCLKYy0awQcTJAt2LKiGvLYQ2Curawj5Av7Oe4Gofhktgvm+OP+mIZwVPQZ9FJgznOnf5OuPlbdKqWeDHSzhdiY0jOjJfim90TLMDSapOupQP9OB5/vYSUkbAvbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639498960; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6ymlhjnOs59OJf5nACu4ikD9OVDJE9IoN6XF9ap3Q80=; b=MfL64V6pcK5/0bF9KFD8RcydRAMJJFb9AD2eoInV11CQ7xu7Pofyr+XevVSUe0AcbhXrnPuLSYu3y0Xn9NaaYK3xA91ILuqzvCxlEikEasHVl0SOJ/8mLxdXe0w5U0DDtfivOXMzqcX8cPRWH9ZnkR7LgSToXmSUdP7jYgSgZJ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 163949896056760.405705433924936; Tue, 14 Dec 2021 08:22:40 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-349-LF0zcRgbPjG8kc-mlsG9oA-1; Tue, 14 Dec 2021 11:22:37 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 295A36408E; Tue, 14 Dec 2021 16:22:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 082161059588; Tue, 14 Dec 2021 16:22:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D21DE4A7C8; Tue, 14 Dec 2021 16:22:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BEGMUZS018975 for ; Tue, 14 Dec 2021 11:22:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6B881838F2; Tue, 14 Dec 2021 16:22:30 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.40.192.161]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E18E7838F6 for ; Tue, 14 Dec 2021 16:22:12 +0000 (UTC) Received: by rein.int.mamuti.net (Postfix, from userid 500) id 2FD0818883E; Tue, 14 Dec 2021 17:22:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639498959; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=6ymlhjnOs59OJf5nACu4ikD9OVDJE9IoN6XF9ap3Q80=; b=TDGhYBklLNaKfI7/f2G773Zme/ajfAtIR7Vt8dEJI7xAus0ruGB8JoVEWhpAY9qYPQoCEh uinaBCDiOteGYuGVO00I7p/7w+lMHVSIcQ8hJQq2sxYuWuy3cZfVJ48rpguGtDAnuVFEK6 ZUj2hUlLjzGURMYNZEAmUuGI+QxhVjs= X-MC-Unique: LF0zcRgbPjG8kc-mlsG9oA-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 1/2] qemu: Use qemuDomainSaveStatus Date: Tue, 14 Dec 2021 17:22:07 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639498962559100001 Content-Type: text/plain; charset="utf-8" It is a nice wrapper around virDomainObjSave which logs a warning, but otherwise ignores the error. Let's use it where appropriate. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 11 ++--- src/qemu/qemu_migration.c | 9 +---- src/qemu/qemu_process.c | 85 +++++++-------------------------------- src/qemu/qemu_saveimage.c | 6 +-- 4 files changed, 20 insertions(+), 91 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5607d6f581..a8bc1252fa 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6324,10 +6324,8 @@ void qemuDomainObjTaint(virQEMUDriver *driver, virDomainTaintFlags taint, qemuDomainLogContext *logCtxt) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL); - ignore_value(virDomainObjSave(obj, driver->xmlopt, cfg->stateDir)); + qemuDomainSaveStatus(obj); } =20 void qemuDomainObjTaintMsg(virQEMUDriver *driver, @@ -7163,20 +7161,17 @@ qemuDomainRemoveInactiveJobLocked(virQEMUDriver *dr= iver, =20 =20 void -qemuDomainSetFakeReboot(virQEMUDriver *driver, +qemuDomainSetFakeReboot(virQEMUDriver *driver G_GNUC_UNUSED, virDomainObj *vm, bool value) { qemuDomainObjPrivate *priv =3D vm->privateData; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (priv->fakeReboot =3D=3D value) return; =20 priv->fakeReboot =3D value; - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("Failed to save status on vm %s", vm->def->name); + qemuDomainSaveStatus(vm); } =20 static void diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e32c5865f9..b9d7d582f5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3383,7 +3383,6 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, { g_autoptr(qemuMigrationCookie) mig =3D NULL; virObjectEvent *event; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainJobPrivate *jobPriv =3D priv->job.privateData; qemuDomainJobInfo *jobInfo =3D NULL; @@ -3473,8 +3472,7 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, jobPriv->migParams, priv->job.apiFlags); =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("Failed to save status on vm %s", vm->def->name); + qemuDomainSaveStatus(vm); } =20 return 0; @@ -5627,7 +5625,6 @@ qemuMigrationDstFinish(virQEMUDriver *driver, int cookie_flags =3D 0; qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainJobPrivate *jobPriv =3D priv->job.privateData; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); unsigned short port; unsigned long long timeReceived =3D 0; virObjectEvent *event; @@ -5834,9 +5831,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, virObjectEventStateQueue(driver->domainEventState, event); } =20 - if (virDomainObjIsActive(vm) && - virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("Failed to save status on vm %s", vm->def->name); + qemuDomainSaveStatus(vm); =20 /* Guest is successfully running, so cancel previous auto destroy */ qemuProcessAutoDestroyRemove(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 82d0af5549..8bd7bf8155 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -414,7 +414,6 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; qemuDomainObjPrivate *priv; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainState state; int reason; =20 @@ -435,8 +434,7 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED, if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("Failed to save status on vm %s", vm->def->name); + qemuDomainSaveStatus(vm); =20 unlock: virObjectUnlock(vm); @@ -458,7 +456,6 @@ qemuProcessFakeReboot(void *opaque) virDomainObj *vm =3D opaque; qemuDomainObjPrivate *priv =3D vm->privateData; virQEMUDriver *driver =3D priv->driver; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_BOOTED; int ret =3D -1, rc; =20 @@ -493,11 +490,7 @@ qemuProcessFakeReboot(void *opaque) goto endjob; } =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } - + qemuDomainSaveStatus(vm); ret =3D 0; =20 endjob: @@ -575,7 +568,6 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSE= D, virQEMUDriver *driver =3D opaque; qemuDomainObjPrivate *priv; virObjectEvent *event =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int detail =3D 0; =20 VIR_DEBUG("vm=3D%p", vm); @@ -622,11 +614,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUS= ED, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SHUTDOW= N, detail); - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } + qemuDomainSaveStatus(vm); } else { priv->pausedShutdown =3D true; } @@ -651,7 +639,6 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, virObjectEvent *event =3D NULL; virDomainPausedReason reason; virDomainEventSuspendedDetailType detail; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv =3D vm->privateData; =20 virObjectLock(vm); @@ -692,10 +679,7 @@ qemuProcessHandleStop(qemuMonitor *mon G_GNUC_UNUSED, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } + qemuDomainSaveStatus(vm); } =20 virObjectUnlock(vm); @@ -710,7 +694,6 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, { virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); qemuDomainObjPrivate *priv; virDomainRunningReason reason =3D VIR_DOMAIN_RUNNING_UNPAUSED; virDomainEventResumedDetailType eventDetail; @@ -734,11 +717,7 @@ qemuProcessHandleResume(qemuMonitor *mon G_GNUC_UNUSED, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, eventDetail); - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } + qemuDomainSaveStatus(vm); } =20 virObjectUnlock(vm); @@ -753,7 +732,6 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUS= ED, { virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); =20 @@ -776,8 +754,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUS= ED, offset +=3D vm->def->clock.data.variable.adjustment0; vm->def->clock.data.variable.adjustment =3D offset; =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("unable to save domain status with RTC change"); + qemuDomainSaveStatus(vm); } =20 event =3D virDomainEventRTCChangeNewFromObj(vm, offset); @@ -797,7 +774,6 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSE= D, virQEMUDriver *driver =3D opaque; virObjectEvent *watchdogEvent =3D NULL; virObjectEvent *lifecycleEvent =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); watchdogEvent =3D virDomainEventWatchdogNewFromObj(vm, action); @@ -817,10 +793,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUS= ED, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after watchdog event", - vm->def->name); - } + qemuDomainSaveStatus(vm); } =20 if (vm->def->watchdog->action =3D=3D VIR_DOMAIN_WATCHDOG_ACTION_DUMP) { @@ -859,7 +832,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, const char *srcPath; const char *devAlias; virDomainDiskDef *disk; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); =20 @@ -902,8 +874,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("Unable to save status on vm %s after IO error", vm->= def->name); + qemuDomainSaveStatus(vm); } virObjectUnlock(vm); =20 @@ -1085,7 +1056,6 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_U= NUSED, virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; virDomainDiskDef *disk; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); disk =3D qemuProcessFindDomainDiskByAliasOrQOM(vm, devAlias, devid); @@ -1098,11 +1068,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_= UNUSED, else if (reason =3D=3D VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE) disk->tray_status =3D VIR_DOMAIN_DISK_TRAY_CLOSED; =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after tray moved even= t", - vm->def->name); - } - + qemuDomainSaveStatus(vm); virDomainObjBroadcast(vm); } =20 @@ -1118,7 +1084,6 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNU= SED, virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; virObjectEvent *lifecycleEvent =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMWakeupNewFromObj(vm); @@ -1135,11 +1100,7 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UN= USED, lifecycleEvent =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED= _WAKEUP); - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after wakeup event", - vm->def->name); - } + qemuDomainSaveStatus(vm); } =20 virObjectUnlock(vm); @@ -1155,7 +1116,6 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UN= USED, virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; virObjectEvent *lifecycleEvent =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendNewFromObj(vm); @@ -1171,11 +1131,7 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_U= NUSED, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_PMSUSPENDED, VIR_DOMAIN_EVENT_PMSUSPENDED_MEMORY); - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after suspend event", - vm->def->name); - } + qemuDomainSaveStatus(vm); =20 if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SUSPEND); @@ -1195,7 +1151,6 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNU= C_UNUSED, { virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); size_t i; =20 virObjectLock(vm); @@ -1216,9 +1171,7 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNU= C_UNUSED, vm->def->mem.cur_balloon, actual); vm->def->mem.cur_balloon =3D actual; =20 - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) - VIR_WARN("unable to save domain status with balloon change"); - + qemuDomainSaveStatus(vm); virObjectUnlock(vm); =20 virObjectEventStateQueue(driver->domainEventState, event); @@ -1232,7 +1185,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNU= C_UNUSED, virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; virObjectEvent *lifecycleEvent =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 virObjectLock(vm); event =3D virDomainEventPMSuspendDiskNewFromObj(vm); @@ -1248,11 +1200,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GN= UC_UNUSED, virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_PMSUSPENDED, VIR_DOMAIN_EVENT_PMSUSPENDED_DISK); - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after suspend event", - vm->def->name); - } + qemuDomainSaveStatus(vm); =20 if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SUSPEND); @@ -1599,7 +1547,6 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_G= NUC_UNUSED, qemuDomainObjPrivate *priv; virQEMUDriver *driver =3D opaque; virObjectEvent *event =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int reason; =20 virObjectLock(vm); @@ -1629,11 +1576,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_= GNUC_UNUSED, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPEND= ED, VIR_DOMAIN_EVENT_SUSPEND= ED_POSTCOPY); - - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Unable to save status on vm %s after state change", - vm->def->name); - } + qemuDomainSaveStatus(vm); } =20 cleanup: diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 557ee2cd21..28d6098dd8 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -586,7 +586,6 @@ qemuSaveImageStartVM(virConnectPtr conn, VIR_AUTOCLOSE intermediatefd =3D -1; g_autoptr(virCommand) cmd =3D NULL; g_autofree char *errbuf =3D NULL; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virQEMUSaveHeader *header =3D &data->header; g_autoptr(qemuDomainSaveCookie) cookie =3D NULL; int rc =3D 0; @@ -680,10 +679,7 @@ qemuSaveImageStartVM(virConnectPtr conn, "%s", _("failed to resume domain")); goto cleanup; } - if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0) { - VIR_WARN("Failed to save status on vm %s", vm->def->name); - goto cleanup; - } + qemuDomainSaveStatus(vm); } else { int detail =3D (start_paused ? VIR_DOMAIN_EVENT_SUSPENDED_PAUSED : VIR_DOMAIN_EVENT_SUSPENDED_RESTORED); --=20 2.34.1 From nobody Sun May 5 15:09:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639498949; cv=none; d=zohomail.com; s=zohoarc; b=nA6HDtTKau02xRKVavWhVkvYLdk2Mglp1PojbCE0k94+9LyGjMrB1D8U0yYbYCMZ75KfrB5zW6HyJxv0ijDEHkYjDSoTgUtfj0c1bYcXmsWlpcv23HcUTp1vEzjGIsng/WQR+maCkDSwuXHVDpb6+UySH/Da7k9PSXf2+PvPM44= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639498949; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qpTkRb1uYMNmb22jOnVC8nWk0DgmApJi74tGKf4BSDM=; b=F3Pim/FMXmnKCzLIi1y7mJLrkt8OyL9mSWq3HJhx9dPviIWHGvWkjlIgrr7UhkqXZ6v2gk9O0hsYbH+iVjfllKFkVTxDgS0dF+WWO+T2qBNRSEsoZwPFIN0T1ZmBV9nofjCCx95xWQyp6xRyah8MHxdihUYqIDQdfguw3uGwBYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1639498949464447.9548775310907; Tue, 14 Dec 2021 08:22:29 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-553-Fg7U4H_GP4Gb9r7ieQZNzA-1; Tue, 14 Dec 2021 11:22:25 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F78C1018721; Tue, 14 Dec 2021 16:22:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 403647B9E6; Tue, 14 Dec 2021 16:22:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0F5684BB7C; Tue, 14 Dec 2021 16:22:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1BEGMH1S018939 for ; Tue, 14 Dec 2021 11:22:17 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0A16488860; Tue, 14 Dec 2021 16:22:17 +0000 (UTC) Received: from rein.int.mamuti.net (unknown [10.40.192.161]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAC578797C for ; Tue, 14 Dec 2021 16:22:12 +0000 (UTC) Received: by rein.int.mamuti.net (Postfix, from userid 500) id 32A60188A99; Tue, 14 Dec 2021 17:22:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639498948; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qpTkRb1uYMNmb22jOnVC8nWk0DgmApJi74tGKf4BSDM=; b=IR5Vpmg0V9ausVL9gTFivhZqLFK722URJg6U23VcvgRFwGSGiBqk2u2HOWy45eNXKG46kB ChsjiurjDEjTIIOhNYEESc+YVoZxWTj0iM3ivGTOdhKZTUxFyzXDRhbWCY2ZWcRyriGBl0 rU4/yc52dcF417ZtGvsyaK7Eoydu7mw= X-MC-Unique: Fg7U4H_GP4Gb9r7ieQZNzA-1 From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/2] qemu: Drop driver parameter from qemuDomainSetFakeReboot Date: Tue, 14 Dec 2021 17:22:08 +0100 Message-Id: <885044ac2c116b03a70cfc25cf0e622e6c170f6e.1639498746.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639498950474100003 Content-Type: text/plain; charset="utf-8" And its callers. The parameter is no longer used since virDomainObjSave was replaced with qemuDomainSaveStatus wrapper. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 3 +-- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_driver.c | 14 +++++++------- src/qemu/qemu_process.c | 13 ++++++------- src/qemu/qemu_process.h | 3 +-- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a8bc1252fa..3f10f9306f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7161,8 +7161,7 @@ qemuDomainRemoveInactiveJobLocked(virQEMUDriver *driv= er, =20 =20 void -qemuDomainSetFakeReboot(virQEMUDriver *driver G_GNUC_UNUSED, - virDomainObj *vm, +qemuDomainSetFakeReboot(virDomainObj *vm, bool value) { qemuDomainObjPrivate *priv =3D vm->privateData; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 5474d1dccc..38c6ffb76b 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -641,8 +641,7 @@ int qemuDomainSnapshotDiscardAllMetadata(virQEMUDriver = *driver, void qemuDomainRemoveInactive(virQEMUDriver *driver, virDomainObj *vm); =20 -void qemuDomainSetFakeReboot(virQEMUDriver *driver, - virDomainObj *vm, +void qemuDomainSetFakeReboot(virDomainObj *vm, bool value); =20 int qemuDomainCheckDiskStartupPolicy(virQEMUDriver *driver, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index db2b25adbd..c9a372ce2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1902,7 +1902,7 @@ qemuDomainShutdownFlagsAgent(virQEMUDriver *driver, if (!qemuDomainAgentAvailable(vm, reportError)) goto endjob; =20 - qemuDomainSetFakeReboot(driver, vm, false); + qemuDomainSetFakeReboot(vm, false); agent =3D qemuDomainObjEnterAgent(vm); ret =3D qemuAgentShutdown(agent, agentFlag); qemuDomainObjExitAgent(vm, agent); @@ -1932,7 +1932,7 @@ qemuDomainShutdownFlagsMonitor(virQEMUDriver *driver, goto endjob; } =20 - qemuDomainSetFakeReboot(driver, vm, isReboot); + qemuDomainSetFakeReboot(vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemPowerdown(priv->mon); qemuDomainObjExitMonitor(driver, vm); @@ -2031,7 +2031,7 @@ qemuDomainRebootAgent(virQEMUDriver *driver, if (virDomainObjCheckActive(vm) < 0) goto endjob; =20 - qemuDomainSetFakeReboot(driver, vm, false); + qemuDomainSetFakeReboot(vm, false); agent =3D qemuDomainObjEnterAgent(vm); ret =3D qemuAgentShutdown(agent, agentFlag); qemuDomainObjExitAgent(vm, agent); @@ -2057,7 +2057,7 @@ qemuDomainRebootMonitor(virQEMUDriver *driver, if (virDomainObjCheckActive(vm) < 0) goto endjob; =20 - qemuDomainSetFakeReboot(driver, vm, isReboot); + qemuDomainSetFakeReboot(vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret =3D qemuMonitorSystemPowerdown(priv->mon); qemuDomainObjExitMonitor(driver, vm); @@ -2213,7 +2213,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, goto endjob; } =20 - qemuDomainSetFakeReboot(driver, vm, false); + qemuDomainSetFakeReboot(vm, false); =20 if (priv->job.asyncJob =3D=3D QEMU_ASYNC_JOB_MIGRATION_IN) stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; @@ -3613,8 +3613,8 @@ processGuestPanicEvent(virQEMUDriver *driver, G_GNUC_FALLTHROUGH; =20 case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART: - qemuDomainSetFakeReboot(driver, vm, true); - qemuProcessShutdownOrReboot(driver, vm); + qemuDomainSetFakeReboot(vm, true); + qemuProcessShutdownOrReboot(vm); break; =20 case VIR_DOMAIN_LIFECYCLE_ACTION_PRESERVE: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8bd7bf8155..de1146251d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -498,7 +498,7 @@ qemuProcessFakeReboot(void *opaque) =20 cleanup: priv->pausedShutdown =3D false; - qemuDomainSetFakeReboot(driver, vm, false); + qemuDomainSetFakeReboot(vm, false); if (ret =3D=3D -1) ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_FORCE)); virDomainObjEndAPI(&vm); @@ -506,8 +506,7 @@ qemuProcessFakeReboot(void *opaque) =20 =20 void -qemuProcessShutdownOrReboot(virQEMUDriver *driver, - virDomainObj *vm) +qemuProcessShutdownOrReboot(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; =20 @@ -526,7 +525,7 @@ qemuProcessShutdownOrReboot(virQEMUDriver *driver, VIR_ERROR(_("Failed to create reboot thread, killing domain")); ignore_value(qemuProcessKill(vm, VIR_QEMU_PROCESS_KILL_NOWAIT)= ); priv->pausedShutdown =3D false; - qemuDomainSetFakeReboot(driver, vm, false); + qemuDomainSetFakeReboot(vm, false); virObjectUnref(vm); } } else { @@ -622,7 +621,7 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSE= D, if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_SHUTDOWN); =20 - qemuProcessShutdownOrReboot(driver, vm); + qemuProcessShutdownOrReboot(vm); =20 unlock: virObjectUnlock(vm); @@ -5630,7 +5629,7 @@ qemuProcessInit(virQEMUDriver *driver, } } else { vm->def->id =3D qemuDriverAllocateID(driver); - qemuDomainSetFakeReboot(driver, vm, false); + qemuDomainSetFakeReboot(vm, false); virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_STAR= TING_UP); =20 if (g_atomic_int_add(&driver->nactive, 1) =3D=3D 0 && driver->inhi= bitCallback) @@ -8866,7 +8865,7 @@ qemuProcessReconnect(void *opaque) reason =3D=3D VIR_DOMAIN_PAUSED_USER)) { VIR_DEBUG("Finishing shutdown sequence for domain %s", obj->def->name); - qemuProcessShutdownOrReboot(driver, obj); + qemuProcessShutdownOrReboot(obj); goto cleanup; } =20 diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index c0f1c85aab..ab276da15c 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -168,8 +168,7 @@ typedef enum { =20 int qemuProcessKill(virDomainObj *vm, unsigned int flags); =20 -void qemuProcessShutdownOrReboot(virQEMUDriver *driver, - virDomainObj *vm); +void qemuProcessShutdownOrReboot(virDomainObj *vm); =20 int qemuProcessAutoDestroyInit(virQEMUDriver *driver); void qemuProcessAutoDestroyShutdown(virQEMUDriver *driver); --=20 2.34.1