[Qemu-commits] [qemu/qemu] 3a0614: icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3a0614c6c782cb760ec925f1662037c1c6038f0c
      
https://github.com/qemu/qemu/commit/3a0614c6c782cb760ec925f1662037c1c6038f0c
  Author: Zhu Guihua <address@hidden>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M hw/cpu/icc_bus.c

  Log Message:
  -----------
  icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE

Rename ICC_BRIGDE for better readability.

Signed-off-by: Zhu Guihua <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 63c693f8d0182fddc411572916e460144ac71689
      
https://github.com/qemu/qemu/commit/63c693f8d0182fddc411572916e460144ac71689
  Author: Gonglei <address@hidden>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M qemu-doc.texi

  Log Message:
  -----------
  qemu-doc.texi: fix typos in x509 examples

Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 7912d04be6322b16cfece6b698361ae6ed036ba9
      
https://github.com/qemu/qemu/commit/7912d04be6322b16cfece6b698361ae6ed036ba9
  Author: Peter Wu <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  slirp/smbd: modify/set several parameters in generated smbd.conf

The file sharing module should not handle printers, so disable it.
The options 'load printers' and 'printing' have been available since the
beginning (May 1996, commit 0e8fd3398771da2f016d72830179507f3edda51b).
Option 'disable spoolss' is available since Samba 2.0.4, commit
de5f42c9d9172592779fa2504d44544e3b6b1c0d).

Next, "socket address" was reported as deprecated, use a combination of
"interfaces" and "bind interfaces only" instead (available since October
1997, commit 79f4fb52c1ed56fd843f81b4eb0cdd2991d4d0f4).

Override cache directory to avoid writing to a global directory. Option
available since Samba 3.4.0, Jan 2009, commit
19a05bf2f485023b11b41dfae3f6459847d55ef7.

Set "usershare max shared=0" to prevent a global directory from being
used. Option available since Samba 3.0.23, February 2006, commit
5831715049f2d460ce42299963a5defdc160891b.

The last option was introduced with Samba 3.4.0, but previously
"state directory" was already added which exists in Samba 3.4.0. As
unknown parameters are ignored (while printing a warning), it should be
safe to add another option.

Signed-off-by: Peter Wu <address@hidden>
Cc: Jan Kiszka <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 5b009e400809523e71f1b72bdaa2b681e2a5b1c7
      
https://github.com/qemu/qemu/commit/5b009e400809523e71f1b72bdaa2b681e2a5b1c7
  Author: zhanghailiang <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M include/sysemu/sysemu.h
    M monitor.c
    M numa.c

  Log Message:
  -----------
  numa: make 'info numa' take into account hotplugged memory

When do memory hotplug, if there is numa node, we should add
the memory size to the corresponding node memory size.

It affects the result of hmp command "info numa".

Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: f17b06901049e54dbfa8b01c278cdc2e3ae5d62d
      
https://github.com/qemu/qemu/commit/f17b06901049e54dbfa8b01c278cdc2e3ae5d62d
  Author: Martin Simmons <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M gdbstub.c

  Log Message:
  -----------
  gdbstub: Add a missing case of signal number translation in gdbstub

While using qemu with gdb "target remote" to debug an application that uses
fork and exec, the qemu process receives SIGSTOP every time the forked process
terminates (sending SIGCHLD).

This is caused by a missing call to gdb_signal_to_target in gdbstub.c, which
is fixed by this patch:

Signed-off-by: Martin Simmons <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2
      
https://github.com/qemu/qemu/commit/c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2
  Author: Chen Gang <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M pc-bios/petalogix-s3adsp1800.dtb

  Log Message:
  -----------
  pc-bios: petalogix-s3adsp1800.dtb: Use 'xlnx, xps-ethernetlite-2.00.a' 
instead of 'xlnx, xps-ethernetlite-2.00.b'

For Linux upstream kernel (e.g. 3.17-rc7), the related compatible string
'xlnx,xps-ethernetlite-2.00.a' is supported, but 'b' is not supported,
so change qemu dtb file to match kernel driver.

The related operation for qemu (after this patch):

   yum install libvirt
   yum install tunctl
   tunctl -b
   ip link set tap0 up
   brctl addif virbr0 tap0

   ./configure
   make
   ./microblaze-softmmu/qemu-system-microblaze -M petalogix-s3adsp1800 \
     -kernel ../linux-stable.microblaze/arch/microblaze/boot/linux.bin \
     -no-reboot -append "console=ttyUL0,115200 doreboot" -nographic \
     -net nic,vlan=0,model=xlnx.xps-ethernetlite,macaddr=00:16:35:AF:94:00 \
     -net tap,vlan=0,ifname=tap0,script=no,downscript=no

   in microblaze qemu bash (guest machine):

     ifconfig eth0 add 192.168.122.2 netmask 255.255.255.0
     ifconfig eth0 up

   Then can telnet 192.168.122.2 directly without password from the host
   machine.

