From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LiZWa-00068o-L8 for qemu-devel@nongnu.org; Sat, 14 Mar 2009 15:28:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LiZWW-00063z-Qw for qemu-devel@nongnu.org; Sat, 14 Mar 2009 15:28:00 -0400 Received: from [199.232.76.173] (port=56223 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LiZWW-00063r-Mu for qemu-devel@nongnu.org; Sat, 14 Mar 2009 15:27:56 -0400 Received: from verein.lst.de ([213.95.11.210]:58681) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1LiZWW-0000Xx-46 for qemu-devel@nongnu.org; Sat, 14 Mar 2009 15:27:56 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id n2EJRsIF003740 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Sat, 14 Mar 2009 20:27:54 +0100 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-6.6) id n2EJRsot003738 for qemu-devel@nongnu.org; Sat, 14 Mar 2009 20:27:54 +0100 Date: Sat, 14 Mar 2009 20:27:54 +0100 From: Christoph Hellwig Message-ID: <20090314192754.GA3717@lst.de> References: <20090314192701.GA3497@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090314192701.GA3497@lst.de> Subject: [Qemu-devel] [PATCH 1/6] more BlockDriver C99 initializers Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Looks like the two bdrv_raw instances were missed last time. Signed-off-by: Christoph Hellwig Index: qemu/block-raw-posix.c =================================================================== --- qemu.orig/block-raw-posix.c 2009-03-14 14:46:32.000000000 +0100 +++ qemu/block-raw-posix.c 2009-03-14 14:49:28.000000000 +0100 @@ -847,27 +847,24 @@ static void raw_flush(BlockDriverState * } BlockDriver bdrv_raw = { - "raw", - sizeof(BDRVRawState), - NULL, /* no probe for protocols */ - raw_open, - NULL, - NULL, - raw_close, - raw_create, - raw_flush, + .format_name = "raw", + .instance_size = sizeof(BDRVRawState), + .bdrv_open = raw_open, + .bdrv_close = raw_close, + .bdrv_create = raw_create, + .bdrv_flush = raw_flush, #ifdef CONFIG_AIO - .bdrv_aio_read = raw_aio_read, - .bdrv_aio_write = raw_aio_write, - .bdrv_aio_cancel = raw_aio_cancel, - .aiocb_size = sizeof(RawAIOCB), + .bdrv_aio_read = raw_aio_read, + .bdrv_aio_write = raw_aio_write, + .bdrv_aio_cancel = raw_aio_cancel, + .aiocb_size = sizeof(RawAIOCB), #endif - .bdrv_read = raw_read, - .bdrv_write = raw_write, - .bdrv_truncate = raw_truncate, - .bdrv_getlength = raw_getlength, + .bdrv_read = raw_read, + .bdrv_write = raw_write, + .bdrv_truncate = raw_truncate, + .bdrv_getlength = raw_getlength, }; /***********************************************/ Index: qemu/block-raw-win32.c =================================================================== --- qemu.orig/block-raw-win32.c 2009-03-14 14:47:37.000000000 +0100 +++ qemu/block-raw-win32.c 2009-03-14 14:48:39.000000000 +0100 @@ -351,26 +351,23 @@ static int raw_create(const char *filena } BlockDriver bdrv_raw = { - "raw", - sizeof(BDRVRawState), - NULL, /* no probe for protocols */ - raw_open, - NULL, - NULL, - raw_close, - raw_create, - raw_flush, + .format_name = "raw", + .instance_size = sizeof(BDRVRawState), + .bdrv_open = raw_open, + .bdrv_close = raw_close, + .bdrv_create = raw_create, + .bdrv_flush = raw_flush, #ifdef WIN32_AIO - .bdrv_aio_read = raw_aio_read, - .bdrv_aio_write = raw_aio_write, - .bdrv_aio_cancel = raw_aio_cancel, - .aiocb_size = sizeof(RawAIOCB); + .bdrv_aio_read = raw_aio_read, + .bdrv_aio_write = raw_aio_write, + .bdrv_aio_cancel = raw_aio_cancel, + .aiocb_size = sizeof(RawAIOCB); #endif - .bdrv_read = raw_read, - .bdrv_write = raw_write, - .bdrv_truncate = raw_truncate, - .bdrv_getlength = raw_getlength, + .bdrv_read = raw_read, + .bdrv_write = raw_write, + .bdrv_truncate = raw_truncate, + .bdrv_getlength = raw_getlength, }; /***********************************************/