boxgrinder-build 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v0.6.2
+
+* [BGBUILD-84] Don't use in libguestfs qemu-kvm where hardware accleration isn't available
+
 v0.6.1
 
 * [BGBUILD-81] post command execution w/ setarch breaks commands which are scripts

data/boxgrinder-build.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{boxgrinder-build}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marek Goldmann"]
-  s.date = %q{2010-11-02}
+  s.date = %q{2010-11-04}
   s.default_executable = %q{boxgrinder-build}
   s.description = %q{A tool for creating appliances from simple plain text files for various virtual environments.}
   s.email = %q{info@boxgrinder.org}

data/lib/boxgrinder-build/helpers/guestfs-helper.rb

@@ -19,6 +19,8 @@
 require 'boxgrinder-build/helpers/augeas-helper'
 require 'guestfs'
 require 'logger'
+require 'open-uri'
+require 'rbconfig'
 
 module BoxGrinder
   class SilencerProxy
@@ -87,6 +89,26 @@ module BoxGrinder
 
     attr_reader :guestfs
 
+    def hw_virtualization_available?
+      @log.trace "Checking if HW virtualization is available..."
+
+      begin
+        open('http://169.254.169.254/1.0/meta-data/local-ipv4')
+        ec2 = true
+      rescue
+        ec2 = false
+      end
+
+      if `cat /proc/cpuinfo | grep flags | grep vmx | wc -l`.chomp.strip.to_i > 0 and !ec2
+        @log.trace "HW acceleration available."
+        return true
+      end
+
+      @log.trace "HW acceleration not available."
+
+      false
+    end
+
     def customize
       read_pipe, write_pipe = IO.pipe
 
@@ -116,21 +138,21 @@ module BoxGrinder
 
       @guestfs = pipe.nil? ? Guestfs::create : Guestfs::create.redirect(pipe)
 
-      # TODO remove this, https://bugzilla.redhat.com/show_bug.cgi?id=502058
+      # https://bugzilla.redhat.com/show_bug.cgi?id=502058
       @guestfs.set_append("noapic")
 
       @log.trace "Setting debug + trace..."
       @guestfs.set_verbose(1)
       @guestfs.set_trace(1)
 
-      # workaround for latest qemu
-      # It'll only work if qemu-stable package is installed. It is installed by default on meta-appliance
-      # TODO wait for stable qemu and remove this
-      # Looks like in F13 (qemu-img-0.12.3-8.fc13.i686) this is fixed
-      qemu_wrapper = "/usr/share/qemu-stable/bin/qemu.wrapper"
+      unless hw_virtualization_available?
+        qemu_wrapper =  (RbConfig::CONFIG['host_cpu'].eql?('x86_64') ? "/usr/bin/qemu-system-x86_64" : "/usr/bin/qemu")
 
-      if File.exists?(qemu_wrapper)
-        @guestfs.set_qemu(qemu_wrapper)
+        if File.exists?(qemu_wrapper)
+          @log.trace "Setting QEMU wrapper to #{qemu_wrapper}..."
+          @guestfs.set_qemu(qemu_wrapper)
+          @log.trace "QEMU wrapper set."
+        end
       end
 
       @log.trace "Adding drive '#{@raw_disk}'..."

data/rubygem-boxgrinder-build.spec

@@ -5,7 +5,7 @@
 
 Summary: A tool for creating appliances from simple plain text files
 Name: rubygem-%{gemname}
-Version: 0.6.1
+Version: 0.6.2
 Release: 1%{?dist}
 Group: Development/Languages
 License: LGPL
@@ -17,7 +17,7 @@ Requires: rubygems >= 1.2
 Requires: ruby >= 0
 Requires: rubygem(commander) => 4.0.3
 Requires: rubygem(commander) < 4.1
-Requires: rubygem(boxgrinder-core) => 0.1.0
+Requires: rubygem(boxgrinder-core) => 0.1.1
 Requires: rubygem(boxgrinder-core) < 0.2
 BuildRequires: rubygems >= 1.2
 BuildRequires: ruby >= 0
@@ -65,5 +65,8 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Nov 03 2010  <mgoldman@redhat.com> - 0.6.2-1
+- [BGBUILD-84] Don't use in libguestfs qemu-kvm where hardware accleration isn't available
+
 * Mon Oct 18 2010  <mgoldman@redhat.com> - 0.6.1-1
 - Initial package

data/spec/helpers/guestfs-helper-spec.rb

@@ -30,15 +30,15 @@ module BoxGrinder
       @helper = GuestFSHelper.new('a/raw/disk', :log => @log)
     end
 
-    def prepare_and_launch(partitions)
+    def prepare_and_launch(partitions, wrapper = nil)
       guetfs = mock('Guestfs')
       guetfs.should_receive(:set_append).with('noapic')
       guetfs.should_receive(:set_verbose)
       guetfs.should_receive(:set_trace)
 
-      File.should_receive(:exists?).with('/usr/share/qemu-stable/bin/qemu.wrapper').and_return(true)
+      @helper.should_receive(:hw_virtualization_available?).and_return(true)
 
-      guetfs.should_receive(:set_qemu).with('/usr/share/qemu-stable/bin/qemu.wrapper')
+      guetfs.should_receive(:set_qemu).with(wrapper) unless wrapper.nil?
       guetfs.should_receive(:add_drive).with('a/raw/disk')
       guetfs.should_receive(:set_network).with(1)
       guetfs.should_receive(:launch)
@@ -165,5 +165,24 @@ module BoxGrinder
 
       @helper.sh("command", :arch => 'arch')
     end
+
+    describe ".hw_virtualization_available?" do
+      it "should return true if HW acceleration is available" do
+        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_raise("blah")
+        @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("2")
+        @helper.hw_virtualization_available?.should == true
+      end
+
+      it "should return false if no vmx flag is present" do
+        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_raise("blah")
+        @helper.should_receive(:`).with('cat /proc/cpuinfo | grep flags | grep vmx | wc -l').and_return("0")
+        @helper.hw_virtualization_available?.should == false
+      end
+
+      it "should return false if we're on EC2" do
+        @helper.should_receive(:open).with('http://169.254.169.254/1.0/meta-data/local-ipv4').and_return("IP")
+        @helper.hw_virtualization_available?.should == false
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: boxgrinder-build
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Marek Goldmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2010-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency