From nobody Mon Feb 9 01:01:08 2026 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 --- 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