mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

No changes while terminating.

Browse source
This commit is contained in:
Michael Lipp 2023-08-08 10:25:12 +02:00
parent b76e5b1da9
commit 3a0da6cb70
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CdMediaController.java
View file

@ -69,7 +69,11 @@ public class CdMediaController extends Component {
@SuppressWarnings({ "PMD.AvoidLiteralsInIfCondition", @SuppressWarnings({ "PMD.AvoidLiteralsInIfCondition",
"PMD.AvoidInstantiatingObjectsInLoops" }) "PMD.AvoidInstantiatingObjectsInLoops" })
public void onConfigureQemu(ConfigureQemu event) { public void onConfigureQemu(ConfigureQemu event) {
if (event.state() == State.TERMINATING) {
return;
}
// Compare known and desired images.
int cdCounter = 0; int cdCounter = 0;
var drives = event.configuration().vm.drives; var drives = event.configuration().vm.drives;
for (int i = 0; i < drives.length; i++) { for (int i = 0; i < drives.length; i++) {

4
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/CpuController.java
View file

@ -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.CpuDeleted;
import org.jdrupes.vmoperator.runner.qemu.events.HotpluggableCpuStatus; import org.jdrupes.vmoperator.runner.qemu.events.HotpluggableCpuStatus;
import org.jdrupes.vmoperator.runner.qemu.events.MonitorCommand; 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.Channel;
import org.jgrapes.core.Component; import org.jgrapes.core.Component;
import org.jgrapes.core.annotation.Handler; import org.jgrapes.core.annotation.Handler;
@ -62,6 +63,9 @@ public class CpuController extends Component {
*/ */
@Handler @Handler
public void onConfigureQemu(ConfigureQemu event) { public void onConfigureQemu(ConfigureQemu event) {
if (event.state() == State.TERMINATING) {
return;
}
Optional.ofNullable(event.configuration().vm.currentCpus) Optional.ofNullable(event.configuration().vm.currentCpus)
.ifPresent(cpus -> { .ifPresent(cpus -> {
if (desiredCpus != null && desiredCpus.equals(cpus)) { if (desiredCpus != null && desiredCpus.equals(cpus)) {