[Qemu-commits] [qemu/qemu] c2ebb0: block/vhdx.c: Mark parent_vhdx

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] c2ebb0: block/vhdx.c: Mark parent_vhdx_guid v

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] c2ebb0: block/vhdx.c: Mark parent_vhdx_guid variable as un...
Date:	Tue, 23 Sep 2014 05:30:07 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c2ebb05e25dcb3acbcdaa541234746151d0ff6b1
      
https://github.com/qemu/qemu/commit/c2ebb05e25dcb3acbcdaa541234746151d0ff6b1
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/vhdx.c

  Log Message:
  -----------
  block/vhdx.c: Mark parent_vhdx_guid variable as unused

The parent_vhdx_guid variable is defined but never used, which provokes
complaints from newer versions of clang. Since the variable definition
is here acting as documentation of the image format, mark it with the
'unused' attribute to keep the compiler happy rather than simply
deleting it.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d735b620b58f2fdfddc8e641e9feac3c9671a49d
      
https://github.com/qemu/qemu/commit/d735b620b58f2fdfddc8e641e9feac3c9671a49d
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/ide/atapi.c

  Log Message:
  -----------
  ide/atapi: Mark non-data commands as complete

When the command completion code in IDE and AHCI
was unified to put all command completion inside
of a callback, "cmd_done," we neglected to
ensure that all AHCI/ATAPI command paths would
eventually register as finished. for the PCI
interface to IDE this is not a problem because
cmd_done is a nop, but the AHCI implementation
needs to send a D2H_REG_FIS and interrupt back
to the guest to inform of completion.

This patch adds calls to ide_stop_transfer,
which calls ide_cmd_done, inside of
ide_atapi_cmd_ok and ide_atapi_cmd_error.

This fixes regressions observed by trying to boot QEMU
with a Fedora 20 live CD under Q35/AHCI, which uses
ATAPI command 0x00, which is a status check that may
cause a hang because we never complete, and ATAPI
command 0x56, which is unsupported by our current
implementation and results in an error that we never
report back to the guest.

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


  Commit: 6698c5bed290f3852c9f200d197b5d99211bc3cd
      
https://github.com/qemu/qemu/commit/6698c5bed290f3852c9f200d197b5d99211bc3cd
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M aio-win32.c

  Log Message:
  -----------
  aio-win32: fix uninitialized use of have_select_revents

Always initialize it with the return value of aio_prepare.

Reported-by: TeLeMan <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0d910cfeaf2076b116b4517166d5deb0fea76394
      
https://github.com/qemu/qemu/commit/0d910cfeaf2076b116b4517166d5deb0fea76394
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/ide/ahci.c
    M hw/ide/core.c

  Log Message:
  -----------
  ide/ahci: Check for -ECANCELED in aio callbacks

Before, bdrv_aio_cancel will either complete the request (like normal)
and call CB with an actual return code, or skip calling the request (for
example when the IO req is not submitted by thread pool yet).

We will change bdrv_aio_cancel to do it differently: always call CB
before return, with either [1] a normal req completion ret code, or [2]
ret == -ECANCELED. So the callers' callback must accept both cases. The
existing logic works with case [1], but not [2].

The simplest transition of callback code is do nothing in case [2], just
as if the CB is not called by the bdrv_aio_cancel() call.

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


  Commit: f197fe2b2c77259b6570620f288d905bfa38e2da
      
https://github.com/qemu/qemu/commit/f197fe2b2c77259b6570620f288d905bfa38e2da
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  block: Add refcnt in BlockDriverAIOCB

This will be useful in synchronous cancel emulation with
bdrv_aio_cancel_async.

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


  Commit: 02c50efe08736116048d5fc355043080f4d5859c
      
https://github.com/qemu/qemu/commit/02c50efe08736116048d5fc355043080f4d5859c
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  block: Add bdrv_aio_cancel_async

This is the async version of bdrv_aio_cancel, which doesn't block the
caller. It guarantees that the cb is called either before returning or
some time later.

bdrv_aio_cancel can base on bdrv_aio_cancel_async, later we can convert
all .io_cancel implementations to .io_cancel_async, and the aio_poll is
the common logic. In the end, .io_cancel can be dropped.

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


  Commit: 3acabd685e2d2b153044e5bf472343e7f4c8177b
      
https://github.com/qemu/qemu/commit/3acabd685e2d2b153044e5bf472343e7f4c8177b
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Drop bdrv_em_co_aiocb_info.cancel

Also drop the now unused ->done pointer.

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


  Commit: f600ac19027e67dd73f1adad50a67a2cdb4f3218
      
https://github.com/qemu/qemu/commit/f600ac19027e67dd73f1adad50a67a2cdb4f3218
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Drop bdrv_em_aiocb_info.cancel

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


  Commit: 3391f5e51c4b55bf72fd33d9bc542a49114e48cd
      
https://github.com/qemu/qemu/commit/3391f5e51c4b55bf72fd33d9bc542a49114e48cd
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/test-thread-pool.c
    M thread-pool.c

  Log Message:
  -----------
  thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async

The .cancel_async shares the same the first half with .cancel: try to
steal the request if not submitted yet. In this case set the elem to
THREAD_DONE status and ret to -ECANCELED, which means
thread_pool_completion_bh will call the cb with -ECANCELED.

If the request is already submitted, do nothing, as we know the normal
completion will happen in the future.

Testing code update:

Before, done_cb is only called if the request is already submitted by
thread pool. Now done_cb is always called, even before it is submitted,
because we emulate bdrv_aio_cancel with bdrv_aio_cancel_async. So also
update the test criteria accordingly.

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


  Commit: 771b64daf9c73be98d223d3ab101a61f02cac277
      
https://github.com/qemu/qemu/commit/771b64daf9c73be98d223d3ab101a61f02cac277
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/linux-aio.c

  Log Message:
  -----------
  linux-aio: Convert laio_aiocb_info.cancel to .cancel_async

Just call io_cancel (2), if it fails, it means the request is not
canceled, so the event loop will eventually call
qemu_laio_process_completion.

In qemu_laio_process_completion, change to call the cb unconditionally.
It is required by bdrv_aio_cancel_async.

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


  Commit: 9bb9da46d6639ded9406e4d8902033c9d97b0006
      
https://github.com/qemu/qemu/commit/9bb9da46d6639ded9406e4d8902033c9d97b0006
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M dma-helpers.c

  Log Message:
  -----------
  dma: Convert dma_aiocb_info.cancel to .cancel_async

Just forward the request to bdrv_aio_cancel_async.

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


  Commit: 722d93335f7cda3065efc17763fd44dd6b244ed1
      
https://github.com/qemu/qemu/commit/722d93335f7cda3065efc17763fd44dd6b244ed1
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: Convert iscsi_aiocb_info.cancel to .cancel_async

Also drop the unused field "canceled".

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


  Commit: 4743b42a1b1947d76ad21ba7119c5638fa28c798
      
https://github.com/qemu/qemu/commit/4743b42a1b1947d76ad21ba7119c5638fa28c798
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/archipelago.c

  Log Message:
  -----------
  archipelago: Drop archipelago_aiocb_info.cancel

The cancelled flag is no longer useful. Later the request will complete
as before, and cb will be called.

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


  Commit: 4c781717c53d606bfa666d606c2875f9952a3155
      
https://github.com/qemu/qemu/commit/4c781717c53d606bfa666d606c2875f9952a3155
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/blkdebug.c

  Log Message:
  -----------
  blkdebug: Drop blkdebug_aiocb_info.cancel

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


  Commit: 9784e70f3d6b9805b5291f71f2543e346fe08433
      
https://github.com/qemu/qemu/commit/9784e70f3d6b9805b5291f71f2543e346fe08433
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/blkverify.c

  Log Message:
  -----------
  blkverify: Drop blkverify_aiocb_info.cancel

Also the finished pointer is not used any more.

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


  Commit: facb5539d6662e8208fc9a763719a5367d4e65d4
      
https://github.com/qemu/qemu/commit/facb5539d6662e8208fc9a763719a5367d4e65d4
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/curl.c

  Log Message:
  -----------
  curl: Drop curl_aiocb_info.cancel

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


  Commit: 533ffb17a5b023fe531477732b71d97267012863
      
https://github.com/qemu/qemu/commit/533ffb17a5b023fe531477732b71d97267012863
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/qed.c

  Log Message:
  -----------
  qed: Drop qed_aiocb_info.cancel

Also drop the now unused ->finished field.

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


  Commit: 997dd8df3e95b2fdbd1f30b3deefaad4e9efd14a
      
https://github.com/qemu/qemu/commit/997dd8df3e95b2fdbd1f30b3deefaad4e9efd14a
  Author: Liu Yuan <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/quorum.c

  Log Message:
  -----------
  quorum: fix quorum_aio_cancel()

For a fifo read pattern, we only have one running aio (possible other cases that
has less number than num_children in the future), so we need to check if
.acb is NULL against bdrv_aio_cancel() to avoid segfault.

