[Qemu-commits] [qemu/qemu] 7edd2c: linux-user: fix compile error due to

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 7edd2c: linux-user: fix compile error due to

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] 7edd2c: linux-user: fix compile error due to stray colon a...
Date:	Fri, 26 Apr 2013 07:30:18 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7edd2cf1a2eace84e3f8753e912449ae8871802f
      
https://github.com/qemu/qemu/commit/7edd2cf1a2eace84e3f8753e912449ae8871802f
  Author: Peter Maydell <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M linux-user/syscall.c

  Log Message:
  -----------
  linux-user: fix compile error due to stray colon at end of #ifdef line

Remove a stray colon from the end of a #ifdef line. Some versions
of gcc complain about this:
 linux-user/syscall.c: In function ‘do_syscall’:
 linux-user/syscall.c:7606:28: error: extra tokens at end of #ifdef directive 
[-Werror]

Signed-off-by: Peter Maydell <address@hidden>
Acked-By: Riku Voipio <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d49b8e0b299df3f0472945eb6d33b8413d102046
      
https://github.com/qemu/qemu/commit/d49b8e0b299df3f0472945eb6d33b8413d102046
  Author: Gabriel Kerneis <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M target-s390x/int_helper.c

  Log Message:
  -----------
  s390x: use CONFIG_INT128 to detect __uint128_t

Target s390x uses ad-hoc macro magic to guess if the compiler
supports the GCC extension __uint128_t.  This patch uses the
the dedicated macro CONFIG_INT128 defined by configure instead.

This fixes compilation with the CIL source code analyzer, which
uses GCC as a preprocessor but does not support __uint128_t.

Signed-off-by: Gabriel Kerneis <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 48c75f484de13d59df6ae0e6becfe4ad4cd41ad5
      
https://github.com/qemu/qemu/commit/48c75f484de13d59df6ae0e6becfe4ad4cd41ad5
  Author: Thomas Schwinge <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M qemu-doc.texi

  Log Message:
  -----------
  qemu-doc: Option -ignore-environment removed.

Has been removed in commit fc9c54124d134dbd76338a92a91804dab2df8166.

Signed-off-by: Thomas Schwinge <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b702d2aebeb6b1392f42262f537f70e6890233a7
      
https://github.com/qemu/qemu/commit/b702d2aebeb6b1392f42262f537f70e6890233a7
  Author: Ed Maste <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h

  Log Message:
  -----------
  virtio: Fix compilation without CONFIG_VHOST_SCSI

Signed-off-by: Ed Maste <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6ea8430d98c48eb67e47d14dfe8c0fdb86413555
      
https://github.com/qemu/qemu/commit/6ea8430d98c48eb67e47d14dfe8c0fdb86413555
  Author: Ed Maste <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M bsd-user/syscall.c

  Log Message:
  -----------
  bsd-user: Track change in FreeBSD SYSCTL(9) types

Originally from Garrett Cooper in FreeBSD PR ports/155558
http://www.freebsd.org/cgi/query-pr.cgi?pr=155558

Signed-off-by: Ed Maste <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4fc16838b8392a29644d4d2c01495e6ff447a6f0
      
https://github.com/qemu/qemu/commit/4fc16838b8392a29644d4d2c01495e6ff447a6f0
  Author: Richard W.M. Jones <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M configure

  Log Message:
  -----------
  block/ssh: Require libssh2 >= 1.2.8.

libssh2 >= 1.2.8 is required to enable this block device (because
that version introduced the libssh2_session_handshake call).

Change the test to use pkg-config exclusively.  If the user requests
--enable-libssh2 and the minimum version is not available, then the
following error is displayed:

  $ ./configure --enable-libssh2

  ERROR: libssh2 >= 1.2.8 required for --enable-libssh2

If --enable-libssh2 is not specified, then the feature is silently
disabled if sufficiently new libssh2 is not available.

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


  Commit: cac8f4a60fc5c372bacd59eeff0646955fb4f246
      
