From dddb536e254af564d408c2ef4aa87b43704ca161 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Wed, 8 Jul 2015 20:45:46 +0200
Subject: [PATCH] vbox: use initFromSettings for construction VM

---
 repos/ports/run/virtualbox.run              | 6 +-----
 repos/ports/src/virtualbox/frontend/main.cc | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run
index b0325df82..eab4eb5c5 100644
--- a/repos/ports/run/virtualbox.run
+++ b/repos/ports/run/virtualbox.run
@@ -118,11 +118,7 @@ append_if [expr $use_serial] config {
 
 append config {
 					<rom name="test.vbox" />
-					<dir name="VirtualBox VMs">
-						<dir name="TestVM">
-							<rom name="test.iso" />
-						</dir>
-					</dir>
+					<rom name="test.iso" />
 				</vfs>
 			</libc>
 		</config>
diff --git a/repos/ports/src/virtualbox/frontend/main.cc b/repos/ports/src/virtualbox/frontend/main.cc
index 00ab28388..9db1fd65d 100644
--- a/repos/ports/src/virtualbox/frontend/main.cc
+++ b/repos/ports/src/virtualbox/frontend/main.cc
@@ -89,7 +89,6 @@ HRESULT setupmachine()
 
 	static com::Utf8Str vm_config(c_vbox_file);
 	static com::Utf8Str vm_name(c_vbox_vmname);
-	settings::MachineConfigFile * machine_config = new settings::MachineConfigFile(&vm_config);
 
 	/* Machine object */
 	ComObjPtr<Machine> machine;
@@ -103,7 +102,7 @@ HRESULT setupmachine()
 	if (FAILED(rc))
 		return rc;
 
-	rc = machine->init(virtualbox, vm_name, *machine_config);
+	rc = machine->initFromSettings(virtualbox, vm_config, nullptr);
 	if (FAILED(rc))
 		return rc;