From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Wed, 3 Dec 2008 17:17:23 +0000 (+0000)
Subject: Merge branch 'master' into stefano
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4ac3ea996f8cd0b156bfd503cba3ded67b5622f4;p=xenclient%2Fioemu.git

Merge branch 'master' into stefano

Conflicts:

	intel.c
	vl.c
---

4ac3ea996f8cd0b156bfd503cba3ded67b5622f4
diff --cc vl.c
index 659c90a9,1b98273a..18da2d32
--- a/vl.c
+++ b/vl.c
@@@ -211,7 -211,8 +211,8 @@@ int opengl_enabled = 0
  #endif
  const char *dom0_input = NULL;
  int vga_passthrough = 0;
 +int intel_output;
+ int kbd_passthrough = 0;
 -char *intel_output = NULL;
  static const char *direct_pci;
  static int nb_pci_emulation = 0;
  static char pci_emulation_config_text[MAX_PCI_EMULATION][256];