qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5324e3: qemu-options: define -spice only #ifd


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 5324e3: qemu-options: define -spice only #ifdef CONFIG_SPICE
Date: Tue, 22 Mar 2022 11:48:30 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 5324e3e958e87083c87e2965b6c87db24c6afa90
      
https://github.com/qemu/qemu/commit/5324e3e958e87083c87e2965b6c87db24c6afa90
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M qemu-options.hx
    M softmmu/vl.c

  Log Message:
  -----------
  qemu-options: define -spice only #ifdef CONFIG_SPICE

Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1982600

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: 3d76c3b6d81ff59638800c003637a3a750cf8b01
      
https://github.com/qemu/qemu/commit/3d76c3b6d81ff59638800c003637a3a750cf8b01
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M softmmu/vl.c

  Log Message:
  -----------
  vl: typo fix in a comment

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


  Commit: 8ef2513d87ebe525540fb23a9c170da58871665c
      
https://github.com/qemu/qemu/commit/8ef2513d87ebe525540fb23a9c170da58871665c
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M target/m68k/m68k-semi.c
    M target/nios2/nios2-semi.c

  Log Message:
  -----------
  m68k/nios2-semi: fix gettimeofday() result check

gettimeofday() returns 0 for success.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: e7b794282264868d84b3d9a5da222b08a783d8fb
      
https://github.com/qemu/qemu/commit/e7b794282264868d84b3d9a5da222b08a783d8fb
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M crypto/cipher-afalg.c
    M crypto/hash-afalg.c
    M gdbstub.c
    M include/qemu-common.h
    M io/channel-socket.c
    M net/socket.c
    M tests/qtest/e1000e-test.c
    M tests/qtest/libqtest.c
    M tests/qtest/npcm7xx_emc-test.c
    M tests/qtest/test-filter-mirror.c
    M tests/qtest/test-filter-redirector.c
    M tests/qtest/virtio-net-test.c
    M tests/unit/socket-helpers.c
    M util/osdep.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  Drop qemu_foo() socket API wrapper

The socket API wrappers were initially introduced in commit
00aa0040 ("Wrap recv to avoid warnings"), but made redundant with
commit a2d96af4 ("osdep: add wrappers for socket functions") which fixes
the win32 declarations and thus removed the earlier warnings.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 9edc6313da34699ebd2bae4573ea22339b26450a
      
https://github.com/qemu/qemu/commit/9edc6313da34699ebd2bae4573ea22339b26450a
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M audio/alsaaudio.c
    M audio/audio.h
    M audio/coreaudio.m
    M audio/dsoundaudio.c
    M audio/ossaudio.c
    M audio/paaudio.c
    M audio/sdlaudio.c
    M block/blkverify.c
    M block/qcow2.h
    M block/ssh.c
    M bsd-user/qemu.h
    M fsdev/9p-marshal.c
    M fsdev/virtfs-proxy-helper.c
    M hw/9pfs/9p.c
    M hw/acpi/aml-build.c
    M hw/display/qxl.h
    M hw/mips/fuloong2e.c
    M hw/mips/malta.c
    M hw/net/rocker/rocker.h
    M hw/net/rtl8139.c
    M hw/virtio/virtio.c
    M hw/xen/xen_pt.h
    M include/chardev/char-fe.h
    M include/disas/dis-asm.h
    M include/hw/acpi/aml-build.h
    M include/hw/core/cpu.h
    M include/hw/hw.h
    M include/hw/virtio/virtio.h
    M include/hw/xen/xen-bus-helper.h
    M include/hw/xen/xen-bus.h
    M include/hw/xen/xen_common.h
    M include/hw/xen/xen_pvdev.h
    M include/monitor/monitor.h
    M include/qapi/error.h
    M include/qapi/qmp/qjson.h
    M include/qemu/buffer.h
    M include/qemu/compiler.h
    M include/qemu/error-report.h
    M include/qemu/log-for-trace.h
    M include/qemu/log.h
    M include/qemu/qemu-print.h
    M include/qemu/readline.h
    M io/channel-websock.c
    M monitor/hmp.c
    M nbd/server.c
    M qemu-img.c
    M qemu-io.c
    M qga/guest-agent-core.h
    M qga/vss-win32/requester.h
    M qobject/json-parser.c
    M scripts/checkpatch.pl
    M scripts/cocci-macro-file.h
    M softmmu/qtest.c
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest-single.h
    M tests/qtest/libqtest.c
    M tests/qtest/migration-helpers.h
    M tests/unit/test-qobject-input-visitor.c

  Log Message:
  -----------
  Replace GCC_FMT_ATTR with G_GNUC_PRINTF

