qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 1a8387: sdhci: Drop unnecessary #include


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 1a8387: sdhci: Drop unnecessary #include
Date: Sat, 15 Feb 2014 09:00:03 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1a838745b80ec6bcb3f78ce38aa1ccf1efc9f937
      
https://github.com/qemu/qemu/commit/1a838745b80ec6bcb3f78ce38aa1ccf1efc9f937
  Author: Kevin Wolf <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M hw/sd/sdhci.c

  Log Message:
  -----------
  sdhci: Drop unnecessary #include

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ee13ed1cbc5f7f848e417f587c93ca1f36d83eb0
      
https://github.com/qemu/qemu/commit/ee13ed1cbc5f7f848e417f587c93ca1f36d83eb0
  Author: Kevin Wolf <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev: Remove 'type' parameter from blockdev_init()

blockdev-add doesn't know about the device that the backend will be
attached to, this is a legacy -drive concept. Move the remaining checks
that use it to drive_init().

[Fam Zheng <address@hidden> suggested line-wrapping to 80 chars as
required by the coding standard.  I have fixed this.
--Stefan]

Signed-off-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 28f106afb35a86aa01e1907ef7632e015fabce02
      
https://github.com/qemu/qemu/commit/28f106afb35a86aa01e1907ef7632e015fabce02
  Author: Jeff Cody <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  block: Add notes to iSCSI's .bdrv_open and .bdrv_reopen_prepare

iSCSI currently does not need to do any actions to support the
current usage of bdrv_reopen().  However, it is important to note
a couple of things: 1.) A connection will not be re-established to
an iSCSI target, and 2.) If iscsi_open() is changed to parse 'flags',
then iscsi_reopen_prepare() may need to be more than a stub.

In light of the above, this commit adds comments above both of the
functions to bring attention to these facts.

Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 39a611a3e035e148257af314a522a6cd169c2d0e
      
https://github.com/qemu/qemu/commit/39a611a3e035e148257af314a522a6cd169c2d0e
  Author: Jeff Cody <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M block/mirror.c
    M block/qcow2-snapshot.c
    M block/vmdk.c

  Log Message:
  -----------
  block: Don't throw away errno via error_setg

There are a handful of places in the block layer where a failure path
has a valid -errno value, yet error_setg() is used.  Those instances
should instead use error_setg_errno(), to preserve as much error
information as possible.

This patch replaces those instances with error_setg_errno(), so that
errno is passed up the stack in the error message.

Reported-By: Kevin Wolf <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e001807847ba40d29450031377b84acd10066b61
      
https://github.com/qemu/qemu/commit/e001807847ba40d29450031377b84acd10066b61
  Author: Jeff Cody <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M tests/qemu-iotests/070
    M tests/qemu-iotests/070.out

  Log Message:
  -----------
  block: qemu-iotests - fix test 070 (vhdx)

VHDX test 070 failed, due to different output from qemu-io / qemu
when opening an image read-only that contains a log file.  Filter
the output, and update the expected results to match the correct
output.

Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 18968ca1a33458f3978394499d2b70e4c32c5ad6
      
https://github.com/qemu/qemu/commit/18968ca1a33458f3978394499d2b70e4c32c5ad6
  Author: Jeff Cody <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M tests/qemu-iotests/070
    M tests/qemu-iotests/070.out

  Log Message:
  -----------
  block: qemu-iotests - add vhdx log replay tests for qemu-img

VHDX logs can now be replayed via 'qemu-img check -r all'.  Add
tests to verify that the log replay is successful when using qemu-img.

Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 2aa4a86f59c7093e03d2ec18c5d5f08c957d1a78
      
https://github.com/qemu/qemu/commit/2aa4a86f59c7093e03d2ec18c5d5f08c957d1a78
  Author: Fam Zheng <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M tests/qemu-iotests/005

  Log Message:
  -----------
  qemu-iotests: Don't run 005 on vmdk split formats

