diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-04 09:26:49 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-04 09:26:49 -0500 |
| commit | a3416197447e7846a927b6ccb4f1edb3a1982443 (patch) | |
| tree | 5bc8954542b3dc382bfe5737636007b5bb6aa28e /scripts | |
| parent | e47dccc64b6ca570e4db96fd5fdb3bef251eb559 (diff) | |
| parent | 5b91704469c0f801e0219f26458356872c4145ab (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Stefan Hajnoczi (6) and others
# Via Kevin Wolf
* kwolf/for-anthony:
block: dump snapshot and image info to specified output
block: move qmp and info dump related code to block/qapi.c
block: move snapshot code in block.c to block/snapshot.c
block: drop bs_snapshots global variable
qemu-iotests: make create_image() common
qemu-iotests: make compare_images() common
qemu-iotests: make cancel_and_wait() common
qemu-iotests: make assert_no_active_block_jobs() common
block: add block driver read only whitelist
qemu-iotests: fix 054 cluster size help output
Message-id: 1370349940-4703-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create_config | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/create_config b/scripts/create_config index c471e8caf9..258513a887 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -34,8 +34,15 @@ case $line in done echo "" ;; - CONFIG_BDRV_WHITELIST=*) - echo "#define CONFIG_BDRV_WHITELIST \\" + CONFIG_BDRV_RW_WHITELIST=*) + echo "#define CONFIG_BDRV_RW_WHITELIST\\" + for drv in ${line#*=}; do + echo " \"${drv}\",\\" + done + echo " NULL" + ;; + CONFIG_BDRV_RO_WHITELIST=*) + echo "#define CONFIG_BDRV_RO_WHITELIST\\" for drv in ${line#*=}; do echo " \"${drv}\",\\" done |