https://github.com/qemu/qemu/commit/cac8f4a60fc5c372bacd59eeff0646955fb4f246
  Author: Liu Yuan <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: add discard/trim support for sheepdog

The 'TRIM' command from VM that is to release underlying data storage for
better thin-provision is already supported by the Sheepdog.

This patch adds the TRIM support at QEMU part.

For older Sheepdog that doesn't support it, we return 0(success) to upper layer.

Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e8bfaa2faeb7c9585a5586aafaad5f3affc37814
      
https://github.com/qemu/qemu/commit/e8bfaa2faeb7c9585a5586aafaad5f3affc37814
  Author: Liu Yuan <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: use BDRV_SECTOR_SIZE

Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8d71c63137600a41b5b959217c0492278536b3dc
      
https://github.com/qemu/qemu/commit/8d71c63137600a41b5b959217c0492278536b3dc
  Author: Liu Yuan <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: implement .bdrv_co_is_allocated()

Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8ec7d390b0d50b5e5b4b1d8dba7ba40d64a70875
      
https://github.com/qemu/qemu/commit/8ec7d390b0d50b5e5b4b1d8dba7ba40d64a70875
  Author: Kevin Wolf <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M blockdev.c
    M tests/qemu-iotests/group

  Log Message:
  -----------
  block: Disable driver-specific options for 1.5

We don't want to commit to the API yet before everything is worked out.
Disable it for the 1.5 release. This commit is meant to be reverted
after the 1.5 release.

The disabling of the driver-specific options is achieved by applying the
old checks while parsing the command line.

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


  Commit: c3ca988d2b0ee94dc8d53eff4b1c2de4ac06a270
      
https://github.com/qemu/qemu/commit/c3ca988d2b0ee94dc8d53eff4b1c2de4ac06a270
  Author: Kevin Wolf <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  rbd: Fix use after free in rbd_open()

Commit a9ccedc3 frees the QemuOpts for the driver-specific options
immediately, even though it still needs the filename string that is
contained there. This doesn't work. Move the deletion of the QemuOpts to
the end of the function where its content isn't needed any more.

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


  Commit: 982dcbf4cbe80fa362c1edc37b2ced1cb8bcf37b
      
https://github.com/qemu/qemu/commit/982dcbf4cbe80fa362c1edc37b2ced1cb8bcf37b
  Author: MORITA Kazutaka <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: cleanup find_vdi_name

This makes 'filename' and 'tag' constant variables, and renames
'for_snapshot' to 'lock' to clear how it works.

Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6a0b5490338ed0fdf55c43062c88dd7638f05d6d
      
https://github.com/qemu/qemu/commit/6a0b5490338ed0fdf55c43062c88dd7638f05d6d
  Author: MORITA Kazutaka <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: add SD_RES_READONLY result code

Sheepdog returns SD_RES_READONLY when qemu sends write requests to the
snapshot vdi.  This adds the result code and makes sd_strerror() print
its error reason.

Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 9ff53a0eb89afacfa1ba56b009d40be942d3bd63
      
https://github.com/qemu/qemu/commit/9ff53a0eb89afacfa1ba56b009d40be942d3bd63
  Author: MORITA Kazutaka <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: add helper function to reload inode

This adds a helper function to update the current inode state with the
specified vdi object.

Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 13c31de2fdd534c065ce4710f6e8df3921e98c4f
      
https://github.com/qemu/qemu/commit/13c31de2fdd534c065ce4710f6e8df3921e98c4f
  Author: MORITA Kazutaka <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: resend write requests when SD_RES_READONLY is received

When a snapshot is taken from out side of qemu (e.g. qemu-img
snapshot), write requests to the current vdi return SD_RES_READONLY.
In this case, the sheepdog block driver needs to update the current
inode to the latest one and resend the write requests.

Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 859e5553a428225de6b8ef302cdcfd68d140b926
      