There would be too many extents that VMDK driver can't open all of them:

    005 0s ... - output mismatch (see 005.out.bad)
    --- 005.out     2013-12-24 09:27:27.608181030 +0800
    +++ 005.out.bad 2014-02-13 10:00:15.282184557 +0800
    @@ -4,10 +4,10 @@
     Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=5368709120000

     small read
    -read 4096/4096 bytes at offset 1024
    -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
    +qemu-io: can't open device /tmp/qemu-iotests/t.vmdk: Could not open 
'/tmp/qemu-iotests/t-s1016.vmdk': Too many open files
    +no file open, try 'help open'

     small write
    -wrote 4096/4096 bytes at offset 8192
    -4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
    +qemu-io: can't open device /tmp/qemu-iotests/t.vmdk: Could not open 
'/tmp/qemu-iotests/t-s1016.vmdk': Too many open files
    +no file open, try 'help open'
     *** done

So disable the two subformats.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: cc67f4d1f9645e8e6d90aee84ca19162d661f082
      
https://github.com/qemu/qemu/commit/cc67f4d1f9645e8e6d90aee84ca19162d661f082
  Author: Jeff Cody <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  block: mirror - use local_err to avoid NULL errp

When starting a block job, commit_active_start() relies on whether *errp
is set by mirror_start_job.  This allows it to determine if the mirror
job start failed, so that it can clean up any changes to open flags from
the bdrv_reopen().  If errp is NULL, then it will not be able to
determine if mirror_start_job failed or not.

To avoid this, use a local Error variable, and then propagate the error
(if any) to errp.

Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 57b6bdf37c64985cf02b8737c550d52759059c9d
      
https://github.com/qemu/qemu/commit/57b6bdf37c64985cf02b8737c550d52759059c9d
  Author: Benoît Canet <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev: Fix wrong usage of QDECREF causing snapshoted quorum to crash on 
close.

As bdrv_open() documentation states:
"The reference to the QDict belongs to the block layer
 * after the call (even on failure), so if the caller intends to reuse the
 * dictionary, it needs to use QINCREF() before calling bdrv_open."

the optional options dict will not be reused after bdrv_open() and should
belong to the block layer so remove the extra QDECREF(options).

Signed-off-by: Benoit Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dd67fa5052fecf661369540d5f104720f57900a4
      
https://github.com/qemu/qemu/commit/dd67fa5052fecf661369540d5f104720f57900a4
  Author: Benoît Canet <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Relax bdrv_lookup_bs constraints.

The following patch will reuse bdrv_lookup_bs in order to open images by
references so the rules of usage of bdrv_lookup_bs must be relaxed a bit.

Signed-off-by: Benoit Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0c5e94ee8339e1aa49020466eba232e6f7c31a0a
      
https://github.com/qemu/qemu/commit/0c5e94ee8339e1aa49020466eba232e6f7c31a0a
  Author: Benoît Canet <address@hidden>
  Date:   2014-02-14 (Fri, 14 Feb 2014)

  Changed paths:
    M block.c
    M blockdev.c

  Log Message:
  -----------
  block: Open by reference will try device then node_name.

Since we introduced node_name for named bs of the graph modify the opening by
reference to use it as a fallback.

This patch also enforce the separation of the device id and graph node
namespaces.

Signed-off-by: Benoit Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a63e5e0c0d457718a957c351c996ba9cb31d5cdd
      
https://github.com/qemu/qemu/commit/a63e5e0c0d457718a957c351c996ba9cb31d5cdd
  Author: Stefan Weil <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M scripts/switch-timer-api
    M tests/i440fx-test.c

  Log Message:
  -----------
  misc: Fix case Qemu -> QEMU

Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: c1570e2a1fd7ff6bc8d7b0c6104bed77283f89a7
      
https://github.com/qemu/qemu/commit/c1570e2a1fd7ff6bc8d7b0c6104bed77283f89a7
  Author: Sebastian Huber <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M hw/sparc/leon3.c

  Log Message:
  -----------
  sparc/leon3: Initialize stack pointer

