qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 0849cb: qemu-option: Drop dead assertion


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 0849cb: qemu-option: Drop dead assertion
Date: Sun, 11 Jul 2021 10:54:52 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 0849cb547844b7205af01455b82dc54956c978a9
      
https://github.com/qemu/qemu/commit/0849cb547844b7205af01455b82dc54956c978a9
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M util/qemu-option.c

  Log Message:
  -----------
  qemu-option: Drop dead assertion

Commit c6ecec43b2 "qemu-option: Check return value instead of @err
where convenient" simplified

    opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1,
                            &local_err);
    if (local_err) {
        error_propagate(errp, local_err);
        return NULL;
    }

to

    opts = qemu_opts_create(list, qdict_get_try_str(qdict, "id"), 1, errp);
    if (!opts) {
        return NULL;
    }

but neglected to delete

    assert(opts != NULL);

Do that now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210610085026.436081-1-armbru@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 9bb5405482e7be4c0a6f259d4f18ea612d4a31ba
      
https://github.com/qemu/qemu/commit/9bb5405482e7be4c0a6f259d4f18ea612d4a31ba
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M softmmu/memory.c
    M softmmu/trace-events

  Log Message:
  -----------
  memory: Display MemoryRegion name in read/write ops trace events

MemoryRegion names is cached on first call to memory_region_name(),
so displaying the name is trace events is cheap. Add it for read /
write ops.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210307074833.143106-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: a476123243617700e16d19237b12d51130d28563
      
https://github.com/qemu/qemu/commit/a476123243617700e16d19237b12d51130d28563
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M hw/usb/desc-msos.c
    M target/s390x/translate.c
    M tcg/arm/tcg-target.c.inc
    M tcg/sparc/tcg-target.c.inc
    M tcg/tcg-op.c

  Log Message:
  -----------
  misc: Fix "havn't" typo

Fix "havn't (make)" -> "haven't (made)" typo.

Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210629051400.2573253-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 7ef2408a96c4471383aecf263a7ea2bd51a3235c
      
https://github.com/qemu/qemu/commit/7ef2408a96c4471383aecf263a7ea2bd51a3235c
  Author: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M tools/virtiofsd/fuse_virtio.c

  Log Message:
  -----------
  virtiofsd: Add missing newline in error message

Signed-off-by: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: 
<e5914ad202a13e9c1bc2a5efa267ff3bd4f48db6.1625173475.git.hubert.jasudowicz@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: eb1960aac1f5b2cad24de300bda2726d63700290
      
https://github.com/qemu/qemu/commit/eb1960aac1f5b2cad24de300bda2726d63700290
  Author: Li Zhijian <lizhijian@cn.fujitsu.com>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M migration/rdma.c
    M softmmu/cpus.c

  Log Message:
  -----------
  misc: Remove redundant new line in perror()

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210706094433.1766952-1-lizhijian@cn.fujitsu.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 4c6dd9a0262d39eb8570ba077b5320df682603d1
      
https://github.com/qemu/qemu/commit/4c6dd9a0262d39eb8570ba077b5320df682603d1
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  hw/virtio: Document *_should_notify() are called within rcu_read_lock()

Such comments make reviewing this file somehow easier.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210523094040.3516968-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 3b51b506686f41dba55a0e9567c4d9a7ffb8632c
      
https://github.com/qemu/qemu/commit/3b51b506686f41dba55a0e9567c4d9a7ffb8632c
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M target/xtensa/xtensa-semi.c

  Log Message:
  -----------
  target/xtensa/xtensa-semi: Fix compilation problem on Haiku

The errno numbers are very large on Haiku, so the linking currently
fails there with a "final link failed: memory exhausted" error
message. We should not use the errno number as array indexes here,
thus convert the code to a switch-case statement instead. A clever
compiler should be able to optimize this code in a similar way
anway.

Reported-by: Richard Zak <richard.j.zak@gmail.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210706081822.1316551-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 179a808045f16e5d9fee06510f0b5ca5ff0c69e8
      
https://github.com/qemu/qemu/commit/179a808045f16e5d9fee06510f0b5ca5ff0c69e8
  Author: Olaf Hering <olaf@aepfle.de>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: fix typo in mig_throttle_guest_down comment

Fixes commit 3d0684b2ad82a5dde68e3f08b0d7786dccaf619c ("ram: Update
all functions comments")

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210708162159.18045-1-olaf@aepfle.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: e28ffe90fde5702aa8716ac2fa1b4116cdcc9e61
      
https://github.com/qemu/qemu/commit/e28ffe90fde5702aa8716ac2fa1b4116cdcc9e61
  Author: Mark Nelson <mdnelson8@gmail.com>
  Date:   2021-07-09 (Fri, 09 Jul 2021)

  Changed paths:
    M util/guest-random.c

  Log Message:
  -----------
  util/guest-random: Fix size arg to tail memcpy

We know that in the body of this if statement i is less than len, so
we really should be copying len - i bytes not i - len bytes.

Fix this typo.

Fixes: 8d8404f1564 ("util: Add qemu_guest_getrandom and associated routines")
Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210709120600.11080-1-mdnelson8@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 86108e23d798bcd3fce35ad271b198f8a8611746
      
https://github.com/qemu/qemu/commit/86108e23d798bcd3fce35ad271b198f8a8611746
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-11 (Sun, 11 Jul 2021)

  Changed paths:
    M hw/usb/desc-msos.c
    M hw/virtio/virtio.c
    M migration/ram.c
    M migration/rdma.c
    M softmmu/cpus.c
    M softmmu/memory.c
    M softmmu/trace-events
    M target/s390x/translate.c
    M target/xtensa/xtensa-semi.c
    M tcg/arm/tcg-target.c.inc
    M tcg/sparc/tcg-target.c.inc
    M tcg/tcg-op.c
    M tools/virtiofsd/fuse_virtio.c
    M util/guest-random.c
    M util/qemu-option.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/trivial-branch-for-6.1-pull-request' into staging

Trivial patches pull request 20210709

# gpg: Signature made Fri 09 Jul 2021 21:26:52 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-for-6.1-pull-request:
  util/guest-random: Fix size arg to tail memcpy
  migration: fix typo in mig_throttle_guest_down comment
  target/xtensa/xtensa-semi: Fix compilation problem on Haiku
  hw/virtio: Document *_should_notify() are called within rcu_read_lock()
  misc: Remove redundant new line in perror()
  virtiofsd: Add missing newline in error message
  misc: Fix "havn't" typo
  memory: Display MemoryRegion name in read/write ops trace events
  qemu-option: Drop dead assertion

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


Compare: https://github.com/qemu/qemu/compare/9516034d05a8...86108e23d798



reply via email to

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