Cc: Eric Blake <address@hidden>
Cc: Benoit Canet <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7940e5056bfdb5d2861774e294d5459952cd0aee
      
https://github.com/qemu/qemu/commit/7940e5056bfdb5d2861774e294d5459952cd0aee
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/quorum.c

  Log Message:
  -----------
  quorum: Convert quorum_aiocb_info.cancel to .cancel_async

Before, we cancel all the child requests with bdrv_aio_cancel, then free
the acb..

Now we just kick off asynchronous cancellation of child requests and
return, we know quorum_aio_cb will be called later, so in the end
quorum_aio_finalize will take care of calling the caller's cb.

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


  Commit: 7691e24dbebb46658e89b3f950fda6ec78bbb823
      
https://github.com/qemu/qemu/commit/7691e24dbebb46658e89b3f950fda6ec78bbb823
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  rbd: Drop rbd_aiocb_info.cancel

And also drop the now unused "cancelled" field.

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


  Commit: 6d24b4df38b0e1b2a6cdeeaa4a0e3dcdee643364
      
https://github.com/qemu/qemu/commit/6d24b4df38b0e1b2a6cdeeaa4a0e3dcdee643364
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: Convert sd_aiocb_info.cancel to .cancel_async

Also drop the now unused SheepdogAIOCB.finished field. Note that this
aio is internal to sheepdog driver and has NULL cb and opaque, and
should be unused at all.

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


  Commit: 5da91e4ef46fe85694c5c43a8f3a186a7a83cda7
      
https://github.com/qemu/qemu/commit/5da91e4ef46fe85694c5c43a8f3a186a7a83cda7
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/win32-aio.c

  Log Message:
  -----------
  win32-aio: Drop win32_aiocb_info.cancel

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


  Commit: e551c999bcca1f29742741033853651f6ea88479
      
https://github.com/qemu/qemu/commit/e551c999bcca1f29742741033853651f6ea88479
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/ide/core.c

  Log Message:
  -----------
  ide: Convert trim_aiocb_info.cancel to .cancel_async

We know that either bh is scheduled or ide_issue_trim_cb will be called
again, so we just set i, j and ret to the right values. In both cases,
ide_trim_bh_cb will be called.

Also forward the cancellation to the iocb->aiocb which we get from
bdrv_aio_discard.

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


  Commit: ca5fd113b8ae5898853a757e06cb8d8a0c5e5d85
      
https://github.com/qemu/qemu/commit/ca5fd113b8ae5898853a757e06cb8d8a0c5e5d85
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  block: Drop AIOCBInfo.cancel

Now that all the implementations are converted to asynchronous version
and we can emulate synchronous cancellation with it. Let's drop the
unused member.

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


  Commit: 8007429a99d6ea8480ba0a7a5fb5ae92473f798c
      
https://github.com/qemu/qemu/commit/8007429a99d6ea8480ba0a7a5fb5ae92473f798c
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block.c
    M block/archipelago.c
    M block/blkdebug.c
    M block/blkverify.c
    M block/curl.c
    M block/iscsi.c
    M block/linux-aio.c
    M block/qed.c
    M block/quorum.c
    M block/rbd.c
    M block/sheepdog.c
    M block/win32-aio.c
    M dma-helpers.c
    M hw/ide/core.c
    M include/block/aio.h
    M thread-pool.c

  Log Message:
  -----------
  block: Rename qemu_aio_release -> qemu_aio_unref

Suggested-by: Benoît Canet <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0722eba9450cb8be9713fec1caa0772330739586
      
https://github.com/qemu/qemu/commit/0722eba9450cb8be9713fec1caa0772330739586
  Author: Gonglei <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M qdev-monitor.c

  Log Message:
  -----------
  qdev-monitor: fix segmentation fault on qdev_device_help()

Normally, qmp_device_list_properties() may return NULL when
a device haven't special properties excpet Object and DeviceState
properties, such as virtio-balloon-device.

We just need check local_err instead of prop_list.

Example:

Segmentation fault (core dumped)

The backtrace as below:

Program received signal SIGSEGV, Segmentation fault.
0x00005555559af1a8 in error_get_pretty (err=0x0) at util/error.c:152
152         return err->msg;
(gdb) bt
    func=0x55555574a6ca <device_help_func>, opaque=0x0, abort_on_failure=0) at 
util/qemu-option.c:1072

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a90d411e63ef29bb99b984e0fdb7796aeee1c724
      
