qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 8f5990: hw/net/pcnet: Use qemu_log_mask(GUEST


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 8f5990: hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) inste...
Date: Thu, 09 May 2019 07:27:13 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8f59905330ce6dbaf929e1ad1784c5e3ed7e69b6
      
https://github.com/qemu/qemu/commit/8f59905330ce6dbaf929e1ad1784c5e3ed7e69b6
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-02 (Thu, 02 May 2019)

  Changed paths:
    M hw/net/pcnet.c

  Log Message:
  -----------
  hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of printf

Avoid to clutter stdout until explicitly requested
(with -d guest_errors):

  $ qemu-system-mips -M malta -m 512 -kernel vmlinux-3.2.0-4-4kc-malta
  Bad SWSTYLE=0x04

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 6ac1fca4ef29d8deaea50b0c7a45e0e9e59ff656
      
https://github.com/qemu/qemu/commit/6ac1fca4ef29d8deaea50b0c7a45e0e9e59ff656
  Author: Wei Yang <address@hidden>
  Date:   2019-05-02 (Thu, 02 May 2019)

  Changed paths:
    M CODING_STYLE

  Log Message:
  -----------
  CODING_STYLE: specify the indent rule for multiline code

We didn't specify the indent rule for multiline code here, which may
mislead users. And in current code, the code use various styles.

Add this rule in CODING_STYLE to make sure this is clear to every one.

Signed-off-by: Wei Yang <address@hidden>
Suggested-by: Igor Mammedov <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 25d68ffb6bca333ce8496eca7f438d5a93f9cd06
      
https://github.com/qemu/qemu/commit/25d68ffb6bca333ce8496eca7f438d5a93f9cd06
  Author: Wei Yang <address@hidden>
  Date:   2019-05-02 (Thu, 02 May 2019)

  Changed paths:
    M CODING_STYLE

  Log Message:
  -----------
  CODING_STYLE: indent example code as all others

All the example code are indented with four spaces except this one.

Fix this by adding four spaces here.

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: e8338fdbbbda84e6f8df83bfccc162f868f8faa2
      
https://github.com/qemu/qemu/commit/e8338fdbbbda84e6f8df83bfccc162f868f8faa2
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M Makefile
    M qemu-ga.texi

  Log Message:
  -----------
  doc: fix the configuration path

Use a CONFDIR variable to show the configured sysconf path in the
generated documentations (html, man pages etc).

Related to:
https://bugzilla.redhat.com/show_bug.cgi?id=1644985

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 66e1155a693e44adcd75ac644269c046cd8672c5
      
https://github.com/qemu/qemu/commit/66e1155a693e44adcd75ac644269c046cd8672c5
  Author: Wei Yang <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M qom/object.c

  Log Message:
  -----------
  qom: use object_new_with_type in object_new_with_propv

Function object_new_with_propv already get the Type of the object, so we
could leverage object_new_with_type here.

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 9c9642d09afa65b93f6fdcbd9decf13fab1d1099
      
https://github.com/qemu/qemu/commit/9c9642d09afa65b93f6fdcbd9decf13fab1d1099
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: fix pam test warning

The pam test generates a warning on Fedora 29 with -O3 compilation
because the headers declare that the pam_conversation pointer to
pam_start must be non-NULL.  Change it to use the same 0 initialised
structure as we actually use in qauthz.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Acked-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: e0048b5e7438c234cb90a06a1a6d5a93629ed43e
      
https://github.com/qemu/qemu/commit/e0048b5e7438c234cb90a06a1a6d5a93629ed43e
  Author: Stefan Weil <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M configure

  Log Message:
  -----------
  Update configure

The last *.aml file was removed in commit 
13b1881aacc7e5018773bd545bbaf8d5476699ee.

Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 8603172889ccbb7b567eec54c03d9709877cc760
      
https://github.com/qemu/qemu/commit/8603172889ccbb7b567eec54c03d9709877cc760
  Author: Aruna Jayasena <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M include/exec/cpu-common.h

  Log Message:
  -----------
  Header cleanups

Removed unwanted includes from cpu-common.h
This task was under https://wiki.qemu.org/Contribute/BiteSizedTasks

Signed-off-by: Aruna Jayasena <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
[lv: fix conflict on rebase]
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 7b71e03af98fd7b5e125d7c10f02c804fcc5e5af
      
https://github.com/qemu/qemu/commit/7b71e03af98fd7b5e125d7c10f02c804fcc5e5af
  Author: Thomas Huth <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: Print output of "-net nic, model=help" to stdout instead of stderr

