virtualbox 0.7.9 → 0.8.0

data/lib/virtualbox/appliance.rb

@@ -48,15 +48,15 @@ module VirtualBox
     # every percent that the operation progresses. This can be done to check the progress
     # of the export in real-time.
     def export(&block)
-      interface.write("ovf-1.0", path).wait(&block)
+      interface.write("ovf-1.0", true, path).wait(&block)
     end
 
     # Adds a VM to the appliance
     def add_machine(vm, options = {})
-      sys_desc = vm.interface.export(interface)
+      sys_desc = vm.interface.export(interface, path)
       options.each do |key, value|
         sys_desc.add_description(key, value, value)
       end
     end
   end
-end
+end

data/lib/virtualbox/com/ffi/interfaces.rb

@@ -38,15 +38,24 @@ module VirtualBox
           create_interface(:USBDeviceFilter, :NSISupports)
           create_interface(:VirtualBoxErrorInfo, :NSIException)
           create_interface(:VirtualSystemDescription, :NSISupports)
-          create_interface(:VRDPServer, :NSISupports)
 
           create_interface(:HostUSBDevice, :USBDevice)
           create_interface(:HostUSBDeviceFilter, :USBDeviceFilter)
 
-          # 3.2.x interfaces
-          if version == "3.2.x"
+          # 3.1.x, 3.2.x
+          if ["3.1.x", "3.2.x"].include?(version)
+            create_interface(:VRDPServer, :NSISupports)
+          end
+
+          # 3.2.x, 4.0.x
+          if ["3.2.x", "4.0.x"].include?(version)
             create_interface(:NATEngine, :NSISupports)
           end
+
+          # 4.0.x interfaces
+          if version == "4.0.x"
+            create_interface(:VRDEServer, :NSISupports)
+          end
         end
       end
     end

data/lib/virtualbox/com/ffi/util.rb

@@ -87,6 +87,7 @@ module VirtualBox
               "3d" => "3D",
               "bios" => "BIOS",
               "vrdp" => "VRDP",
+              "vrde" => "VRDE",
               "hw" => "HW",
               "png" => "PNG",
               "io" => "IO",
@@ -103,7 +104,8 @@ module VirtualBox
               "hdd" => "HDD",
               "rtc" => "RTC",
               "utc" => "UTC",
-              "io" => "IO"
+              "io" => "IO",
+              "vm" => "VM"
             }
 
             parts = string.to_s.split(/_/).collect do |part|

data/lib/virtualbox/com/implementer/ffi.rb

@@ -144,11 +144,31 @@ module VirtualBox
               results << pointer_for_type(item[1])
             end
           elsif item.is_a?(Array) && item.length == 1
-            # Convert the array to a size, then array parameter
+            # Array argument
             data = args.shift
+
+            # First add the length of the array
             results << data.length
-            results << data.inject([]) do |converted_data, single|
-              single_type_to_arg([single], item[0], converted_data)
+
+            # Create the array
+            c_type, type = infer_type(item.first)
+
+            # If its a regular type (int, bool, etc.) then just make it an
+            # array of that
+            if type != :interface
+              results << data.inject([]) do |converted_data, single|
+                single_type_to_arg([single], item[0], converted_data)
+              end
+            else
+              # Then convert the rest into a raw MemoryPointer
+              array = ::FFI::MemoryPointer.new(:pointer, data.length)
+              data.each_with_index do |datum, i|
+                converted = []
+                single_type_to_arg([datum], item.first, converted)
+                array[i].put_pointer(0, converted.first)
+              end
+
+              results << array
             end
           elsif item == WSTRING
             # We have to convert the arg to a unicode string

data/lib/virtualbox/com/interface/4.0.x/access_mode.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class AccessMode < AbstractEnum
+          map [:null, :access_mode_read_only, :access_mode_read_write]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/appliance.rb

@@ -0,0 +1,23 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class Appliance < AbstractInterface
+          IID = "e3ba9ab9-ac2c-4266-8bd2-91c4bf721ceb"
+
+          property :path, WSTRING, :readonly => true
+          property :disks, [WSTRING], :readonly => true
+          property :virtual_system_descriptions, [:VirtualSystemDescription], :readonly => true
+          property :machines, [WSTRING], :readonly => true
+
+          function :read, :Progress, [WSTRING]
+          function :interpret, nil, []
+          function :import_machines, :Progress, []
+          function :create_vfs_explorer, :VFSExplorer, [WSTRING]
+          function :write, :Progress, [WSTRING, T_BOOL, WSTRING]
+          function :get_warnings, [WSTRING], []
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/audio_adapter.rb

@@ -0,0 +1,15 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class AudioAdapter < AbstractInterface
+          IID = "921873db-5f3f-4b69-91f9-7be9e535a2cb"
+
+          property :enabled, T_BOOL
+          property :audio_controller, :AudioControllerType
+          property :audio_driver, :AudioDriverType
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/audio_controller_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class AudioControllerType < AbstractEnum
+          map [:ac97, :sb16]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/audio_driver_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class AudioDriverType < AbstractEnum
+          map [:null, :winmm, :oss, :alsa, :direct_sound, :core_audio, :mmpm, :pulse, :sol_audio]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/auth_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class AuthType < AbstractEnum
+          map [:null, :external, :guest]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/bios_boot_menu_mode.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class BIOSBootMenuMode < AbstractEnum
+          map [:disabled, :menu_only, :message_and_menu]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/bios_settings.rb

@@ -0,0 +1,21 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class BIOSSettings < AbstractInterface
+          IID = "38b54279-dc35-4f5e-a431-835b867c6b5e"
+
+          property :logo_fade_in, T_BOOL
+          property :logo_fade_out, T_BOOL
+          property :logo_display_time, T_UINT32
+          property :logo_image_path, WSTRING
+          property :boot_menu_mode, :BIOSBootMenuMode
+          property :acpi_enabled, T_BOOL
+          property :io_apic_enabled, T_BOOL
+          property :time_offset, T_INT64
+          property :pxe_debug_enabled, T_BOOL
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/cleanup_mode.rb

@@ -0,0 +1,12 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class CleanupMode < AbstractEnum
+          map [:null, :unregister_only, :detach_all_return_none,
+               :detach_all_return_hard_disks_only, :full]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/clipboard_mode.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class ClipboardMode < AbstractEnum
+          map [:disabled, :host_to_guest, :guest_to_host, :bidirectional]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/console.rb

@@ -0,0 +1,50 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class Console < AbstractInterface
+          IID = "6375231a-c17c-464b-92cb-ae9e128d71c3"
+
+          property :machine, :Machine, :readonly => true
+          property :state, :MachineState, :readonly => true
+          property :guest, :Guest, :readonly => true
+          property :keyboard, :Keyboard, :readonly => true
+          property :mouse, :Mouse, :readonly => true
+          property :display, :Display, :readonly => true
+          property :debugger, :MachineDebugger, :readonly => true
+          property :usb_devices, [:USBDevice], :readonly => true
+          property :remote_usb_devices, [:HostUSBDevice], :readonly => true
+          property :shared_folders, [:SharedFolder], :readonly => true
+          property :vrde_server_info, :VRDEServerInfo, :readonly => true
+          property :event_source, :EventSource, :readonly => true
+          property :attached_pci_devices, [:PciDeviceAttachment], :readonly => true
+
+          function :power_up, :Progress, []
+          function :power_up_paused, :Progress, []
+          function :power_down, :Progress, []
+          function :reset, nil, []
+          function :pause, nil, []
+          function :resume, nil, []
+          function :power_button, nil, []
+          function :sleep_button, nil, []
+          function :get_power_button_handled, T_BOOL, []
+          function :get_guest_entered_acpi_mode, T_BOOL, []
+          function :save_state, :Progress, []
+          function :adopt_saved_state, nil, [WSTRING]
+          function :discard_saved_state, nil, [T_BOOL]
+          function :get_device_activity, :DeviceActivity, [:DeviceType]
+          function :attach_usb_device, nil, [WSTRING]
+          function :detach_usb_device, :USBDevice, [WSTRING]
+          function :find_usb_device_by_address, :USBDevice, [WSTRING]
+          function :find_usb_device_by_id, :USBDevice, [WSTRING]
+          function :create_shared_folder, nil, [WSTRING, WSTRING, T_BOOL, T_BOOL]
+          function :remove_shared_folder, nil, [WSTRING]
+          function :take_snapshot, :Progress, [WSTRING, WSTRING]
+          function :delete_snapshot, :Progress, [WSTRING]
+          function :restore_snapshot, :Progress, [:Snapshot]
+          function :teleport, :Progress, [WSTRING, T_UINT32, WSTRING, T_UINT32]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/cpu_property_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class CpuPropertyType < AbstractEnum
+          map [:null, :pae, :synthetic]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/device_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class DeviceType < AbstractEnum
+          map [:null, :floppy, :dvd, :hard_disk, :network, :usb, :shared_folder]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/dhcp_server.rb