https://github.com/qemu/qemu/commit/a90d411e63ef29bb99b984e0fdb7796aeee1c724
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M aio-win32.c

  Log Message:
  -----------
  aio-win32: avoid out-of-bounds access to the events array

If ret is WAIT_TIMEOUT and there was an event returned by select(),
we can write to a location after the end of the array.  But in
that case we can retry the WaitForMultipleObjects call with the
same set of events, so just move the event[ret - WAIT_OBJECT_0]
assignment inside the existin conditional.

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


  Commit: e819ab22777fd455d5b130afe48c808d35ef7e93
      
https://github.com/qemu/qemu/commit/e819ab22777fd455d5b130afe48c808d35ef7e93
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/Makefile.objs
    A block/null.c
    M qapi/block-core.json

  Log Message:
  -----------
  block: Introduce "null" drivers

This is an analogue to Linux null_blk. It can be used for testing or
benchmarking block device emulation and general block layer
functionalities such as coroutines and throttling, where disk IO is not
necessary or wanted.

Use null-aio:// for AIO version, and null-co:// for coroutine version.

[Resolved conflict with Fam's async bdrv_aio_cancel() series:
1. Drop .bdrv_aio_cancel() since it is now done by block.c
2. Rename qemu_aio_release() to qemu_aio_unref()
--Stefan]

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e8712cea6aa34a38130c6eb412d46180f1d4fe6f
      
https://github.com/qemu/qemu/commit/e8712cea6aa34a38130c6eb412d46180f1d4fe6f
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi: Sort BlockdevDriver enum data list

Reviewed-by: Benoît Canet <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: db866be982f970d1dfe3798465847e3fb0ae0aaf
      
https://github.com/qemu/qemu/commit/db866be982f970d1dfe3798465847e3fb0ae0aaf
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi: Sort items in BlockdevOptions definition

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 9bf040b962f90aa2e1cef6543dfee6c96f73ef7e
      
https://github.com/qemu/qemu/commit/9bf040b962f90aa2e1cef6543dfee6c96f73ef7e
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/qcow2-refcount.c
    M qapi/block-core.json

  Log Message:
  -----------
  qapi/block: Add "fatal" to BLOCK_IMAGE_CORRUPTED

Not every BLOCK_IMAGE_CORRUPTED event must be fatal; for example, when
reading from an image, they should generally not be. Nonetheless, even
an image only read from may of course be corrupted and this can be
detected during normal operation. In this case, a non-fatal event should
be emitted, but the image should not be marked corrupt (in accordance to
"fatal" set to false).

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 85186ebdac7e183242deaa55d5049988de832be1
      
https://github.com/qemu/qemu/commit/85186ebdac7e183242deaa55d5049988de832be1
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  qcow2: Add qcow2_signal_corruption()

Add a helper function for easily marking an image corrupt (on fatal
corruptions) while outputting an informative message to stderr and via
QAPI.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: adb435522b86b3fca2324cb8c94e17b55ae071f1
      
https://github.com/qemu/qemu/commit/adb435522b86b3fca2324cb8c94e17b55ae071f1
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/qcow2-refcount.c
    M tests/qemu-iotests/060.out

  Log Message:
  -----------
  qcow2: Use qcow2_signal_corruption() for overlaps

Use the new function in case of a failed overlap check.

This changes output in case of corruption, so adapt iotest 060's
reference output accordingly.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: a97c67ee6c1546b985c1048c7a1f9e4fc13d9ee1
      
https://github.com/qemu/qemu/commit/a97c67ee6c1546b985c1048c7a1f9e4fc13d9ee1
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/qcow2-cluster.c
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Check L1/L2/reftable entries for alignment

Offsets taken from the L1, L2 and refcount tables are generally assumed
to be correctly aligned. However, this cannot be guaranteed if the image
has been written to by something different than qemu, thus check all
offsets taken from these tables for correct cluster alignment.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5b0ed2be883238f52567ba2635ea38f34e8eb90d
      
https://github.com/qemu/qemu/commit/5b0ed2be883238f52567ba2635ea38f34e8eb90d
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  iotests: Add more tests for qcow2 corruption

Add tests for unaligned L1/L2/reftable entries and non-fatal corruption
reports.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 407ba0844d90a344e5ed012129e6e40e091bf48b
      
https://github.com/qemu/qemu/commit/407ba0844d90a344e5ed012129e6e40e091bf48b
  Author: Maria Kustova <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/image-fuzzer/qcow2/fuzz.py
    M tests/image-fuzzer/runner.py

  Log Message:
  -----------
  image-fuzzer: Trivial readability and formatting improvements

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


  Commit: 93bb1315250dd010e65dc067af103cbaf0de03ae
      
