From 385a33835477bfef800b23540c9471dac1fea8f2 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 5 Nov 2013 17:48:16 -0800
Subject: [PATCH] builder/qemu: get rid of unnecessary step
---
builder/qemu/builder.go | 1 -
builder/qemu/driver.go | 8 -------
builder/qemu/step_suppress_messages.go | 29 --------------------------
3 files changed, 38 deletions(-)
delete mode 100644 builder/qemu/step_suppress_messages.go
diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go
index dce5c618..e22d090c 100644
--- a/builder/qemu/builder.go
+++ b/builder/qemu/builder.go
@@ -387,7 +387,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
Files: b.config.FloppyFiles,
},
new(stepCreateDisk),
- new(stepSuppressMessages),
new(stepHTTPServer),
new(stepForwardSSH),
new(stepConfigureVNC),
diff --git a/builder/qemu/driver.go b/builder/qemu/driver.go
index 2505887a..dc789dbb 100644
--- a/builder/qemu/driver.go
+++ b/builder/qemu/driver.go
@@ -28,10 +28,6 @@ type Driver interface {
// Stop stops a running machine, forcefully.
Stop(string) error
- // SuppressMessages should do what needs to be done in order to
- // suppress any annoying popups, if any.
- SuppressMessages() error
-
// Qemu executes the given command via qemu-system-x86_64
Qemu(vmName string, qemuArgs ...string) error
@@ -95,10 +91,6 @@ func (d *QemuDriver) Stop(name string) error {
return nil
}
-func (d *QemuDriver) SuppressMessages() error {
- return nil
-}
-
func (d *QemuDriver) Qemu(vmName string, qemuArgs ...string) error {
var stdout, stderr bytes.Buffer
diff --git a/builder/qemu/step_suppress_messages.go b/builder/qemu/step_suppress_messages.go
deleted file mode 100644
index 8aa035a2..00000000
--- a/builder/qemu/step_suppress_messages.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package qemu
-
-import (
- "fmt"
- "github.com/mitchellh/multistep"
- "github.com/mitchellh/packer/packer"
- "log"
-)
-
-// This step sets some variables in Qemu so that annoying
-// pop-up messages don't exist.
-type stepSuppressMessages struct{}
-
-func (stepSuppressMessages) Run(state multistep.StateBag) multistep.StepAction {
- driver := state.Get("driver").(Driver)
- ui := state.Get("ui").(packer.Ui)
-
- log.Println("Suppressing messages in Qemu")
- if err := driver.SuppressMessages(); err != nil {
- err := fmt.Errorf("Error configuring Qemu to suppress messages: %s", err)
- state.Put("error", err)
- ui.Error(err.Error())
- return multistep.ActionHalt
- }
-
- return multistep.ActionContinue
-}
-
-func (stepSuppressMessages) Cleanup(state multistep.StateBag) {}
--
2.30.9