A lot of real world LEON3 systems are shipped with the GRMON boot
loader.  This boot loader initializes the stack pointer with the end of
RAM address.  The application can use this to detect the RAM size of a
particular board variant.

Signed-off-by: Sebastian Huber <address@hidden>
Reviewed-by: Fabien Chouteau <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 3f281822b26e4b39b2a49ac030fc6a5f184dd387
      
https://github.com/qemu/qemu/commit/3f281822b26e4b39b2a49ac030fc6a5f184dd387
  Author: Stewart Smith <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: add hint of libfdt to DTC dependency not found message

Most distros package it as libfdt, and mentioning libfdt here makes it
much easier to find the package you're missing.

Signed-off-by: Stewart Smith <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 21684af0233df1d2b554db736e4feb774950d488
      
https://github.com/qemu/qemu/commit/21684af0233df1d2b554db736e4feb774950d488
  Author: Stewart Smith <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: add hints to a remedy for feature_not_found errors

Modify feature_not_found to accept an optional second parameter to be
printed after the generic feature not found error.

Modify most calls to feature_not_found to provide hints as to the
packages that may be missing. The few calls remaining without a remedy
are ones I couldn't work out how to remedy myself.

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


  Commit: 62dc90c668fc4e17639f594b70a1001780f59a9b
      
https://github.com/qemu/qemu/commit/62dc90c668fc4e17639f594b70a1001780f59a9b
  Author: Michael Tokarev <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: refactor do_socketcall()

Refactor do_socketcall() to do argument conversion/checking first,
according to a lookup table (which call has how many args) and
by calling the right function second with ready-to-go arguments.

This ensures that all arguments are handled as abi_long, according
to socketcall prototype, and simplifies argument handling alot too.

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


  Commit: 262471794d6d75435fa755eb2d6363d941743b14
      
https://github.com/qemu/qemu/commit/262471794d6d75435fa755eb2d6363d941743b14
  Author: Michael Tokarev <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M include/net/checksum.h

  Log Message:
  -----------
  net: declare struct iovec in checksum.h to fix compiler warning

The checksum calculation header exports a function that refers to
struct iov defined in iov.h.  Without including the former, build
fails like this:

  In file included from hw/net/fsl_etsec/rings.c:24:0:
  include/net/checksum.h:51:31: error: ‘struct iovec’ declared inside parameter 
list [-Werror]
  include/net/checksum.h:51:31: error: its scope is only this definition or 
declaration, which is probably not what you want [-Werror]

Mention struct iovec there.

Reported-by: Alexander Graf <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 24c84e687edd628084dd383ab1f1601765dbfd03
      
https://github.com/qemu/qemu/commit/24c84e687edd628084dd383ab1f1601765dbfd03
  Author: Michael Tokarev <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: remove old, long-unused defines

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


  Commit: b33276a7a8224de8f1b2adbf03eede36d63e1c33
      
https://github.com/qemu/qemu/commit/b33276a7a8224de8f1b2adbf03eede36d63e1c33
  Author: Michael Tokarev <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: trim includes

Over time, lots of stuff moved from vl.c into separate
files.  But include statements has never been cleaned,
and they continue to carry lots of anymore-unused stuff.

Remove includes which are not relevant for vl.c anymore.
Apparently there are more includes like this, because
many are included from qemu-common.h and the like, or,
for example, I don't see were we use win32-specific
stuff in vl.c (so that maybe #include <windows.h> might
be removed too).

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


  Commit: 5556332aba80c0579244c4458d3e35f13badd5ed
      
https://github.com/qemu/qemu/commit/5556332aba80c0579244c4458d3e35f13badd5ed
  Author: Michael Tokarev <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: anchor all ignored names