https://github.com/qemu/qemu/commit/93bb1315250dd010e65dc067af103cbaf0de03ae
  Author: Gonglei <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hmp.c

  Log Message:
  -----------
  hmp: fix memory leak at hmp_info_block_jobs()

Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7b17ce60cc58b3c20b3e708a2d69f6bbe2b4edfa
      
https://github.com/qemu/qemu/commit/7b17ce60cc58b3c20b3e708a2d69f6bbe2b4edfa
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Fix leak of QemuOpts in qcow2_open()

Currently, the QemuOpts object opts is leaked if anything fails from its
creation up to and including the image repair block. Fix this by freeing
that object in the fail path.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e775ba7721181e3ff6677b91f0464968330988d9
      
https://github.com/qemu/qemu/commit/e775ba7721181e3ff6677b91f0464968330988d9
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi-visit.py

  Log Message:
  -----------
  qapi: Allow enums in anonymous unions

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: ee42b5ce0b33986970f5c2fd4b676cddc0d6306c
      
https://github.com/qemu/qemu/commit/ee42b5ce0b33986970f5c2fd4b676cddc0d6306c
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

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

  Log Message:
  -----------
  qcow2: Add overlap-check.template option

Being able to set the overlap-check option to a string and then refine
it via the overlap-check.* options is a nice idea for the command line
but does not work so well for non-flattened dicts. In that case, one can
only specify either but not both, so add a field to overlap-check.*
which does the same as directly specifying overlap-check but can be used
in conjunction with the other fields in non-flattened dicts.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: f658581130878905e7af001286b8514f28d23c43
      
https://github.com/qemu/qemu/commit/f658581130878905e7af001286b8514f28d23c43
  Author: Max Reitz <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi/block-core: Add "new" qcow2 options

qcow2 supports more than four options by now, add the new options
(overlap check mode and metadata cache size)

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 56271efdeaa9d01cff9d82c4b8b2ab73152fe1ea
      
https://github.com/qemu/qemu/commit/56271efdeaa9d01cff9d82c4b8b2ab73152fe1ea
  Author: Maria Kustova <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M docs/image-fuzzer.txt

  Log Message:
  -----------
  docs: List all image elements currently supported by the fuzzer

Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 2e5be6b77ef428df9088a5d01586cd0cd0b1a107
      
https://github.com/qemu/qemu/commit/2e5be6b77ef428df9088a5d01586cd0cd0b1a107
  Author: Maria Kustova <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/image-fuzzer/qcow2/fuzz.py

  Log Message:
  -----------
  fuzz: Add fuzzing functions for entries of refcount table and blocks

Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1e8fd8d44d6d5d5fa6d7583ac796809886abbd69
      
https://github.com/qemu/qemu/commit/1e8fd8d44d6d5d5fa6d7583ac796809886abbd69
  Author: Maria Kustova <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/image-fuzzer/qcow2/layout.py

  Log Message:
  -----------
  layout: Add generators for refcount table and blocks

Refcount structures are placed in clusters randomly selected from all
unallocated host clusters.

Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Maria Kustova <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 1cd1031ddc3bdef68acbbdd0d010c09279c727ea
      
https://github.com/qemu/qemu/commit/1cd1031ddc3bdef68acbbdd0d010c09279c727ea
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/Makefile
    A tests/ahci-test.c

  Log Message:
  -----------
  ahci: Adding basic functionality qtest.

Currently, there is no qtest to test the functionality of
the AHCI functionality present within the Q35 machine type.

This patch adds a skeleton for an AHCI test suite,
and adds a simple sanity-check test case where we
identify that the AHCI device is present, then
disengage the virtual machine.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: c8b5b20f81030f8f40be041ccc23021ac602c468
      
https://github.com/qemu/qemu/commit/c8b5b20f81030f8f40be041ccc23021ac602c468
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/ide/ich.c

  Log Message:
  -----------
  ahci: MSI capability should be at 0x80, not 0x50.

In the Intel ICH9 data sheet, the MSI capability offset
in the PCI configuration space for ICH9 AHCI devices is
specified to be 0x80.

Further, the PCI capability pointer should always point
to 0x80 in ICH9 devices, despite the fact that AHCI 1.3
specifies that it should be pointing to PMCAP (Which in
this instance would be 0x70) to maintain adherence to
the Intel data sheet specifications and real observed behavior.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8840a843dc14adc9b6e7b5454ca64116e110a17c
      
