qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 6e52aa: gitignore: Update with some filetypes


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 6e52aa: gitignore: Update with some filetypes
Date: Fri, 23 Jul 2021 10:40:20 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 6e52aafbac1d9f4eaa465ab4ec5d4327f2430832
      
https://github.com/qemu/qemu/commit/6e52aafbac1d9f4eaa465ab4ec5d4327f2430832
  Author: Viresh Kumar <viresh.kumar@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: Update with some filetypes

Update .gitignore to ignore .swp and .patch files.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: 
<79262dbe1f7888eb02e1911501eebafa6f2f6400.1616583806.git.viresh.kumar@linaro.org>
Message-Id: <20210720232703.10650-2-alex.bennee@linaro.org>


  Commit: 189c099f75f39da1c1a0f3e527109af2b169a8fe
      
https://github.com/qemu/qemu/commit/189c099f75f39da1c1a0f3e527109af2b169a8fe
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    A docs/system/device-emulation.rst
    A docs/system/devices/ivshmem.rst
    A docs/system/devices/net.rst
    A docs/system/devices/nvme.rst
    A docs/system/devices/usb.rst
    A docs/system/devices/virtio-pmem.rst
    M docs/system/index.rst
    R docs/system/ivshmem.rst
    R docs/system/net.rst
    R docs/system/nvme.rst
    R docs/system/usb.rst
    R docs/system/virtio-pmem.rst

  Log Message:
  -----------
  docs: collect the disparate device emulation docs into one section

While we are at it add a brief preamble that explains some of the
common concepts in QEMU's device emulation which will hopefully lead
to less confusing about our dizzying command line options.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20210720232703.10650-3-alex.bennee@linaro.org>


  Commit: 15d9c3cef108f34874200785bf9970bf77dc378b
      
https://github.com/qemu/qemu/commit/15d9c3cef108f34874200785bf9970bf77dc378b
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M docs/interop/vhost-user.rst
    M docs/system/device-emulation.rst
    A docs/system/devices/vhost-user.rst

  Log Message:
  -----------
  docs: add a section on the generalities of vhost-user

While we do mention some of this stuff in the various daemons and
manuals the subtleties of the socket and memory sharing are sometimes
missed. This document attempts to give some background on vhost-user
daemons in general terms.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210720232703.10650-4-alex.bennee@linaro.org>


  Commit: 11bdcfcdd2ccad91dc3076c7de30803f32f7cdde
      
https://github.com/qemu/qemu/commit/11bdcfcdd2ccad91dc3076c7de30803f32f7cdde
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: remove needless if leg

It was pointed out in review of the previous patch that the if leg
isn't needed as the for loop will not enter on an empty $device_archs.

