[Qemu-commits] [qemu/qemu] 8e12ec: qga:/qga-win: adding a empty PCI address creation ...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 8e12ec8ee301632b0fabc97489ee5db8fe0d6851
      
https://github.com/qemu/qemu/commit/8e12ec8ee301632b0fabc97489ee5db8fe0d6851
  Author: Kfir Manor <kfir@daynix.com>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga:/qga-win: adding a empty PCI address creation function

Refactoring code to avoid duplication of creating an empty PCI address code.

Signed-off-by: Kfir Manor <kfir@daynix.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>


  Commit: cce910f219d3875c1c29aed70378d030f7110e01
      
https://github.com/qemu/qemu/commit/cce910f219d3875c1c29aed70378d030f7110e01
  Author: Kfir Manor <kfir@daynix.com>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga:/qga-win: skip getting pci info for USB disks

Skip getting PCI info from disks type USB and give them an empty PCI address 
instead.

Signed-off-by: Kfir Manor <kfir@daynix.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>


  Commit: 28236ad8d152ffb8e7e7a280747df50cd8e49471
      
https://github.com/qemu/qemu/commit/28236ad8d152ffb8e7e7a280747df50cd8e49471
  Author: Brad Smith <brad@comstyle.com>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M meson.build
    M qga/commands-bsd.c
    M qga/commands-posix.c
    M qga/main.c

  Log Message:
  -----------
  qga: Add initial OpenBSD and NetBSD support

qga: Add initial OpenBSD and NetBSD support

Signed-off-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>


  Commit: f9f0e6173e1d570847930abfe2b4560c7b6a964a
      
https://github.com/qemu/qemu/commit/f9f0e6173e1d570847930abfe2b4560c7b6a964a
  Author: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M configure
    M qga/installer/qemu-ga.wxs
    M qga/main.c
    M qga/meson.build
    A qga/messages-win32.mc

  Log Message:
  -----------
  qga-win: add logging to Windows event log

This commit allows QGA to write to Windows event log using Win32 API's
ReportEvent() [1], much like syslog() under *nix guests.

In order to generate log message definitions we use a very basic message
text file [2], so that every QGA's message gets ID 1.  The tools
"windmc" and "windres" respectively are used to generate ".rc" file and
COFF object file, and then the COFF file is linked into qemu-ga.exe.

[1] 
https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-reporteventa
[2] https://learn.microsoft.com/en-us/windows/win32/eventlog/message-text-files

Originally-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Tested-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>


  Commit: 8e86851bd6b9b67fb5f6896cb85ff20c7d9bbbaa
      
https://github.com/qemu/qemu/commit/8e86851bd6b9b67fb5f6896cb85ff20c7d9bbbaa
  Author: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: map GLib log levels to system levels

This patch translates GLib-specific log levels to system ones, so that
they may be used by both *nix syslog() (as a "priority" argument) and
Windows ReportEvent() (as a "wType" argument).

Currently the only codepath to write to "syslog" domain is slog()
function.  However, this patch allows the interface to be extended.

Note that since slog() is using G_LOG_LEVEL_INFO level, its behaviour
doesn't change.

Originally-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Tested-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>


  Commit: 9ca180bce1f9dad86b8d455a0c5c252d4c54eb92
      
https://github.com/qemu/qemu/commit/9ca180bce1f9dad86b8d455a0c5c252d4c54eb92
  Author: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M qga/installer/qemu-ga.wxs
    M qga/meson.build

  Log Message:
  -----------
  qga-win: choose the right libpcre version to include in MSI package

According to GLib changelog [1], since version 2.73.2 GLib is using
libpcre2 instead of libpcre.  As a result, qemu-ga MSI installation
fails due to missing DLL when linked with the newer GLib.

This commit makes wixl to put the right libpcre version into the MSI
bundle: either libpcre-1.dll or libpcre2-8-0.dll, depending on the
present version of GLib.

[1] https://gitlab.gnome.org/GNOME/glib/-/releases#2.73.2

Previous version:
https://lists.nongnu.org/archive/html/qemu-trivial/2022-11/msg00237.html

Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Tested-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>


  Commit: 67de3d090d0b62d779fa497e708859b5ec1b791d
      
https://github.com/qemu/qemu/commit/67de3d090d0b62d779fa497e708859b5ec1b791d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-12-20 (Tue, 20 Dec 2022)

  Changed paths:
    M configure
    M meson.build
    M qga/commands-bsd.c
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/installer/qemu-ga.wxs
    M qga/main.c
    M qga/meson.build
    A qga/messages-win32.mc

  Log Message:
  -----------
  Merge tag 'qga-pull-2022-12-20' of github.com:kostyanf14/qemu into staging

qga-pull-2022-12-20

# gpg: Signature made Tue 20 Dec 2022 13:57:59 GMT
# gpg:                using RSA key C2C2C109EA43C63C1423EB84EF5D5E8161BA84E7
# gpg: Good signature from "Kostiantyn Kostiuk (Upstream PR sign) 
<kkostiuk@redhat.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C2C2 C109 EA43 C63C 1423  EB84 EF5D 5E81 61BA 84E7

* tag 'qga-pull-2022-12-20' of github.com:kostyanf14/qemu:
  qga-win: choose the right libpcre version to include in MSI package
  qga: map GLib log levels to system levels
  qga-win: add logging to Windows event log
  qga: Add initial OpenBSD and NetBSD support
  qga:/qga-win: skip getting pci info for USB disks
  qga:/qga-win: adding a empty PCI address creation function

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/cb11e2ac3537...67de3d090d0b