diff options
author | Eric Blake <eblake@redhat.com> | 2018-07-02 14:14:57 -0500 |
---|---|---|
committer | Eric Blake <eblake@redhat.com> | 2018-07-02 15:27:38 -0500 |
commit | 216ee3657e14013505abe7853cecb632199fb13e (patch) | |
tree | e18e4865e721e7157c435e8dacd786918e300e0f /nbd/client.c | |
parent | bacebdedbf921a2c641a34486ff543089d338f32 (diff) | |
download | qemu-216ee3657e14013505abe7853cecb632199fb13e.zip qemu-216ee3657e14013505abe7853cecb632199fb13e.tar.gz qemu-216ee3657e14013505abe7853cecb632199fb13e.tar.bz2 |
nbd/client: Add x-dirty-bitmap to query bitmap from server
In order to test that the NBD server is properly advertising
dirty bitmaps, we need a bare minimum client that can request
and read the context. Since feature freeze for 3.0 is imminent,
this is the smallest workable patch, which replaces the qemu
block status report with the results of the NBD server's dirty
bitmap (making it very easy to use 'qemu-img map --output=json'
to learn where the dirty portions are). Note that the NBD
protocol defines a dirty section with the same bit but opposite
sense that normal "base:allocation" uses to report an allocated
section; so in qemu-img map output, "data":true corresponds to
clean, "data":false corresponds to dirty.
A more complete solution that allows dirty bitmaps to be queried
at the same time as normal block status will be required before
this addition can lose the x- prefix. Until then, the fact that
this replaces normal status with dirty status means actions
like 'qemu-img convert' will likely misbehave due to treating
dirty regions of the file as if they are unallocated.
The next patch adds an iotest to exercise this new code.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180702191458.28741-2-eblake@redhat.com>
Diffstat (limited to 'nbd/client.c')
-rw-r--r-- | nbd/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nbd/client.c b/nbd/client.c index 232ff4f..40b74d9 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2017 Red Hat, Inc. + * Copyright (C) 2016-2018 Red Hat, Inc. * Copyright (C) 2005 Anthony Liguori <anthony@codemonkey.ws> * * Network Block Device Client Side @@ -831,7 +831,7 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name, if (info->structured_reply && base_allocation) { result = nbd_negotiate_simple_meta_context( - ioc, name, "base:allocation", + ioc, name, info->x_dirty_bitmap ?: "base:allocation", &info->meta_base_allocation_id, errp); if (result < 0) { goto fail; |