[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] bc6abc: vhost-user-blk: set config ops before
From: |
GitHub |
Subject: |
[Qemu-commits] [qemu/qemu] bc6abc: vhost-user-blk: set config ops before vhost-user i... |
Date: |
Mon, 09 Apr 2018 09:28:39 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: bc6abcff7c608dba27962efa75f234c5dd10e290
https://github.com/qemu/qemu/commit/bc6abcff7c608dba27962efa75f234c5dd10e290
Author: Maxime Coquelin <address@hidden>
Date: 2018-04-09 (Mon, 09 Apr 2018)
Changed paths:
M hw/block/vhost-user-blk.c
M hw/virtio/vhost.c
Log Message:
-----------
vhost-user-blk: set config ops before vhost-user init
As soon as vhost-user init is done, the backend may send
VHOST_USER_SLAVE_CONFIG_CHANGE_MSG, so let's set the
notification callback before it.
Also, it will be used to know whether the device supports
the config feature to advertize it or not.
Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Changpeng Liu <address@hidden>
Commit: 1c3e5a261709daee4a01f30b1534329b2eea386e
https://github.com/qemu/qemu/commit/1c3e5a261709daee4a01f30b1534329b2eea386e
Author: Maxime Coquelin <address@hidden>
Date: 2018-04-09 (Mon, 09 Apr 2018)
Changed paths:
M docs/interop/vhost-user.txt
M hw/virtio/vhost-user.c
Log Message:
-----------
vhost-user: back SET/GET_CONFIG requests with a protocol feature
Without a dedicated protocol feature, QEMU cannot know whether
the backend can handle VHOST_USER_SET_CONFIG and
VHOST_USER_GET_CONFIG messages.
This patch adds a protocol feature that is only advertised by
QEMU if the device implements the config ops. Vhost user init
fails if the device support the feature but the backend doesn't.
The backend should only send VHOST_USER_SLAVE_CONFIG_CHANGE_MSG
requests if the protocol feature has been negotiated.
Signed-off-by: Maxime Coquelin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Changpeng Liu <address@hidden>
Commit: ea3e6f5a93f77fa068b7858b714057e4bbde67cb
https://github.com/qemu/qemu/commit/ea3e6f5a93f77fa068b7858b714057e4bbde67cb
Author: Changpeng Liu <address@hidden>
Date: 2018-04-09 (Mon, 09 Apr 2018)
Changed paths:
M contrib/libvhost-user/libvhost-user.h
Log Message:
-----------
contrib/libvhost-user: add the protocol feature used for SET/GET message
Signed-off-by: Changpeng Liu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: e7b94a84b6cb4a632c558ed24e8d6f4baa3f75eb
https://github.com/qemu/qemu/commit/e7b94a84b6cb4a632c558ed24e8d6f4baa3f75eb
Author: Dr. David Alan Gilbert <address@hidden>
Date: 2018-04-09 (Mon, 09 Apr 2018)
Changed paths:
M hw/virtio/vhost.c
Log Message:
-----------
vhost: Allow adjoining regions
My rework of section adding combines overlapping or adjoining regions,
but checks they're actually the same underlying RAM block.
Fix the case where two blocks adjoin but don't overlap; that new region
should get added (but not combined), but my previous patch was disallowing it.
Fixes: c1ece84e7c9
Reported-by: Alex Williamson <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Alex Williamson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d434e5ac5d70e9da7d20e50246af9251a125bdad
https://github.com/qemu/qemu/commit/d434e5ac5d70e9da7d20e50246af9251a125bdad
Author: linzhecheng <address@hidden>
Date: 2018-04-09 (Mon, 09 Apr 2018)
Changed paths:
M hw/char/virtio-serial-bus.c
Log Message:
-----------
virtio-serial: fix heap-over-flow
Check device having the feature of VIRTIO_CONSOLE_F_EMERG_WRITE before
get config->emerg_wr. It is neccessary because sizeof(virtio_console_config)
is 8 byte if VirtIOSerial doesn't have the feature of
VIRTIO_CONSOLE_F_EMERG_WRITE(see virtio_serial_device_realize),
read/write emerg_wr will lead to heap-over-flow.
Signed-off-by: linzhecheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: a84e937649f09d372e677b3978a933f1207513a2
https://github.com/qemu/qemu/commit/a84e937649f09d372e677b3978a933f1207513a2
Author: Peter Maydell <address@hidden>
Date: 2018-04-09 (Mon, 09 Apr 2018)
Changed paths:
M contrib/libvhost-user/libvhost-user.h
M docs/interop/vhost-user.txt
M hw/block/vhost-user-blk.c
M hw/char/virtio-serial-bus.c
M hw/virtio/vhost-user.c
M hw/virtio/vhost.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,vhost: fixes
Add a feature flag for new protocol messages.
Misc fixes.
Signed-off-by: Michael S. Tsirkin <address@hidden>
# gpg: Signature made Mon 09 Apr 2018 15:37:29 BST
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg: aka "Michael S. Tsirkin <address@hidden>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
virtio-serial: fix heap-over-flow
vhost: Allow adjoining regions
contrib/libvhost-user: add the protocol feature used for SET/GET message
vhost-user: back SET/GET_CONFIG requests with a protocol feature
vhost-user-blk: set config ops before vhost-user init
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/9005774b27b6...a84e937649f0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] bc6abc: vhost-user-blk: set config ops before vhost-user i...,
GitHub <=