Commit 9bdfb9e8 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

vpc: use current_size field for XenServer VHD images 



The vpc driver has two methods of determining virtual disk size.  The
correct one to use depends on the software that generated the image
file.  Add the XenServer creator_app signature so that image size is
correctly detected for those images.

Reported-by: default avatarGrant Wu <grantwwu@gmail.com>
Reported-by: default avatarSpencer Baugh <sbaugh@catern.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0211b9be

block/vpc.c

+3 −1
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, 
     *      'qem2'  :  current_size     QEMU (uses current_size)

     *      'win '  :  current_size     Hyper-V

     *      'd2v '  :  current_size     Disk2vhd

     *      'tap\0' :  current_size     XenServer

     *

     *  The user can override the table values via drive options, however

     *  even with an override we will still use current_size for images
@@ -306,7 +307,8 @@ static int vpc_open(BlockDriverState *bs, QDict *options, int flags, 
     */

    use_chs = (!!strncmp(footer->creator_app, "win ", 4) &&

               !!strncmp(footer->creator_app, "qem2", 4) &&

               !!strncmp(footer->creator_app, "d2v ", 4)) || s->force_use_chs;

               !!strncmp(footer->creator_app, "d2v ", 4) &&

               !!memcmp(footer->creator_app, "tap", 4)) || s->force_use_chs;



    if (!use_chs || bs->total_sectors == VHD_MAX_GEOMETRY || s->force_use_sz) {

        bs->total_sectors = be64_to_cpu(footer->current_size) /