Merge pull request kata-containers#9402 from deagon/feat/debug-threads

qemu: show the thread name when enable the hypervisor.debug option
apostasie · Apr 8, 2024 · be8f0cb · be8f0cb
2 parents e39be7a + cd0c31e
commit be8f0cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/runtime/pkg/govmm/qemu/qemu.go b/src/runtime/pkg/govmm/qemu/qemu.go
@@ -2776,6 +2776,8 @@ type Config struct {
 	PidFile string
 
 	qemuParams []string
+
+	Debug bool
 }
 
 // appendFDs appends a list of arbitrary file descriptors to the qemu configuration and
@@ -2812,8 +2814,15 @@ func (config *Config) appendSeccompSandbox() {
 
 func (config *Config) appendName() {
 	if config.Name != "" {
+		var nameParams []string
+		nameParams = append(nameParams, config.Name)
+
+		if config.Debug {
+			nameParams = append(nameParams, "debug-threads=on")
+		}
+
 		config.qemuParams = append(config.qemuParams, "-name")
-		config.qemuParams = append(config.qemuParams, config.Name)
+		config.qemuParams = append(config.qemuParams, strings.Join(nameParams, ","))
 	}
 }
 

diff --git a/src/runtime/virtcontainers/qemu.go b/src/runtime/virtcontainers/qemu.go
@@ -687,6 +687,7 @@ func (q *qemu) CreateVM(ctx context.Context, id string, network Network, hypervi
 		Bios:           firmwarePath,
 		PFlash:         pflash,
 		PidFile:        filepath.Join(q.config.VMStorePath, q.id, "pid"),
+		Debug:          hypervisorConfig.Debug,
 	}
 
 	qemuConfig.Devices, qemuConfig.Bios, err = q.arch.appendProtectionDevice(qemuConfig.Devices, firmwarePath, firmwareVolumePath)