qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 46e7b7: tests: Rename tests/Makefile to tests

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 46e7b7: tests: Rename tests/Makefile to tests/Makefile.inc...
Date: Wed, 08 Jun 2016 08:30:08 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 46e7b70699d8bf4db08c8bb5111974318dd5416d
      
https://github.com/qemu/qemu/commit/46e7b70699d8bf4db08c8bb5111974318dd5416d
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M Makefile
    R tests/Makefile
    A tests/Makefile.include

  Log Message:
  -----------
  tests: Rename tests/Makefile to tests/Makefile.include

The file is only included from the top Makefile. Rename it to reflect
this more obviously.

Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8156d480861e937768d7d9ac0b73c1e74c368f1d
      
https://github.com/qemu/qemu/commit/8156d480861e937768d7d9ac0b73c1e74c368f1d
  Author: Gerd Hoffmann <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c

  Log Message:
  -----------
  pc: allow raising low memory via max-ram-below-4g option

This patch extends the functionality of the max-ram-below-4g option
to also allow increasing lowmem.  Use case: Give as much memory as
possible to legacy non-PAE guests.

While being at it also rework the lowmem calculation logic and add a
longish comment describing how it works and what the compatibility
constrains are.

Note:  This is a incompatible change.  When setting max-ram-below-4g to
a value larger than 3.5G (or 3G with gigabyte alignment) it has no
effect on older qemu versions: qemu silently ignores it.  With the patch
applied it actually has an effect and changes the ram layout.  Highly
unlikely to hit in practive though as there is no reason start old qemu
versions that way.

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 4b3eec91b90346c57ec99694ddc806b70a54ff90
      
https://github.com/qemu/qemu/commit/4b3eec91b90346c57ec99694ddc806b70a54ff90
  Author: xiaoqiang zhao <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/char/escc.c

  Log Message:
  -----------
  hw/char: QOM'ify escc.c (fix)

