[Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec_dir() to cu

From:	Richard Henderson
Subject:	[Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec_dir() to cutils
Date:	Sun, 29 May 2022 18:56:58 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 06680b15b4ee3184b57c9c910886a9ff8a7e58c0
      
https://github.com/qemu/qemu/commit/06680b15b4ee3184b57c9c910886a9ff8a7e58c0
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M include/qemu/cutils.h
    M include/qemu/osdep.h
    M qemu-io.c
    M storage-daemon/qemu-storage-daemon.c
    M tests/qtest/fuzz/fuzz.c
    M util/cutils.c
    M util/oslib-posix.c
    M util/oslib-win32.c

  Log Message:
  -----------
  include: move qemu_*_exec_dir() to cutils

The function is required by get_relocated_path() (already in cutils),
and used by qemu-ga and may be generally useful.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-2-marcandre.lureau@redhat.com>


  Commit: 49e0128c483aa4a49860210ea51e00523ec26aaa
      
https://github.com/qemu/qemu/commit/49e0128c483aa4a49860210ea51e00523ec26aaa
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M util/oslib-win32.c

  Log Message:
  -----------
  util/win32: simplify qemu_get_local_state_dir()

SHGetFolderPath() is a deprecated API:
https://docs.microsoft.com/en-us/windows/win32/api/shlobj_core/nf-shlobj_core-shgetfolderpatha

It is a wrapper for SHGetKnownFolderPath() and CSIDL_COMMON_PATH is
mapped to FOLDERID_ProgramData:
https://docs.microsoft.com/en-us/windows/win32/shell/csidl

g_get_system_data_dirs() is a suitable replacement, as it will have
FOLDERID_ProgramData in the returned list. However, it follows the XDG
Base Directory Specification, if `XDG_DATA_DIRS` is defined, it will be
returned instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20220525144140.591926-3-marcandre.lureau@redhat.com>


  Commit: 56b6dab2743b276a50036cd0a115e98cb1134f38
      
https://github.com/qemu/qemu/commit/56b6dab2743b276a50036cd0a115e98cb1134f38
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M tests/qtest/libqmp.c
    M tests/qtest/libqmp.h

  Log Message:
  -----------
  tests: make libqmp buildable for win32

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220525144140.591926-4-marcandre.lureau@redhat.com>


  Commit: 69f56c140de06fee0f266b93634475e1d968e430
      
https://github.com/qemu/qemu/commit/69f56c140de06fee0f266b93634475e1d968e430
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: flatten safe_open_or_create()

There is a bit too much nesting in the function, this can be simplified
a bit to improve readability.

This also helps with the following error handling changes.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-5-marcandre.lureau@redhat.com>


  Commit: 0edbfbe31c532a98a8674b68c94a97537f4e4230
      
https://github.com/qemu/qemu/commit/0edbfbe31c532a98a8674b68c94a97537f4e4230
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    A qga/cutils.c
    A qga/cutils.h
    M qga/meson.build

  Log Message:
  -----------
  qga: add qga_open_cloexec() helper

QGA calls qemu_open_old() in various places. Calling qemu_open() instead
isn't a great alternative, as it has special "/dev/fdset" handling and
depends on QEMU internal monitor data structures.

Instead, provide a simple helper for QGA needs, with Error* support. The
following patches will make use of it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-6-marcandre.lureau@redhat.com>


  Commit: 1a89a17b769352dbced5c6d8b0935e4d1f306c6e
      
https://github.com/qemu/qemu/commit/1a89a17b769352dbced5c6d8b0935e4d1f306c6e
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: use qga_open_cloexec() for safe_open_or_create()

The function takes care of setting CLOEXEC.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-7-marcandre.lureau@redhat.com>


  Commit: 87ed8b2c2cd03d2596c11559f3e64ba15f58a99e
      
https://github.com/qemu/qemu/commit/87ed8b2c2cd03d2596c11559f3e64ba15f58a99e
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M qga/channel-posix.c

  Log Message:
  -----------
  qga: throw an Error in ga_channel_open()

Allow for a single point of error reporting, and further refactoring.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-8-marcandre.lureau@redhat.com>


  Commit: b9947c9ce7eec9f31c9adfea2cd1f42e0bfe76b8
      
https://github.com/qemu/qemu/commit/b9947c9ce7eec9f31c9adfea2cd1f42e0bfe76b8
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M qga/channel-posix.c
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: replace qemu_open_old() with qga_open_cloexec()

qemu_open_old() uses qemu_open_internal() which handles special
"/dev/fdset/" path for monitor fd sets, set CLOEXEC, and uses Error
reporting (and some O_DIRECT special error casing).

The monitor fdset handling is unnecessary for qga, use
qga_open_cloexec() instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-9-marcandre.lureau@redhat.com>


  Commit: 561bfcb69dbd3ad055f9f7ff53f04213c09b51e3
      
https://github.com/qemu/qemu/commit/561bfcb69dbd3ad055f9f7ff53f04213c09b51e3
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: make build_fs_mount_list() return a bool

Change build_fs_mount_list() to return bool, in accordance
with the guidance under = Rules = in include/qapi/error.h

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-10-marcandre.lureau@redhat.com>


  Commit: a85d09269bb1a7071d3ce0f2957e3ca9dba7c047
      
https://github.com/qemu/qemu/commit/a85d09269bb1a7071d3ce0f2957e3ca9dba7c047
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M tests/unit/test-qga.c

  Log Message:
  -----------
  test/qga: use G_TEST_DIR to locate os-release test file

This a more accurate way to lookup the test data, and will allow to move
the test in a subproject.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-11-marcandre.lureau@redhat.com>


  Commit: 4f3c5778a9643c4026be47f161e63112a83db265
      
https://github.com/qemu/qemu/commit/4f3c5778a9643c4026be47f161e63112a83db265
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

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

  Log Message:
  -----------
  qga/wixl: prefer variables over environment

No need to setup an environment or to check if the variable is undefined
manually.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-12-marcandre.lureau@redhat.com>


  Commit: be2db8368f84d9053baa8388f037b7ff11035787
      
https://github.com/qemu/qemu/commit/be2db8368f84d9053baa8388f037b7ff11035787
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

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

  Log Message:
  -----------
  qga/wixl: require Mingw_bin

No clear reason to make guesses here.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-13-marcandre.lureau@redhat.com>


  Commit: 0480a1b67b22218637ab299fb0ea7df2ff8287ce
      
https://github.com/qemu/qemu/commit/0480a1b67b22218637ab299fb0ea7df2ff8287ce
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

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

  Log Message:
  -----------
  qga/wixl: simplify some pre-processing

Sadly, wixl doesn't have 'elif'.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-14-marcandre.lureau@redhat.com>


  Commit: 5b9e7d05d63372540139ba70a8f7c3699d7751b6
      
https://github.com/qemu/qemu/commit/5b9e7d05d63372540139ba70a8f7c3699d7751b6
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

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

  Log Message:
  -----------
  qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir

Use more conventional variables to set the location of pre-built
DLL/bin.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-15-marcandre.lureau@redhat.com>


  Commit: bb6960a11ae9c9d727bab45c22cb4a9eb12cde55
      
https://github.com/qemu/qemu/commit/bb6960a11ae9c9d727bab45c22cb4a9eb12cde55
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-05-28 (Sat, 28 May 2022)

  Changed paths:
    M tests/unit/test-qga.c

  Log Message:
  -----------
  test/qga: use g_auto wherever sensible

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20220525144140.591926-16-marcandre.lureau@redhat.com>


  Commit: f7a1ea403e0282a7f57edd4298c4f65f24165da5
      
https://github.com/qemu/qemu/commit/f7a1ea403e0282a7f57edd4298c4f65f24165da5
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-05-29 (Sun, 29 May 2022)

  Changed paths:
    M configure
    M include/qemu/cutils.h
    M include/qemu/osdep.h
    M meson.build
    M qemu-io.c
    M qga/channel-posix.c
    M qga/commands-posix.c
    A qga/cutils.c
    A qga/cutils.h
    M qga/installer/qemu-ga.wxs
    M qga/meson.build
    M storage-daemon/qemu-storage-daemon.c
    M tests/qtest/fuzz/fuzz.c
    M tests/qtest/libqmp.c
    M tests/qtest/libqmp.h
    M tests/unit/test-qga.c
    M util/cutils.c
    M util/oslib-posix.c
    M util/oslib-win32.c

  Log Message:
  -----------
  Merge tag 'misc-pull-request' of gitlab.com:marcandre.lureau/qemu into staging

Misc cleanups

Mostly qemu-ga related cleanups.

# -----BEGIN PGP SIGNATURE-----
#
# iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmKT+IccHG1hcmNhbmRy
# ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5SGgD/97YXkEQHHQNCiKwFub
# c3RpunfM2ww/492fwBqRYt/QZgnl1esR3gNkMLcEtR8dtWoGja98XNcTBSGcbZGj
# ydGlMZ5kfe/+7mJd5xu45egfEbWICXySstohWU6MzpddBQ1tTgq0iTsU738CsPY7
# kreQgnbYjvfPux0/xhLbYmuLZgBeLX3ser4tzaDA5ExvHjdMSkzjV6qQI5j2BZbZ
# 7jCEfOJJ++Rht71A+FN98HGF9WG6LhV0e6AUnc52XhhldnnhJ3hSU6vcrrvHfYFk
# 31awe1R2agWb4RMfhV2Nfn1uwsc3E+2cNPYbTvm3v/wX00Zc0gE4Z2e1/nXYU8OZ
# +kjJeiVBCgt8DNfJDYnqRWnrYSyhMmc/UIysl0SKLVVOymPDotqHjkEanDNwPUsK
# sgGNkZz2KsBkW9+PoIXh9nxowT5gG/v2oBQuLZQ+2iHgrfNVTKUweO8vHDv+A5lj
# 2hEjx7IhUTNlclSHjggj2Uig7cfSgPVw27ephij0pi5pclsS8wLDs3XlVX+GSyW9
# P+2DWcsi7sBx1Gt6VcwWO07McS+NrqwwhR7rT0ioNhmS1TE0mt0YWhkCg5iabVFo
# yzweA0urN8AF0Js5IKZdNk0/z83nr8Qu8dRmGjciaYo7abBetmIdqdzuv1mIkV2H
# Sqi0mv7yPf7uYHk0U1lb2RNtJQ==
# =L0lG
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 29 May 2022 03:49:43 PM PDT
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" 
[full]
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" 
[full]

* tag 'misc-pull-request' of gitlab.com:marcandre.lureau/qemu:
  test/qga: use g_auto wherever sensible
  qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir
  qga/wixl: simplify some pre-processing
  qga/wixl: require Mingw_bin
  qga/wixl: prefer variables over environment
  test/qga: use G_TEST_DIR to locate os-release test file
  qga: make build_fs_mount_list() return a bool
  qga: replace qemu_open_old() with qga_open_cloexec()
  qga: throw an Error in ga_channel_open()
  qga: use qga_open_cloexec() for safe_open_or_create()
  qga: add qga_open_cloexec() helper
  qga: flatten safe_open_or_create()
  tests: make libqmp buildable for win32
  util/win32: simplify qemu_get_local_state_dir()
  include: move qemu_*_exec_dir() to cutils

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/0234342e0ea9...f7a1ea403e02
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec_dir() to cutils, Richard Henderson, 2022/05/29
- [Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec_dir() to cutils, Richard Henderson <=
Prev by Date: [Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec_dir() to cutils
Next by Date: [Qemu-commits] [qemu/qemu] 95d0f1: docs/system/arm: Add FEAT_HCX to list of emulated ...
Previous by thread: [Qemu-commits] [qemu/qemu] 06680b: include: move qemu_*_exec_dir() to cutils
Next by thread: [Qemu-commits] [qemu/qemu] 95d0f1: docs/system/arm: Add FEAT_HCX to list of emulated ...
Index(es):
- Date
- Thread