The related operation for generating new dtb:

   building Linux kernel firstly, then get dts tool "./scripts/dts/dts".
   "./scripts/dtc/dtc -I dtb -O dts  -o ../work.dts 
../qemu/petalogix-s3adsp1800.dtb"
   edit work.dts (replace 'xlnx,xps-ethernetlite-2.00.b')
   "./scripts/dtc/dtc -I dts -O dtb  -o ..qemu/petalogix-s3adsp1800.dtb 
../work.dts"

(Since I am not quite sure whether can read this patch or not, I put the
related dtb file in attachment, please check, thanks).

Signed-off-by: Chen Gang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 7f151e6f718f2edaf8661c4dedf6fcdb30b10e1b
      
https://github.com/qemu/qemu/commit/7f151e6f718f2edaf8661c4dedf6fcdb30b10e1b
  Author: Willem Pinckaers <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M coroutine-sigaltstack.c

  Log Message:
  -----------
  coroutine-sigaltstack: Change jmp_buf to sigjmp_buf

This is a simple patch to change the type of old_env from jmp_buf
to sigjmp_buf.  old_env is used by sigsetjmp and as such should be
a sigjmp_buf.

This fixes a stack_chk fail in a OSX 32bit build. Since at least on
OSX sigjmp_buf is four bytes larger then a jmpbuf, resulting in an
overflow in sigsetjmp. Due to variable reordering this overwrites
the stack cookie.

Signed-off-by: Willem Pinckaers <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Peter: I think I must have missed this one when I converted
       all the jmp_buf to sigjmp_buf in commit 6ab7e546.
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: d208a85f1568ab8aec238cb91367581c61350008
      
https://github.com/qemu/qemu/commit/d208a85f1568ab8aec238cb91367581c61350008
  Author: Chen Gang <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M xen-hvm.c

  Log Message:
  -----------
  xen-hvm: Remove redundant variable 'xstate'

In xen_hvm_change_state_handler(), we can pass 'opaque' with type cast
to xen_main_loop_prepare() directly, there's no need to use additional
variable for it.

Signed-off-by: Chen Gang <address@hidden>
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 8f9d989cac7bd92fb976d65d0aada2d4c6d8ecf9
      
https://github.com/qemu/qemu/commit/8f9d989cac7bd92fb976d65d0aada2d4c6d8ecf9
  Author: Chen Fan <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M target-i386/cpu.c

  Log Message:
  -----------
  target-i386: cpu: keeping function parameters alignment on new line

Signed-off-by: Chen Fan <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 00c2275c95edb3c355fce7e1128bdef845b9fe34
      
https://github.com/qemu/qemu/commit/00c2275c95edb3c355fce7e1128bdef845b9fe34
  Author: Gonglei <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M include/hw/sysbus.h

  Log Message:
  -----------
  sysbus: Correct SYSTEM_BUS(obj) defines

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 705be728c0b5546da10d8ef4239a112d1616bb97
      
https://github.com/qemu/qemu/commit/705be728c0b5546da10d8ef4239a112d1616bb97
  Author: Fam Zheng <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M block.c
    M include/block/block.h

  Log Message:
  -----------
  block: Fix comment for bdrv_co_get_block_status

It returns more information than binary, fix the comment.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 776346cd63e5a1ceeeb4d81fa111d911abb73a69
      
https://github.com/qemu/qemu/commit/776346cd63e5a1ceeeb4d81fa111d911abb73a69
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M block.c
    M coroutine-sigaltstack.c
    M gdbstub.c
    M hw/cpu/icc_bus.c
    M include/block/block.h
    M include/hw/sysbus.h
    M include/sysemu/sysemu.h
    M monitor.c
    M net/slirp.c
    M numa.c
    M pc-bios/petalogix-s3adsp1800.dtb
    M qemu-doc.texi
    M target-i386/cpu.c
    M xen-hvm.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/mjt/tags/pull-trivial-patches-2014-11-11' into staging

trivial patches for 2014-11-11

# gpg: Signature made Tue 11 Nov 2014 14:38:39 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"

* remotes/mjt/tags/pull-trivial-patches-2014-11-11:
  block: Fix comment for bdrv_co_get_block_status
  sysbus: Correct SYSTEM_BUS(obj) defines
  target-i386: cpu: keeping function parameters alignment on new line
  xen-hvm: Remove redundant variable 'xstate'
  coroutine-sigaltstack: Change jmp_buf to sigjmp_buf
  pc-bios: petalogix-s3adsp1800.dtb: Use 'xlnx, xps-ethernetlite-2.00.a' 
instead of 'xlnx, xps-ethernetlite-2.00.b'
  gdbstub: Add a missing case of signal number translation in gdbstub
  numa: make 'info numa' take into account hotplugged memory
  slirp/smbd: modify/set several parameters in generated smbd.conf
  qemu-doc.texi: fix typos in x509 examples
  icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE

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


Compare: https://github.com/qemu/qemu/compare/844741451001...776346cd63e5