[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 714587: vhost: block migration if backend doe
From: |
GitHub |
Subject: |
[Qemu-commits] [qemu/qemu] 714587: vhost: block migration if backend does not log mem... |
Date: |
Tue, 24 Jun 2014 04:30:07 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 7145872ed373d75c4d5de40e55248a0840a15f70
https://github.com/qemu/qemu/commit/7145872ed373d75c4d5de40e55248a0840a15f70
Author: Michael S. Tsirkin <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/virtio/vhost.c
M include/hw/virtio/vhost.h
Log Message:
-----------
vhost: block migration if backend does not log memory
vhost user does not support LOG_ALL feature bit.
Generally, we should not try to set this bit without
checking that backend can support it first.
Detect and block migration.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 8617343faae6ba7e916137c6c9e3ef22c00565d8
https://github.com/qemu/qemu/commit/8617343faae6ba7e916137c6c9e3ef22c00565d8
Author: Michael S. Tsirkin <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/virtio/vhost.c
Log Message:
-----------
vhost: fix resource leak in error handling
vhost_verify_ring_mappings leaks mappings on error.
Fix this up.
Cc: address@hidden
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 8f4e5ac3e27f832c09d5de274c84a7f22de0e4dd
https://github.com/qemu/qemu/commit/8f4e5ac3e27f832c09d5de274c84a7f22de0e4dd
Author: Igor Mammedov <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hmp.c
M monitor.c
M qapi-schema.json
Log Message:
-----------
qapi/hmp: use 'backend' instead of 'device' with memory backend
fixup documentation comments and HMP message/help text
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 1dc75c6d74738cfc06dbcf4a2af6c09af692a640
https://github.com/qemu/qemu/commit/1dc75c6d74738cfc06dbcf4a2af6c09af692a640
Author: Nikolay Nikolaev <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M stubs/Makefile.objs
A stubs/chr-baum-init.c
A stubs/qemu-chr-open-spice.c
Log Message:
-----------
libqemustub: add more stubs for qemu-char
Additional stubs:
- chr_baum_init
- qemu_chr_open_spice_vmc
- qemu_chr_open_spice_port
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: bd95939fc804f3a6ffddbe761cdb21421808f156
https://github.com/qemu/qemu/commit/bd95939fc804f3a6ffddbe761cdb21421808f156
Author: Nikolay Nikolaev <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M tests/vhost-user-test.c
Log Message:
-----------
qtest: fix qtest for vhost-user
Fix compile for older glib, provide conditionally compiled versions of the
used glib APIs.
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: f61badf32f1870e80e579f9dac363891a226e976
https://github.com/qemu/qemu/commit/f61badf32f1870e80e579f9dac363891a226e976
Author: Nikolay Nikolaev <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M tests/vhost-user-test.c
Log Message:
-----------
qtest: fix vhost-user-test unbalanced mutex locks
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 6a2acedb19221ddf5e6fd3fb3590ba636aa21007
https://github.com/qemu/qemu/commit/6a2acedb19221ddf5e6fd3fb3590ba636aa21007
Author: Gabriel L. Somlo <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/net/e1000.c
Log Message:
-----------
e1000: emulate auto-negotiation during external link status change
This patch emulates auto-negotiation when the network link status
is modified externally (i.e. via "set_link <id> off/on").
Also, a couple of cleanup items:
- unset PHY status reg. AUTONEG_COMPLETE during link_down()
- set PHY status reg. AUTONEG_COMPLETE during autoneg_timer() only
if we actually brought the link up.
- group all checks for "can we, and should we autonegotiate?"
together for more clarity.
Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 6883b5914029fa8ffc42a43d2a2188493c27fd58
https://github.com/qemu/qemu/commit/6883b5914029fa8ffc42a43d2a2188493c27fd58
Author: Gabriel L. Somlo <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/net/e1000.c
M hw/net/e1000_regs.h
Log Message:
-----------
e1000: improve auto-negotiation reporting via mii-tool
Using mii-tool (on F20-live), the following output is produced:
SIOCGMIIREG on ens3 failed: Input/output error
ens3: no autonegotiation, 1000baseT-FD flow-control, link ok
The first line (SIOCGMIIREG error) is due to mii-tool's inability
to read the PHY auto-negotiation expansion register.
On the second line, "no autonegotiation" is wrong, and caused by
the absence of a flag in the link partner ability register which
would indicate that our link partner has acked us. This flag is
listed as "reserved" in the Intel e1000 manual, but mii-tool uses
it as LPA_LPACK from /usr/include/linux/mii.h.
This patch adds read access to PHY_AUTONEG_EXP and defines the
link partner ack flag, allowing mii-tool to generate output as
normally expected:
ens3: negotiated 1000baseT-FD flow-control, link ok
Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 39bb8ee737595e9b264d075dfcd7d86f4d3f1133
https://github.com/qemu/qemu/commit/39bb8ee737595e9b264d075dfcd7d86f4d3f1133
Author: Gabriel L. Somlo <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/net/e1000.c
Log Message:
-----------
e1000: signal guest on successful link auto-negotiation
Generate a link status change interrupt once link auto-netotiation
is successfully completed. This does not affect Linux and Windows
(XP and 7 tested) in any way, but is needed by the stock OS X driver
(AppleIntel8254XEthernet.kext), which would otherwise fail to notice
the link status change event.
Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d52aec95453838f2957c0cbf6ef79c51d161e87f
https://github.com/qemu/qemu/commit/d52aec95453838f2957c0cbf6ef79c51d161e87f
Author: Gabriel L. Somlo <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/net/e1000.c
Log Message:
-----------
e1000: move e1000_autoneg_timer() to after set_ics()
Enable calling set_ics() from within e1000_autoneg_timer() without
the need for a forward declaration.
This patch contains no functional changes.
Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d7a4155265416a1c8f3067b59e68bf5fda1d6215
https://github.com/qemu/qemu/commit/d7a4155265416a1c8f3067b59e68bf5fda1d6215
Author: Gabriel L. Somlo <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/net/e1000.c
Log Message:
-----------
e1000: factor out checking for auto-negotiation availability
Also fix minor indentation issues in the surrounding code.
Suggested-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Gabriel Somlo <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 684531ad1f69feb1288b9813c3eb47fba992ea96
https://github.com/qemu/qemu/commit/684531ad1f69feb1288b9813c3eb47fba992ea96
Author: Hu Tao <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M qapi/string-output-visitor.c
Log Message:
-----------
qapi/string-output-visitor: fix human output
"0x1-0x10" looks better than "0x1-10"
Signed-off-by: Hu Tao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Commit: 4f8586144161d5e680fdef3e09b7e8e9111c2929
https://github.com/qemu/qemu/commit/4f8586144161d5e680fdef3e09b7e8e9111c2929
Author: Stefan Hajnoczi <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M qemu-char.c
Log Message:
-----------
qemu-char: fix qemu_chr_fe_get_msgfd()
Commit c76bf6bb8fbbb233a7d3641e09229d23747d5ee3 ("Add chardev API
qemu_chr_fe_get_msgfds") broke qemu_chr_fe_get_msgfd() because it
changed the return value.
Callers expect -1 if no fd is available. The commit changed the return
value to 0 (which is a valid file descriptor number) so callers always
detected a file descriptor even if none was available.
This patch fixes qemu-iotests 045:
$ cd tests/qemu-iotests && ./check 045
[...]
+FAIL: test_add_fd_invalid_fd (__main__.TestFdSets)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+ File "./045", line 123, in test_add_fd_invalid_fd
+ self.assert_qmp(result, 'error/class', 'GenericError')
+ File "/home/stefanha/qemu/tests/qemu-iotests/iotests.py", line 232, in
assert_qmp
+ result = self.dictpath(d, path)
+ File "/home/stefanha/qemu/tests/qemu-iotests/iotests.py", line 211, in
dictpath
+ self.fail('failed path traversal for "%s" in "%s"' % (path, str(d)))
+AssertionError: failed path traversal for "error/class" in "{u'return':
{u'fdset-id': 2, u'fd': 0}}"
Cc: Nikolay Nikolaev <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d2fc39b4208709db95b6825c0e1b00ce6fbf0ecc
https://github.com/qemu/qemu/commit/d2fc39b4208709db95b6825c0e1b00ce6fbf0ecc
Author: Stefan Hajnoczi <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M qemu-char.c
Log Message:
-----------
qemu-char: avoid leaking unused fds in tcp_get_msgfds()
Commit c76bf6bb8fbbb233a7d3641e09229d23747d5ee3 ("Add chardev API
qemu_chr_fe_get_msgfds") extended the get_msgfds API from one to
multiple file descriptors. It forgot to close unused file descriptors
before freeing the file descriptor array.
This patch prevents a file descriptor leak if the tcp_get_msgfds()
callers requests fewer file descriptors than are available.
Cc: Nikolay Nikolaev <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: c7ff54825b74f27c3aac85aad540542801630d0a
https://github.com/qemu/qemu/commit/c7ff54825b74f27c3aac85aad540542801630d0a
Author: Fam Zheng <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/virtio/virtio-pci.c
Log Message:
-----------
virtio-pci: Report an error when msix vectors init fails
Currently vectors silently cleared to 0 if the initialization is failed,
but user should at least have one way to notice this.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 48cb7f3c1526b4632bd63d945cac80d26616d6f5
https://github.com/qemu/qemu/commit/48cb7f3c1526b4632bd63d945cac80d26616d6f5
Author: Eduardo Habkost <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/i386/pc_q35.c
Log Message:
-----------
q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props
pc-q35-1.4 was incorrectly using PC_COMPAT_1_4 instead of
PC_Q35_COMPAT_1_4.
The only side-effect was that the hpet compat property (inherited from
PC_Q35_COMPAT_1_7) was missing.
Without this patch, pc-q35-1.4 inicorrectly initializes hpet-intcap to
0xff0104 (behavior introduced in QEMU 2.0, by commit
7a10ef51c2397ac4323bc786af02c58b413b5cd2).
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Commit: e4bcd27c86d20d6f1bc06a34e6612c18534a4968
https://github.com/qemu/qemu/commit/e4bcd27c86d20d6f1bc06a34e6612c18534a4968
Author: Marcel Apfelbaum <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/pci/pcie.c
Log Message:
-----------
hw/pcie: correct debug message
Trivial issue, discovered while debugging.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: f23b6bdc3c30c77ba0dffaa6de5e398dc3c49c51
https://github.com/qemu/qemu/commit/f23b6bdc3c30c77ba0dffaa6de5e398dc3c49c51
Author: Marcel Apfelbaum <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/pci-bridge/ioh3420.c
M hw/pci-bridge/xio3130_downstream.c
M hw/pci/pcie.c
M include/hw/i386/pc.h
M include/hw/pci/pci.h
M include/hw/pci/pcie.h
M include/hw/pci/pcie_regs.h
Log Message:
-----------
hw/pcie: implement power controller functionality
It is needed by hot-unplug in order to get an indication
from the OS when the device can be physically detached.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 554f802da3f8b09b16b9a84ad5847b2eb0e9ad2b
https://github.com/qemu/qemu/commit/554f802da3f8b09b16b9a84ad5847b2eb0e9ad2b
Author: Marcel Apfelbaum <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/pci/pcie.c
Log Message:
-----------
hw/pcie: better hotplug/hotunplug support
The current code is broken: it does surprise removal which crashes guests.
Reimplemented the steps:
- Hotplug triggers both 'present detect change' and
'attention button pressed'.
- Hotunplug starts by triggering 'attention button pressed',
then waits for the OS to power off the device and only
then detaches it.
Fixes CVE-2014-3471.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 20de98aff5471f4c849f456d2f9716c748a1c05c
https://github.com/qemu/qemu/commit/20de98aff5471f4c849f456d2f9716c748a1c05c
Author: Michael S. Tsirkin <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/pci/pcie.c
Log Message:
-----------
pcie: coding style tweak
- whitespace fix
- unnecessary != 0 in a condition
Cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 3c2a96699e9fc09b5712dacfe200cdaaff0bb55c
https://github.com/qemu/qemu/commit/3c2a96699e9fc09b5712dacfe200cdaaff0bb55c
Author: Don Slutz <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M include/hw/xen/xen.h
M xen-hvm-stub.c
M xen-hvm.c
Log Message:
-----------
xen-hvm: Fix xen_hvm_init() to adjust pc memory layout
This is just below_4g_mem_size and above_4g_mem_size which is used later in
QEMU.
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Don Slutz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: c87b1520726f7ae1e698a41f07043d1b539ac88c
https://github.com/qemu/qemu/commit/c87b1520726f7ae1e698a41f07043d1b539ac88c
Author: Don Slutz <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M hw/i386/pc.c
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M include/hw/i386/pc.h
M vl.c
Log Message:
-----------
pc & q35: Add new machine opt max-ram-below-4g
This is a pc & q35 only machine opt.
If you add enough PCI devices then all mmio for them will not fit
below 4G which may not be the layout the user wanted. This allows
you to increase the below 4G address space that PCI devices can use
(aka decrease ram below 4G) and therefore in more cases not have any
mmio that is above 4G.
For example using "-machine pc,max-ram-below-4g=2G" on the command
line will limit the amount of ram that is below 4G to 2G.
Note: this machine option cannot be used to increase the amount
of ram below 4G.
Signed-off-by: Don Slutz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
MST: fix 32 bit
Commit: c4f5cdc53f181f6fe84a0f1bf99914598934a8a6
https://github.com/qemu/qemu/commit/c4f5cdc53f181f6fe84a0f1bf99914598934a8a6
Author: Don Slutz <address@hidden>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M xen-hvm.c
Log Message:
-----------
xen-hvm: Handle machine opt max-ram-below-4g
This is the xen part of "pc & q35: Add new machine opt max-ram-below-4g"
Note: this machine option cannot be used to increase the amount
of ram below 4G.
Signed-off-by: Don Slutz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 27acb9dd2407f41550e453b85aa5ebf1bd618b79
https://github.com/qemu/qemu/commit/27acb9dd2407f41550e453b85aa5ebf1bd618b79
Author: Peter Maydell <address@hidden>
Date: 2014-06-24 (Tue, 24 Jun 2014)
Changed paths:
M hmp.c
M hw/i386/pc.c
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M hw/net/e1000.c
M hw/net/e1000_regs.h
M hw/pci-bridge/ioh3420.c
M hw/pci-bridge/xio3130_downstream.c
M hw/pci/pcie.c
M hw/virtio/vhost.c
M hw/virtio/virtio-pci.c
M include/hw/i386/pc.h
M include/hw/pci/pci.h
M include/hw/pci/pcie.h
M include/hw/pci/pcie_regs.h
M include/hw/virtio/vhost.h
M include/hw/xen/xen.h
M monitor.c
M qapi-schema.json
M qapi/string-output-visitor.c
M qemu-char.c
M stubs/Makefile.objs
A stubs/chr-baum-init.c
A stubs/qemu-chr-open-spice.c
M tests/vhost-user-test.c
M vl.c
M xen-hvm-stub.c
M xen-hvm.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc,pci,vhost,net fixes, enhancements
Don's patches to limit below-4g ram for pc
Marcel's pcie hotplug rewrite
Gabriel's changes to e1000 auto-negotiation
qemu char bugfixes by Stefan
misc bugfixes
Signed-off-by: Michael S. Tsirkin <address@hidden>
# gpg: Signature made Mon 23 Jun 2014 16:25:19 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg: aka "Michael S. Tsirkin <address@hidden>"
* remotes/mst/tags/for_upstream: (23 commits)
xen-hvm: Handle machine opt max-ram-below-4g
pc & q35: Add new machine opt max-ram-below-4g
xen-hvm: Fix xen_hvm_init() to adjust pc memory layout
pcie: coding style tweak
hw/pcie: better hotplug/hotunplug support
hw/pcie: implement power controller functionality
hw/pcie: correct debug message
q35: Use PC_Q35_COMPAT_1_4 on pc-q35-1.4 compat_props
virtio-pci: Report an error when msix vectors init fails
qemu-char: avoid leaking unused fds in tcp_get_msgfds()
qemu-char: fix qemu_chr_fe_get_msgfd()
qapi/string-output-visitor: fix human output
e1000: factor out checking for auto-negotiation availability
e1000: move e1000_autoneg_timer() to after set_ics()
e1000: signal guest on successful link auto-negotiation
e1000: improve auto-negotiation reporting via mii-tool
e1000: emulate auto-negotiation during external link status change
qtest: fix vhost-user-test unbalanced mutex locks
qtest: fix qtest for vhost-user
libqemustub: add more stubs for qemu-char
...
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/7ba48975d342...27acb9dd2407
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 714587: vhost: block migration if backend does not log mem...,
GitHub <=