by default, patterns/names in .gitignore are applied
recursively to all subdirectories.  So any name mentioned
in .gitignore is ignored in all subdirectores.  This is good
for, say. object files (*.o), but not good for particular
names which should be ignored only in one directory.  For
example, qemu-img.1 file is generated in the top directory,
and it should be ignored only there, not in some subdir.

At first, this might not matter much, but we have lots of
examples already where it actually does not help at all.
For example, top-level .gitignore ignores a file/dir named
"patches" (which is very questionable by itself), but it
is applied recursively, so git also ignores, for example,
debian/patches/ which should not be ignored.

So anchor all the names where appropriate.  .gitignore
should be cleaned up further, which will be addressed in
a subsequent patch.

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


  Commit: 88c1ee73d3231c74ff90bcfc084a7589670ec244
      
https://github.com/qemu/qemu/commit/88c1ee73d3231c74ff90bcfc084a7589670ec244
  Author: Peter Crosthwaite <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M hw/char/serial.c

  Log Message:
  -----------
  char/serial: Fix emptyness check

This was guarding against a full fifo rather than an empty fifo when
popping. Fix.

Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Martin Kletzander <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>


  Commit: 44e3a39f30377e96f6a1f3a21f6b1c8b40b28baf
      
https://github.com/qemu/qemu/commit/44e3a39f30377e96f6a1f3a21f6b1c8b40b28baf
  Author: Peter Maydell <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M block.c
    M block/iscsi.c
    M block/mirror.c
    M block/qcow2-snapshot.c
    M block/vmdk.c
    M blockdev.c
    M hw/sd/sdhci.c
    M tests/qemu-iotests/005
    M tests/qemu-iotests/070
    M tests/qemu-iotests/070.out

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

Block pull request

# gpg: Signature made Fri 14 Feb 2014 17:26:30 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  block: Open by reference will try device then node_name.
  block: Relax bdrv_lookup_bs constraints.
  blockdev: Fix wrong usage of QDECREF causing snapshoted quorum to crash on 
close.
  block: mirror - use local_err to avoid NULL errp
  qemu-iotests: Don't run 005 on vmdk split formats
  block: qemu-iotests - add vhdx log replay tests for qemu-img
  block: qemu-iotests - fix test 070 (vhdx)
  block: Don't throw away errno via error_setg
  block: Add notes to iSCSI's .bdrv_open and .bdrv_reopen_prepare
  blockdev: Remove 'type' parameter from blockdev_init()
  sdhci: Drop unnecessary #include

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


  Commit: 078a1c37cad0d11d93ff8102f7653ce6109bb62d
      
https://github.com/qemu/qemu/commit/078a1c37cad0d11d93ff8102f7653ce6109bb62d
  Author: Peter Maydell <address@hidden>
  Date:   2014-02-15 (Sat, 15 Feb 2014)

  Changed paths:
    M .gitignore
    M configure
    M hw/char/serial.c
    M hw/sparc/leon3.c
    M include/net/checksum.h
    M linux-user/syscall.c
    M scripts/switch-timer-api
    M tests/i440fx-test.c
    M vl.c

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

trivial patches for 2014-02-15

# gpg: Signature made Sat 15 Feb 2014 12:10:46 GMT using RSA key ID 74F0C838
# gpg: Good signature from "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg:                 aka "Michael Tokarev <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: E190 8639 3B10 B51B AC2C  8B73 5253 C5AD 74F0 C838

* remotes/mjt/tags/trivial-patches-2014-02-15:
  char/serial: Fix emptyness check
  gitignore: anchor all ignored names
  vl: trim includes
  vl: remove old, long-unused defines
  net: declare struct iovec in checksum.h to fix compiler warning
  linux-user: refactor do_socketcall()
  configure: add hints to a remedy for feature_not_found errors
  configure: add hint of libfdt to DTC dependency not found message
  sparc/leon3: Initialize stack pointer
  misc: Fix case Qemu -> QEMU

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


Compare: https://github.com/qemu/qemu/compare/90ce3d76eb91...078a1c37cad0

reply via email to

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