OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

* Documentation updates

Browse Source 
* Remove leading underscores from header guards
 * Display hexadecimal value with '0x' prefix
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmDQaxERHHRodXRoQHJl
 ZGhhdC5jb20ACgkQLtnXdP5wLbVBCRAApz4k5fD3rcig2zA1SQEfTKmDFOUPelBK
 /nqewUdAmkad99T+cL3/ZQLSSgGphj36rn+GAbXfVhkr32TAkSRi0X2e8P4yt0VE
 LKw/RBZAHqsaY97jILrCNxDNJo5sRqXQgpyXSYc4U6DGVxrhJJ46LWvU6Z2ElfLP
 /50lt3lEtQFs0zNtA0ObawgSoJn04xxmpDOiFcQKV4EoWb89YZ6BQ8MtzT0GvIqV
 mb+nJSpXyj0g76+OHbgLst7Ig9JMv15t1a6JbWjuRKN1CGMazyBZk5gyIl2Tw2Ln
 25Sh3NW70eOLXly41NBRfMJSy7RS476opJ+RseljZhg8KULQTd3X+rLmdGRZZk+X
 kGog5sxCHTifVBB0mp5BJYSMGQYcfkYcNPKq98bT5KfMDDiwkt9N72HmOztrE1wq
 x9o51gJ7xJUgscEFqKe/+GahK+jcBM1LV4kvj6D9T4tcaDiIrJSxCM6K3hTORM+Y
 7hZ9jr8t06n/MnHJtXd5wgW07Wh1YWXBCU1K1n3eEmcBzbaK6abY7mj4F5bmPZW4
 A8k3K7KAO9PPBYGXnoxdGL74Pe4k8EBLIfajFlxemgQ22NtPumZbs5U1xn0gIGPl
 ZQUirNdIj03yakvYdNZ67ko0+XwfYJsJ4WLeXddNhzJaeRC/ooSDnysv4A4HtMu+
 84aE5RxZsB8=
 =Ri1w
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/thuth-gitlab/tags/pull-request-2021-06-21' into staging

* Documentation updates
* Remove leading underscores from header guards
* Display hexadecimal value with '0x' prefix

# gpg: Signature made Mon 21 Jun 2021 11:33:53 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/thuth-gitlab/tags/pull-request-2021-06-21:
  MAINTAINERS: Add qtest/arm-cpu-features.c to ARM TCG CPUs section
  fuzz: Display hexadecimal value with '0x' prefix
  Remove leading underscores from QEMU defines
  Update documentation to refer to new location for issues
  docs/tools/virtiofsd: Fix bad rst syntax
  docs/tools/virtiofsd.rst: Do not hard-code the QEMU binary name
  docs/interop/live-block-operations: Do not hard-code the QEMU binary name

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-06-24 09:31:26 +01:00
commit d0ac9a6147
16 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/lockdown.yml vendored
View File

@ -14,11 +14,11 @@ issues:
at https://gitlab.com/qemu-project/qemu.git. at https://gitlab.com/qemu-project/qemu.git.
The project does not process issues filed on GitHub. The project does not process issues filed on GitHub.
The project issues are tracked on Launchpad: The project issues are tracked on GitLab:
https://bugs.launchpad.net/qemu https://gitlab.com/qemu-project/qemu/-/issues
QEMU welcomes bug report contributions. You can file new ones on: QEMU welcomes bug report contributions. You can file new ones on:
https://bugs.launchpad.net/qemu/+filebug https://gitlab.com/qemu-project/qemu/-/issues/new
pulls: pulls:
comment: | comment: |

1
MAINTAINERS
View File

@ -155,6 +155,7 @@ S: Maintained
F: target/arm/ F: target/arm/
F: tests/tcg/arm/ F: tests/tcg/arm/
F: tests/tcg/aarch64/ F: tests/tcg/aarch64/
F: tests/qtest/arm-cpu-features.c
F: hw/arm/ F: hw/arm/
F: hw/cpu/a*mpcore.c F: hw/cpu/a*mpcore.c
F: include/hw/cpu/a*mpcore.h F: include/hw/cpu/a*mpcore.h

6
README.rst
View File

@ -131,16 +131,16 @@ will be tagged as my-feature-v2.
Bug reporting Bug reporting
============= =============
The QEMU project uses Launchpad as its primary upstream bug tracker. Bugs The QEMU project uses GitLab issues to track bugs. Bugs
found when running code built from QEMU git or upstream released sources found when running code built from QEMU git or upstream released sources
should be reported via: should be reported via:
* `<https://bugs.launchpad.net/qemu/>`_ * `<https://gitlab.com/qemu-project/qemu/-/issues>`_
If using QEMU via an operating system vendor pre-built binary package, it If using QEMU via an operating system vendor pre-built binary package, it
is preferable to report bugs to the vendor's own bug tracker first. If is preferable to report bugs to the vendor's own bug tracker first. If
the bug is also known to affect latest upstream code, it can also be the bug is also known to affect latest upstream code, it can also be
reported via launchpad. reported via GitLab.
For additional information on bug reporting consult: For additional information on bug reporting consult:

