From fe1bdcd2f7e3eb7a3fbae34364f2be61da9a0ed9 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Mon, 12 Sep 2016 19:27:42 +0200 Subject: [PATCH] qemu: Remove the extra parameters field from the Config structure The extraParams is confusing and can conflict with the rest of the Config structure definitions. We remove it and will add new fields to that structure as needed. Signed-off-by: Samuel Ortiz --- qemu.go | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/qemu.go b/qemu.go index ec721f683d..57790389fa 100644 --- a/qemu.go +++ b/qemu.go @@ -175,12 +175,15 @@ type Config struct { // Name is the qemu guest name Name string - // Machine - Machine Machine + // UUID is the qemu process UUID. + UUID string // CPUModel is the CPU model to be used by qemu. CPUModel string + // Machine + Machine Machine + // QMPSocket is the QMP socket description. QMPSocket QMPSocket @@ -202,9 +205,6 @@ type Config struct { // VGA is the qemu VGA mode. VGA string - // UUID is the qemu process UUID. - UUID string - // Kernel is the guest kernel configuration. Kernel Kernel @@ -217,9 +217,6 @@ type Config struct { // GlobalParam is the -global parameter GlobalParam string - // ExtraParams is a slice of options to pass to qemu. - ExtraParams []string - // FDs is a list of open file descriptors to be passed to the spawned qemu process FDs []*os.File } @@ -513,8 +510,6 @@ func LaunchQemu(config Config, logger QMPLog) (string, error) { params = appendGlobalParam(params, config) params = appendVGA(params, config) - params = append(params, config.ExtraParams...) - return LaunchCustomQemu(config.Ctx, config.Path, params, config.FDs, logger) }