diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-10-21 13:17:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2011-12-22 11:53:57 +0100 |
| commit | 7a706633e9f77a15d12bcfdef5d80f09892fa70c (patch) | |
| tree | 8f646532808050fd11408932b5dd9ac022101247 /nbd.c | |
| parent | 1486d04a1b41093e5f97f20ca7397e01df055f49 (diff) | |
| download | focaccia-qemu-7a706633e9f77a15d12bcfdef5d80f09892fa70c.tar.gz focaccia-qemu-7a706633e9f77a15d12bcfdef5d80f09892fa70c.zip | |
nbd: add support for NBD_CMD_TRIM
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'nbd.c')
| -rw-r--r-- | nbd.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nbd.c b/nbd.c index 4fd0f4ed28..7ab1b1f5c0 100644 --- a/nbd.c +++ b/nbd.c @@ -203,8 +203,8 @@ int nbd_negotiate(int csock, off_t size, uint32_t flags) cpu_to_be64w((uint64_t*)(buf + 8), 0x00420281861253LL); cpu_to_be64w((uint64_t*)(buf + 16), size); cpu_to_be32w((uint32_t*)(buf + 24), - flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_FLUSH | - NBD_FLAG_SEND_FUA); + flags | NBD_FLAG_HAS_FLAGS | NBD_FLAG_SEND_TRIM | + NBD_FLAG_SEND_FLUSH | NBD_FLAG_SEND_FUA); memset(buf + 28, 0, 124); if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) { @@ -723,6 +723,17 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, if (nbd_send_reply(csock, &reply) == -1) return -1; break; + case NBD_CMD_TRIM: + TRACE("Request type is TRIM"); + ret = bdrv_discard(bs, (request.from + dev_offset) / 512, + request.len / 512); + if (ret < 0) { + LOG("discard failed"); + reply.error = -ret; + } + if (nbd_send_reply(csock, &reply) == -1) + return -1; + break; default: LOG("invalid request type (%u) received", request.type); errno = EINVAL; |