[Qemu-commits] [qemu/qemu] 60e94e: qxl: store channel id in qxl->id

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 60e94e4397f62703ec77caa290610d99349f7e35
      
https://github.com/qemu/qemu/commit/60e94e4397f62703ec77caa290610d99349f7e35
  Author: Gerd Hoffmann <address@hidden>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M hw/display/qxl.c
    M hw/display/qxl.h

  Log Message:
  -----------
  qxl: store channel id in qxl->id

See qemu_spice_add_display_interface(), the console index is also used
as channel id.  So put that into the qxl->id field too.

In typical use cases (one primary qxl-vga device, optionally one or more
secondary qxl devices, no non-qxl display devices) this doesn't change
anything.

With this in place the qxl->id can not be used any more to figure
whenever a given device is primary (with vga compat mode) or secondary.
So add a bool to track this.

Cc: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


  Commit: e69a10f468d8f6aa6c00a4308f5a8e1f2fd6b3a1
      
https://github.com/qemu/qemu/commit/e69a10f468d8f6aa6c00a4308f5a8e1f2fd6b3a1
  Author: yuchenlin <address@hidden>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M hw/display/vga_int.h

  Log Message:
  -----------
  vga_int: remove unused function protype

Signed-off-by: yuchenlin <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1
      
https://github.com/qemu/qemu/commit/ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1
  Author: Peter Maydell <address@hidden>
  Date:   2018-10-29 (Mon, 29 Oct 2018)

  Changed paths:
    M hw/display/qxl.c
    M hw/display/qxl.h
    M hw/display/vga_int.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181029-pull-request' 
into staging

vga: two fixes.

# gpg: Signature made Mon 29 Oct 2018 12:46:20 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/vga-20181029-pull-request:
  vga_int: remove unused function protype
  qxl: store channel id in qxl->id

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/285278ca785f...ef3a6af5e789
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.