[Qemu-devel] [PULL 0/8] Ui 20190110 patches

Gerd Hoffmann posted 8 patches 5 years, 3 months ago
Failed in applying to current master (apply log)
configure                 |   4 +-
Makefile                  |   4 +-
include/ui/console.h      |   4 --
include/ui/qemu-spice.h   |   6 --
chardev/spice.c           |  10 ---
hw/display/qxl.c          |   2 -
ui/console.c              |  36 ----------
ui/egl-headless.c         |  10 ++-
ui/keymaps.c              |   7 +-
ui/spice-core.c           |   9 ---
pc-bios/keymaps/common    | 157 ----------------------------------------
pc-bios/keymaps/modifiers |  18 -----
pc-bios/keymaps/nl-be     |   3 -
pc-bios/keymaps/sl        | 177 +++++++++++++++++++++++++++++++++++++++++++++-
pc-bios/keymaps/sv        | 176 ++++++++++++++++++++++++++++++++++++++++++++-
15 files changed, 367 insertions(+), 256 deletions(-)
delete mode 100644 pc-bios/keymaps/common
delete mode 100644 pc-bios/keymaps/modifiers
delete mode 100644 pc-bios/keymaps/nl-be
[Qemu-devel] [PULL 0/8] Ui 20190110 patches
Posted by Gerd Hoffmann 5 years, 3 months ago
The following changes since commit e59dbbac0364344a3ad84c3497a98c56003d3fb8:

  Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging (2019-01-04 18:23:13 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/ui-20190110-pull-request

for you to fetch changes up to 766a0a54faa97b8d4cbc7a6bd47f7ea78e625c19:

  spice: Remove unused include (2019-01-10 08:55:36 +0100)

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

----------------------------------------------------------------

Frediano Ziglio (1):
  spice: Remove unused include

Gerd Hoffmann (5):
  egl-headless: add egl_create_context
  keymaps: remove modifiers include
  keymaps: drop nl-be map
  keymaps: remove common include
  keymaps: drop support for include files

Marc-André Lureau (1):
  configure: bump spice-server required version to 0.12.5

Peter Maydell (1):
  ui/console: Remove qemu_create_display_surface_guestmem()

 configure                 |   4 +-
 Makefile                  |   4 +-
 include/ui/console.h      |   4 --
 include/ui/qemu-spice.h   |   6 --
 chardev/spice.c           |  10 ---
 hw/display/qxl.c          |   2 -
 ui/console.c              |  36 ----------
 ui/egl-headless.c         |  10 ++-
 ui/keymaps.c              |   7 +-
 ui/spice-core.c           |   9 ---
 pc-bios/keymaps/common    | 157 ----------------------------------------
 pc-bios/keymaps/modifiers |  18 -----
 pc-bios/keymaps/nl-be     |   3 -
 pc-bios/keymaps/sl        | 177 +++++++++++++++++++++++++++++++++++++++++++++-
 pc-bios/keymaps/sv        | 176 ++++++++++++++++++++++++++++++++++++++++++++-
 15 files changed, 367 insertions(+), 256 deletions(-)
 delete mode 100644 pc-bios/keymaps/common
 delete mode 100644 pc-bios/keymaps/modifiers
 delete mode 100644 pc-bios/keymaps/nl-be

-- 
2.9.3


Re: [Qemu-devel] [PULL 0/8] Ui 20190110 patches
Posted by Peter Maydell 5 years, 3 months ago
On Thu, 10 Jan 2019 at 08:58, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit e59dbbac0364344a3ad84c3497a98c56003d3fb8:
>
>   Merge remote-tracking branch 'remotes/philmd/tags/fw_cfg-20190104-pull-request' into staging (2019-01-04 18:23:13 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/ui-20190110-pull-request
>
> for you to fetch changes up to 766a0a54faa97b8d4cbc7a6bd47f7ea78e625c19:
>
>   spice: Remove unused include (2019-01-10 08:55:36 +0100)
>
> ----------------------------------------------------------------
> ui: bugfixes, drop keymap include support, drop dead code.
>
> ----------------------------------------------------------------
>
> Frediano Ziglio (1):
>   spice: Remove unused include
>
> Gerd Hoffmann (5):
>   egl-headless: add egl_create_context
>   keymaps: remove modifiers include
>   keymaps: drop nl-be map
>   keymaps: remove common include
>   keymaps: drop support for include files
>
> Marc-André Lureau (1):
>   configure: bump spice-server required version to 0.12.5
>
> Peter Maydell (1):
>   ui/console: Remove qemu_create_display_surface_guestmem()

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes. (In particular we have a section
for changes in the required versions of dependent libraries etc).

-- PMM