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 <address@hidden>
> Signed-off-by: Chunyan Liu <cy...@suse.com>
> ---
> 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.
Regards...
--
Leandro Dorileo
