From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33724) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6Mvo-0007ND-79 for qemu-devel@nongnu.org; Tue, 28 Aug 2012 10:38:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6Mvf-0001Pu-KH for qemu-devel@nongnu.org; Tue, 28 Aug 2012 10:38:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5386) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6Mvf-0001Pq-B6 for qemu-devel@nongnu.org; Tue, 28 Aug 2012 10:38:07 -0400 Message-ID: <503CD7CB.9050903@redhat.com> Date: Tue, 28 Aug 2012 16:38:03 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1346164009-30648-1-git-send-email-stefanha@linux.vnet.ibm.com> <1346164009-30648-3-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1346164009-30648-3-git-send-email-stefanha@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 for-1.2 2/2] qemu-iotests: add backing file smaller than image test case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , Anthony Liguori , qemu-devel@nongnu.org Il 28/08/2012 16:26, Stefan Hajnoczi ha scritto: > This new test case checks that streaming completes successfully when the > backing file is smaller than the image file. > > Signed-off-by: Stefan Hajnoczi > --- > tests/qemu-iotests/030 | 33 +++++++++++++++++++++++++++++++++ > tests/qemu-iotests/030.out | 4 ++-- > 2 files changed, 35 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 > index f71ab8d..55b16f8 100755 > --- a/tests/qemu-iotests/030 > +++ b/tests/qemu-iotests/030 > @@ -125,6 +125,39 @@ class TestSingleDrive(ImageStreamingTestCase): > result = self.vm.qmp('block-stream', device='nonexistent') > self.assert_qmp(result, 'error/class', 'DeviceNotFound') > > + > +class TestSmallerBackingFile(ImageStreamingTestCase): > + backing_len = 1 * 1024 * 1024 # MB > + image_len = 2 * backing_len > + > + def setUp(self): > + self.create_image(backing_img, self.backing_len) > + qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % backing_img, test_img, str(self.image_len)) > + self.vm = iotests.VM().add_drive(test_img) > + self.vm.launch() > + > + # If this hangs, then you are missing a fix to complete streaming when the > + # end of the backing file is reached. > + def test_stream(self): > + self.assert_no_active_streams() > + > + result = self.vm.qmp('block-stream', device='drive0') > + self.assert_qmp(result, 'return', {}) > + > + completed = False > + while not completed: > + for event in self.vm.get_qmp_events(wait=True): > + if event['event'] == 'BLOCK_JOB_COMPLETED': > + self.assert_qmp(event, 'data/type', 'stream') > + self.assert_qmp(event, 'data/device', 'drive0') > + self.assert_qmp(event, 'data/offset', self.image_len) > + self.assert_qmp(event, 'data/len', self.image_len) > + completed = True > + > + self.assert_no_active_streams() > + self.vm.shutdown() > + > + > class TestStreamStop(ImageStreamingTestCase): > image_len = 8 * 1024 * 1024 * 1024 # GB > > diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out > index 3f8a935..2f7d390 100644 > --- a/tests/qemu-iotests/030.out > +++ b/tests/qemu-iotests/030.out > @@ -1,5 +1,5 @@ > -...... > +....... > ---------------------------------------------------------------------- > -Ran 6 tests > +Ran 7 tests > > OK > Reviewed-by: Paolo Bonzini