[PULL 0/1] QGA build bug fixes for QEMU 8.2.0-rc2

[PULL 0/1] QGA build bug fixes for QEMU 8.2.0-rc2

[Konstantin Kostiuk]

The following changes since commit 4705fc0c8511d073bee4751c3c974aab2b10a970:

  Merge tag 'pull-for-8.2-fixes-231123-1' of https://gitlab.com/stsquad/qemu into staging (2023-11-24 08:00:18 -0500)

are available in the Git repository at:

  https://github.com/kostyanf14/qemu.git tags/qga-pull-2023-11-25

for you to fetch changes up to 7e5b19793d0519ec761f2bcf6591a4c995de3894:

  build-sys: fix meson project version usage (2023-11-25 19:23:38 +0200)

----------------------------------------------------------------
qga-pull-2023-11-25

----------------------------------------------------------------
Marc-André Lureau (1):
      build-sys: fix meson project version usage

 qga/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.42.0

[PULL 1/1] build-sys: fix meson project version usage

[Konstantin Kostiuk]

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Program wixl found: YES (/usr/bin/wixl)

../qga/meson.build:149:16: ERROR: Unknown variable "project".

Fixes: e20d68aa0b9 ("configure, meson: use command line options to configure qemu-ga")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
 qga/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qga/meson.build b/qga/meson.build
index 940a51d55d..ff7a8496e4 100644
--- a/qga/meson.build
+++ b/qga/meson.build
@@ -146,7 +146,7 @@ if targetos == 'windows'
       libpcre = 'libpcre2'
     endif
     qga_msi_version = get_option('qemu_ga_version') == '' \
-      ? project.version() \
+      ? meson.project_version() \
       : get_option('qemu_ga_version')
     qga_msi = custom_target('QGA MSI',
                             input: files('installer/qemu-ga.wxs'),
-- 
2.42.0

Re: [PULL 0/1] QGA build bug fixes for QEMU 8.2.0-rc2

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 115 bytes --]

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/8.2 for any user-visible changes.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]