One less qemu-specific macro. It also helps to make some headers/units
only depend on glib, and thus moved in standalone projects eventually.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>


  Commit: c08401793a1f298b4d52410835b01ca9b64c313a
      
https://github.com/qemu/qemu/commit/c08401793a1f298b4d52410835b01ca9b64c313a
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M block/qcow2-refcount.c
    M include/qemu-common.h
    M include/qemu/compiler.h
    M include/qemu/range.h
    M scripts/checkpatch.pl
    M scripts/cocci-macro-file.h

  Log Message:
  -----------
  compiler.h: replace QEMU_WARN_UNUSED_RESULT with G_GNUC_WARN_UNUSED_RESULT

One less qemu-specific macro. It also helps to make some headers/units
only depend on glib, and thus moved in standalone projects eventually.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 887ce500ef0046d35e613e40f7beb647a797b3e7
      
https://github.com/qemu/qemu/commit/887ce500ef0046d35e613e40f7beb647a797b3e7
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M include/qemu/compiler.h
    M include/qom/object.h
    M scripts/checkpatch.pl
    M scripts/cocci-macro-file.h

  Log Message:
  -----------
  compiler.h: replace QEMU_SENTINEL with G_GNUC_NULL_TERMINATED

One less qemu-specific macro. It also helps to make some headers/units
only depend on glib, and thus moved in standalone projects eventually.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 77a19c6aa405e0d734faf60d77a5d293fa4716ca
      
https://github.com/qemu/qemu/commit/77a19c6aa405e0d734faf60d77a5d293fa4716ca
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M include/qemu/osdep.h

  Log Message:
  -----------
  Simplify HOST_LONG_BITS

Simplify the macro, not depending on headers defines, but compiler
predefined __SIZEOF__POINTER__ only.

Available since gcc 4.3 and clang 2.8.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 519655970ebeb7a0dfe5ad3c1d1dc17a02b7faa6
      
https://github.com/qemu/qemu/commit/519655970ebeb7a0dfe5ad3c1d1dc17a02b7faa6
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M include/qemu/compiler.h
    M include/qemu/osdep.h

  Log Message:
  -----------
  Move HOST_LONG_BITS to compiler.h

This will help to make common code independent.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 06cef3bc5907aa79275dcbb8a8a53f618bc86545
      
https://github.com/qemu/qemu/commit/06cef3bc5907aa79275dcbb8a8a53f618bc86545
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M scripts/modinfo-collect.py

  Log Message:
  -----------
  scripts/modinfo-collect: remove unused/dead code

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: John Snow <jsnow@redhat.com>


  Commit: 5933dd9576e9be2053598f4fad88f2406d72a85c
      
https://github.com/qemu/qemu/commit/5933dd9576e9be2053598f4fad88f2406d72a85c
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M util/cutils.c

  Log Message:
  -----------
  util: remove needless includes

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 8a166615a49de80234aa14ae4e830b4a3cc9da6d
      
https://github.com/qemu/qemu/commit/8a166615a49de80234aa14ae4e830b4a3cc9da6d
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M include/qemu-common.h
    M net/announce.c
    M util/cutils.c

  Log Message:
  -----------
  util: remove the net/net.h dependency

Move qemu_ether_ntoa() which is only needed in net/.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 0e8d95e27b607b275ab19d47fd4a61d48e1a90c0
      
https://github.com/qemu/qemu/commit/0e8d95e27b607b275ab19d47fd4a61d48e1a90c0
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M qapi/qmp-dispatch.c

  Log Message:
  -----------
  qapi: remove needless include

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 848126d11e93ff2a13d0d816244ed82aef83854f
      
