diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-31 15:40:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-31 15:40:39 +0000 |
| commit | e8977901b79fb678f288dd372261b640bbeccd0d (patch) | |
| tree | a5169c4b7619aaf32317749ac7ca04d93faf6fbe /hw/block | |
| parent | aefcd2836620363020d53b18e712a3350116f332 (diff) | |
| parent | 95b3c9cfd5eaaa4a2a4afa1eaf09612a94ade1da (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
- add device category (edu, i8042, sd memory card)
- code clean-up
- LGPL information clean-up
- fix typo (acpi)
# gpg: Signature made Wed 30 Jan 2019 13:21:50 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-branch-pull-request:
virtio-blk: remove duplicate definition of VirtIOBlock *s pointer
hw/block: clean up stale xen_disk trace entries
target/m68k: Fix LGPL information in the file headers
target/s390x: Fix LGPL version in the file header comments
tcg: Fix LGPL version number
target/tricore: Fix LGPL version number
target/openrisc: Fix LGPL version number
COPYING.LIB: Synchronize the LGPL 2.1 with the version from gnu.org
Don't talk about the LGPL if the file is licensed under the GPL
hw: sd: set category of the sd memory card
hw: input: set category of the i8042 device
typo: apci->acpi
hw: edu: set category of the edu device
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/trace-events | 7 | ||||
| -rw-r--r-- | hw/block/virtio-blk.c | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/hw/block/trace-events b/hw/block/trace-events index 55e5a5500c..d0851953c5 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -121,13 +121,6 @@ nvme_ub_db_wr_invalid_cqhead(uint32_t qid, uint16_t new_head) "completion queue nvme_ub_db_wr_invalid_sq(uint32_t qid) "submission queue doorbell write for nonexistent queue, sqid=%"PRIu32", ignoring" nvme_ub_db_wr_invalid_sqtail(uint32_t qid, uint16_t new_tail) "submission queue doorbell write value beyond queue size, sqid=%"PRIu32", new_head=%"PRIu16", ignoring" -# hw/block/xen_disk.c -xen_disk_alloc(char *name) "%s" -xen_disk_init(char *name) "%s" -xen_disk_connect(char *name) "%s" -xen_disk_disconnect(char *name) "%s" -xen_disk_free(char *name) "%s" - # hw/block/xen-block.c xen_block_realize(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" xen_block_connect(const char *type, uint32_t disk, uint32_t partition) "%s d%up%u" diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index f208c6ddb9..9a87b3bfac 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -569,8 +569,6 @@ static int virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb) break; case VIRTIO_BLK_T_GET_ID: { - VirtIOBlock *s = req->dev; - /* * NB: per existing s/n string convention the string is * terminated by '\0' only when shorter than buffer. |