github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-25 19:21:53 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Remove the extra parameters field from the Config structure

Browse Source 
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 <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2016-09-12 19:27:42 +02:00
parent 15bce61a90
commit fe1bdcd2f7
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qemu.go
View File

@ -175,12 +175,15 @@ type Config struct {
// Name is the qemu guest name // Name is the qemu guest name
Name string Name string
// Machine // UUID is the qemu process UUID.
Machine Machine UUID string
// CPUModel is the CPU model to be used by qemu. // CPUModel is the CPU model to be used by qemu.
CPUModel string CPUModel string
// Machine
Machine Machine
// QMPSocket is the QMP socket description. // QMPSocket is the QMP socket description.
QMPSocket QMPSocket QMPSocket QMPSocket
@ -202,9 +205,6 @@ type Config struct {
// VGA is the qemu VGA mode. // VGA is the qemu VGA mode.
VGA string VGA string
// UUID is the qemu process UUID.
UUID string
// Kernel is the guest kernel configuration. // Kernel is the guest kernel configuration.
Kernel Kernel Kernel Kernel
@ -217,9 +217,6 @@ type Config struct {
// GlobalParam is the -global parameter // GlobalParam is the -global parameter
GlobalParam string 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 is a list of open file descriptors to be passed to the spawned qemu process
FDs []*os.File FDs []*os.File
} }
@ -513,8 +510,6 @@ func LaunchQemu(config Config, logger QMPLog) (string, error) {
params = appendGlobalParam(params, config) params = appendGlobalParam(params, config)
params = appendVGA(params, config) params = appendVGA(params, config)
params = append(params, config.ExtraParams...)
return LaunchCustomQemu(config.Ctx, config.Path, params, config.FDs, logger) return LaunchCustomQemu(config.Ctx, config.Path, params, config.FDs, logger)
} }