30
docs/interop/live-block-operations.rst
View File

@ -127,13 +127,15 @@ Interacting with a QEMU instance
To show some example invocations of command-line, we will use the To show some example invocations of command-line, we will use the
following invocation of QEMU, with a QMP server running over UNIX following invocation of QEMU, with a QMP server running over UNIX
socket:: socket:
$ ./qemu-system-x86_64 -display none -no-user-config \ .. parsed-literal::
-M q35 -nodefaults -m 512 \
-blockdev node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \ $ |qemu_system| -display none -no-user-config -nodefaults \\
-device virtio-blk,drive=node-A,id=virtio0 \ -m 512 -blockdev \\
-monitor stdio -qmp unix:/tmp/qmp-sock,server=on,wait=off node-name=node-A,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./a.qcow2 \\
-device virtio-blk,drive=node-A,id=virtio0 \\
-monitor stdio -qmp unix:/tmp/qmp-sock,server=on,wait=off
The ``-blockdev`` command-line option, used above, is available from The ``-blockdev`` command-line option, used above, is available from
QEMU 2.9 onwards. In the above invocation, notice the ``node-name`` QEMU 2.9 onwards. In the above invocation, notice the ``node-name``
@ -692,14 +694,16 @@ And start the destination QEMU (we already have the source QEMU running
-- discussed in the section: `Interacting with a QEMU instance`_) -- discussed in the section: `Interacting with a QEMU instance`_)
instance, with the following invocation. (As noted earlier, for instance, with the following invocation. (As noted earlier, for
simplicity's sake, the destination QEMU is started on the same host, but simplicity's sake, the destination QEMU is started on the same host, but
it could be located elsewhere):: it could be located elsewhere):
$ ./qemu-system-x86_64 -display none -no-user-config \ .. parsed-literal::
-M q35 -nodefaults -m 512 \
-blockdev node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \ $ |qemu_system| -display none -no-user-config -nodefaults \\
-device virtio-blk,drive=node-TargetDisk,id=virtio0 \ -m 512 -blockdev \\
-S -monitor stdio -qmp unix:./qmp-sock2,server=on,wait=off \ node-name=node-TargetDisk,driver=qcow2,file.driver=file,file.node-name=file,file.filename=./target-disk.qcow2 \\
-incoming tcp:localhost:6666 -device virtio-blk,drive=node-TargetDisk,id=virtio0 \\
-S -monitor stdio -qmp unix:./qmp-sock2,server=on,wait=off \\
-incoming tcp:localhost:6666
Given the disk image chain on source QEMU:: Given the disk image chain on source QEMU::

22
docs/tools/virtiofsd.rst
View File

@ -239,7 +239,7 @@ xattr-mapping Examples
:: ::
-o xattrmap=":prefix:all::user.virtiofs.::bad:all:::" -o xattrmap=":prefix:all::user.virtiofs.::bad:all:::"
This uses two rules, using : as the field separator; This uses two rules, using : as the field separator;
@ -250,7 +250,8 @@ the host set.
This is equivalent to the 'map' rule: This is equivalent to the 'map' rule:
:: ::
-o xattrmap=":map::user.virtiofs.:"
-o xattrmap=":map::user.virtiofs.:"
2) Prefix 'trusted.' attributes, allow others through 2) Prefix 'trusted.' attributes, allow others through
@ -277,7 +278,8 @@ through.
This is equivalent to the 'map' rule: This is equivalent to the 'map' rule:
:: ::
-o xattrmap="/map/trusted./user.virtiofs./"
-o xattrmap="/map/trusted./user.virtiofs./"
3) Hide 'security.' attributes, and allow everything else 3) Hide 'security.' attributes, and allow everything else
@ -298,13 +300,13 @@ Examples
Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain socket
``/var/run/vm001-vhost-fs.sock``: ``/var/run/vm001-vhost-fs.sock``:
:: .. parsed-literal::
host# virtiofsd --socket-path=/var/run/vm001-vhost-fs.sock -o source=/var/lib/fs/vm001 host# virtiofsd --socket-path=/var/run/vm001-vhost-fs.sock -o source=/var/lib/fs/vm001
host# qemu-system-x86_64 \ host# |qemu_system| \\
-chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \ -chardev socket,id=char0,path=/var/run/vm001-vhost-fs.sock \\
-device vhost-user-fs-pci,chardev=char0,tag=myfs \ -device vhost-user-fs-pci,chardev=char0,tag=myfs \\
-object memory-backend-memfd,id=mem,size=4G,share=on \ -object memory-backend-memfd,id=mem,size=4G,share=on \\
-numa node,memdev=mem \ -numa node,memdev=mem \\
... ...
guest# mount -t virtiofs myfs /mnt guest# mount -t virtiofs myfs /mnt

4
include/fpu/softfloat-helpers.h
View File

@ -48,8 +48,8 @@ this code that are retained.
=============================================================================== ===============================================================================
*/ */
#ifndef _SOFTFLOAT_HELPERS_H_ #ifndef SOFTFLOAT_HELPERS_H
#define _SOFTFLOAT_HELPERS_H_ #define SOFTFLOAT_HELPERS_H
#include "fpu/softfloat-types.h" #include "fpu/softfloat-types.h"

4
include/hw/usb/dwc2-regs.h
View File

@ -39,8 +39,8 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __DWC2_HW_H__ #ifndef DWC2_HW_H
#define __DWC2_HW_H__ #define DWC2_HW_H
#define HSOTG_REG(x) (x) #define HSOTG_REG(x) (x)

4
include/hw/usb/xlnx-usb-subsystem.h
View File

@ -22,8 +22,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef _XLNX_VERSAL_USB_SUBSYSTEM_H_ #ifndef XLNX_VERSAL_USB_SUBSYSTEM_H
#define _XLNX_VERSAL_USB_SUBSYSTEM_H_ #define XLNX_VERSAL_USB_SUBSYSTEM_H
#include "hw/usb/xlnx-versal-usb2-ctrl-regs.h" #include "hw/usb/xlnx-versal-usb2-ctrl-regs.h"
#include "hw/usb/hcd-dwc3.h" #include "hw/usb/hcd-dwc3.h"

4
include/hw/usb/xlnx-versal-usb2-ctrl-regs.h
View File

@ -23,8 +23,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef _XLNX_USB2_REGS_H_ #ifndef XLNX_USB2_REGS_H
#define _XLNX_USB2_REGS_H_ #define XLNX_USB2_REGS_H
#define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs" #define TYPE_XILINX_VERSAL_USB2_CTRL_REGS "xlnx.versal-usb2-ctrl-regs"

4
include/qemu/plugin-memory.h
View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef _PLUGIN_MEMORY_H_ #ifndef PLUGIN_MEMORY_H
#define _PLUGIN_MEMORY_H_ #define PLUGIN_MEMORY_H
struct qemu_plugin_hwaddr { struct qemu_plugin_hwaddr {
bool is_io; bool is_io;

4
include/qemu/selfmap.h
View File

@ -6,8 +6,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef _SELFMAP_H_ #ifndef SELFMAP_H
#define _SELFMAP_H_ #define SELFMAP_H
typedef struct { typedef struct {
unsigned long start; unsigned long start;

4
include/user/syscall-trace.h
View File

@ -7,8 +7,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef _SYSCALL_TRACE_H_ #ifndef SYSCALL_TRACE_H
#define _SYSCALL_TRACE_H_ #define SYSCALL_TRACE_H
#include "trace/trace-root.h" #include "trace/trace-root.h"

4
plugins/plugin.h
View File

@ -9,8 +9,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
#ifndef _PLUGIN_INTERNAL_H_ #ifndef PLUGIN_INTERNAL_H
#define _PLUGIN_INTERNAL_H_ #define PLUGIN_INTERNAL_H
#include <gmodule.h> #include <gmodule.h>
#include "qemu/qht.h" #include "qemu/qht.h"

4
tests/qtest/fuzz/generic_fuzz.c
View File

@ -841,9 +841,9 @@ static void generic_pre_fuzz(QTestState *s)
g_hash_table_iter_init(&iter, fuzzable_memoryregions); g_hash_table_iter_init(&iter, fuzzable_memoryregions);
while (g_hash_table_iter_next(&iter, (gpointer)&mr, NULL)) { while (g_hash_table_iter_next(&iter, (gpointer)&mr, NULL)) {
printf(" * %s (size %lx)\n", printf(" * %s (size 0x%" PRIx64 ")\n",
object_get_canonical_path_component(&(mr->parent_obj)), object_get_canonical_path_component(&(mr->parent_obj)),
(uint64_t)mr->size); memory_region_size(mr));
} }
if (!g_hash_table_size(fuzzable_memoryregions)) { if (!g_hash_table_size(fuzzable_memoryregions)) {

4
tests/qtest/fuzz/qos_fuzz.h
View File

@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef _QOS_FUZZ_H_ #ifndef QOS_FUZZ_H
#define _QOS_FUZZ_H_ #define QOS_FUZZ_H
#include "tests/qtest/fuzz/fuzz.h" #include "tests/qtest/fuzz/fuzz.h"
#include "tests/qtest/libqos/qgraph.h" #include "tests/qtest/libqos/qgraph.h"

4
tests/tcg/minilib/minilib.h
View File

@ -9,8 +9,8 @@
* SPDX-License-Identifier: GPL-2.0-only * SPDX-License-Identifier: GPL-2.0-only
*/ */
#ifndef _MINILIB_H_ #ifndef MINILIB_H
#define _MINILIB_H_ #define MINILIB_H
/* /*
* Provided by the individual arch * Provided by the individual arch