From 7a367dc0a8df1d73ba3e41cbbc7bf8c108cf6081 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Wed, 28 Apr 2021 15:50:36 +0200 Subject: [PATCH] qemu: Simplify (Object).Valid() so that more object types can be added without going over cyclomatic complexity limits Signed-off-by: Jakob Naucke --- qemu/qemu.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/qemu/qemu.go b/qemu/qemu.go index bd9abd6e4f..b70d65f971 100644 --- a/qemu/qemu.go +++ b/qemu/qemu.go @@ -275,24 +275,14 @@ type Object struct { func (object Object) Valid() bool { switch object.Type { case MemoryBackendFile: - if object.ID == "" || object.MemPath == "" || object.Size == 0 { - return false - } - + return object.ID != "" && object.MemPath != "" && object.Size != 0 case TDXGuest: - if object.ID == "" || object.File == "" || object.DeviceID == "" { - return false - } + return object.ID != "" && object.File != "" && object.DeviceID != "" case SEVGuest: - if object.ID == "" || object.File == "" || object.CBitPos == 0 || object.ReducedPhysBits == 0 { - return false - } - + return object.ID != "" && object.File != "" && object.CBitPos != 0 && object.ReducedPhysBits != 0 default: return false } - - return true } // QemuParams returns the qemu parameters built out of this Object device.