- Remove ps2passthrough patch.

  - Rebase the patch queue on the new branch.

diff --git a/master/dom0-driver b/master/dom0-driver
index 0f756c110d45a6f910076478fd55f90fd91c26d5..8db215109522138ad3796d411b53a848a5337b12 100644 (file)
--- a/master/dom0-driver
+++ b/master/dom0-driver
@@ -24,10 +24,10 @@ index 14b42f3..97214c0 100644
  #endif
 diff --git a/dom0_driver.c b/dom0_driver.c
 new file mode 100644
-index 0000000..5ab64f0
+index 0000000..2dbe199
 --- /dev/null
 +++ b/dom0_driver.c
-@@ -0,0 +1,698 @@
+@@ -0,0 +1,697 @@
 +/*
 + * QEMU dom0_driver
 + *
@@ -73,7 +73,6 @@ index 0000000..5ab64f0
 +#include <time.h>
 +
 +extern int vga_passthrough;
-+extern int intel;
 +
 +static void dom0_driver_state_change(const char *path, void *opaque);
 +static void dom0_driver_command(const char *path, void *opaque);

diff --git a/master/intel b/master/intel
index 20587f59f5d75424c67f4f34ed07b212064dbefe..684b9034b62d174718acfa522f587387c82269b3 100644 (file)
--- a/master/intel
+++ b/master/intel
@@ -33,7 +33,7 @@ index 97214c0..8c9b09b 100644
 +void intel_display_init(DisplayState *ds);
  #endif
 diff --git a/dom0_driver.c b/dom0_driver.c
-index a0fa64e..c8b376e 100644
+index 2dbe199..5806b34 100644
 --- a/dom0_driver.c
 +++ b/dom0_driver.c
 @@ -43,6 +43,7 @@
@@ -44,9 +44,9 @@ index a0fa64e..c8b376e 100644
  
  static void dom0_driver_state_change(const char *path, void *opaque);
  static void dom0_driver_command(const char *path, void *opaque);
-@@ -698,6 +699,11 @@ void dom0_driver_init(const char *position)
-       driver.enter = dom0_driver_unblank;
-       driver.leave = dom0_driver_blank;
+@@ -682,6 +683,11 @@ void dom0_driver_init(const char *position)
+         driver.enter = intel_enter;
+         driver.leave = intel_leave;
      }
 +    else if (intel)
 +    {
@@ -673,7 +673,7 @@ index 0000000..c071866
 +    lds = ds;
 +}
 diff --git a/vl.c b/vl.c
-index 0ffe1ec..97cb5d8 100644
+index 45e03c1..fdab62f 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -235,6 +235,7 @@ int win2k_install_hack = 0;
@@ -684,7 +684,7 @@ index 0ffe1ec..97cb5d8 100644
  #endif
  int usb_enabled = 0;
  int smp_cpus = 1;
-@@ -4293,6 +4294,7 @@ enum {
+@@ -4305,6 +4306,7 @@ enum {
      QEMU_OPTION_vcpus,
      QEMU_OPTION_vga_passthrough,
      QEMU_OPTION_dom0_input,
@@ -692,7 +692,7 @@ index 0ffe1ec..97cb5d8 100644
  
      /* Debug/Expert options: */
      QEMU_OPTION_serial,
-@@ -4468,6 +4470,7 @@ static const QEMUOption qemu_options[] = {
+@@ -4480,6 +4482,7 @@ static const QEMUOption qemu_options[] = {
      { "vcpus", HAS_ARG, QEMU_OPTION_vcpus },
      { "vga-passthrough", 0, QEMU_OPTION_vga_passthrough },
      { "dom0-input", 1, QEMU_OPTION_dom0_input },
@@ -700,7 +700,7 @@ index 0ffe1ec..97cb5d8 100644
  #if defined(CONFIG_XEN) && !defined(CONFIG_DM)
      { "xen-domid", HAS_ARG, QEMU_OPTION_xen_domid },
      { "xen-create", 0, QEMU_OPTION_xen_create },
-@@ -5307,6 +5310,9 @@ int main(int argc, char **argv, char **envp)
+@@ -5319,6 +5322,9 @@ int main(int argc, char **argv, char **envp)
              case QEMU_OPTION_dom0_input:
                  dom0_input = optarg;
                  break;
@@ -710,7 +710,7 @@ index 0ffe1ec..97cb5d8 100644
              case QEMU_OPTION_direct_pci:
                 direct_pci = optarg;
                  break;
-@@ -5909,26 +5915,26 @@ int main(int argc, char **argv, char **envp)
+@@ -5921,26 +5927,26 @@ int main(int argc, char **argv, char **envp)
                  curses_display_init(ds, full_screen);
              } else
  #endif

diff --git a/master/series b/master/series
index 210946e663cf566fa481325550097d771f8560d2..5d6fad1911d853c1b0e1c97b1e72f45abf4a9fbb 100644 (file)
--- a/master/series
+++ b/master/series
@@ -14,7 +14,7 @@ vga-passthrough
 dom0-driver
 intel
 use-vga-cmdline
-ps2-passthrough
+#ps2-passthrough
 
 alsa-fix
 alsa-config