@@ -0,0 +1,22 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class DHCPServer < AbstractInterface
+          IID = "6cfe387c-74fb-4ca7-bff6-973bec8af7a3"
+
+          property :enabled, T_BOOL
+          property :ip_address, WSTRING, :readonly => true
+          property :network_mask, WSTRING, :readonly => true
+          property :network_name, WSTRING, :readonly => true
+          property :lower_ip, WSTRING, :readonly => true
+          property :upper_ip, WSTRING, :readonly => true
+
+          function :set_configuration, nil, [WSTRING, WSTRING, WSTRING, WSTRING]
+          function :start, nil, [WSTRING, WSTRING, WSTRING]
+          function :stop, nil, []
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/event_source.rb

@@ -0,0 +1,13 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class EventSource < AbstractInterface
+          IID_STR = "TODO"
+
+          # TODO
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/fault_tolerance_state.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class FaultToleranceState < AbstractEnum
+          map [:null, :inactive, :master, :standby]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/firmware_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class FirmwareType < AbstractEnum
+          map [:bios, :efi, :efi32, :efi64, :efidual]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/guest.rb

@@ -0,0 +1,13 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class Guest < AbstractInterface
+          IID = "TODO"
+
+          # TODO
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/guest_os_type.rb

@@ -0,0 +1,33 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class GuestOSType < AbstractInterface
+          IID = "cfe9e64c-4430-435b-9e7c-e3d8e417bd58"
+
+          property :family_id, WSTRING, :readonly => true
+          property :family_description, WSTRING, :readonly => true
+          property :id, WSTRING, :readonly => true
+          property :description, WSTRING, :readonly => true
+          property :is_64_bit, T_BOOL, :readonly => true
+          property :recommended_io_apic, T_BOOL, :readonly => true
+          property :recommended_virt_ex, T_BOOL, :readonly => true
+          property :recommended_ram, T_UINT32, :readonly => true
+          property :recommended_vram, T_UINT32, :readonly => true
+          property :recommended_hdd, T_UINT32, :readonly => true
+          property :adapter_type, :NetworkAdapterType, :readonly => true
+          property :recommended_pae, T_BOOL, :readonly => true
+          property :recommended_dvd_storage_controller, T_UINT32, :readonly => true
+          property :recommended_dvd_storage_bus, T_UINT32, :readonly => true
+          property :recommended_hd_storage_controller, T_UINT32, :readonly => true
+          property :recommended_hd_storage_bus, T_UINT32, :readonly => true
+          property :recommended_firmware, T_UINT32, :readonly => true
+          property :recommended_usb_hid, T_BOOL, :readonly => true
+          property :recommended_hpet, T_BOOL, :readonly => true
+          property :recommended_usb_tablet, T_BOOL, :readonly => true
+          property :recommended_rtc_use_utc, T_BOOL, :readonly => true
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host.rb