https://github.com/qemu/qemu/commit/859e5553a428225de6b8ef302cdcfd68d140b926
  Author: Liu Yuan <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: fix loadvm operation

Currently the 'loadvm' opertaion works as following:
1. switch to the snapshot
2. mark current working VDI as a snapshot
3. rely on sd_create_branch to create a new working VDI based on the snapshot

This works not the same as other format as QCOW2. For e.g,

qemu > savevm # get a live snapshot snap1
qemu > savevm # snap2
qemu > loadvm 1 # This will steally create snap3 of the working VDI

Which will result in following snapshot chain:

base <-- snap1 <-- snap2 <-- snap3
    ^
    |
      working VDI

snap3 was unnecessarily created and might be annoying users.

This patch discard the unnecessary 'snap3' creation. and implement
rollback(loadvm) operation to the specified snapshot by
1. switch to the snapshot
2. delete working VDI
3. rely on sd_create_branch to create a new working VDI based on the snapshot

The snapshot chain for above example will be:

base <-- snap1 <-- snap2
    ^
    |
      working VDI

Cc: address@hidden
Cc: MORITA Kazutaka <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Reviewed-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 186b027d98a3c91c1c6dee631a027d5b2a0fce25
      
https://github.com/qemu/qemu/commit/186b027d98a3c91c1c6dee631a027d5b2a0fce25
  Author: Anthony Liguori <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M bsd-user/syscall.c
    M hw/s390x/s390-virtio-bus.c
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h
    M linux-user/syscall.c
    M qemu-doc.texi
    M target-s390x/int_helper.c

  Log Message:
  -----------
  Merge remote-tracking branch 'stefanha/trivial-patches' into staging

# By Ed Maste (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  bsd-user: Track change in FreeBSD SYSCTL(9) types
  virtio: Fix compilation without CONFIG_VHOST_SCSI
  qemu-doc: Option -ignore-environment removed.
  s390x: use CONFIG_INT128 to detect __uint128_t
  linux-user: fix compile error due to stray colon at end of #ifdef line

Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: c34688f9015c5dacc81efc4f2a0df5742d9c927c
      
https://github.com/qemu/qemu/commit/c34688f9015c5dacc81efc4f2a0df5742d9c927c
  Author: Anthony Liguori <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M block/rbd.c
    M block/sheepdog.c
    M blockdev.c
    M configure
    M tests/qemu-iotests/group

  Log Message:
  -----------
  Merge remote-tracking branch 'stefanha/block' into staging

# By Liu Yuan (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
  sheepdog: fix loadvm operation
  sheepdog: resend write requests when SD_RES_READONLY is received
  sheepdog: add helper function to reload inode
  sheepdog: add SD_RES_READONLY result code
  sheepdog: cleanup find_vdi_name
  rbd: Fix use after free in rbd_open()
  block: Disable driver-specific options for 1.5
  sheepdog: implement .bdrv_co_is_allocated()
  sheepdog: use BDRV_SECTOR_SIZE
  sheepdog: add discard/trim support for sheepdog
  block/ssh: Require libssh2 >= 1.2.8.

Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: bf9b255f484fd61cbaa91faeff254140a0ecd18c
      
https://github.com/qemu/qemu/commit/bf9b255f484fd61cbaa91faeff254140a0ecd18c
  Author: Anthony Liguori <address@hidden>
  Date:   2013-04-26 (Fri, 26 Apr 2013)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: refactor menu creation

Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a1bff71c56f2...bf9b255f484f
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 7edd2c: linux-user: fix compile error due to stray colon a..., GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] a1bff7: microblaze: Add internal base vectors reg
Next by Date: [Qemu-commits] [qemu/qemu] 74ad2d: S390: Make IPL reset address dynamic
Previous by thread: [Qemu-commits] [qemu/qemu] a1bff7: microblaze: Add internal base vectors reg
Next by thread: [Qemu-commits] [qemu/qemu] 74ad2d: S390: Make IPL reset address dynamic
Index(es):
- Date
- Thread