From: Wen Congyang <wency@cn.fujitsu.com>
To: xen devel <xen-devel@lists.xen.org>
Cc: Ian Campbell <Ian.Campbell@citrix.com>,
Wen Congyang <wency@cn.fujitsu.com>,
Ian Jackson <Ian.Jackson@eu.citrix.com>,
Jiang Yunhong <yunhong.jiang@intel.com>,
Dong Eddie <eddie.dong@intel.com>,
Shriram Rajagopalan <rshriram@cs.ubc.ca>,
Yang Hongyang <yanghy@cn.fujitsu.com>,
Lai Jiangshan <laijs@cn.fujitsu.com>
Subject: [RFC Patch v3 08/18] blktap2: use correct way to define array.
Date: Fri, 5 Sep 2014 17:10:51 +0800 [thread overview]
Message-ID: <1409908261-18682-9-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1409908261-18682-1-git-send-email-wency@cn.fujitsu.com>
Currently, we use the following way to define an array:
type array[] = {
[index] = xxx,
0,
};
So array[index+1] will be NULL. If index is not the last
index, it will override another index.
tapdisk_vbd_index is not defined, but array[DISK_TYPE_VINDEX]
is overridden, so we don't find this problem when building
the source.
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Shriram Rajagopalan <rshriram@cs.ubc.ca>
---
tools/blktap2/drivers/tapdisk-disktype.c | 12 ++----------
tools/blktap2/drivers/tapdisk-disktype.h | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/tools/blktap2/drivers/tapdisk-disktype.c b/tools/blktap2/drivers/tapdisk-disktype.c
index e9a6890..8d1383b 100644
--- a/tools/blktap2/drivers/tapdisk-disktype.c
+++ b/tools/blktap2/drivers/tapdisk-disktype.c
@@ -82,12 +82,6 @@ static const disk_info_t block_cache_disk = {
1,
};
-static const disk_info_t vhd_index_disk = {
- "vhdi",
- "vhd index image (vhdi)",
- 1,
-};
-
static const disk_info_t log_disk = {
"log",
"write logger (log)",
@@ -110,9 +104,8 @@ const disk_info_t *tapdisk_disk_types[] = {
[DISK_TYPE_QCOW] = &qcow_disk,
[DISK_TYPE_BLOCK_CACHE] = &block_cache_disk,
[DISK_TYPE_LOG] = &log_disk,
- [DISK_TYPE_VINDEX] = &vhd_index_disk,
[DISK_TYPE_REMUS] = &remus_disk,
- 0,
+ [DISK_TYPE_MAX] = NULL,
};
extern struct tap_disk tapdisk_aio;
@@ -137,10 +130,9 @@ const struct tap_disk *tapdisk_disk_drivers[] = {
[DISK_TYPE_RAM] = &tapdisk_ram,
[DISK_TYPE_QCOW] = &tapdisk_qcow,
[DISK_TYPE_BLOCK_CACHE] = &tapdisk_block_cache,
- [DISK_TYPE_VINDEX] = &tapdisk_vhd_index,
[DISK_TYPE_LOG] = &tapdisk_log,
[DISK_TYPE_REMUS] = &tapdisk_remus,
- 0,
+ [DISK_TYPE_MAX] = NULL,
};
int
diff --git a/tools/blktap2/drivers/tapdisk-disktype.h b/tools/blktap2/drivers/tapdisk-disktype.h
index b697eea..c574990 100644
--- a/tools/blktap2/drivers/tapdisk-disktype.h
+++ b/tools/blktap2/drivers/tapdisk-disktype.h
@@ -39,7 +39,7 @@
#define DISK_TYPE_BLOCK_CACHE 7
#define DISK_TYPE_LOG 8
#define DISK_TYPE_REMUS 9
-#define DISK_TYPE_VINDEX 10
+#define DISK_TYPE_MAX 10
#define DISK_TYPE_NAME_MAX 32
--
1.9.3
next prev parent reply other threads:[~2014-09-05 9:10 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 9:10 [RFC Patch v3 00/18] Some bugfix patches Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 01/18] copy the correct page to memory Wen Congyang
2014-09-08 11:27 ` Ian Campbell
2014-09-08 11:58 ` Andrew Cooper
2014-09-05 9:10 ` [RFC Patch v3 02/18] csum the correct page Wen Congyang
2014-09-08 11:28 ` Ian Campbell
2014-09-05 9:10 ` [RFC Patch v3 03/18] don't zero out ioreq page Wen Congyang
2014-09-05 9:25 ` Paul Durrant
2014-09-05 9:33 ` Wen Congyang
2014-09-05 9:39 ` Paul Durrant
2014-09-05 10:45 ` David Vrabel
2014-09-12 7:33 ` Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 04/18] blktap2: dynamic allocate aio_requests to avoid -EBUSY error Wen Congyang
2014-09-08 11:34 ` Ian Campbell
2014-09-24 18:22 ` Shriram Rajagopalan
2014-09-05 9:10 ` [RFC Patch v3 05/18] blktap2: return the correct dev path Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 06/18] blktap2: use correct way to get free event id Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 07/18] blktap2: don't return negative " Wen Congyang
2014-09-05 9:10 ` Wen Congyang [this message]
2014-09-05 9:10 ` [RFC Patch v3 09/18] block-remus: fix memory leak Wen Congyang
2014-09-24 19:37 ` Shriram Rajagopalan
2014-09-25 5:23 ` Wen Congyang
2014-09-25 11:14 ` Shriram Rajagopalan
2014-09-26 2:29 ` Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 10/18] block-remus: pass uuid to the callback td_open Wen Congyang
2014-09-24 19:27 ` Shriram Rajagopalan
2014-09-05 9:10 ` [RFC Patch v3 11/18] block-remus: use correct way to get remus_image Wen Congyang
2014-09-24 19:26 ` Shriram Rajagopalan
2014-09-05 9:10 ` [RFC Patch v3 12/18] block-remus: fix bug in tdremus_close() Wen Congyang
2014-09-24 19:24 ` Shriram Rajagopalan
2014-09-05 9:10 ` [RFC Patch v3 13/18] don't call client_flush() when switching to unprotected mode Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 14/18] pass correct file to qemu if we use blktap2 Wen Congyang
2014-09-08 11:35 ` Ian Campbell
2014-09-05 9:10 ` [RFC Patch v3 15/18] support blktap remus in xl Wen Congyang
2014-09-08 11:39 ` Ian Campbell
2014-09-10 7:19 ` Wen Congyang
2014-09-10 10:04 ` Ian Campbell
2014-09-10 10:36 ` Wen Congyang
2014-09-05 9:10 ` [RFC Patch v3 16/18] update libxl__device_disk_from_xs_be() to support blktap device Wen Congyang
2014-09-08 11:42 ` Ian Campbell
2014-09-09 1:57 ` Wen Congyang
2014-09-11 7:58 ` Wen Congyang
2014-09-12 8:53 ` Wei Liu
2014-09-12 9:03 ` Wen Congyang
2014-09-12 10:35 ` Wei Liu
2014-09-05 9:11 ` [RFC Patch v3 17/18] read nictype from xenstore Wen Congyang
2014-09-08 11:41 ` Ian Campbell
2014-09-05 9:11 ` [RFC Patch v3 18/18] x86/hvm: Always set pending event injection when loading VMC[BS] state Wen Congyang
2014-09-10 15:06 ` Aravind Gopalakrishnan
2014-09-11 6:10 ` Wen Congyang
2014-09-11 10:35 ` Tim Deegan
2014-09-12 3:14 ` Wen Congyang
2014-09-12 15:43 ` Tim Deegan
2014-09-17 7:56 ` Wen Congyang
2014-09-17 14:29 ` Aravind Gopalakrishnan
2014-09-18 0:05 ` Aravind Gopalakrishnan
2014-09-18 0:05 ` Aravind Gopalakrishnan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409908261-18682-9-git-send-email-wency@cn.fujitsu.com \
--to=wency@cn.fujitsu.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=eddie.dong@intel.com \
--cc=laijs@cn.fujitsu.com \
--cc=rshriram@cs.ubc.ca \
--cc=xen-devel@lists.xen.org \
--cc=yanghy@cn.fujitsu.com \
--cc=yunhong.jiang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).