https://github.com/qemu/qemu/commit/8840a843dc14adc9b6e7b5454ca64116e110a17c
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  ahci: Add test_pci_spec to ahci-test.

Adds a specification adherence test for AHCI
where the boot-up values for the PCI configuration space
are compared against the AHCI 1.3 specification.

This test does not itself attempt to engage the device.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 96d6d3bad978a4085b9560e30316c98cb6e0489c
      
https://github.com/qemu/qemu/commit/96d6d3bad978a4085b9560e30316c98cb6e0489c
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/ahci-test.c
    M tests/libqos/pci.c

  Log Message:
  -----------
  ahci: add test_pci_enable to ahci-test.

This adds a test wherein we engage the PCI AHCI
device and ensure that the memory region for the
HBA functionality is now accessible.

Under Q35 environments, additional PCI configuration
is performed to ensure that the HBA functionality
will become usable.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: fac7aa7fc2ebc26803b0a7b44b010f47ce3e1dd8
      
https://github.com/qemu/qemu/commit/fac7aa7fc2ebc26803b0a7b44b010f47ce3e1dd8
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/ide/ahci.c

  Log Message:
  -----------
  ahci: properly shadow the TFD register

In a real AHCI device, several S/ATA registers are mirrored or shadowed
within the AHCI register set. These registers are not updated
synchronously for each read access, but are instead updated after a
Device-to-Host Register FIS packet is received. The D2H FIS contains
the values from these registers on the device.

In QEMU, by reaching directly into the device to grab these bits before
they are "sent," we may introduce race conditions where unexpected
values are present "before they are sent" which could cause issues for
some guests, particularly if an attempt is made to read the PxTFD
register prior to enabling the port, where incorrect values will be read.

This patch also addresses the boot-time values for the PxTFD and PxSIG
registers to bring them in line with the AHCI 1.3 specification.

Lastly, several fields (PxTFD, PxSIG and PxSACT) are read-only,
and any attempts to write to them should be ignored.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: c2f3029fbc5e7beb4cfb7ac264e10838fada524e
      
https://github.com/qemu/qemu/commit/c2f3029fbc5e7beb4cfb7ac264e10838fada524e
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  ahci: Add test_hba_spec to ahci-test.

Add a test routine that checks the boot-up values of the HBA
configuration memory space against the AHCI 1.3 specification
and Intel ICH9 data sheet (for Q35 machines) for adherence and
sane values.

The HBA is not yet engaged or put into the idle state.

[Replaced g_assert_false(...) with g_assert(!...) for glib <2.38
compatibility, reported by Peter Maydell <address@hidden>.
--Stefan]

Signed-off-by: John Snow <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dbc180e5725e4eb4fd1632d0af41189c7410e459
      
https://github.com/qemu/qemu/commit/dbc180e5725e4eb4fd1632d0af41189c7410e459
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  ahci: Add test_hba_enable to ahci-test.

This test engages the HBA functionality and initializes
values to sane defaults to allow for minimal HBA functionality.

Buffers are allocated and pointers are updated to allow minimal
I/O commands to complete as expected. Error registers and responses
are sanity checked for specification adherence.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0fa781e3d50ec2e7b45dda96709b16b38f88799b
      
https://github.com/qemu/qemu/commit/0fa781e3d50ec2e7b45dda96709b16b38f88799b
  Author: John Snow <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  ahci: Add test_identify case to ahci-test.

Utilizing all of the bring-up code in pci_enable and hba_enable,
this test issues a simple IDENTIFY command via the HBA and retrieves
the response via the PIO receive mechanisms of the HBA.

Bugs: The DPS interrupt (Descriptor Processed Status) does not
currently get set. This will need to be adjusted in a future
patch series when the AHCI DMA pathways are reworked to allow
the feature, which may be utilized by OSX guests.

Signed-off-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3e7e6f186f6180c5900dbc8db04abbbda1275dad
      
https://github.com/qemu/qemu/commit/3e7e6f186f6180c5900dbc8db04abbbda1275dad
  Author: Chrysostomos Nanakos <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/archipelago.c

  Log Message:
  -----------
  block/archipelago: Fix typo in qemu_archipelago_truncate()

Fix a typo introduced by 94c80a438c85f2c19698547fbb115ea46d80c5f1

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


  Commit: 550830f9351291c585c963204ad9127998b1c1ce
      
