From 7a706633e9f77a15d12bcfdef5d80f09892fa70c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 21 Oct 2011 13:17:14 +0200 Subject: nbd: add support for NBD_CMD_TRIM Signed-off-by: Paolo Bonzini --- nbd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'nbd.c') 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)) { @@ -720,6 +720,17 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, reply.error = -ret; } + 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; -- cgit v1.2.3