mbox

[PULL,00/11,for-2.2] Trivial patches for 2014-11-11

Message ID cover.1415716845.git.mjt@msgid.tls.msk.ru
State New
Headers show

Pull-request

git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2014-11-11

Message

Michael Tokarev Nov. 11, 2014, 2:46 p.m. UTC
Here's another week's trivial patches pull req, for 2.2 release.
There's nothing exciting in there, but some patches are worth to
mention.

  4/11: numa: make 'info numa' take into account hotplugged memory
    this one has been pinged several times, and the numa
    maintainer agreed to push it using other tree.  It can
    be considered a bugfix for `info numa' output (not taking
    some memory into account), and while somewhat large for
    -trivial, it is actually rather trivial

  5/11: gdbstub: Add a missing case of signal number translation in gdbstub
    a bugfix to allow gdb debugging

  7/11: coroutine-sigaltstack: Change jmp_buf to sigjmp_buf
    this one is a bugfix discussed today

Please consider applying/pulling.

Thanks,

/mjt

The following changes since commit 7135781f65f1267a72bf554ee2b7bd605f9e59aa:

  Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-02' into staging (2014-11-03 14:55:17 +0000)

are available in the git repository at:

  git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2014-11-11

for you to fetch changes up to 705be728c0b5546da10d8ef4239a112d1616bb97:

  block: Fix comment for bdrv_co_get_block_status (2014-11-11 17:36:19 +0300)

----------------------------------------------------------------
trivial patches for 2014-11-11

----------------------------------------------------------------
Chen Fan (1):
      target-i386: cpu: keeping function parameters alignment on new line

Chen Gang (2):
      pc-bios: petalogix-s3adsp1800.dtb: Use 'xlnx, xps-ethernetlite-2.00.a' instead of 'xlnx, xps-ethernetlite-2.00.b'
      xen-hvm: Remove redundant variable 'xstate'

Fam Zheng (1):
      block: Fix comment for bdrv_co_get_block_status

Gonglei (2):
      qemu-doc.texi: fix typos in x509 examples
      sysbus: Correct SYSTEM_BUS(obj) defines

Martin Simmons (1):
      gdbstub: Add a missing case of signal number translation in gdbstub

Peter Wu (1):
      slirp/smbd: modify/set several parameters in generated smbd.conf

Willem Pinckaers (1):
      coroutine-sigaltstack: Change jmp_buf to sigjmp_buf

Zhu Guihua (1):
      icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE

zhanghailiang (1):
      numa: make 'info numa' take into account hotplugged memory

 block.c                          |    6 +++---
 coroutine-sigaltstack.c          |    2 +-
 gdbstub.c                        |    5 ++++-
 hw/cpu/icc_bus.c                 |    4 ++--
 include/block/block.h            |    4 +++-
 include/hw/sysbus.h              |    2 +-
 include/sysemu/sysemu.h          |    1 +
 monitor.c                        |    6 +++++-
 net/slirp.c                      |    9 ++++++++-
 numa.c                           |   38 ++++++++++++++++++++++++++++++++++++++
 pc-bios/petalogix-s3adsp1800.dtb |  Bin 8259 -> 8259 bytes
 qemu-doc.texi                    |    4 ++--
 target-i386/cpu.c                |    6 +++---
 xen-hvm.c                        |    3 +--
 14 files changed, 72 insertions(+), 18 deletions(-)

Comments

Michael Tokarev Nov. 11, 2014, 2:46 p.m. UTC | #1
From: Chen Gang <gang.chen.5i5j@gmail.com>

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 <gang.chen.5i5j@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 pc-bios/petalogix-s3adsp1800.dtb |  Bin 8259 -> 8259 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pc-bios/petalogix-s3adsp1800.dtb b/pc-bios/petalogix-s3adsp1800.dtb
index 93c5973fd81244268aace6e5e6006ad6fb4d6199..8ac80f2f2d191a8491b71182be50b3df2989551d 100644
GIT binary patch
delta 14
VcmX@?aM)pkI6GtFW(js}NdPEw1Wf<{

delta 14
VcmX@?aM)pkI6Gs~W(js}NdPE$1Wo_|
Peter Maydell Nov. 11, 2014, 4:03 p.m. UTC | #2
On 11 November 2014 14:46, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Here's another week's trivial patches pull req, for 2.2 release.
> There's nothing exciting in there, but some patches are worth to
> mention.
>
>   4/11: numa: make 'info numa' take into account hotplugged memory
>     this one has been pinged several times, and the numa
>     maintainer agreed to push it using other tree.  It can
>     be considered a bugfix for `info numa' output (not taking
>     some memory into account), and while somewhat large for
>     -trivial, it is actually rather trivial
>
>   5/11: gdbstub: Add a missing case of signal number translation in gdbstub
>     a bugfix to allow gdb debugging
>
>   7/11: coroutine-sigaltstack: Change jmp_buf to sigjmp_buf
>     this one is a bugfix discussed today
>
> Please consider applying/pulling.
>
> Thanks,
>
> /mjt
>
> The following changes since commit 7135781f65f1267a72bf554ee2b7bd605f9e59aa:
>
>   Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-02' into staging (2014-11-03 14:55:17 +0000)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/pull-trivial-patches-2014-11-11
>
> for you to fetch changes up to 705be728c0b5546da10d8ef4239a112d1616bb97:
>
>   block: Fix comment for bdrv_co_get_block_status (2014-11-11 17:36:19 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2014-11-11
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM