Try second time

diff --git a/tizen/distrib/temp/dev/emul-skin.properties b/tizen/distrib/temp/dev/emul-skin.properties
index b34ef66..96e8da9 100644 (file)
--- a/tizen/distrib/temp/dev/emul-skin.properties
+++ b/tizen/distrib/temp/dev/emul-skin.properties
@@ -1,6 +1,6 @@
 #Generated automatically by emulator.
-#Thu Mar 08 21:51:13 KST 2012
-window.y=45
-window.x=1083
+#Thu Mar 08 17:39:01 KST 2012
+window.y=61
+window.x=969
 window.scale=1
 window.rotate=1

diff --git a/tizen/distrib/temp/linuxboot.bin b/tizen/distrib/temp/linuxboot.bin
new file mode 100644 (file)
index 0000000..e7c3669
Binary files /dev/null and b/tizen/distrib/temp/linuxboot.bin differ

diff --git a/tizen/distrib/temp/pxe-virtio.rom b/tizen/distrib/temp/pxe-virtio.rom
new file mode 100644 (file)
index 0000000..b1ec909
Binary files /dev/null and b/tizen/distrib/temp/pxe-virtio.rom differ

diff --git a/tizen/distrib/temp/run_emulator.sh b/tizen/distrib/temp/run_emulator.sh
index a24d3d0..2a92b45 100755 (executable)
--- a/tizen/distrib/temp/run_emulator.sh
+++ b/tizen/distrib/temp/run_emulator.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-./qemu-system-i386 --skin-args a --qemu-args -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice wacom-tablet -vga maru -bios bios.bin -L ../../../pc-bios -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm emulimg.x86 -redir tcp:1202:10.0.2.16:22
+./qemu-system-i386 --skin-args a --qemu-args -drive file=emulimg.x86,if=virtio -boot c -append "console=ttyS0 video=uvesafb:ywrap,480x800-32@60 proxy= dns1=168.126.63.1 sdb_port=26100 dpi=2070 root=/dev/vda rw ip=10.0.2.16::10.0.2.2:255.255.255.0::eth0:none 5" -serial file:emulator.klog -m 512 -M maru-x86-machine -net nic,model=virtio -soundhw all -usb -usbdevice maru-touchscreen -vga std -bios bios.bin -L . -kernel bzImage -usbdevice keyboard -net user -rtc base=utc -enable-kvm 

diff --git a/tizen/distrib/temp/vgabios-maruvga.bin b/tizen/distrib/temp/vgabios-maruvga.bin
index 41006f4..24d03a8 100644 (file)
Binary files a/tizen/distrib/temp/vgabios-maruvga.bin and b/tizen/distrib/temp/vgabios-maruvga.bin differ

diff --git a/tizen/distrib/temp/vgabios-stdvga.bin b/tizen/distrib/temp/vgabios-stdvga.bin
new file mode 100644 (file)
index 0000000..24d03a8
Binary files /dev/null and b/tizen/distrib/temp/vgabios-stdvga.bin differ

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index 48e68f7..e0ea179 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -113,21 +113,22 @@ int main(int argc, char* argv[])
 
        parse_options(argc, argv, &skin_argc, &skin_argv, &qemu_argc, &qemu_argv);
 
-/*
        int i;
 
+/*
        printf("%d\n", skin_argc);
        for(i = 0; i < skin_argc; ++i)
        {
                printf("%s\n", skin_argv[i]);
        }
+*/
 
        printf("%d\n", qemu_argc);
        for(i = 0; i < qemu_argc; ++i)
        {
-               printf("%s\n", qemu_argv[i]);
+               printf("%s ", qemu_argv[i]);
        }
-*/
+       printf("\n");
 
        construct_main_window(skin_argc, skin_argv);
        qemu_main(qemu_argc, qemu_argv, NULL);