The previous commit e7c9136977cb99c6eb52c9139f7b8d8b5fa87db9
(hw/char: QOM'ify escc.c) cause qemu-system-ppc/ppc64
OpenBIOS to freeze on startup, this commit fix it.

Signed-off-by: xiaoqiang zhao <address@hidden>
Tested-by: Mark Cave-Ayland <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ff589551c8e8e9e95e211b9d8daafb4ed39f1aec
      
https://github.com/qemu/qemu/commit/ff589551c8e8e9e95e211b9d8daafb4ed39f1aec
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/scsi/esp.c

  Log Message:
  -----------
  scsi: esp: check TI buffer index before read/write

The 53C9X Fast SCSI Controller(FSC) comes with internal 16-byte
FIFO buffers. One is used to handle commands and other is for
information transfer. Three control variables 'ti_rptr',
'ti_wptr' and 'ti_size' are used to control r/w access to the
information transfer buffer ti_buf[TI_BUFSZ=16]. In that,

'ti_rptr' is used as read index, where read occurs.
'ti_wptr' is a write index, where write would occur.
'ti_size' indicates total bytes to be read from the buffer.

While reading/writing to this buffer, index could exceed its
size. Add check to avoid OOB r/w access.

Reported-by: Huawei PSIRT <address@hidden>
Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6214a11ac167b1e866c04a81360286d186f04d82
      
https://github.com/qemu/qemu/commit/6214a11ac167b1e866c04a81360286d186f04d82
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M hw/scsi/scsi-disk.c

  Log Message:
  -----------
  scsi: mark TYPE_SCSI_DISK_BASE as abstract

Suggested-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 844864fbae66935951529408831c2f22367a57b6
      
https://github.com/qemu/qemu/commit/844864fbae66935951529408831c2f22367a57b6
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  scsi: megasas: null terminate bios version buffer

While reading information via 'megasas_ctrl_get_info' routine,
a local bios version buffer isn't null terminated. Add the
terminating null byte to avoid any OOB access.

Reported-by: Li Qiang <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d41d4da3c5d702b505d74265900a13fae2c8d0e0
      
https://github.com/qemu/qemu/commit/d41d4da3c5d702b505d74265900a13fae2c8d0e0
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: Add a "FORCE" target

Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 553350156d80c18d0127c742f47b7adbd642f3ef
      
https://github.com/qemu/qemu/commit/553350156d80c18d0127c742f47b7adbd642f3ef
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  Makefile: add dependency on scripts/create_config

Make sure that config-host.h and config-target.h are rebuilt whenever
there is a change in the scripts that generates them; add the dependency
to the pattern rule as suggested by Peter.

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


  Commit: 0ab0c99851ab8d270389e6423df9ff664d5c5c0d
      
https://github.com/qemu/qemu/commit/0ab0c99851ab8d270389e6423df9ff664d5c5c0d
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: add dependency on scripts/make_device_config.sh

Make sure that config-devices.mak is rebuilt whenever
there is a change in the scripts that generates it.

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


  Commit: 077de81a4c7e7064c850bb9ba9c5532ac7dd82b7
      
https://github.com/qemu/qemu/commit/077de81a4c7e7064c850bb9ba9c5532ac7dd82b7
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M Makefile
    M Makefile.target

  Log Message:
  -----------
  Makefile: add dependency on scripts/hxtool

Make sure that the various documentation and C code files are rebuilt
whenever there is a change in the script that splits them out of
.hx files.

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


  Commit: 67a1de0d195a6185c39b436159c9ffc7720bf979
      
https://github.com/qemu/qemu/commit/67a1de0d195a6185c39b436159c9ffc7720bf979
  Author: Fam Zheng <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M Makefile
    M linux-user/main.c
    M qemu-img.c
    M qmp.c
    M scripts/create_config
    M vl.c

  Log Message:
  -----------
  Makefile: Derive "PKGVERSION" from "git describe" by default

Currently, if not specified in "./configure", QEMU_PKGVERSION will be
empty. Write a rule in Makefile to generate a value from "git describe"
combined with a possible git tree cleanness suffix, and write into a new
header.

    $ cat qemu-version.h
    #define QEMU_PKGVERSION "-v2.6.0-557-gd6550e9-dirty"

Include the header in .c files where the macro is referenced. It's not
necessary to include it in all files, otherwise each time the content of
the file changes, all sources have to be recompiled.

Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ed45cae39117d413155417b57286e9d172c4c411
      
https://github.com/qemu/qemu/commit/ed45cae39117d413155417b57286e9d172c4c411
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M hw/scsi/scsi-disk.c

  Log Message:
  -----------
  scsi-disk: add missing break

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 99a9a52a23bd9c256a783b4509990c21c6635c7d
      
https://github.com/qemu/qemu/commit/99a9a52a23bd9c256a783b4509990c21c6635c7d
  Author: Robert Ho <address@hidden>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  vnc: list the 'to' parameter of '-vnc' in the qemu man page

Signed-off-by: Robert Ho <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c503a855992caa8c8f12e4509829490cdfc1af00
      
https://github.com/qemu/qemu/commit/c503a855992caa8c8f12e4509829490cdfc1af00
  Author: Peter Maydell <address@hidden>
  Date:   2016-06-08 (Wed, 08 Jun 2016)

  Changed paths:
    M Makefile
    M Makefile.target
    M hw/char/escc.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/scsi/esp.c
    M hw/scsi/megasas.c
    M hw/scsi/scsi-disk.c
    M linux-user/main.c
    M qemu-img.c
    M qemu-options.hx
    M qmp.c
    M rules.mak
    M scripts/create_config
    R tests/Makefile
    A tests/Makefile.include
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* max-ram-below-4g improvement (Gerd)
* escc fix (xiaoqiang)
* ESP fix (Prasad)
* scsi-disk tweaks/fix (me)
* Makefile dependency fixes (me)
* PKGVERSION improvement (Fam)
* -vnc man improvement (Robert)

# gpg: Signature made Tue 07 Jun 2016 18:06:22 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"

* remotes/bonzini/tags/for-upstream:
  vnc: list the 'to' parameter of '-vnc' in the qemu man page
  scsi-disk: add missing break
  Makefile: Derive "PKGVERSION" from "git describe" by default
  Makefile: add dependency on scripts/hxtool
  Makefile: add dependency on scripts/make_device_config.sh
  Makefile: add dependency on scripts/create_config
  Makefile: Add a "FORCE" target
  scsi: megasas: null terminate bios version buffer
  scsi: mark TYPE_SCSI_DISK_BASE as abstract
  scsi: esp: check TI buffer index before read/write
  hw/char: QOM'ify escc.c (fix)
  pc: allow raising low memory via max-ram-below-4g option
  tests: Rename tests/Makefile to tests/Makefile.include

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


Compare: https://github.com/qemu/qemu/compare/6ed5546fa7bf...c503a855992c
reply via email to
[Prev in Thread] Current Thread [Next in Thread]