We are printing all other help output to stdout already (e.g. "-help",
"-cpu help" and "-machine help" output). So the "-net nic,model=help"
output should go to stdout instead of stderr, too. And while we're at
it, also print the NICs line by line, like we do it e.g. with the
"-cpu help" or "-M help" output, too.

Buglink: https://bugs.launchpad.net/qemu/+bug/1574327
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 59100753886bcdc50e076a6d19647b8f91b1cc02
      
https://github.com/qemu/qemu/commit/59100753886bcdc50e076a6d19647b8f91b1cc02
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts

Commit 48ff7a625b36 added the QEMU Guest Agent tool with the
optional ".exe" suffix for Windows hosts, but forgot to use
this suffix in the 'clean' rule. Calling this rule let a dangling
executable in the build directory.
Correct this by using the proper optional suffix.

Fixes: 48ff7a625b36
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 9176a58018642080ec1910b2be255c2f81f1e8e3
      
https://github.com/qemu/qemu/commit/9176a58018642080ec1910b2be255c2f81f1e8e3
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M hw/sparc/leon3.c

  Log Message:
  -----------
  hw/sparc/leon3: Allow load of uImage firmwares

Currently the Leon3 machine doesn't allow to load legacy u-boot images:

  $ qemu-system-sparc -M leon3_generic -d in_asm \
      -kernel HelenOS-0.6.0-sparc32-leon3.bin
  qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin'

  $ file HelenOS-0.6.0-sparc32-leon3.bin
  HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\
    Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\
    Sun Dec 21 19:18:09 2014,\
    Load Address: 0x40000000, Entry Point: 0x40000000,\
    Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF

Since QEMU can load uImages, add the necessary code,
so the Leon3 machine can load these images:

  $ qemu-system-sparc -M leon3_generic -d in_asm \
      -kernel HelenOS-0.6.0-sparc32-leon3.bin
  ----------------
  IN:
  0x40000000:  b  0x400007a8
  0x40000004:  nop
  ----------------
  IN:
  0x400007a8:  save  %sp, -136, %sp
  0x400007ac:  call  0x40000020
  0x400007b0:  sethi  %hi(0x4000b800), %i1
  ...

Tested with the following firmware:
http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: KONRAD Frederic <address@hidden>
Tested-by: KONRAD Frederic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 2d2023c3b99edb33ad4bb9791f70456ea1a1c049
      
https://github.com/qemu/qemu/commit/2d2023c3b99edb33ad4bb9791f70456ea1a1c049
  Author: Daniel P. Berrangé <address@hidden>
  Date:   2019-05-03 (Fri, 03 May 2019)

  Changed paths:
    M util/qemu-sockets.c

  Log Message:
  -----------
  sockets: avoid string truncation warnings when copying UNIX path

In file included from /usr/include/string.h:494,
                 from include/qemu/osdep.h:101,
                 from util/qemu-sockets.c:18:
In function ‘strncpy’,
    inlined from ‘unix_connect_saddr.isra.0’ at util/qemu-sockets.c:925:5:
/usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ 
specified bound 108 equals destination size [-Wstringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In function ‘strncpy’,
    inlined from ‘unix_listen_saddr.isra.0’ at util/qemu-sockets.c:880:5:
/usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ 
specified bound 108 equals destination size [-Wstringop-truncation]
  106 |   return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

We are already validating the UNIX socket path length earlier in
the functions. If we save this string length when we first check
it, then we can simply use memcpy instead of strcpy later, avoiding
the gcc truncation warnings.

Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 68a7b9724fe80bedb85060bde605213ce3f9baec
      
https://github.com/qemu/qemu/commit/68a7b9724fe80bedb85060bde605213ce3f9baec
  Author: Peter Maydell <address@hidden>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M CODING_STYLE
    M Makefile
    M configure
    M hw/net/pcnet.c
    M hw/sparc/leon3.c
    M include/exec/cpu-common.h
    M net/net.c
    M qemu-ga.texi
    M qom/object.c
    M util/qemu-sockets.c

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

Pull request trivial branch 2019-05-03

# gpg: Signature made Fri 03 May 2019 12:26:34 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  sockets: avoid string truncation warnings when copying UNIX path
  hw/sparc/leon3: Allow load of uImage firmwares
  Makefile: Let the 'clean' rule remove qemu-ga.exe on Windows hosts
  net: Print output of "-net nic, model=help" to stdout instead of stderr
  Header cleanups
  Update configure
  configure: fix pam test warning
  qom: use object_new_with_type in object_new_with_propv
  doc: fix the configuration path
  CODING_STYLE: indent example code as all others
  CODING_STYLE: specify the indent rule for multiline code
  hw/net/pcnet: Use qemu_log_mask(GUEST_ERROR) instead of printf

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c56247e55bde...68a7b9724fe8



reply via email to

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