From 3a0da6cb706d3ee9d7537fcf69769ed06847b2a3 Mon Sep 17 00:00:00 2001 From: "Michael N. Lipp" Date: Tue, 8 Aug 2023 10:25:12 +0200 Subject: [PATCH] No changes while terminating. --- .../org/jdrupes/vmoperator/runner/qemu/CdMediaController.java | 4 ++++ .../src/org/jdrupes/vmoperator/runner/qemu/CpuController.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CdMediaController.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CdMediaController.java index 23293f6..53922f2 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CdMediaController.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CdMediaController.java @@ -69,7 +69,11 @@ public class CdMediaController extends Component { @SuppressWarnings({ "PMD.AvoidLiteralsInIfCondition", "PMD.AvoidInstantiatingObjectsInLoops" }) public void onConfigureQemu(ConfigureQemu event) { + if (event.state() == State.TERMINATING) { + return; + } + // Compare known and desired images. int cdCounter = 0; var drives = event.configuration().vm.drives; for (int i = 0; i < drives.length; i++) { diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CpuController.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CpuController.java index eefd37b..6c86991 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CpuController.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CpuController.java @@ -32,6 +32,7 @@ import org.jdrupes.vmoperator.runner.qemu.events.CpuAdded; import org.jdrupes.vmoperator.runner.qemu.events.CpuDeleted; import org.jdrupes.vmoperator.runner.qemu.events.HotpluggableCpuStatus; import org.jdrupes.vmoperator.runner.qemu.events.MonitorCommand; +import org.jdrupes.vmoperator.runner.qemu.events.RunnerStateChange.State; import org.jgrapes.core.Channel; import org.jgrapes.core.Component; import org.jgrapes.core.annotation.Handler; @@ -62,6 +63,9 @@ public class CpuController extends Component { */ @Handler public void onConfigureQemu(ConfigureQemu event) { + if (event.state() == State.TERMINATING) { + return; + } Optional.ofNullable(event.configuration().vm.currentCpus) .ifPresent(cpus -> { if (desiredCpus != null && desiredCpus.equals(cpus)) {