Fixes: d1d5e9eefd ("configure: allow the selection of alternate config in the 
build")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210720232703.10650-5-alex.bennee@linaro.org>


  Commit: fa3d60953c2d47c9829dd57b3e3900f2f620ce93
      
https://github.com/qemu/qemu/commit/fa3d60953c2d47c9829dd57b3e3900f2f620ce93
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/aliases

  Log Message:
  -----------
  contrib/gitdm: add some new aliases to fix up commits

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Cc: Yuval Shaia <yuval.shaia.ml@gmail.com>
Message-Id: <20210720232703.10650-6-alex.bennee@linaro.org>


  Commit: 82585a3100286f8fbe08fed763b5229efee9a3f7
      
https://github.com/qemu/qemu/commit/82585a3100286f8fbe08fed763b5229efee9a3f7
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M .mailmap

  Log Message:
  -----------
  .mailmap: fix up some broken commit authors

Fixes: 49a6f3bffb ("target/arm: Correct the encoding of MDCCSR_EL0 and 
DBGDSCRint")
Fixes: 5a07192a04 ("target/i386: Fix handling of k_gs_base register in 32-bit 
mode in gdbstub")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Nick Hudson <hnick@vmware.com>
Cc: Marek Dolata <mkdolata@us.ibm.com>
Message-Id: <20210720232703.10650-7-alex.bennee@linaro.org>


  Commit: 0204e6482bcf063c1b5db488b7de8fc1d6bab603
      
https://github.com/qemu/qemu/commit/0204e6482bcf063c1b5db488b7de8fc1d6bab603
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map

  Log Message:
  -----------
  contrib/gitdm: add domain-map for MontaVista

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Message-Id: <20210720232703.10650-8-alex.bennee@linaro.org>


  Commit: 200a10279e5bace8b918c1fdc02215199e355b08
      
https://github.com/qemu/qemu/commit/200a10279e5bace8b918c1fdc02215199e355b08
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    A contrib/gitdm/group-map-robots
    M gitdm.config

  Log Message:
  -----------
  contrib/gitdm: add a group mapping for robot scanners

This mostly affects Reported-by: tags

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210720232703.10650-9-alex.bennee@linaro.org>


  Commit: 20ddc8ce9914b1889363ff3e8c8ff6ab72fba6b5
      
https://github.com/qemu/qemu/commit/20ddc8ce9914b1889363ff3e8c8ff6ab72fba6b5
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M gitdm.config

  Log Message:
  -----------
  gitdm.config: sort the corporate GroupMap entries

Lets try and keep them that way.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210720232703.10650-10-alex.bennee@linaro.org>


  Commit: 44114d3fda3c9b8d43f3af46608b402115dd6030
      
https://github.com/qemu/qemu/commit/44114d3fda3c9b8d43f3af46608b402115dd6030
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map
    M contrib/gitdm/group-map-individuals

  Log Message:
  -----------
  contrib/gitdm: add domain-map/group-map mappings for Samsung

Minwoo's work from their personal address are treated as personal
contributions.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Klaus Jensen <k.jensen@samsung.com>
Cc: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Cc: Minwoo Im <minwoo.im.dev@gmail.com>
Message-Id: <20210720232703.10650-11-alex.bennee@linaro.org>


  Commit: 061a20d50a330ccd4d865513075deac25979067e
      
https://github.com/qemu/qemu/commit/061a20d50a330ccd4d865513075deac25979067e
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map

  Log Message:
  -----------
  contrib/gitdm: add domain-map for Eldorado

Luis acked on IRC:

  #qemu@znc-oftc_2021-07-13.txt:[15:00:02] <lffpires> stsquad: "eldorado.org.br 
Eldorado" is fine

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Luis Pires <luis.pires@eldorado.org.br>
Message-Id: <20210720232703.10650-12-alex.bennee@linaro.org>


  Commit: 0e7933e31478519ba5d46a06d4a0f3ba31882f27
      
https://github.com/qemu/qemu/commit/0e7933e31478519ba5d46a06d4a0f3ba31882f27
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map
    M contrib/gitdm/group-map-individuals

  Log Message:
  -----------
  contrib/gitdm: add domain-map/group-map for Wind River

As per discussion at:
  
http://patchwork.ozlabs.org/project/qemu-devel/patch/20201004180443.2035359-19-f4bug@amsat.org/

I've added Bin's personal email as an individual contributor.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Bin Meng <bin.meng@windriver.com>
Cc: Ruimei Yan <ruimei.yan@windriver.com>
Cc: Xuzhou Cheng <xuzhou.cheng@windriver.com>
Message-Id: <20210720232703.10650-13-alex.bennee@linaro.org>


  Commit: a8d1095a10114e339665eef601ba615b6b673444
      
https://github.com/qemu/qemu/commit/a8d1095a10114e339665eef601ba615b6b673444
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map

  Log Message:
  -----------
  contrib/gitdm: un-ironically add a mapping for LWN

I think this mainly comes from kernel-doc stuff imported into the QEMU
tree.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Message-Id: <20210720232703.10650-14-alex.bennee@linaro.org>


  Commit: 3d4fcf4200f6b8957e4b3a64082b1f820279a476
      
https://github.com/qemu/qemu/commit/3d4fcf4200f6b8957e4b3a64082b1f820279a476
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map

  Log Message:
  -----------
  contrib/gitdm: add domain-map for Crudebyte

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <20210720232703.10650-15-alex.bennee@linaro.org>


  Commit: efe2165a0f0a92c1b9fb8d42f41dfccd2cfddd83
      
https://github.com/qemu/qemu/commit/efe2165a0f0a92c1b9fb8d42f41dfccd2cfddd83
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/domain-map

  Log Message:
  -----------
  contrib/gitdm: add domain-map for NVIDIA

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Kirti Wankhede <kwankhede@nvidia.com>
Cc: Yishai Hadas <yishaih@nvidia.com>
Message-Id: <20210720232703.10650-16-alex.bennee@linaro.org>


  Commit: e061e481a63305365816c63a16ec314fc92ac856
      
https://github.com/qemu/qemu/commit/e061e481a63305365816c63a16ec314fc92ac856
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    A contrib/gitdm/group-map-netflix
    M gitdm.config

  Log Message:
  -----------
  contrib/gitdm: add group-map for Netflix

Warner confirmed he works for Netflix on IRC.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Message-Id: <20210720232703.10650-17-alex.bennee@linaro.org>


  Commit: a7659cd675c4c8fc59818008ad57e0f3dee5f148
      
https://github.com/qemu/qemu/commit/a7659cd675c4c8fc59818008ad57e0f3dee5f148
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/group-map-academics

  Log Message:
  -----------
  contrib/gitdm: add an explicit academic entry for BU

For some reason Alexander's contributions were not getting grouped
from the plain "edu" mapping.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20210720232703.10650-18-alex.bennee@linaro.org>


  Commit: a10f373de4e983d7fc91db5733ff08e9ce30b248
      
https://github.com/qemu/qemu/commit/a10f373de4e983d7fc91db5733ff08e9ce30b248
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    A contrib/gitdm/group-map-interns
    M gitdm.config

  Log Message:
  -----------
  contrib/gitdm: add a new interns group-map for GSoC/Outreachy work

It makes sense to put our various interns in a group so we can see the
overall impact of GSoC and Outreachy on the project.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Cc: Ahmed Karaman <ahmedkhaledkaraman@gmail.com>
Cc: César Belley <cesar.belley@lse.epita.fr>
Message-Id: <20210720232703.10650-19-alex.bennee@linaro.org>


  Commit: 094d278547dcb66ad222047ab9c325c452fe31e3
      
https://github.com/qemu/qemu/commit/094d278547dcb66ad222047ab9c325c452fe31e3
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/gitdm/aliases
    M contrib/gitdm/group-map-individuals

  Log Message:
  -----------
  contrib/gitdm: add more individual contributor entries.

Also ensure Li's canonical gmail address is used.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Li Qiang <liq3ea@gmail.com>
Acked-by: Chetan Pant <chetan4windows@gmail.com>
Acked-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id: <20210720232703.10650-20-alex.bennee@linaro.org>


  Commit: f7e68c9c99ad94f23d3ba3af1642c805b11c71c1
      
https://github.com/qemu/qemu/commit/f7e68c9c99ad94f23d3ba3af1642c805b11c71c1
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M bsd-user/syscall.c
    M include/qemu/plugin.h
    M include/qemu/qemu-plugin.h
    M linux-user/exit.c
    M plugins/core.c

  Log Message:
  -----------
  tcg/plugins: implement a qemu_plugin_user_exit helper

In user-mode emulation there is a small race between preexit_cleanup
and exit_group() which means we may end up calling instrumented
instructions before the kernel reaps child threads. To solve this we
implement a new helper which ensures the callbacks are flushed along
with any translations before we let the host do it's a thing.

While we are at it make the documentation of
qemu_plugin_register_atexit_cb clearer as to what the user can expect.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Acked-by: Warner Losh <imp@bsdimp.com>
Message-Id: <20210720232703.10650-21-alex.bennee@linaro.org>


  Commit: de9fc40f36ab8e696d1c69727e80a80c46f20978
      
https://github.com/qemu/qemu/commit/de9fc40f36ab8e696d1c69727e80a80c46f20978
  Author: Mahmoud Mandour <ma.mandourr@gmail.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/plugins/cache.c

  Log Message:
  -----------
  plugins/cache: Fixed a bug with destroying FIFO metadata

This manifests itself when associativity degree is greater than the
number of sets and FIFO is used, otherwise it's also a memory leak
whenever FIFO was used.

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210714172151.8494-2-ma.mandourr@gmail.com>
Message-Id: <20210720232703.10650-22-alex.bennee@linaro.org>


  Commit: 072c444b0d948451771b0245b74d5310a00e3dd2
      
https://github.com/qemu/qemu/commit/072c444b0d948451771b0245b74d5310a00e3dd2
  Author: Mahmoud Mandour <ma.mandourr@gmail.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/plugins/cache.c

  Log Message:
  -----------
  plugins/cache: limited the scope of a mutex lock

It's not necessary to lock the address translation portion of the
vcpu_mem_access callback.

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210714172151.8494-3-ma.mandourr@gmail.com>
Message-Id: <20210720232703.10650-23-alex.bennee@linaro.org>


  Commit: c2888a679d376baa2dc36a31e44ddb824f232d9c
      
https://github.com/qemu/qemu/commit/c2888a679d376baa2dc36a31e44ddb824f232d9c
  Author: Mahmoud Mandour <ma.mandourr@gmail.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M contrib/plugins/cache.c

  Log Message:
  -----------
  plugins/cache: Fixed "function decl. is not a prototype" warnings

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210714172151.8494-7-ma.mandourr@gmail.com>
Message-Id: <20210720232703.10650-24-alex.bennee@linaro.org>


  Commit: 2da42253ef9af7a9c3a5e9e7fcfb1e7eb84a8bb6
      
https://github.com/qemu/qemu/commit/2da42253ef9af7a9c3a5e9e7fcfb1e7eb84a8bb6
  Author: Aaron Lindsay <aaron@os.amperecomputing.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M plugins/api.c

  Log Message:
  -----------
  plugins: Fix physical address calculation for IO regions

The address calculation for IO regions introduced by

commit 787148bf928a54b5cc86f5b434f9399e9737679c
Author: Aaron Lindsay <aaron@os.amperecomputing.com>
    plugins: Expose physical addresses instead of device offsets

is not always accurate. Use the more correct
MemoryRegionSection.offset_within_address_space.

Signed-off-by: Aaron Lindsay <aaron@os.amperecomputing.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210720195735.3934473-1-aaron@os.amperecomputing.com>
Message-Id: <20210720232703.10650-25-alex.bennee@linaro.org>


  Commit: c56f1ee668d504af62f09e041e584e725edfa4b8
      
https://github.com/qemu/qemu/commit/c56f1ee668d504af62f09e041e584e725edfa4b8
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M tests/tcg/configure.sh

  Log Message:
  -----------
  tests/tcg/configure.sh: add handling for assembler only builds

Up until this point we only handled local compilers or assumed we had
everything in the container. This falls down when we are building QEMU
inside the container.

This special handling only affects tricore for now but I put it in a
case just in case we add any other "special" targets. Setting
CROSS_CC_GUEST is a bit of a hack just to ensure the test runs as we
gate on a detected compiler even though the Makefile won't actually
use it. It also means we display something sane in the configure
output.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210720232703.10650-27-alex.bennee@linaro.org>


  Commit: 39ce92373283a3a3ff0aa2d381b87e930a9ab1a8
      
https://github.com/qemu/qemu/commit/39ce92373283a3a3ff0aa2d381b87e930a9ab1a8
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M tests/docker/dockerfiles/debian-tricore-cross.docker

  Log Message:
  -----------
  gitlab: enable a very minimal build with the tricore container

Rather than base of the shared Debian 10 container which would require
us to bring in even more dependencies just bring in what is needed for
building tricore-softmmu in GitLab. We don't even remove the container
from the DOCKER_PARTIAL_IMAGES lest we cause more confusion.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210720232703.10650-28-alex.bennee@linaro.org>


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

  Changed paths:
    M .gitlab-ci.d/cirrus.yml

  Log Message:
  -----------
  gitlab-ci: Remove the second superfluous macos task

While there might have been bigger differnces between the -base and
the -xcode images in the beginning, they almost vanished in the
current builds, e.g. when comparing the output of the "configure"
step after cleaning up the differences due to temporary path names,
I only get:

  $ diff -u /tmp/base.txt /tmp/xcode.txt
  --- /tmp/base.txt     2021-07-16 09:16:24.211427940 +0200
  +++ /tmp/xcode.txt    2021-07-16 09:16:43.029684274 +0200
  @@ -19,14 +19,14 @@
   Build type: native build
   Project name: qemu
   Project version: 6.0.50
  -C compiler for the host machine: cc (clang 12.0.0 "Apple clang version 
12.0.0 (clang-1200.0.32.29)")
  +C compiler for the host machine: cc (clang 12.0.0 "Apple clang version 
12.0.0 (clang-1200.0.32.28)")
   C linker for the host machine: cc ld64 609.8
   Host machine cpu family: x86_64
   Host machine cpu: x86_64
   Program sh found: YES (/bin/sh)
   Program python3 found: YES (/usr/local/opt/python@3.9/bin/python3.9)
   Program bzip2 found: YES (/usr/bin/bzip2)
  -C++ compiler for the host machine: c++ (clang 12.0.0 "Apple clang version 
12.0.0 (clang-1200.0.32.29)")
  +C++ compiler for the host machine: c++ (clang 12.0.0 "Apple clang version 
12.0.0 (clang-1200.0.32.28)")
   C++ linker for the host machine: c++ ld64 609.8
   Objective-C compiler for the host machine: clang (clang 12.0.0)
   Objective-C linker for the host machine: clang ld64 609.8

Since we're not using Xcode itself at all, it seems like it does not
make much sense anymore to waste compute cycles with two images here.
Thus let's delete the -xcode job now.

[AJB: fix up commit formatting which trips up b4]

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210719073051.1559348-1-thuth@redhat.com>
Message-Id: <20210720232703.10650-29-alex.bennee@linaro.org>


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

  Changed paths:
    M .gitlab-ci.d/opensbi.yml

  Log Message:
  -----------
  gitlab-ci: Extract OpenSBI job rules to reusable section

All jobs depending on 'docker-opensbi' job must use at most all
the rules that triggers it. The simplest way to ensure that
is to always use the same rules. Extract all the rules to a
reusable section, and include this section (with the 'extends'
keyword) in both 'docker-opensbi' and 'build-opensbi' jobs.

The problem was introduced in commit c6fc0fc1a71 ("gitlab-ci.yml:
Add jobs to build OpenSBI firmware binaries"), but was revealed in
commit 91e9c47e50a ("docker: OpenSBI build job depends on OpenSBI
container").

This fix is similar to the one used with the EDK2 firmware job in
commit ac0595cf6b3 ("gitlab-ci: Extract EDK2 job rules to reusable
section").

Reported-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210720164829.3949558-1-philmd@redhat.com>
Message-Id: <20210720232703.10650-30-alex.bennee@linaro.org>


  Commit: 054d6baf9051401f6ce1eedf586c685d80960e3a
      
https://github.com/qemu/qemu/commit/054d6baf9051401f6ce1eedf586c685d80960e3a
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M .gitignore
    M .gitlab-ci.d/buildtest.yml
    M .gitlab-ci.d/cirrus.yml
    M .gitlab-ci.d/opensbi.yml
    M .mailmap
    M bsd-user/syscall.c
    M configure
    M contrib/gitdm/aliases
    M contrib/gitdm/domain-map
    M contrib/gitdm/group-map-academics
    M contrib/gitdm/group-map-individuals
    A contrib/gitdm/group-map-interns
    A contrib/gitdm/group-map-netflix
    A contrib/gitdm/group-map-robots
    M contrib/plugins/cache.c
    M docs/interop/vhost-user.rst
    A docs/system/device-emulation.rst
    A docs/system/devices/ivshmem.rst
    A docs/system/devices/net.rst
    A docs/system/devices/nvme.rst
    A docs/system/devices/usb.rst
    A docs/system/devices/vhost-user.rst
    A docs/system/devices/virtio-pmem.rst
    M docs/system/index.rst
    R docs/system/ivshmem.rst
    R docs/system/net.rst
    R docs/system/nvme.rst
    R docs/system/usb.rst
    R docs/system/virtio-pmem.rst
    M gitdm.config
    M include/qemu/plugin.h
    M include/qemu/qemu-plugin.h
    M linux-user/exit.c
    M plugins/api.c
    M plugins/core.c
    M tests/docker/dockerfiles/debian-tricore-cross.docker
    M tests/tcg/configure.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/stsquad/tags/pull-for-6.1-rc1-230721-1' 
into staging

Doc, metadata, plugin and testing updates for 6.1-rc1:

  - git ignore some file editor detritus
  - add overview on device emulation terminology
  - remove needless if leg in configure custom devices logic
  - numerous gitdm/mailmap updates
  - fix plugin_exit race for linux-user
  - fix a few bugs in cache modelling plugin
  - fix plugin calculation of physical address
  - handle pure assembler/linker tcg tests outside of docker
  - add tricore build to gitlab
  - remove superfluous MacOSX task
  - generalise the OpenBSI gitlab rules

# gpg: Signature made Fri 23 Jul 2021 17:28:26 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) 
<alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-for-6.1-rc1-230721-1: (28 commits)
  gitlab-ci: Extract OpenSBI job rules to reusable section
  gitlab-ci: Remove the second superfluous macos task
  gitlab: enable a very minimal build with the tricore container
  tests/tcg/configure.sh: add handling for assembler only builds
  plugins: Fix physical address calculation for IO regions
  plugins/cache: Fixed "function decl. is not a prototype" warnings
  plugins/cache: limited the scope of a mutex lock
  plugins/cache: Fixed a bug with destroying FIFO metadata
  tcg/plugins: implement a qemu_plugin_user_exit helper
  contrib/gitdm: add more individual contributor entries.
  contrib/gitdm: add a new interns group-map for GSoC/Outreachy work
  contrib/gitdm: add an explicit academic entry for BU
  contrib/gitdm: add group-map for Netflix
  contrib/gitdm: add domain-map for NVIDIA
  contrib/gitdm: add domain-map for Crudebyte
  contrib/gitdm: un-ironically add a mapping for LWN
  contrib/gitdm: add domain-map/group-map for Wind River
  contrib/gitdm: add domain-map for Eldorado
  contrib/gitdm: add domain-map/group-map mappings for Samsung
  gitdm.config: sort the corporate GroupMap entries
  ...

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


Compare: https://github.com/qemu/qemu/compare/b508c820bae2...054d6baf9051



reply via email to

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