提交 · 5098699a51756f7e8934dc035112c8f8aa2a0ec3 · openeuler / qemu

06 4月, 2013 8 次提交

Merge remote-tracking branch 'kwolf/for-anthony' into staging · 5098699a

由 Anthony Liguori 提交于 4月 05, 2013

# By Stefan Hajnoczi (4) and Kevin Wolf (3)
# Via Kevin Wolf
* kwolf/for-anthony:
  qcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount
  qcow2: Return real error in qcow2_update_snapshot_refcount
  block: clean up I/O throttling wait_time code
  block: drop duplicated slice extension code
  block: keep I/O throttling slice time constant
  block: fix I/O throttling accounting blind spot
  usb-storage: Forward serial number to scsi-disk

5098699a

qcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount · c2b6ff51

由 Kevin Wolf 提交于 4月 05, 2013

It ignored the error code, and at least the 'goto fail' is obvious
nonsense as it creates an endless loop (if the next attempt doesn't
magically succeed) and leaves the in-memory L1 table in big-endian
instead of converting it back.

In error cases, there's no point in writing an updated L1 table, so
skip this part for them.
Signed-off-by: NKevin Wolf <kwolf@redhat.com>

c2b6ff51

qcow2: Return real error in qcow2_update_snapshot_refcount · c2bc78b6

由 Kevin Wolf 提交于 4月 05, 2013

This fixes the error message triggered by the following script:

    cat > /tmp/blkdebug.cfg <<EOF
    [inject-error]
    event = "cluster_free"
    errno = "28"
    immediately = "off"
    EOF

    $qemu_img create -f qcow2 test.qcow2 10G
    $qemu_img snapshot -c snap test.qcow2
    $qemu_img snapshot -d snap blkdebug:/tmp/blkdebug.cfg:test.qcow2
Signed-off-by: NKevin Wolf <kwolf@redhat.com>

c2bc78b6

block: clean up I/O throttling wait_time code · 0775437f

由 Stefan Hajnoczi 提交于 4月 05, 2013

The wait_time variable is in seconds.  Reflect this in a comment and use
NANOSECONDS_PER_SECOND instead of BLOCK_IO_SLICE_TIME * 10 (which
happens to have the right value).
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
Tested-By: NBenoit Canet <benoit@irqsave.net>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>

0775437f

block: drop duplicated slice extension code · e660fb8b

由 Stefan Hajnoczi 提交于 4月 05, 2013

The current slice is extended when an I/O request exceeds the limit.
There is no need to extend the slice every time we check a request.
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
Tested-By: NBenoit Canet <benoit@irqsave.net>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>

e660fb8b

block: keep I/O throttling slice time constant · ae29d6c6

由 Stefan Hajnoczi 提交于 4月 05, 2013

It is not necessary to adjust the slice time at runtime.  We already
extend the current slice in order to carry over accounting into the next
slice.  Changing the actual slice time value introduces oscillations.

The guest may experience large changes in throughput or IOPS from one
moment to the next when slice times are adjusted.
Reported-by: NBenoît Canet <benoit@irqsave.net>
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
Tested-By: NBenoit Canet <benoit@irqsave.net>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>

ae29d6c6

block: fix I/O throttling accounting blind spot · 5905fbc9

由 Stefan Hajnoczi 提交于 4月 05, 2013

I/O throttling relies on bdrv_acct_done() which is called when a request
completes.  This leaves a blind spot since we only charge for completed
requests, not submitted requests.

For example, if there is 1 operation remaining in this time slice the
guest could submit 3 operations and they will all be submitted
successfully since they don't actually get accounted for until they
complete.

Originally we probably thought this is okay since the requests will be
accounted when the time slice is extended.  In practice it causes
fluctuations since the guest can exceed its I/O limit and it will be
punished for this later on.

Account for I/O upon submission so that I/O limits are enforced
properly.
Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
Tested-By: NBenoit Canet <benoit@irqsave.net>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>