https://github.com/qemu/qemu/commit/550830f9351291c585c963204ad9127998b1c1ce
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/Makefile.objs
    R block/cow.c
    M qapi/block-core.json
    M qemu-doc.texi
    M qemu-img.texi
    M qmp-commands.hx
    M tests/image-fuzzer/runner.py
    M tests/qemu-iotests/069
    M tests/qemu-iotests/072
    M tests/qemu-iotests/099
    M tests/qemu-iotests/common
    M ui/cocoa.m

  Log Message:
  -----------
  block: delete cow block driver

This patch removes support for the cow file format.

Normally we do not break backwards compatibility but in this case there
is no impact and it is the most logical option.  Extraordinary claims
require extraordinary evidence so I will show why removing the cow block
driver is the right thing to do.

The cow file format is the disk image format for Usermode Linux, a way
of running a Linux system in userspace.  The performance of UML was
never great and it was hacky, but it enjoyed some popularity before
hardware virtualization support became mainstream.

QEMU's block/cow.c is supposed to read this image file format.
Unfortunately the file format was underspecified:

1. Earlier Linux versions used the MAXPATHLEN constant for the backing
   filename field.  The value of MAXPATHLEN can change, so Linux
   switched to a 4096 literal but QEMU has a 1024 literal.

2. Padding was not used on the header struct (both in the Linux kernel
   and in QEMU) so the struct layout varied across architectures.  In
   particular, i386 and x86_64 were different due to int64_t alignment
   differences.  Linux now uses __attribute__((packed)), QEMU does not.

Therefore:

1. QEMU cow images do not conform to the Linux cow image file format.

2. cow images cannot be shared between different host architectures.

This means QEMU cow images are useless and QEMU has not had bug reports
from users actually hitting these issues.

Let's get rid of this thing, it serves no purpose and no one will be
affected.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e91a8b2fef92e7d31290e785a35f85a503fa1356
      
https://github.com/qemu/qemu/commit/e91a8b2fef92e7d31290e785a35f85a503fa1356
  Author: Jeff Cody <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M block/vhdx.c

  Log Message:
  -----------
  block: vhdx - fix reading beyond pointer during image creation

In vhdx_create_metadata(), we allocate 40 bytes to entry_buffer for
the various metadata table entries.  However, we write out 64kB from
that buffer into the new file.  Only write out the correct 40 bytes.

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


  Commit: 2f78e491d7b46542158ce0b8132ee4e05bc0ade4
      
https://github.com/qemu/qemu/commit/2f78e491d7b46542158ce0b8132ee4e05bc0ade4
  Author: Chrysostomos Nanakos <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M async.c
    M include/block/aio.h
    M include/qemu/main-loop.h
    M iothread.c
    M main-loop.c
    M qemu-img.c
    M qemu-io.c
    M qemu-nbd.c
    M tests/test-aio.c
    M tests/test-thread-pool.c
    M tests/test-throttle.c
    M vl.c

  Log Message:
  -----------
  async: aio_context_new(): Handle event_notifier_init failure

On a system with a low limit of open files the initialization
of the event notifier could fail and QEMU exits without printing any
error information to the user.

The problem can be easily reproduced by enforcing a low limit of open
files and start QEMU with enough I/O threads to hit this limit.

The same problem raises, without the creation of I/O threads, while
QEMU initializes the main event loop by enforcing an even lower limit of
open files.

This commit adds an error message on failure:

 # qemu [...] -object iothread,id=iothread0 -object iothread,id=iothread1
 qemu: Failed to initialize event notifier: Too many open files in system

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


  Commit: d9612b43dd062309a6a4ad4e5cef2badc94f5385
      
https://github.com/qemu/qemu/commit/d9612b43dd062309a6a4ad4e5cef2badc94f5385
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/net/vhost_net.c
    M include/hw/virtio/dataplane/vring.h
    A include/hw/virtio/virtio_ring.h
    M linux-headers/linux/vhost.h

  Log Message:
  -----------
  virtio: Import virtio_vring.h

This header has no further dependencies. It only has some stable data
types and primitive functions, so we can copy it to include/hw/virtio in
order to allow vring code (and its user virtio-blk dataplane) to be
built unconditionally, even for cross compiling.

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


  Commit: 032f8b8158eaab94573340c883cb6cd03cea1117
      
https://github.com/qemu/qemu/commit/032f8b8158eaab94573340c883cb6cd03cea1117
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M hw/virtio/dataplane/vring.c

  Log Message:
  -----------
  vring: Better error handling if num is too large

To be more consistent inside this function.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 52b53c04faab9f7a9879c8dc014930649a3e698d
      
