Fix conflicts on intel.c.

diff --git a/master/intel b/master/intel
index af0f3c736646ddda686d0b040c33606ce47efdb4..b84f672f808ed1bd376695a098dace8f737751c0 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/hw/vga.c b/hw/vga.c
-index 90bd544..d515e9d 100644
+index 90bd544..5048dea 100644
 --- a/hw/vga.c
 +++ b/hw/vga.c
 @@ -161,6 +161,18 @@ static uint8_t expand4to8[16];
@@ -72,17 +72,16 @@ index 90bd544..d515e9d 100644
              if (is_graphic_console()) {
                  qemu_free_displaysurface(s->ds);
                  s->ds->surface = qemu_create_displaysurface_from(disp_width, height, depth,
-@@ -1632,7 +1641,8 @@ static void vga_draw_graphic(VGAState *s, int full_update)
-         s->ds->surface->data = s->vram_ptr + (s->start_addr * 4);
+@@ -1633,6 +1642,8 @@ static void vga_draw_graphic(VGAState *s, int full_update)
          dpy_setdata(s->ds);
      }
--
+
 +    if (intel_output && is_buffer_shared(s->ds->surface))
 +        return;
      s->rgb_to_pixel =
          rgb_to_pixel_dup_table[get_depth_index(s->ds)];
 
-@@ -2473,8 +2483,6 @@ static void vga_bios_init(VGAState *s)
+@@ -2473,8 +2484,6 @@ static void vga_bios_init(VGAState *s)
  }
 
 
@@ -503,7 +502,7 @@ index 0000000..8a20756
 +    lds = ds;
 +}
 diff --git a/vl.c b/vl.c
-index 18c2a8a..bb83e19 100644
+index 0ffe1ec..97cb5d8 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -235,6 +235,7 @@ int win2k_install_hack = 0;
@@ -530,7 +529,7 @@ index 18c2a8a..bb83e19 100644
  #if defined(CONFIG_XEN) && !defined(CONFIG_DM)
      { "xen-domid", HAS_ARG, QEMU_OPTION_xen_domid },
      { "xen-create", 0, QEMU_OPTION_xen_create },
-@@ -5306,6 +5309,9 @@ int main(int argc, char **argv, char **envp)
+@@ -5307,6 +5310,9 @@ int main(int argc, char **argv, char **envp)
              case QEMU_OPTION_dom0_input:
                  dom0_input = optarg;
                  break;
@@ -540,7 +539,7 @@ index 18c2a8a..bb83e19 100644
              case QEMU_OPTION_direct_pci:
                 direct_pci = optarg;
                  break;
-@@ -5908,26 +5914,26 @@ int main(int argc, char **argv, char **envp)
+@@ -5909,26 +5915,26 @@ int main(int argc, char **argv, char **envp)
                  curses_display_init(ds, full_screen);
              } else
  #endif