Use vga command line for passthrough, disable aio.

Note:  With this change, it is recommended that vga=passthrough option be used in xenvm config
file instead of vga_passthrough=1 although the latter option is available at the moment for backward
compatibility but will be deprecated in future.

diff --git a/xen-3.4/disable-aio b/xen-3.4/disable-aio
new file mode 100644 (file)
index 0000000..b6c874e
--- /dev/null
+++ b/xen-3.4/disable-aio
@@ -0,0 +1,13 @@
+diff --git a/xen-setup b/xen-setup
+index 24defda..84f2936 100755
+--- a/xen-setup
++++ b/xen-setup
+@@ -9,7 +9,7 @@ rm -f config-host.mak
+ 
+ if test -f config-host.h; then mv config-host.h config-host.h~; fi
+ 
+-./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl "$@" --prefix=/usr
++./configure --disable-gfx-check --disable-curses --disable-slirp --disable-vnc-tls --disable-sdl --disable-aio "$@" --prefix=/usr
+ 
+ target=i386-dm
+ 

diff --git a/xen-3.4/series b/xen-3.4/series
index be5bad615c93d6ca999153dbe02be0af67023f00..d4add3b4a6dbe785b6e166d96ae75b7b244b8478 100644 (file)
--- a/xen-3.4/series
+++ b/xen-3.4/series
@@ -5,3 +5,5 @@ vga-passthrough
 dom0-driver
 intel
 battery_management
+use-vga-cmdline
+disable-aio

diff --git a/xen-3.4/use-vga-cmdline b/xen-3.4/use-vga-cmdline
new file mode 100644 (file)
index 0000000..4006998
--- /dev/null
+++ b/xen-3.4/use-vga-cmdline
@@ -0,0 +1,49 @@
+diff --git a/vl.c b/vl.c
+index ae32f82..05d12ae 100644
+--- a/vl.c
++++ b/vl.c
+@@ -4598,24 +4598,20 @@ static void select_soundhw (const char *optarg)
+ static void select_vgahw (const char *p)
+ {
+     const char *opts;
++    std_vga_enabled = 0;
++    cirrus_vga_enabled = 0;
++    vmsvga_enabled = 0;
+ 
+-    if (strstart(p, "std", &opts)) {
++    if (strstart(p, "std", &opts)) 
+         std_vga_enabled = 1;
+-        cirrus_vga_enabled = 0;
+-        vmsvga_enabled = 0;
+-    } else if (strstart(p, "cirrus", &opts)) {
++    else if (strstart(p, "cirrus", &opts)) 
+         cirrus_vga_enabled = 1;
+-        std_vga_enabled = 0;
+-        vmsvga_enabled = 0;
+-    } else if (strstart(p, "vmware", &opts)) {
+-        cirrus_vga_enabled = 0;
+-        std_vga_enabled = 0;
++    else if (strstart(p, "vmware", &opts)) 
+         vmsvga_enabled = 1;
+-    } else if (strstart(p, "none", &opts)) {
+-        cirrus_vga_enabled = 0;
+-        std_vga_enabled = 0;
+-        vmsvga_enabled = 0;
+-    } else {
++    else if (strstart(p, "passthrough", &opts))
++        vga_passthrough = 1;
++    else if (!strstart(p, "none", &opts)) 
++    {
+     invalid_vga:
+         fprintf(stderr, "Unknown vga type: %s\n", p);
+         exit(1);
+@@ -5272,6 +5268,9 @@ int main(int argc, char **argv, char **envp)
+                 break;
+             case QEMU_OPTION_vga_passthrough:
+                 vga_passthrough = 1;
++                std_vga_enabled = 0;
++                cirrus_vga_enabled = 0;
++                vmsvga_enabled = 0;
+                 break;
+             case QEMU_OPTION_dom0_input:
+                 dom0_input = optarg;