Merge tag 'pull-qemu-20221031' of https://gitlab.com/stweil/qemu into staging

Patches for Windows

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEESSNv6nXJXWmOwreK4Iwh1Wd0UK0FAmNfkC0ACgkQ4Iwh1Wd0
# UK2tEw//QQapqOnJQmjiGVWJ3xUEVoDUmZbhXlPaLKOzSkAnrnIdIO2p4jsXrITi
# LfL8PF7wCg1+oldPsKmhh+ZD6XiUyNBpTt61atXRJS/TybKAGjI33XC+/Hliwity
# 4A0+WxJ960ExLwZzaE/ANTYM86Jo5SqhzACosGh8txRbL1rkmqlrCU1DwnhU6vq1
# 5ph1HFgpqkii43Eiq+v1nmkbh5MWVuMap6MOoQzgwVTkaUU0cTmR8/KqhSHrIryj
# xFPH2wY8pA3vFgMv5OSOjq5Lg197kiWUyhJa6eBBsi4MKnQgRzAxE6yHhpyYZ5EA
# dMW9iLhPVFRDAoQOiSRLj/NA1nl2gwDdjs5WhKqF6AtxMck5IDqltLKFvLlXIxiK
# BYi3ghVeA5LUarcxuAOHse8rCXxBaIJI3aSolO5fDe0mcpNIb7CgCleBKlnBWEsP
# GtRhr1AkoKHcetO5iEfg1QG71/XWdWWy3hfW39GJeBl9C7/AxzoLC7yStI7Iv3b4
# tv/Tylt+Js1KadA9z/tof4wm4NkGf2Q9aFoSbm4pSZH+7b4ZI5LVLlDKYCnjT37v
# LekyJgkU3wRjKdLkM1n6qhsa5Ey2D7STw9ANWQwqOImoj5Dkix2FIqfaydctgrxq
# zmdQpJhOzIO8b9vVSRLn2xYtae5LNlxiAx85r5l11jwfqDOWTts=
# =ZJqu
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 31 Oct 2022 05:06:53 EDT
# gpg:                using RSA key 49236FEA75C95D698EC2B78AE08C21D5677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>" [unknown]
# gpg:                 aka "Stefan Weil (Universitätsbibliothek Mannheim) <stefan.weil@uni-mannheim.de>" [unknown]
# gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>" [unknown]
# gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>" [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: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* tag 'pull-qemu-20221031' of https://gitlab.com/stweil/qemu:
  block/nfs: Fix 32-bit Windows build
  scripts/nsis.py: Automatically package required DLLs of QEMU executables
  scripts/nsis.py: Fix destination directory name when invoked on Windows
  scripts/nsis.py: Drop the unnecessary path separator

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --combined meson.build
index 15dff0a8d3d325909c71b250ca7bd46d7a62cf99,d0a186e7f5e685f913b985a007e062e6cc21bd1d..1c1afcc9b8d8b94c85a6721d81f9d605b91f4054
--- 1/meson.build
--- 2/meson.build
+++ b/meson.build
@@@ -636,16 -636,10 +636,16 @@@ if vmnet.found() and not cc.has_header_
  endif
  
  seccomp = not_found
 +seccomp_has_sysrawrc = false
  if not get_option('seccomp').auto() or have_system or have_tools
    seccomp = dependency('libseccomp', version: '>=2.3.0',
                         required: get_option('seccomp'),
                         method: 'pkg-config', kwargs: static_kwargs)
 +  if seccomp.found()
 +    seccomp_has_sysrawrc = cc.has_header_symbol('seccomp.h',
 +                                                'SCMP_FLTATR_API_SYSRAWRC',
 +                                                dependencies: seccomp)
 +  endif
  endif
  
  libcap_ng = not_found
@@@ -1853,6 -1847,7 +1853,6 @@@ config_host_data.set('CONFIG_LIBNFS', l
  config_host_data.set('CONFIG_LIBSSH', libssh.found())
  config_host_data.set('CONFIG_LINUX_AIO', libaio.found())
  config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
 -config_host_data.set('CONFIG_LIBURING_REGISTER_RING_FD', cc.has_function('io_uring_register_ring_fd', prefix: '#include <liburing.h>', dependencies:linux_io_uring))
  config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
  config_host_data.set('CONFIG_NUMA', numa.found())
  config_host_data.set('CONFIG_OPENGL', opengl.found())
@@@ -1862,9 -1857,6 +1862,9 @@@ config_host_data.set('CONFIG_RDMA', rdm
  config_host_data.set('CONFIG_SDL', sdl.found())
  config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
  config_host_data.set('CONFIG_SECCOMP', seccomp.found())
 +if seccomp.found()
 +  config_host_data.set('CONFIG_SECCOMP_SYSRAWRC', seccomp_has_sysrawrc)
 +endif
  config_host_data.set('CONFIG_SNAPPY', snappy.found())
  config_host_data.set('CONFIG_TPM', have_tpm)
  config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
@@@ -2130,23 -2122,7 +2130,23 @@@ config_host_data.set('CONFIG_PTHREAD_CO
      pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
      return 0;
    }''', dependencies: threads))
 +config_host_data.set('CONFIG_PTHREAD_AFFINITY_NP', cc.links(gnu_source_prefix + '''
 +  #include <pthread.h>
  
 +  static void *f(void *p) { return NULL; }
 +  int main(void)
 +  {
 +    int setsize = CPU_ALLOC_SIZE(64);
 +    pthread_t thread;
 +    cpu_set_t *cpuset;
 +    pthread_create(&thread, 0, f, 0);
 +    cpuset = CPU_ALLOC(64);
 +    CPU_ZERO_S(setsize, cpuset);
 +    pthread_setaffinity_np(thread, setsize, cpuset);
 +    pthread_getaffinity_np(thread, setsize, cpuset);
 +    CPU_FREE(cpuset);
 +    return 0;
 +  }''', dependencies: threads))
  config_host_data.set('CONFIG_SIGNALFD', cc.links(gnu_source_prefix + '''
    #include <sys/signalfd.h>
    #include <stddef.h>
@@@ -3640,6 -3616,7 +3640,7 @@@ if host_machine.system() == 'windows
      '@OUTPUT@',
      get_option('prefix'),
      meson.current_source_dir(),
+     config_host['GLIB_BINDIR'],
      host_machine.cpu(),
      '--',
      '-DDISPLAYVERSION=' + meson.project_version(),