@@ -0,0 +1,43 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class Host < AbstractInterface
+          IID_STR = "e380cbfc-ae65-4fa6-899e-45ded6b3132a"
+
+          property :dvd_drives, [:Medium], :readonly => true
+          property :floppy_drives, [:Medium], :readonly => true
+          property :usb_devices, [:HostUSBDevice], :readonly => true
+          property :usb_device_filters, [:HostUSBDeviceFilter], :readonly => true
+          property :network_interfaces, [:HostNetworkInterface], :readonly => true
+          property :processor_count, T_ULONG, :readonly => true
+          property :processor_online_count, T_ULONG, :readonly => true
+          property :processor_core_count, T_ULONG, :readonly => true
+          property :memory_size, T_ULONG, :readonly => true
+          property :memory_available, T_ULONG, :readonly => true
+          property :operating_system, WSTRING, :readonly => true
+          property :os_version, WSTRING, :readonly => true
+          property :utc_time, T_INT64, :readonly => true
+          property :acceleration_3d_available, T_BOOL, :readonly => true
+
+          function :get_processor_speed, T_ULONG, [T_UINT32]
+          function :get_processor_feature, T_BOOL, [T_UINT32] # TODO ENUM
+          function :get_processor_description, WSTRING, [T_UINT32]
+          function :get_processor_cpu_id_leaf, nil, [T_UINT32, T_UINT32, T_UINT32, [:out, T_UINT32], [:out, T_UINT32], [:out, T_UINT32], [:out, T_UINT32]]
+          function :create_host_only_network_interface, :Progress, [[:out, :HostNetworkInterface]]
+          function :remove_host_only_network_interface, :Progress, [WSTRING]
+          function :create_usb_device_filter, :HostUSBDeviceFilter, [WSTRING]
+          function :insert_usb_device_filter, nil, [T_UINT32, :HostUSBDeviceFilter]
+          function :remove_usb_device_filter, nil, [T_UINT32]
+          function :find_host_dvd_drive, :Medium, [WSTRING]
+          function :find_host_floppy_drive, :Medium, [WSTRING]
+          function :find_host_network_interface_by_name, :HostNetworkInterface, [WSTRING]
+          function :find_host_network_interface_by_id, :HostNetworkInterface, [WSTRING]
+          function :find_host_network_interfaces_of_type, [:HostNetworkInterface], [:HostNetworkInterfaceType]
+          function :find_usb_device_by_id, :HostUSBDevice, [WSTRING]
+          function :find_usb_device_by_address, :HostUSBDevice, [WSTRING]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host_network_interface.rb

@@ -0,0 +1,30 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HostNetworkInterface < AbstractInterface
+          IID = "ce6fae58-7642-4102-b5db-c9005c2320a8"
+
+          property :name, WSTRING, :readonly => true
+          property :id, WSTRING, :readonly => true
+          property :network_name, WSTRING, :readonly => true
+          property :dhcp_enabled, T_BOOL, :readonly => true
+          property :ip_address, WSTRING, :readonly => true
+          property :network_mask, WSTRING, :readonly => true
+          property :ip_v6_supported, T_BOOL, :readonly => true
+          property :ip_v6_address, WSTRING, :readonly => true
+          property :ip_v6_network_mask_prefix_length, T_UINT32, :readonly => true
+          property :hardware_address, WSTRING, :readonly => true
+          property :medium_type, :HostNetworkInterfaceMediumType, :readonly => true
+          property :status, :HostNetworkInterfaceStatus, :readonly => true
+          property :interface_type, :HostNetworkInterfaceType, :readonly => true
+
+          function :enable_static_ip_config, nil, [WSTRING, WSTRING]
+          function :enable_static_ip_config_v6, nil, [WSTRING, T_UINT32]
+          function :enable_dynamic_ip_config, nil, []
+          function :dhcp_rediscover, nil, []
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host_network_interface_medium_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HostNetworkInterfaceMediumType < AbstractEnum
+          map [:unknown, :ethernet, :ppp, :slip]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host_network_interface_status.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HostNetworkInterfaceStatus < AbstractEnum
+          map [:unknown, :up, :down]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host_network_interface_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HostNetworkInterfaceType < AbstractEnum
+          map [:null, :bridged, :host_only]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host_usb_device.rb

@@ -0,0 +1,13 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HostUSBDevice < AbstractInterface
+          IID = "173b4b44-d268-4334-a00d-b6521c9a740a"
+
+          property :state, :USBDeviceState, :readonly => true
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/host_usb_device_filter.rb

@@ -0,0 +1,13 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HostUSBDeviceFilter < AbstractInterface
+          IID = "4cc70246-d74a-400f-8222-3900489c0374"
+
+          property :action, :USBDeviceFilterAction
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/hw_virt_ex_property_type.rb

@@ -0,0 +1,12 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class HWVirtExPropertyType < AbstractEnum
+          map [:null, :enabled, :exclusive, :vpid, :nested_paging, :large_pages,
+              :force]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/keyboard_hid_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class KeyboardHidType < AbstractEnum
+          map [:null, :none, :ps2_keyboard, :usb_keyboard, :combo_keyboard]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/lock_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class LockType < AbstractEnum
+          map [:null, :shared, :write]
+        end
+      end
+    end
+  end
+end