https://github.com/qemu/qemu/commit/848126d11e93ff2a13d0d816244ed82aef83854f
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M configure
    M meson.build

  Log Message:
  -----------
  meson: move int128 checks from configure

(note: the test isn't working as intended, the next patches fixes it)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: d2958fb0b6c7bcd8c4e6c0222554ef25d62ecef0
      
https://github.com/qemu/qemu/commit/d2958fb0b6c7bcd8c4e6c0222554ef25d62ecef0
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: fix CONFIG_ATOMIC128 check

The current testing code isn't correct and matching QEMU usage:

testfile.c: In function 'main':
testfile.c:5:11: error: incorrect number of arguments to function 
'__atomic_load'
    5 |       y = __atomic_load(&x, 0);
      |           ^~~~~~~~~~~~~
testfile.c:6:7: error: argument 2 of '__atomic_store' must be a pointer type
    6 |       __atomic_store(&x, y, 0);
      |       ^~~~~~~~~~~~~~
testfile.c:7:7: error: argument 3 of '__atomic_compare_exchange' must be a 
pointer type
    7 |       __atomic_compare_exchange(&x, &y, x, 0, 0, 0);
      |       ^~~~~~~~~~~~~~~~~~~~~~~~~

Replace the test with common atomics test for u64 and u128 that matches
better QEMU needs.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: b3313070463d873bbb0e289033872d2fc6adfd9d
      
https://github.com/qemu/qemu/commit/b3313070463d873bbb0e289033872d2fc6adfd9d
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M qapi/string-output-visitor.c

  Log Message:
  -----------
  qapi: remove needless include

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


  Commit: 45297887dc88e2ea6d1001064a407e713b2d6ebb
      
https://github.com/qemu/qemu/commit/45297887dc88e2ea6d1001064a407e713b2d6ebb
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: remove bswap.h include

Apparently not needed anymore.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>


  Commit: 336d354ba73f62099b1a931662694b23cb3d2b65
      
https://github.com/qemu/qemu/commit/336d354ba73f62099b1a931662694b23cb3d2b65
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M include/qemu/error-report.h
    M qemu-io.c
    M softmmu/vl.c
    M storage-daemon/qemu-storage-daemon.c
    M trace/control.c
    M util/qemu-error.c

  Log Message:
  -----------
  error: use GLib to remember the program name

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


  Commit: 389834ee65c57b8404988ac6d556b90160df31f0
      
https://github.com/qemu/qemu/commit/389834ee65c57b8404988ac6d556b90160df31f0
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M tests/unit/check-qobject.c

  Log Message:
  -----------
  tests: remove needless include

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


  Commit: e0e7fe07e1ef55432b4f9e59d663199f971d8ed2
      
https://github.com/qemu/qemu/commit/e0e7fe07e1ef55432b4f9e59d663199f971d8ed2
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M configure
    M nbd/server.c

  Log Message:
  -----------
  Remove trailing ; after G_DEFINE_AUTO macro

The macro doesn't need it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 4ea4bec6f459ff1af6af01677d5bfac240db0201
      
https://github.com/qemu/qemu/commit/4ea4bec6f459ff1af6af01677d5bfac240db0201
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M qapi/qapi-forward-visitor.c

  Log Message:
  -----------
  qapi: remove needless include

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


  Commit: 04ddcda6a2387274b3f31a501be3affd172aea3d
      
https://github.com/qemu/qemu/commit/04ddcda6a2387274b3f31a501be3affd172aea3d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-03-22 (Tue, 22 Mar 2022)

  Changed paths:
    M audio/alsaaudio.c
    M audio/audio.h
    M audio/coreaudio.m
    M audio/dsoundaudio.c
    M audio/ossaudio.c
    M audio/paaudio.c
    M audio/sdlaudio.c
    M block/blkverify.c
    M block/qcow2-refcount.c
    M block/qcow2.h
    M block/ssh.c
    M bsd-user/qemu.h
    M configure
    M crypto/cipher-afalg.c
    M crypto/hash-afalg.c
    M fsdev/9p-marshal.c
    M fsdev/virtfs-proxy-helper.c
    M gdbstub.c
    M hw/9pfs/9p.c
    M hw/acpi/aml-build.c
    M hw/display/qxl.h
    M hw/mips/fuloong2e.c
    M hw/mips/malta.c
    M hw/net/rocker/rocker.h
    M hw/net/rtl8139.c
    M hw/virtio/virtio.c
    M hw/xen/xen_pt.h
    M include/chardev/char-fe.h
    M include/disas/dis-asm.h
    M include/hw/acpi/aml-build.h
    M include/hw/core/cpu.h
    M include/hw/hw.h
    M include/hw/virtio/virtio.h
    M include/hw/xen/xen-bus-helper.h
    M include/hw/xen/xen-bus.h
    M include/hw/xen/xen_common.h
    M include/hw/xen/xen_pvdev.h
    M include/monitor/monitor.h
    M include/qapi/error.h
    M include/qapi/qmp/qjson.h
    M include/qemu-common.h
    M include/qemu/buffer.h
    M include/qemu/compiler.h
    M include/qemu/error-report.h
    M include/qemu/log-for-trace.h
    M include/qemu/log.h
    M include/qemu/osdep.h
    M include/qemu/qemu-print.h
    M include/qemu/range.h
    M include/qemu/readline.h
    M include/qom/object.h
    M io/channel-socket.c
    M io/channel-websock.c
    M meson.build
    M monitor/hmp.c
    M nbd/server.c
    M net/announce.c
    M net/socket.c
    M qapi/qapi-forward-visitor.c
    M qapi/qmp-dispatch.c
    M qapi/string-output-visitor.c
    M qemu-img.c
    M qemu-io.c
    M qemu-options.hx
    M qga/guest-agent-core.h
    M qga/main.c
    M qga/vss-win32/requester.h
    M qobject/json-parser.c
    M scripts/checkpatch.pl
    M scripts/cocci-macro-file.h
    M scripts/modinfo-collect.py
    M softmmu/qtest.c
    M softmmu/vl.c
    M storage-daemon/qemu-storage-daemon.c
    M target/m68k/m68k-semi.c
    M target/nios2/nios2-semi.c
    M tests/qtest/e1000e-test.c
    M tests/qtest/libqos/libqtest.h
    M tests/qtest/libqtest-single.h
    M tests/qtest/libqtest.c
    M tests/qtest/migration-helpers.h
    M tests/qtest/npcm7xx_emc-test.c
    M tests/qtest/test-filter-mirror.c
    M tests/qtest/test-filter-redirector.c
    M tests/qtest/virtio-net-test.c
    M tests/unit/check-qobject.c
    M tests/unit/socket-helpers.c
    M tests/unit/test-qobject-input-visitor.c
    M trace/control.c
    M util/cutils.c
    M util/osdep.c
    M util/qemu-error.c
    M util/qemu-sockets.c

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

Fixes and cleanups for 7.0

Hi,

A collection of fixes & cleanup patches that should be safe for 7.0 inclusion.

# gpg: Signature made Tue 22 Mar 2022 12:11:30 GMT
# 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]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* tag 'fixes-pull-request' of gitlab.com:marcandre.lureau/qemu: (21 commits)
  qapi: remove needless include
  Remove trailing ; after G_DEFINE_AUTO macro
  tests: remove needless include
  error: use GLib to remember the program name
  qga: remove bswap.h include
  qapi: remove needless include
  meson: fix CONFIG_ATOMIC128 check
  meson: move int128 checks from configure
  qapi: remove needless include
  util: remove the net/net.h dependency
  util: remove needless includes
  scripts/modinfo-collect: remove unused/dead code
  Move HOST_LONG_BITS to compiler.h
  Simplify HOST_LONG_BITS
  compiler.h: replace QEMU_SENTINEL with G_GNUC_NULL_TERMINATED
  compiler.h: replace QEMU_WARN_UNUSED_RESULT with G_GNUC_WARN_UNUSED_RESULT
  Replace GCC_FMT_ATTR with G_GNUC_PRINTF
  Drop qemu_foo() socket API wrapper
  m68k/nios2-semi: fix gettimeofday() result check
  vl: typo fix in a comment
  ...

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


Compare: https://github.com/qemu/qemu/compare/309df6acb293...04ddcda6a238



reply via email to

[Prev in Thread] Current Thread [Next in Thread]