Commit 823dcd58 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190110-pull-request' into staging 



ui: bugfixes, drop keymap include support, drop dead code.

# gpg: Signature made Thu 10 Jan 2019 08:47:10 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20190110-pull-request:
  spice: Remove unused include
  keymaps: drop support for include files
  keymaps: remove common include
  keymaps: drop nl-be map
  keymaps: remove modifiers include
  ui/console: Remove qemu_create_display_surface_guestmem()
  configure: bump spice-server required version to 0.12.5
  egl-headless: add egl_create_context

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d246ff5d 766a0a54

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -651,9 +651,9 @@ distclean: clean 
	rm -Rf .sdk

	if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi



KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \

KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  no  pt-br  sv \

ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \

common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr \

de-ch  es     fo  fr-ca  hu     ja  mk  pt  sl     tr \

bepo    cz



ifdef INSTALL_BLOBS

chardev/spice.c

+0 −10
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len) 
    return bytes;

}



#if SPICE_SERVER_VERSION >= 0x000c02

static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event)

{

    SpiceChardev *scd = container_of(sin, SpiceChardev, sin);
@@ -95,7 +94,6 @@ static void vmc_event(SpiceCharDeviceInstance *sin, uint8_t event) 
    trace_spice_vmc_event(chr_event);

    qemu_chr_be_event(chr, chr_event);

}

#endif



static void vmc_state(SpiceCharDeviceInstance *sin, int connected)

{
@@ -119,9 +117,7 @@ static SpiceCharDeviceInterface vmc_interface = { 
    .state              = vmc_state,

    .write              = vmc_write,

    .read               = vmc_read,

#if SPICE_SERVER_VERSION >= 0x000c02

    .event              = vmc_event,

#endif

#if SPICE_SERVER_VERSION >= 0x000c06

    .flags              = SPICE_CHAR_DEVICE_NOTIFY_WRITABLE,

#endif
@@ -223,9 +219,7 @@ static void char_spice_finalize(Object *obj) 
    }



    g_free((char *)s->sin.subtype);

#if SPICE_SERVER_VERSION >= 0x000c02

    g_free((char *)s->sin.portname);

#endif

}



static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open)
@@ -240,7 +234,6 @@ static void spice_vmc_set_fe_open(struct Chardev *chr, int fe_open) 


static void spice_port_set_fe_open(struct Chardev *chr, int fe_open)

{

#if SPICE_SERVER_VERSION >= 0x000c02

    SpiceChardev *s = SPICE_CHARDEV(chr);



    if (fe_open) {
@@ -248,7 +241,6 @@ static void spice_port_set_fe_open(struct Chardev *chr, int fe_open) 
    } else {

        spice_server_port_event(&s->sin, SPICE_PORT_EVENT_CLOSED);

    }

#endif

}



static void spice_chr_accept_input(struct Chardev *chr)
@@ -298,7 +290,6 @@ static void qemu_chr_open_spice_vmc(Chardev *chr, 
    chr_open(chr, type);

}



#if SPICE_SERVER_VERSION >= 0x000c02

static void qemu_chr_open_spice_port(Chardev *chr,

                                     ChardevBackend *backend,

                                     bool *be_opened,
@@ -331,7 +322,6 @@ void qemu_spice_register_ports(void) 
        vmc_register_interface(s);

    }

}

#endif



static void qemu_chr_parse_spice_vmc(QemuOpts *opts, ChardevBackend *backend,

                                     Error **errp)

configure

+2 −2
Original line number Diff line number Diff line
@@ -4622,7 +4622,7 @@ int main(void) { spice_server_new(); return 0; } 
EOF

  spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)

  spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)

  if $pkg_config --atleast-version=0.12.0 spice-server && \

  if $pkg_config --atleast-version=0.12.5 spice-server && \

     $pkg_config --atleast-version=0.12.3 spice-protocol && \

     compile_prog "$spice_cflags" "$spice_libs" ; then

    spice="yes"
@@ -4633,7 +4633,7 @@ EOF 
  else

    if test "$spice" = "yes" ; then

      feature_not_found "spice" \

          "Install spice-server(>=0.12.0) and spice-protocol(>=0.12.3) devel"

          "Install spice-server(>=0.12.5) and spice-protocol(>=0.12.3) devel"

    fi

    spice="no"

  fi

hw/display/qxl.c

+0 −2
Original line number Diff line number Diff line
@@ -1189,9 +1189,7 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d) 
        return;

    }

    trace_qxl_enter_vga_mode(d->id);

#if SPICE_SERVER_VERSION >= 0x000c03 /* release 0.12.3 */

    spice_qxl_driver_unload(&d->ssd.qxl);

#endif

    graphic_console_set_hwops(d->ssd.dcl.con, d->vga.hw_ops, &d->vga);

    update_displaychangelistener(&d->ssd.dcl, GUI_REFRESH_INTERVAL_DEFAULT);

    qemu_spice_create_host_primary(&d->ssd);

include/ui/console.h

+0 −4
Original line number Diff line number Diff line
@@ -257,10 +257,6 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, 
                                                pixman_format_code_t format,

                                                int linesize, uint8_t *data);

DisplaySurface *qemu_create_displaysurface_pixman(pixman_image_t *image);

DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,

                                                    pixman_format_code_t format,

                                                    int linesize,

                                                    uint64_t addr);

DisplaySurface *qemu_create_message_surface(int w, int h,

                                            const char *msg);

PixelFormat qemu_default_pixelformat(int bpp);