[Qemu-commits] [qemu/qemu] 933c8f: meson: Fix argument for makensis (build regression)

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 933c8fe7814d481ad19ded7ff0b5b4389e5d3176
      
https://github.com/qemu/qemu/commit/933c8fe7814d481ad19ded7ff0b5b4389e5d3176
  Author: Stefan Weil <sw@weilnetz.de>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    M scripts/nsis.py

  Log Message:
  -----------
  meson: Fix argument for makensis (build regression)

`make installer` with a DLL directory was broken.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20201117190640.390359-1-sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ac9574bc879c50aecd4abf1d680e146f97d55487
      
https://github.com/qemu/qemu/commit/ac9574bc879c50aecd4abf1d680e146f97d55487
  Author: Stefan Weil <sw@weilnetz.de>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    M docs/can.txt
    M docs/interop/vhost-user.rst
    M docs/replay.txt
    M docs/specs/ppc-spapr-numa.rst
    M docs/system/deprecated.rst
    M docs/tools/virtiofsd.rst
    M hw/vfio/igd.c

  Log Message:
  -----------
  docs: Fix some typos (found by codespell)

Fix also a similar typo in a code comment.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20201117193448.393472-1-sw@weilnetz.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: dccdb0f82a0d018443b12fb13d91655a10b0a151
      
https://github.com/qemu/qemu/commit/dccdb0f82a0d018443b12fb13d91655a10b0a151
  Author: Stefan Weil <sw@weilnetz.de>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    M qga/meson.build

  Log Message:
  -----------
  meson: Fix build with --disable-guest-agent-msi

The QGA MSI target requires several macros which are only available
without --disable-guest-agent-msi.

Don't define that target if configure was called with --disable-guest-agent-msi.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20201117201834.408892-1-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ca31e3072fa74a8de5a02311eb62396087774cf7
      
https://github.com/qemu/qemu/commit/ca31e3072fa74a8de5a02311eb62396087774cf7
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: Fixes curses detection on msys2

Fixes regression on curses detection in msys2
by commit#925a40df2828d32d3aaaf022282cba81082fb263

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Message-Id: <20201116213106.589-1-luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 65baabca22366e5246955474228908d6a8354881
      
https://github.com/qemu/qemu/commit/65baabca22366e5246955474228908d6a8354881
  Author: Jessica Clarke <jrtc27@jrtc27.com>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    M target/i386/hvf/x86_cpuid.c

  Log Message:
  -----------
  hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET

Buglink: https://bugs.launchpad.net/qemu/+bug/1894836
Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Message-Id: <20201116200319.28138-1-jrtc27@jrtc27.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c6a89b45bd625c6ea745cba550cffd8220602ce7
      
https://github.com/qemu/qemu/commit/c6a89b45bd625c6ea745cba550cffd8220602ce7
  Author: Jessica Clarke <jrtc27@jrtc27.com>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    M target/i386/hvf/x86.h

  Log Message:
  -----------
  hvf: Fix segment selector format

The Requested Privilege Level field is 2 bits, the Table Indicator field
is 1 bit and the Index field is the remaining 15 bits, with TI=0 meaning
GDT and TI=1 meaning LDT.

Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Message-Id: <20201116200414.28286-1-jrtc27@jrtc27.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 29cf16db23e605769f6d89c47a1d45ef3373b88e
      
https://github.com/qemu/qemu/commit/29cf16db23e605769f6d89c47a1d45ef3373b88e
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    A .gitattributes

  Log Message:
  -----------
  buildsys: Help git-diff adding .gitattributes config file

Since commits 0979ed017f0 ("meson: rename .inc.h files to .h.inc")
and 139c1837db7 ("meson: rename included C source files to .c.inc")
'git-diff --function-context' stopped displaying C function context
correctly.
We can help git-diff by providing attributes to the .[ch].inc path
names. See:
https://git-scm.com/docs/gitattributes#_generating_diff_text

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201014082209.3712625-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 269ff671c593379378c5cf5ea3bddd7909dd3333
      
https://github.com/qemu/qemu/commit/269ff671c593379378c5cf5ea3bddd7909dd3333
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-18 (Wed, 18 Nov 2020)

  Changed paths:
    A .gitattributes
    M docs/can.txt
    M docs/interop/vhost-user.rst
    M docs/replay.txt
    M docs/specs/ppc-spapr-numa.rst
    M docs/system/deprecated.rst
    M docs/tools/virtiofsd.rst
    M hw/vfio/igd.c
    M meson.build
    M qga/meson.build
    M scripts/nsis.py
    M target/i386/hvf/x86.h
    M target/i386/hvf/x86_cpuid.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into 
staging

Bugfixes for HVF and Windows builds.

# gpg: Signature made Wed 18 Nov 2020 08:34:05 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  buildsys: Help git-diff adding .gitattributes config file
  hvf: Fix segment selector format
  hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET
  meson: Fixes curses detection on msys2
  meson: Fix build with --disable-guest-agent-msi
  docs: Fix some typos (found by codespell)
  meson: Fix argument for makensis (build regression)

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


Compare: https://github.com/qemu/qemu/compare/66a300a107ec...269ff671c593