-
Notifications
You must be signed in to change notification settings - Fork 1
/
citrix
1205 lines (1137 loc) · 32.6 KB
/
citrix
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
vhd-util (4.4.0-1) unstable; urgency=low
.
* Initial release
Author: Monty Taylor <mordred@inaugust.com>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
Index: vhd-util/tools/blktap2/include/libvhd.h
===================================================================
--- vhd-util.orig/tools/blktap2/include/libvhd.h
+++ vhd-util/tools/blktap2/include/libvhd.h
@@ -24,6 +24,19 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*++
+
+History: Alfred Song 06/24/2010
+ add globle debug flag declare: vhd_globle_dbg
+ add macro: VHD_GLOBLE_LOG
+ Alfred Song 06/25/2010
+ add function: vhd_raw_to_fixed
+ vhd_fiexed_to_raw
+ Alfred Song 07/12/2010
+ add function: vhd_fiexed_to_dynamic
+ vhd_dynamic_to_fixed
+
+--*/
#ifndef _VHD_LIB_H_
#define _VHD_LIB_H_
@@ -36,6 +49,7 @@
#include <sys/bswap.h>
#endif
+#include <syslog.h>
#include "vhd-uuid.h"
#include "vhd.h"
@@ -68,6 +82,17 @@
#define BE64_OUT(foo)
#endif
+
+extern int vhd_globle_dbg; /* system log switch */
+
+#define VHD_GLOBLE_LOG(_f, _a...) \
+ do { \
+ if (vhd_globle_dbg) \
+ syslog(LOG_INFO, "%s\\%s, %d\\"_f, \
+ __FILE__, __func__, __LINE__, ##_a); \
+ } while (0)
+
+
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
@@ -75,6 +100,7 @@
#define VHD_BLOCK_SHIFT 21
#define VHD_BLOCK_SIZE (1ULL << VHD_BLOCK_SHIFT)
+#define VHD_SECTORS_PER_BLOCK (VHD_BLOCK_SIZE >> VHD_SECTOR_SHIFT)
#define UTF_16 "UTF-16"
#define UTF_16LE "UTF-16LE"
@@ -128,9 +154,9 @@ typedef struct vhd_context vhd_c
typedef uint32_t vhd_flag_creat_t;
struct vhd_bat {
- uint32_t spb;
- uint32_t entries;
- uint32_t *bat;
+ uint32_t spb; /* sector number per block */
+ uint32_t entries; /* total entry number */
+ uint32_t *bat; /* entry table */
};
struct vhd_batmap {
@@ -144,8 +170,8 @@ struct vhd_context {
int oflags;
int is_block;
- uint32_t spb;
- uint32_t bm_secs;
+ uint32_t spb; /* sectors per block */
+ uint32_t bm_secs; /* sectors of bitmap */
vhd_header_t header;
vhd_footer_t footer;
@@ -323,4 +349,78 @@ int vhd_write_block(vhd_context_t *, uin
int vhd_io_read(vhd_context_t *, char *, uint64_t, uint32_t);
int vhd_io_write(vhd_context_t *, char *, uint64_t, uint32_t);
+off_t get_file_size_rev(const char * name);
+
+/*++
+
+ Function Name: vhd_raw_to_fixed
+
+ Description: convert raw disk image to fixed type vhd disk image
+
+ Creator: Alfred Song 06/25/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+--*/
+int vhd_raw_to_fixed(char * src_name, char * tag_name);
+
+/*++
+
+ Function Name: vhd_fixed_to_raw
+
+ Description: convert fixed type vhd disk image to raw disk image
+
+ Creator: Alfred Song 06/25/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+--*/
+int vhd_fixed_to_raw(char * src_name, char * tag_name);
+
+/*++
+
+ Function Name: vhd_fixed_to_dynamic
+
+ Description: convert fixed type vhd disk image to dynamic type vhd disk image
+
+ Creator: Alfred Song 07/07/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+--*/
+int
+vhd_fixed_to_dynamic(char * src_name, char * tag_name);
+
+/*++
+
+ Function Name: vhd_dynamic_to_fixed
+
+ Description: convert dynamic type vhd disk image to fixed type vhd disk image
+
+ Creator: Alfred Song 07/07/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+--*/
+int
+vhd_dynamic_to_fixed(char * src_name, char * tag_name);
+
+//int get_file_size(char *, off_t *);
+
#endif
Index: vhd-util/tools/blktap2/include/vhd-util.h
===================================================================
--- vhd-util.orig/tools/blktap2/include/vhd-util.h
+++ vhd-util/tools/blktap2/include/vhd-util.h
@@ -24,6 +24,13 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+/*++
+
+History: Alfred Song 06/24/2010
+ add function vhd_util_convert
+
+--*/
#ifndef _VHD_UTIL_H_
#define _VHD_UTIL_H_
@@ -40,5 +47,6 @@ int vhd_util_modify(int argc, char **arg
int vhd_util_scan(int argc, char **argv);
int vhd_util_check(int argc, char **argv);
int vhd_util_revert(int argc, char **argv);
+int vhd_util_convert(int argc, char ** argv);
#endif
Index: vhd-util/tools/blktap2/vhd/lib/Makefile
===================================================================
--- vhd-util.orig/tools/blktap2/vhd/lib/Makefile
+++ vhd-util/tools/blktap2/vhd/lib/Makefile
@@ -42,6 +42,7 @@ LIB-SRCS += vhd-util-set-field.c
LIB-SRCS += vhd-util-snapshot.c
LIB-SRCS += vhd-util-scan.c
LIB-SRCS += vhd-util-check.c
+LIB-SRCS += vhd-util-convert.c
LIB-SRCS += vhd-util-uuid.c
LIB-SRCS += relative-path.c
LIB-SRCS += atomicio.c
Index: vhd-util/tools/blktap2/vhd/lib/libvhd.c
===================================================================
--- vhd-util.orig/tools/blktap2/vhd/lib/libvhd.c
+++ vhd-util/tools/blktap2/vhd/lib/libvhd.c
@@ -24,6 +24,20 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*++
+
+History: Alfred Song 06/24/2010
+ add globle debug flag define: vhd_globle_dbg
+ Alfred Song 06/25/2010
+ add function: vhd_raw_to_fixed
+ vhd_fiexed_to_raw
+ Alfred Song 07/12/2010
+ add function: vhd_fiexed_to_dynamic
+ vhd_dynamic_to_fixed
+ modify the vhd_raw_to_fixed and vhd_fiexed_to_raw to process
+ different target name.
+
+--*/
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
@@ -46,6 +60,7 @@
#define VHD_EPOCH_START 946684800
static int libvhd_dbg = 0;
+int vhd_globle_dbg = 0;
void
libvhd_set_log_level(int level)
@@ -55,12 +70,12 @@ libvhd_set_log_level(int level)
}
#define VHDLOG(_f, _a...) \
- do { \
- if (libvhd_dbg) \
- syslog(LOG_INFO, "libvhd::%s: "_f, \
+ do { \
+ if (libvhd_dbg) \
+ syslog(LOG_INFO, "libvhd::%s: "_f, \
__func__, ##_a); \
} while (0)
-
+
#define BIT_MASK 0x80
#ifdef ENABLE_FAILURE_TESTING
@@ -417,7 +432,7 @@ vhd_batmap_header_offset(vhd_context_t *
off = ctx->header.table_offset;
bat = ctx->header.max_bat_size * sizeof(uint32_t);
- off += vhd_bytes_padded(bat);
+ off += vhd_bytes_padded(bat); /* sector align for bat entry */
*_off = off;
return 0;
@@ -930,6 +945,7 @@ vhd_read_footer_at(vhd_context_t *ctx, v
memcpy(footer, buf, sizeof(vhd_footer_t));
vhd_footer_in(footer);
+
err = vhd_validate_footer(footer);
out:
@@ -955,6 +971,7 @@ vhd_read_footer(vhd_context_t *ctx, vhd_
return -errno;
err = vhd_read_footer_at(ctx, footer, off - 512);
+
if (err != -EINVAL)
return err;
@@ -1802,7 +1819,7 @@ vhd_read_bitmap(vhd_context_t *ctx, uint
return -EINVAL;
off = vhd_sectors_to_bytes(blk);
- size = vhd_bytes_padded(ctx->spb >> 3);
+ size = vhd_bytes_padded(ctx->spb >> 3); /* byte-size of bitmap */
err = vhd_seek(ctx, off, SEEK_SET);
if (err)
@@ -1824,6 +1841,18 @@ fail:
return err;
}
+/*
+* Description:
+* Read a block data from a VHD file.
+*
+* Input:
+* ctx - pointer to VHD operation structure
+* block - which block to read
+*
+* Output:
+* bufp - output buffer saving block data read
+*
+*/
int
vhd_read_block(vhd_context_t *ctx, uint32_t block, char **bufp)
{
@@ -1863,6 +1892,7 @@ vhd_read_block(vhd_context_t *ctx, uint3
goto fail;
}
+ /* padded by 0 */
if (end < off + ctx->header.block_size) {
size = end - off;
memset(buf + size, 0, ctx->header.block_size - size);
@@ -1911,7 +1941,7 @@ vhd_write_footer_at(vhd_context_t *ctx,
if (err)
goto out;
- vhd_footer_out(f);
+ vhd_footer_out(f); /* switch to big-endian before output to disk */
err = vhd_write(ctx, f, sizeof(vhd_footer_t));
@@ -2247,6 +2277,11 @@ vhd_read(vhd_context_t *ctx, void *buf,
if (ret == size)
return 0;
+ /* when real data size less than the required data size,
+ return real data size. we consider it valid/invalid, decided by errno. */
+ if (ret > 0 && ret < size)
+ return errno;
+
VHDLOG("%s: read of %zu returned %zd, errno: %d\n",
ctx->file, size, ret, -errno);
@@ -2264,6 +2299,11 @@ vhd_write(vhd_context_t *ctx, void *buf,
if (ret == size)
return 0;
+ /* when real data size less than the required data size,
+ return real data size. we consider it valid/invalid, decided by errno. */
+ if (ret > 0 && ret < size)
+ return errno;
+
VHDLOG("%s: write of %zu returned %zd, errno: %d\n",
ctx->file, size, ret, -errno);
@@ -2346,7 +2386,7 @@ int
vhd_open(vhd_context_t *ctx, const char *file, int flags)
{
int err, oflags;
-
+
if (flags & VHD_OPEN_STRICT)
vhd_flag_clear(flags, VHD_OPEN_FAST);
@@ -2372,6 +2412,7 @@ vhd_open(vhd_context_t *ctx, const char
}
err = vhd_test_file_fixed(ctx->file, &ctx->is_block);
+
if (err)
goto fail;
@@ -2384,6 +2425,7 @@ vhd_open(vhd_context_t *ctx, const char
}
err = vhd_read_footer(ctx, &ctx->footer);
+
if (err)
goto fail;
@@ -2460,7 +2502,7 @@ vhd_initialize_header_parent_name(vhd_co
* big endian unicode here
*/
cd = iconv_open(UTF_16BE, "ASCII");
- if (cd == (iconv_t)-1) {
+ if (cd == (iconv_t)-1) { /* (iconv_t)(-1) */
err = -errno;
goto out;
}
@@ -2512,6 +2554,22 @@ get_file_size(const char *name)
return end;
}
+off_t
+get_file_size_rev(const char *name)
+{
+ int fd;
+ off_t end;
+
+ fd = open(name, O_LARGEFILE | O_RDONLY);
+ if (fd == -1) {
+ VHDLOG("unable to open '%s': %d\n", name, errno);
+ return -errno;
+ }
+ end = lseek(fd, 0, SEEK_END);
+ close(fd);
+ return end;
+}
+
static int
vhd_initialize_header(vhd_context_t *ctx, const char *parent_path,
uint64_t size, int raw)
@@ -2582,7 +2640,9 @@ vhd_write_parent_locators(vhd_context_t
off = ctx->batmap.header.batmap_offset +
vhd_sectors_to_bytes(ctx->batmap.header.batmap_size);
- if (off & (VHD_SECTOR_SIZE - 1))
+
+ /* 512 bytes align */
+ if (off & (VHD_SECTOR_SIZE - 1))
off = vhd_bytes_padded(off);
for (i = 0; i < 3; i++) {
@@ -2699,7 +2759,7 @@ vhd_create_batmap(vhd_context_t *ctx)
if (!vhd_type_dynamic(ctx))
return -EINVAL;
- map_bytes = (ctx->header.max_bat_size + 7) >> 3;
+ map_bytes = (ctx->header.max_bat_size + 7) >> 3; /* byte align for map-table of batmap */
header = &ctx->batmap.header;
memset(header, 0, sizeof(vhd_batmap_header_t));
@@ -2711,9 +2771,12 @@ vhd_create_batmap(vhd_context_t *ctx)
header->batmap_offset = off +
vhd_bytes_padded(sizeof(vhd_batmap_header_t));
- header->batmap_size = secs_round_up_no_zero(map_bytes);
+
+ /* size in sector(round up) for map-table of batmap, not including header of batmap */
+ header->batmap_size = secs_round_up_no_zero(map_bytes);
header->batmap_version = VHD_BATMAP_CURRENT_VERSION;
+ /* size in byte(512 bytes round up) for map-table of batmap, not including header of batmap */
map_bytes = vhd_sectors_to_bytes(header->batmap_size);
err = posix_memalign((void **)&ctx->batmap.map,
@@ -2746,7 +2809,7 @@ vhd_create_bat(vhd_context_t *ctx)
memset(ctx->bat.bat, 0, size);
for (i = 0; i < ctx->header.max_bat_size; i++)
- ctx->bat.bat[i] = DD_BLK_UNUSED;
+ ctx->bat.bat[i] = DD_BLK_UNUSED; /* initially, unused for each entry */
err = vhd_seek(ctx, ctx->header.table_offset, SEEK_SET);
if (err)
@@ -2847,6 +2910,8 @@ __vhd_create(const char *name, const cha
memset(&ctx, 0, sizeof(vhd_context_t));
footer = &ctx.footer;
header = &ctx.header;
+
+ /* size allocating by block align */
blks = (bytes + VHD_BLOCK_SIZE - 1) >> VHD_BLOCK_SHIFT;
size = blks << VHD_BLOCK_SHIFT;
@@ -2969,6 +3034,10 @@ __vhd_io_dynamic_copy_data(vhd_context_t
if (test_bit(map, map_off + i))
goto next;
+ /*
+ * consider the data sector are all-zero when the
+ * corresponding bit in bitmap is zero for better performance
+ */
if (ctx && !vhd_bitmap_test(ctx, bitmap, bitmap_off + i))
goto next;
@@ -3160,8 +3229,10 @@ out:
int
vhd_io_read(vhd_context_t *ctx, char *buf, uint64_t sec, uint32_t secs)
{
+/*
if (vhd_sectors_to_bytes(sec + secs) > ctx->footer.curr_size)
return -ERANGE;
+*/
if (!vhd_type_dynamic(ctx))
return __vhd_io_fixed_read(ctx, buf, sec, secs);
@@ -3327,11 +3398,482 @@ fail:
int
vhd_io_write(vhd_context_t *ctx, char *buf, uint64_t sec, uint32_t secs)
{
+/*
if (vhd_sectors_to_bytes(sec + secs) > ctx->footer.curr_size)
return -ERANGE;
+*/
if (!vhd_type_dynamic(ctx))
return __vhd_io_fixed_write(ctx, buf, sec, secs);
return __vhd_io_dynamic_write(ctx, buf, sec, secs);
}
+
+/*
+int
+get_file_size(char * file_path, off_t * out_file_size)
+{
+ int err;
+ struct stat stats;
+
+ err = stat(file_path, &stats);
+ if (err == -1)
+ return -errno;
+
+ *out_file_size = stats.st_size;
+ return err;
+}
+*/
+
+/*++
+
+ Function Name: vhd_raw_to_fixed
+
+ Description: convert raw disk image to fixed type vhd disk image
+
+ Creator: Alfred Song 06/25/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+ NOTE: For better performance, we will do the overwritten convert!
+
+--*/
+int
+vhd_raw_to_fixed(char * src_name, char * tag_name)
+{
+ uint64_t file_size;
+ vhd_context_t ctx;
+ int err;
+
+ file_size = 0;
+ err = 0;
+ memset(&ctx, 0, sizeof(vhd_context_t));
+
+ if (!src_name && !tag_name) {
+ VHD_GLOBLE_LOG("error, invalid input, src_name=%s, tag_name=%s\n", \
+ src_name, tag_name);
+ goto out;
+ }
+
+ VHD_GLOBLE_LOG("src_name=%s, tag_name=%s\n", src_name, tag_name);
+
+ file_size = get_file_size_rev(src_name);
+ if (file_size == 0) {
+ printf("Source file size is zero.\n");
+ VHD_GLOBLE_LOG("file_size(%"PRIu64").\n", file_size);
+ return -EINVAL;
+ }
+
+ if (errno){
+ printf("Fail to get source file size.\n");
+ VHD_GLOBLE_LOG("errno(%d).\n", errno);
+ return -EINVAL;
+ }
+ VHD_GLOBLE_LOG("file_size=%"PRIu64"\n", file_size);
+
+ vhd_initialize_footer(&ctx, HD_TYPE_FIXED, file_size);
+
+ ctx.fd = open(src_name, O_WRONLY | O_LARGEFILE | O_DIRECT, 0644);
+ if (ctx.fd == -1)
+ return -errno;
+
+ ctx.file = strdup(src_name);
+ if (!ctx.file) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+ err = vhd_test_file_fixed(ctx.file, &ctx.is_block);
+ if (err)
+ goto out;
+
+ err = vhd_write_footer_at(&ctx, &ctx.footer, file_size);
+ if (err)
+ goto out;
+
+ /* no error, change name */
+ vhd_close(&ctx);
+ if (strcmp(src_name, tag_name) != 0) {
+ err = rename(src_name, tag_name);
+ if (err) {
+ VHD_GLOBLE_LOG("error, src_name=%s, tag_name=%s, %d\n", \
+ src_name, tag_name, err);
+ goto out;
+ }
+ }
+ printf("NOTE: For better performance, we will do the overwritten convert!\n");
+ printf("Done! Convert to %s.\n", tag_name);
+
+out:
+ vhd_close(&ctx);
+ if (err && !ctx.is_block)
+ unlink(src_name);
+ return err;
+}
+
+/*++
+
+ Function Name: vhd_fixed_to_raw
+
+ Description: convert fixed type vhd disk image to raw disk image
+
+ Creator: Alfred Song 06/25/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+ NOTE: For better performance, we will do the overwritten convert!
+
+--*/
+int
+vhd_fixed_to_raw(char * src_name, char * tag_name)
+{
+ uint64_t file_size;
+ vhd_context_t ctx;
+ int err;
+
+ file_size = 0;
+ err = 0;
+ memset(&ctx, 0, sizeof(vhd_context_t));
+
+ if (!src_name && !tag_name) {
+ VHD_GLOBLE_LOG("error, invalid input, src_name=%s, tag_name=%s\n", \
+ src_name, tag_name);
+ goto out;
+ }
+
+ VHD_GLOBLE_LOG("src_name=%s, tag_name=%s\n", src_name, tag_name);
+
+ file_size = get_file_size_rev(src_name);
+ if (file_size == 0) {
+ printf("Source file size is zero.\n");
+ VHD_GLOBLE_LOG("file_size(%"PRIu64").\n", file_size);
+ goto out;
+ }
+
+ if (errno){
+ printf("Fail to get source file size.\n");
+ VHD_GLOBLE_LOG("errno(%d).\n", errno);
+ goto out;
+ }
+ VHD_GLOBLE_LOG("file_size=%"PRIu64"\n", file_size);
+
+ err = truncate(src_name, file_size - 512);
+ if (err) {
+ VHD_GLOBLE_LOG("err(%d).\n", err);
+ goto out;
+ }
+
+ /* no error, change name */
+ vhd_close(&ctx);
+ if (strcmp(src_name, tag_name) != 0) {
+ err = rename(src_name, tag_name);
+ if (err) {
+ VHD_GLOBLE_LOG("error, src_name=%s, tag_name=%s, %d\n", \
+ src_name, tag_name, err);
+ goto out;
+ }
+ }
+ printf("NOTE: For better performance, we will do the overwritten convert!\n");
+ printf("Done! Convert to %s.\n", tag_name);
+
+out:
+ vhd_close(&ctx);
+ if (err && !ctx.is_block)
+ unlink(src_name);
+ return err;
+}
+
+/*++
+
+ Function Name: vhd_fixed_to_dynamic
+
+ Description: convert fixed type vhd disk image to dynamic type vhd disk image
+
+ Creator: Alfred Song 07/07/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+--*/
+int
+vhd_fixed_to_dynamic(char * src_name, char * tag_name)
+{
+ vhd_context_t ctx_src;
+ vhd_context_t ctx_tag;
+ int err;
+ uint64_t current_block, sec, secs, total_block;
+ char * buf;
+ char * new_name;
+
+ memset(&ctx_src, 0, sizeof(vhd_context_t));
+ memset(&ctx_tag, 0, sizeof(vhd_context_t));
+ err = 0;
+ buf = NULL;
+ new_name = NULL;
+
+ if (!src_name && !tag_name) {
+ VHD_GLOBLE_LOG("error, invalid input, src_name=%s, tag_name=%s\n", \
+ src_name, tag_name);
+ goto out;
+ }
+
+ VHD_GLOBLE_LOG("src_name=%s, tag_name=%s\n", src_name, tag_name);
+
+ /* size allocate to keep no overflow happen */
+ err = posix_memalign((void **)&new_name, 4096, strlen(src_name) + 10);
+ if (err) {
+ err = -err;
+ goto out;
+ }
+
+ strcpy(new_name, src_name);
+ strcat(new_name, ".bak");
+
+ err = rename(src_name, new_name);
+ if (err) {
+ VHD_GLOBLE_LOG("error, src_name=%s, new_name=%s, %d\n", \
+ src_name, new_name, err);
+ goto out;
+ }
+
+ VHD_GLOBLE_LOG("after renaming, src_name=%s, new_name=%s\n", \
+ src_name, new_name);
+
+/*
+ if (strcmp(src_name, tag_name) == 0) {
+ printf("error, source file %s equals target file %s.\nPlease specify \
+different name.\n", src_name, tag_name);
+ err = -EINVAL;
+ goto out;
+ //TODO
+ }
+*/
+ printf("Back up source to %s.\n", new_name);
+ err = vhd_open(&ctx_src, new_name, VHD_OPEN_RDWR);
+ if (err) {
+ printf("error, opening %s: %d\n", new_name, err);
+ VHD_GLOBLE_LOG("error, opening new_name=%s, %d\n", new_name, err);
+ goto out;
+ }
+
+ if (ctx_src.footer.type != HD_TYPE_FIXED) {
+ err = -EINVAL;
+ printf("error, source file %s is not fixed type VHD, %d\n", new_name, err);
+ VHD_GLOBLE_LOG("error, source file %s is not fixed type VHD, %d\n", new_name, err);
+ goto out;
+ }
+
+ if (ctx_src.footer.curr_size % VHD_BLOCK_SIZE) {
+ total_block = ctx_src.footer.curr_size / VHD_BLOCK_SIZE + 1;
+ } else {
+ total_block = ctx_src.footer.curr_size / VHD_BLOCK_SIZE;
+ }
+
+ VHD_GLOBLE_LOG("curr_size=%"PRIu64", total_block=%"PRIu64"\n", ctx_src.footer.curr_size, total_block);
+
+ err = vhd_create(tag_name, total_block * VHD_BLOCK_SIZE, HD_TYPE_DYNAMIC, 0);
+ if (err) {
+ printf("error, creating %s: %d\n", tag_name, err);
+ VHD_GLOBLE_LOG("error, creating tag_name=%s, %d\n", tag_name, err);
+ goto out;
+ }
+
+ err = vhd_open(&ctx_tag, tag_name, VHD_OPEN_RDWR);
+ if (err) {
+ printf("error, opening %s: %d\n", tag_name, err);
+ VHD_GLOBLE_LOG("error, opening tag_name=%s, %d\n", tag_name, err);
+ goto out;
+ }
+
+ sec = 0;
+ secs = VHD_SECTORS_PER_BLOCK;
+
+ err = posix_memalign((void **)&buf, 4096, VHD_BLOCK_SIZE);
+ if (err) {
+ err = -err;
+ goto out;
+ }
+
+ printf("Converting to %s.\n", tag_name);
+ for (current_block = 0; current_block < total_block; current_block++) {
+ err = vhd_io_read(&ctx_src, buf, sec, secs);
+ if (err) {
+ VHD_GLOBLE_LOG("vhd_io_read error, sec=%"PRIu64", current_block=%"PRIu64"\n", sec, current_block);
+ goto out;
+ }
+
+ err = vhd_io_write(&ctx_tag, buf, sec, secs);
+ if (err) {
+ VHD_GLOBLE_LOG("vhd_io_write error, sec=%"PRIu64", current_block=%"PRIu64"\n", sec, current_block);
+ goto out;
+ }
+
+ sec += secs;
+ if ((current_block % 10) == 0)
+ printf(">"); /* progress show */
+ }
+
+ VHD_GLOBLE_LOG("sec=%"PRIu64", current_block=%"PRIu64"\n", sec, current_block);
+ printf("Done!\n");
+out:
+ free(buf);
+ free(new_name);
+ vhd_close(&ctx_src);
+ vhd_close(&ctx_tag);
+ return err;
+}
+
+/*++
+
+ Function Name: vhd_dynamic_to_fixed
+
+ Description: convert dynamic type vhd disk image to fixed type vhd disk image
+
+ Creator: Alfred Song 07/07/2010
+
+ Input: src_name - source file name
+ tag_name - target file name
+
+ Output: 0 - success
+ others - fail
+
+--*/
+int
+vhd_dynamic_to_fixed(char * src_name, char * tag_name)
+{
+ vhd_context_t ctx_src;
+ vhd_context_t ctx_tag;
+ int err;
+ uint64_t current_block, sec, secs, total_block;
+ char * buf;
+ char * new_name;
+
+ memset(&ctx_src, 0, sizeof(vhd_context_t));
+ memset(&ctx_tag, 0, sizeof(vhd_context_t));
+ err = 0;
+ buf = NULL;
+ new_name = NULL;
+
+ if (!src_name && !tag_name) {
+ VHD_GLOBLE_LOG("error, invalid input, src_name=%s, tag_name=%s\n", \
+ src_name, tag_name);
+ goto out;
+ }
+
+ VHD_GLOBLE_LOG("src_name=%s, tag_name=%s\n", src_name, tag_name);
+
+ /* size allocate to keep no overflow happen */
+ err = posix_memalign((void **)&new_name, 4096, strlen(src_name) + 10);
+ if (err) {
+ err = -err;
+ goto out;
+ }
+
+ strcpy(new_name, src_name);
+ strcat(new_name, ".bak");
+
+ err = rename(src_name, new_name);
+ if (err) {
+ VHD_GLOBLE_LOG("error, src_name=%s, new_name=%s, %d\n", \
+ src_name, new_name, err);
+ goto out;
+ }
+
+ VHD_GLOBLE_LOG("after renaming, src_name=%s, new_name=%s\n", \
+ src_name, new_name);
+/*
+ if (strcmp(src_name, tag_name) == 0) {
+ printf("error, source file %s equals target file %s.\nPlease specify \
+different name.\n", src_name, tag_name);
+ err = -EINVAL;
+ goto out;
+ //TODO
+ }
+*/
+
+ printf("Back up source to %s.\n", new_name);
+ err = vhd_open(&ctx_src, new_name, VHD_OPEN_RDWR);
+ if (err) {
+ printf("error, opening %s: %d\n", new_name, err);
+ VHD_GLOBLE_LOG("error, opening new_name=%s, %d\n", new_name, err);
+ goto out;
+ }
+
+ if (ctx_src.footer.type != HD_TYPE_DYNAMIC) {
+ err = -EINVAL;
+ printf("error, source file %s is not dynamic type VHD, %d\n", new_name, err);
+ VHD_GLOBLE_LOG("error, source file %s is not dynamic type VHD, %d\n", new_name, err);
+ goto out;
+ }
+
+ if (ctx_src.footer.curr_size % VHD_BLOCK_SIZE) {
+ total_block = ctx_src.footer.curr_size / VHD_BLOCK_SIZE + 1;
+ } else {
+ total_block = ctx_src.footer.curr_size / VHD_BLOCK_SIZE;
+ }
+
+ VHD_GLOBLE_LOG("curr_size=%"PRIu64", total_block=%"PRIu64"\n", ctx_src.footer.curr_size, total_block);
+
+ err = vhd_create(tag_name, total_block * VHD_BLOCK_SIZE, HD_TYPE_FIXED, 0);
+ if (err) {
+ printf("error, creating %s: %d\n", tag_name, err);
+ VHD_GLOBLE_LOG("error, creating tag_name=%s, %d\n", tag_name, err);
+ goto out;
+ }
+
+ err = vhd_open(&ctx_tag, tag_name, VHD_OPEN_RDWR);
+ if (err) {
+ printf("error, opening %s: %d\n", tag_name, err);
+ VHD_GLOBLE_LOG("error, opening tag_name=%s, %d\n", tag_name, err);
+ goto out;
+ }
+
+ sec = 0;
+ secs = VHD_SECTORS_PER_BLOCK;
+
+ err = posix_memalign((void **)&buf, 4096, VHD_BLOCK_SIZE);
+ if (err) {
+ err = -err;
+ goto out;
+ }
+
+ printf("Converting to %s.\n", tag_name);
+ for (current_block = 0; current_block < total_block; current_block++) {
+ err = vhd_io_read(&ctx_src, buf, sec, secs);
+ if (err) {
+ VHD_GLOBLE_LOG("vhd_io_read error, sec=%"PRIu64", current_block=%"PRIu64"\n", sec, current_block);
+ goto out;
+ }
+
+ err = vhd_io_write(&ctx_tag, buf, sec, secs);
+ if (err) {
+ VHD_GLOBLE_LOG("vhd_io_write error, sec=%"PRIu64", current_block=%"PRIu64"\n", sec, current_block);
+ goto out;
+ }
+
+ sec += secs;
+ if ((current_block % 10) == 0)
+ printf(">"); /* progress show */
+ }
+
+ VHD_GLOBLE_LOG("sec=%"PRIu64", current_block=%"PRIu64"\n", sec, current_block);
+ printf("Done!\n");
+out:
+ free(buf);
+ free(new_name);
+ vhd_close(&ctx_src);
+ vhd_close(&ctx_tag);
+ return err;
+}
+
Index: vhd-util/tools/blktap2/vhd/lib/vhd-util-check.c
===================================================================
--- vhd-util.orig/tools/blktap2/vhd/lib/vhd-util-check.c
+++ vhd-util/tools/blktap2/vhd/lib/vhd-util-check.c
@@ -89,7 +89,7 @@ vhd_util_check_validate_footer(vhd_foote
footer->crtr_ver == VHD_VERSION(1, 1))) {
char tmp = footer->hidden;
footer->hidden = 0;
- checksum = vhd_checksum_footer(footer);
+ checksum = vhd_checksum_footer(footer); /* ignore 'hidden' */
footer->hidden = tmp;
if (checksum == footer->checksum)
Index: vhd-util/tools/blktap2/vhd/lib/vhd-util-convert.c
===================================================================
--- /dev/null
+++ vhd-util/tools/blktap2/vhd/lib/vhd-util-convert.c
@@ -0,0 +1,136 @@
+/*++