5905fbc9

usb-storage: Forward serial number to scsi-disk · 76534da7

由 Kevin Wolf 提交于 4月 03, 2013

usb-storage takes care to fetch the USB serial number from -drive
options, but it neglected to pass its own 'serial' property to the
scsi-disk it creates. With this patch, the 'serial' qdev property and
the 'serial' option in -drive behave the same and correctly apply the
serial number on both USB and SCSI level.
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
Acked-by: NGerd Hoffmann <kraxel@redhat.com>

76534da7

05 4月, 2013 19 次提交

Merge remote-tracking branch 'luiz/queue/qmp' into staging · 150a470b

由 Anthony Liguori 提交于 4月 05, 2013

# By Luiz Capitulino
# Via Luiz Capitulino
* luiz/queue/qmp:
  chardev: drop the Memory chardev driver
  hmp: human-monitor-command: stop using the Memory chardev driver
  Monitor: Make output buffer dynamic
  qstring: add qstring_get_length()

150a470b

chardev: drop the Memory chardev driver · 4bf0bb80

由 Luiz Capitulino 提交于 4月 02, 2013

It's not used anymore since the last commit.
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Acked-by: NGerd Hoffmann <kraxel@redhat.com>

4bf0bb80

hmp: human-monitor-command: stop using the Memory chardev driver · 48c043d0

由 Luiz Capitulino 提交于 4月 02, 2013

The Memory chardev driver was added because, as the Monitor's output
buffer was static, we needed a way to accumulate the output of an
HMP commmand when ran by human-monitor-command.

However, the Monitor's output buffer is now dynamic, so it's possible
for the human-monitor-command to use it instead of the Memory chardev
driver.

This commit does that change, but there are two important
observations about it:

 1. We need a way to signal to the Monitor that it shouldn't call
    chardev functions when flushing its output. This is done
    by adding a new flag to the Monitor object called skip_flush
	(which is set to true by qmp_human_monitor_command())

 2. The current code has buffered semantics: QMP clients will
    only see a command's output if it flushes its output with
	a new-line character. This commit changes this to unbuffered,
	which means that QMP clients will see a command's output
	whenever the command prints anything.

	I don't think this will matter in practice though, as I believe
	all HMP commands print the new-line character anyway.
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Acked-by: NGerd Hoffmann <kraxel@redhat.com>

48c043d0

Monitor: Make output buffer dynamic · e1f2641b

由 Luiz Capitulino 提交于 3月 25, 2013

Commit f628926b changed monitor_flush()
to retry on qemu_chr_fe_write() errors. However, the Monitor's output
buffer can keep growing while the retry is not issued and this can
cause the buffer to overflow.

To reproduce this issue, just start qemu and type on the Monitor:

(qemu) ?

This will cause an assertion to trig.

To fix this problem this commit makes the Monitor buffer dynamic,
which means that it can grow as much as needed.
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Acked-by: NGerd Hoffmann <kraxel@redhat.com>

e1f2641b

qstring: add qstring_get_length() · 54d49ac9

由 Luiz Capitulino 提交于 3月 25, 2013

Long overdue.
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Acked-by: NGerd Hoffmann <kraxel@redhat.com>

54d49ac9

Allow clock_gettime() monotonic clock to be utilized on more OS's · d05ef160

由 Brad Smith 提交于 4月 04, 2013

Allow the clock_gettime() code using monotonic clock to be utilized on
more POSIX compliannt OS's. This started as a fix for OpenBSD which was
listed in one function as part of the previous hard coded list of OS's
for the functions to support but not in the other.
Signed-off-by: NBrad Smith <brad@comstyle.com>
Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
Message-id: 20130405003748.GH884@rox.home.comstyle.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

d05ef160

pc_acpi_init(): don't bail as soon as failing to find default DSDT · c5a98cf3