From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPdSw-0006wR-Ph for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPdSr-000521-PB for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:44:54 -0400 Received: from mail-ob0-f182.google.com ([209.85.214.182]:61420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPdSr-00051r-K0 for qemu-devel@nongnu.org; Mon, 17 Mar 2014 15:44:49 -0400 Received: by mail-ob0-f182.google.com with SMTP id uz6so6046942obc.41 for ; Mon, 17 Mar 2014 12:44:48 -0700 (PDT) Date: Mon, 17 Mar 2014 19:43:42 +0000 From: Leandro Dorileo Message-ID: <20140317194342.GD24576@dorilex> References: <1394436721-21812-1-git-send-email-cyliu@suse.com> <1394436721-21812-26-git-send-email-cyliu@suse.com> <20140317192929.GB24576@dorilex> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20140317192929.GB24576@dorilex> Subject: Re: [Qemu-devel] [PATCH v22 25/25] cleanup QEMUOptionParameter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chunyan Liu Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com Hi, On Mon, Mar 17, 2014 at 07:29:29PM +0000, Leandro Dorileo wrote: > Hi, > > On Mon, Mar 10, 2014 at 03:32:01PM +0800, Chunyan Liu wrote: > > Now all places using QEMUOptionParameter could use QemuOpts too, remove > > QEMUOptionParameter related code. > > > > Signed-off-by: Dong Xu Wang > > Signed-off-by: Chunyan Liu > > --- > > block.c | 69 ++------ > > block/cow.c | 4 +- > > block/gluster.c | 8 +- > > block/qcow.c | 4 +- > > block/qcow2.c | 6 +- > > block/qed.c | 4 +- > > block/raw-posix.c | 10 +- > > block/raw-win32.c | 2 +- > > block/raw_bsd.c | 4 +- > > block/rbd.c | 2 +- > > block/sheepdog.c | 6 +- > > block/ssh.c | 2 +- > > block/vdi.c | 2 +- > > block/vhdx.c | 4 +- > > block/vmdk.c | 6 +- > > block/vpc.c | 2 +- > > block/vvfat.c | 2 +- > > include/block/block.h | 8 +- > > include/block/block_int.h | 13 +- > > include/qemu/option.h | 46 ------ > > qemu-img.c | 63 +------- > > util/qemu-option.c | 401 ---------------------------------------------- > > 22 files changed, 62 insertions(+), 606 deletions(-) > > It seems you've missed block/iscsi.c in the final cleanup. > > I got the following: > > block/iscsi.c:1385:47: error: unknown type name ‘QEMUOptionParameter’ > static int iscsi_create(const char *filename, QEMUOptionParameter *options, > ^ > block/iscsi.c:1470:24: error: ‘iscsi_create’ undeclared here (not in a function) > .bdrv_create = iscsi_create, > > > I did a s/QemuOptionParameter/QemuOption/ and got the following: > > block/iscsi.c: In function ‘iscsi_create’: > block/iscsi.c:1398:31: error: ‘opts’ undeclared (first use in this function) > qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE; > ^ > block/iscsi.c:1398:31: note: each undeclared identifier is reported only once for each function it appears in > /home/dorileo/work/sources/foss/qemu/rules.mak:33: recipe for target 'block/iscsi.o' failed > > iscsi_create() is expecting an argument opts not options, then a s/options/opts/ here > fixed the issue. > > I ran my QemuOpts testsuite on top of your patches and got a few problems (initially 2 wrong assertions). > I'll dig it a little deeper - when I find some time to - and comment in the proper patches. It's also broken test-opts-visitor.c ERROR:tests/test-opts-visitor.c:119:test_value: assertion failed: (magic == 0xDEADBEEF) -- Leandro Dorileo