From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkuA2-0000zd-5U for qemu-devel@nongnu.org; Thu, 15 May 2014 07:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wku9x-0004rq-0y for qemu-devel@nongnu.org; Thu, 15 May 2014 07:49:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wku9w-0004rX-OH for qemu-devel@nongnu.org; Thu, 15 May 2014 07:49:12 -0400 Date: Thu, 15 May 2014 07:49:07 -0400 From: Jeff Cody Message-ID: <20140515114907.GF8452@localhost.localdomain> References: <53efdb963d57e99fd0f77a34b1d3a860b3f6d2aa.1400123059.git.jcody@redhat.com> <20140515114755.GD2812@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20140515114755.GD2812@irqsave.net> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 3/5] block: make 'top' argument to block-commit optional List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Beno=EEt?= Canet Cc: kwolf@redhat.com, pkrempa@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Thu, May 15, 2014 at 01:47:55PM +0200, Beno=EEt Canet wrote: > The Wednesday 14 May 2014 =E0 23:20:17 (-0400), Jeff Cody wrote : > > Now that active layer block-commit is supported, the 'top' argument > > no longer needs to be mandatory. > >=20 > > Change it optional, with the default being the active layer in the >=20 > Do you mean "Change it to optional" or "Make it optional" ?=20 > Thanks - forgot the "to". > > device chain. > >=20 > > Signed-off-by: Jeff Cody > > --- > > blockdev.c | 3 ++- > > qapi-schema.json | 7 ++++--- > > qmp-commands.hx | 5 +++-- > > tests/qemu-iotests/040 | 28 ++++++++++++++++++---------- > > 4 files changed, 27 insertions(+), 16 deletions(-) > >=20 > > diff --git a/blockdev.c b/blockdev.c > > index 500707e..02c6525 100644 > > --- a/blockdev.c > > +++ b/blockdev.c > > @@ -1868,7 +1868,8 @@ void qmp_block_stream(const char *device, bool = has_base, > > } > > =20 > > void qmp_block_commit(const char *device, > > - bool has_base, const char *base, const char *t= op, > > + bool has_base, const char *base, > > + bool has_top, const char *top, > > bool has_speed, int64_t speed, > > Error **errp) > > { > > diff --git a/qapi-schema.json b/qapi-schema.json > > index 36cb964..06a9b5d 100644 > > --- a/qapi-schema.json > > +++ b/qapi-schema.json > > @@ -2099,8 +2099,9 @@ > > # @base: #optional The file name of the backing image to write dat= a into. > > # If not specified, this is the deepest backing i= mage > > # > > -# @top: The file name of the backing image within the i= mage chain, > > -# which contains the topmost data to be committed= down. > > +# @top: #optional The file name of the backing image within the i= mage chain, > > +# which contains the topmost data to be committed= down. If > > +# not specified, this is the active layer. > > # > > # If top =3D=3D base, that is an error. > > # If top =3D=3D active, the job will not be compl= eted by itself, > > @@ -2128,7 +2129,7 @@ > > # > > ## > > { 'command': 'block-commit', > > - 'data': { 'device': 'str', '*base': 'str', 'top': 'str', > > + 'data': { 'device': 'str', '*base': 'str', '*top': 'str', > > '*speed': 'int' } } > > =20 > > ## > > diff --git a/qmp-commands.hx b/qmp-commands.hx > > index cae890e..1aa3c65 100644 > > --- a/qmp-commands.hx > > +++ b/qmp-commands.hx > > @@ -985,7 +985,7 @@ EQMP > > =20 > > { > > .name =3D "block-commit", > > - .args_type =3D "device:B,base:s?,top:s,speed:o?", > > + .args_type =3D "device:B,base:s?,top:s?,speed:o?", > > .mhandler.cmd_new =3D qmp_marshal_input_block_commit, > > }, > > =20 > > @@ -1003,7 +1003,8 @@ Arguments: > > If not specified, this is the deepest backing image > > (json-string, optional) > > - "top": The file name of the backing image within the image chain, > > - which contains the topmost data to be committed down. > > + which contains the topmost data to be committed down. If > > + not specified, this is the active layer. (json-string, opt= ional) > > =20 > > If top =3D=3D base, that is an error. > > If top =3D=3D active, the job will not be completed by its= elf, > > diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 > > index 734b6a6..803b0c7 100755 > > --- a/tests/qemu-iotests/040 > > +++ b/tests/qemu-iotests/040 > > @@ -35,11 +35,7 @@ test_img =3D os.path.join(iotests.test_dir, 'test.= img') > > class ImageCommitTestCase(iotests.QMPTestCase): > > '''Abstract base class for image commit test cases''' > > =20 > > - def run_commit_test(self, top, base): > > - self.assert_no_active_block_jobs() > > - result =3D self.vm.qmp('block-commit', device=3D'drive0', to= p=3Dtop, base=3Dbase) > > - self.assert_qmp(result, 'return', {}) > > - > > + def wait_for_complete(self): > > completed =3D False > > while not completed: > > for event in self.vm.get_qmp_events(wait=3DTrue): > > @@ -58,6 +54,18 @@ class ImageCommitTestCase(iotests.QMPTestCase): > > self.assert_no_active_block_jobs() > > self.vm.shutdown() > > =20 > > + def run_commit_test(self, top, base): > > + self.assert_no_active_block_jobs() > > + result =3D self.vm.qmp('block-commit', device=3D'drive0', to= p=3Dtop, base=3Dbase) > > + self.assert_qmp(result, 'return', {}) > > + self.wait_for_complete() > > + > > + def run_default_commit_test(self): > > + self.assert_no_active_block_jobs() > > + result =3D self.vm.qmp('block-commit', device=3D'drive0') > > + self.assert_qmp(result, 'return', {}) > > + self.wait_for_complete() > > + > > class TestSingleDrive(ImageCommitTestCase): > > image_len =3D 1 * 1024 * 1024 > > test_len =3D 1 * 1024 * 256 > > @@ -109,17 +117,17 @@ class TestSingleDrive(ImageCommitTestCase): > > self.assertEqual(-1, qemu_io('-c', 'read -P 0xab 0 524288', = backing_img).find("verification failed")) > > self.assertEqual(-1, qemu_io('-c', 'read -P 0xef 524288 5242= 88', backing_img).find("verification failed")) > > =20 > > + def test_top_is_default_active(self): > > + self.run_default_commit_test() > > + self.assertEqual(-1, qemu_io('-c', 'read -P 0xab 0 524288', = backing_img).find("verification failed")) > > + self.assertEqual(-1, qemu_io('-c', 'read -P 0xef 524288 5242= 88', backing_img).find("verification failed")) > > + > > def test_top_and_base_reversed(self): > > self.assert_no_active_block_jobs() > > result =3D self.vm.qmp('block-commit', device=3D'drive0', to= p=3D'%s' % backing_img, base=3D'%s' % mid_img) > > self.assert_qmp(result, 'error/class', 'GenericError') > > self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found= ' % mid_img) > > =20 > > - def test_top_omitted(self): > > - self.assert_no_active_block_jobs() > > - result =3D self.vm.qmp('block-commit', device=3D'drive0') > > - self.assert_qmp(result, 'error/class', 'GenericError') > > - self.assert_qmp(result, 'error/desc', "Parameter 'top' is mi= ssing") > > =20 > > class TestRelativePaths(ImageCommitTestCase): > > image_len =3D 1 * 1024 * 1024 > > --=20 > > 1.8.3.1 > >=20 > Reviewed-by: Benoit Canet