https://github.com/qemu/qemu/commit/52b53c04faab9f7a9879c8dc014930649a3e698d
  Author: Fam Zheng <address@hidden>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M configure
    M hw/block/Makefile.objs
    M hw/block/virtio-blk.c
    M hw/virtio/Makefile.objs
    M include/hw/virtio/virtio-blk.h

  Log Message:
  -----------
  block: Always compile virtio-blk dataplane

Dataplane doesn't depend on linux-aio any more, so we don't need the
compiling condition now.

Configure options are kept but just print a message.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 380f649e02f9545159dc3158d7c1b2e70c1005e3
      
https://github.com/qemu/qemu/commit/380f649e02f9545159dc3158d7c1b2e70c1005e3
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M aio-win32.c
    M async.c
    M block.c
    M block/Makefile.objs
    M block/archipelago.c
    M block/blkdebug.c
    M block/blkverify.c
    R block/cow.c
    M block/curl.c
    M block/iscsi.c
    M block/linux-aio.c
    A block/null.c
    M block/qcow2-cluster.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qcow2.h
    M block/qed.c
    M block/quorum.c
    M block/rbd.c
    M block/sheepdog.c
    M block/vhdx.c
    M block/win32-aio.c
    M configure
    M dma-helpers.c
    M docs/image-fuzzer.txt
    M hmp.c
    M hw/block/Makefile.objs
    M hw/block/virtio-blk.c
    M hw/ide/ahci.c
    M hw/ide/atapi.c
    M hw/ide/core.c
    M hw/ide/ich.c
    M hw/net/vhost_net.c
    M hw/virtio/Makefile.objs
    M hw/virtio/dataplane/vring.c
    M include/block/aio.h
    M include/block/block.h
    M include/hw/virtio/dataplane/vring.h
    M include/hw/virtio/virtio-blk.h
    A include/hw/virtio/virtio_ring.h
    M include/qemu/main-loop.h
    M iothread.c
    M linux-headers/linux/vhost.h
    M main-loop.c
    M qapi/block-core.json
    M qdev-monitor.c
    M qemu-doc.texi
    M qemu-img.c
    M qemu-img.texi
    M qemu-io.c
    M qemu-nbd.c
    M qmp-commands.hx
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/Makefile
    A tests/ahci-test.c
    M tests/image-fuzzer/qcow2/fuzz.py
    M tests/image-fuzzer/qcow2/layout.py
    M tests/image-fuzzer/runner.py
    M tests/libqos/pci.c
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/069
    M tests/qemu-iotests/072
    M tests/qemu-iotests/099
    M tests/qemu-iotests/common
    M tests/test-aio.c
    M tests/test-thread-pool.c
    M tests/test-throttle.c
    M thread-pool.c
    M ui/cocoa.m
    M vl.c

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

# gpg: Signature made Mon 22 Sep 2014 12:41:59 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* remotes/stefanha/tags/block-pull-request: (59 commits)
  block: Always compile virtio-blk dataplane
  vring: Better error handling if num is too large
  virtio: Import virtio_vring.h
  async: aio_context_new(): Handle event_notifier_init failure
  block: vhdx - fix reading beyond pointer during image creation
  block: delete cow block driver
  block/archipelago: Fix typo in qemu_archipelago_truncate()
  ahci: Add test_identify case to ahci-test.
  ahci: Add test_hba_enable to ahci-test.
  ahci: Add test_hba_spec to ahci-test.
  ahci: properly shadow the TFD register
  ahci: add test_pci_enable to ahci-test.
  ahci: Add test_pci_spec to ahci-test.
  ahci: MSI capability should be at 0x80, not 0x50.
  ahci: Adding basic functionality qtest.
  layout: Add generators for refcount table and blocks
  fuzz: Add fuzzing functions for entries of refcount table and blocks
  docs: List all image elements currently supported by the fuzzer
  qapi/block-core: Add "new" qcow2 options
  qcow2: Add overlap-check.template option
  ...

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


Compare: https://github.com/qemu/qemu/compare/17336812c790...380f649e02f9
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] c2ebb0: block/vhdx.c: Mark parent_vhdx_guid variable as un..., GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] c88930: qemu-char: Permit only a single "stdio" character ...
Next by Date: [Qemu-commits] [qemu/qemu] 450749: s390x: remove duplicate defines in SCLP code
Previous by thread: [Qemu-commits] [qemu/qemu] c88930: qemu-char: Permit only a single "stdio" character ...
Next by thread: [Qemu-commits] [qemu/qemu] 450749: s390x: remove duplicate defines in SCLP code
Index(es):
- Date
- Thread