From 6b5a505384e2d62ce3341151afa333ab1435c3bb Mon Sep 17 00:00:00 2001 From: Kent Holloway Date: Fri, 3 Oct 2014 10:39:57 -0500 Subject: [PATCH] -redir is deprecated and missing on some versions of QEMU, using -netdev instead which is recommended. Removing M letter from Memory flag as QEMU now assumes this value is always in MB and errors out if you pass the M as a part of the command --- builder/qemu/step_run.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go index 6d4b43d6e..563237c96 100644 --- a/builder/qemu/step_run.go +++ b/builder/qemu/step_run.go @@ -2,11 +2,12 @@ package qemu import ( "fmt" - "github.com/mitchellh/multistep" - "github.com/mitchellh/packer/packer" "log" "path/filepath" "strings" + + "github.com/mitchellh/multistep" + "github.com/mitchellh/packer/packer" ) // stepRun runs the virtual machine @@ -78,13 +79,12 @@ func getCommandArgs(bootDrive string, state multistep.StateBag) ([]string, error defaultArgs["-name"] = vmName defaultArgs["-machine"] = fmt.Sprintf("type=%s", config.MachineType) - defaultArgs["-netdev"] = "user,id=user.0" + defaultArgs["-netdev"] = fmt.Sprintf("user,id=user.0,hostfwd=tcp::%v-:22", sshHostPort) defaultArgs["-device"] = fmt.Sprintf("%s,netdev=user.0", config.NetDevice) defaultArgs["-drive"] = fmt.Sprintf("file=%s,if=%s", imgPath, config.DiskInterface) defaultArgs["-cdrom"] = isoPath defaultArgs["-boot"] = bootDrive - defaultArgs["-m"] = "512M" - defaultArgs["-redir"] = fmt.Sprintf("tcp:%v::22", sshHostPort) + defaultArgs["-m"] = "512" defaultArgs["-vnc"] = vnc // Append the accelerator to the machine type if it is specified