From cb5b548ad770dacd14cca4a5ba115ce874b99ee1 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 30 May 2024 19:16:00 +0200 Subject: [PATCH] govmm: Drop QEMU's `Daemonize` knob Code isn't used anymore. Signed-off-by: Greg Kurz --- src/runtime/pkg/govmm/qemu/qemu.go | 7 ------- src/runtime/pkg/govmm/qemu/qemu_test.go | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/runtime/pkg/govmm/qemu/qemu.go b/src/runtime/pkg/govmm/qemu/qemu.go index d9c1e21a2c..37ed258a39 100644 --- a/src/runtime/pkg/govmm/qemu/qemu.go +++ b/src/runtime/pkg/govmm/qemu/qemu.go @@ -2684,9 +2684,6 @@ type Knobs struct { // NoGraphic completely disables graphic output. NoGraphic bool - // Daemonize will turn the qemu process into a daemon - Daemonize bool - // Both HugePages and MemPrealloc require the Memory.Size of the VM // to be set, as they need to reserve the memory upfront in order // for the VM to boot without errors. @@ -3125,10 +3122,6 @@ func (config *Config) appendKnobs() { config.qemuParams = append(config.qemuParams, "--no-shutdown") } - if config.Knobs.Daemonize { - config.qemuParams = append(config.qemuParams, "-daemonize") - } - config.appendMemoryKnobs() if config.Knobs.Mlock { diff --git a/src/runtime/pkg/govmm/qemu/qemu_test.go b/src/runtime/pkg/govmm/qemu/qemu_test.go index 3471ec2828..8fc9609057 100644 --- a/src/runtime/pkg/govmm/qemu/qemu_test.go +++ b/src/runtime/pkg/govmm/qemu/qemu_test.go @@ -445,13 +445,12 @@ func TestAppendEmptyDevice(t *testing.T) { } func TestAppendKnobsAllTrue(t *testing.T) { - var knobsString = "-no-user-config -nodefaults -nographic --no-reboot -daemonize -overcommit mem-lock=on -S" + var knobsString = "-no-user-config -nodefaults -nographic --no-reboot -overcommit mem-lock=on -S" knobs := Knobs{ NoUserConfig: true, NoDefaults: true, NoGraphic: true, NoReboot: true, - Daemonize: true, MemPrealloc: true, FileBackedMem: true, MemShared: true,