← Back to branch summary

~ressu/+junk/xen-debian

« back to all changes in this revision

Viewing changes to tools/blktap2/drivers/tapdisk-diff.c

  • Committer: sami at haahtinen
  • Author(s): Bastian Blank
  • Date: 2011-03-17 14:12:45 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: sami@haahtinen.name-20110317141245-owgqox0l0p3g5857
Tags: 4.1.0~rc6-1
http://bugs.debian.org/596545
* New upstream release candidate.
* Build documentation using pdflatex.
* Use python 2.6. (closes: #596545)
* Fix lintian override.
* Install new tools: xl, xenpaging.
* Enable blktap2.
  - Use own md5 implementation.
  - Fix includes.
  - Fix linking of blktap2 binaries.
  - Remove optimization setting.
* Temporarily disable hvmloader, wants to download ipxe.
* Remove xenstored pid check from xl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/blktap2/drivers/tapdisk-diff.c
38
38
#include "scheduler.h"
39
39
#include "tapdisk-vbd.h"
40
40
#include "tapdisk-server.h"
 
41
#include "tapdisk-disktype.h"
41
42
#include "libvhd.h"
42
43
 
43
44
#define POLL_READ                        0
540
541
 
541
542
        s->id = tapdisk_stream_count++;
542
543
 
543
 
        err = tapdisk_vbd_initialize(-1, -1, s->id);
 
544
        err = tapdisk_vbd_initialize(s->id);
544
545
        if (err)
545
546
                goto out;
546
547
 
670
671
tapdisk_stream_open(struct tapdisk_stream *s, const char *arg)
671
672
{
672
673
        int err, type;
673
 
        char *path;
 
674
        const char *path;
674
675
 
675
 
        err = tapdisk_parse_disk_type(arg, &path, &type);
676
 
        if (err)
677
 
                return err;
 
676
        type = tapdisk_disktype_parse_params(arg, &path);
 
677
        if (type < 0)
 
678
                return type;
678
679
 
679
680
        tapdisk_stream_initialize(s);
680
681
 
716
717
{
717
718
        int c, err, type1;
718
719
        const char *arg1 = NULL, *arg2 = NULL;
719
 
        char *path1;
 
720
        const disk_info_t *info;
 
721
        const char *path1;
720
722
 
721
723
        err    = 0;
722
724
 
741
743
        if (!arg1 || !arg2)
742
744
                goto fail_usage;
743
745
 
744
 
        err = tapdisk_parse_disk_type(arg1, &path1, &type1);
745
 
        if (err)
746
 
                return err;
 
746
        type1 = tapdisk_disktype_parse_params(arg1, &path1);
 
747
        if (type1 < 0)
 
748
                return type1;
 
749
 
747
750
        if (type1 != DISK_TYPE_VHD) {
748
751
                printf("error: first VDI is not VHD\n");
749
752
                return EINVAL;
755
758
 
756
759
        tapdisk_start_logging("tapdisk-diff");
757
760
 
758
 
        err = tapdisk_server_initialize(NULL, NULL);
 
761
        err = tapdisk_server_initialize();
759
762
        if (err)
760
763
                goto out;
761
764