← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to block/vvfat.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
block/vvfat.c
1164
1164
    s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
1165
1165
 
1166
1166
    if (qemu_opt_get_bool(opts, "rw", false)) {
1167
 
        if (enable_write_target(s)) {
1168
 
            ret = -EIO;
 
1167
        ret = enable_write_target(s);
 
1168
        if (ret < 0) {
1169
1169
            goto fail;
1170
1170
        }
1171
1171
        bs->read_only = 0;
2917
2917
    s->qcow_filename = g_malloc(1024);
2918
2918
    ret = get_tmp_filename(s->qcow_filename, 1024);
2919
2919
    if (ret < 0) {
2920
 
        g_free(s->qcow_filename);
2921
 
        s->qcow_filename = NULL;
2922
 
        return ret;
 
2920
        goto err;
2923
2921
    }
2924
2922
 
2925
2923
    bdrv_qcow = bdrv_find_format("qcow");
2927
2925
    set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512);
2928
2926
    set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:");
2929
2927
 
2930
 
    if (bdrv_create(bdrv_qcow, s->qcow_filename, options) < 0)
2931
 
        return -1;
 
2928
    ret = bdrv_create(bdrv_qcow, s->qcow_filename, options);
 
2929
    if (ret < 0) {
 
2930
        goto err;
 
2931
    }
2932
2932
 
2933
2933
    s->qcow = bdrv_new("");
2934
 
    if (s->qcow == NULL) {
2935
 
        return -1;
2936
 
    }
2937
2934
 
2938
2935
    ret = bdrv_open(s->qcow, s->qcow_filename, NULL,
2939
2936
            BDRV_O_RDWR | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH, bdrv_qcow);
2940
2937
    if (ret < 0) {
2941
 
        return ret;
 
2938
        bdrv_delete(s->qcow);
 
2939
        goto err;
2942
2940
    }
2943
2941
 
2944
2942
#ifndef _WIN32
2951
2949
    *(void**)s->bs->backing_hd->opaque = s;
2952
2950
 
2953
2951
    return 0;
 
2952
 
 
2953
err:
 
2954
    g_free(s->qcow_filename);
 
2955
    s->qcow_filename = NULL;
 
2956
    return ret;
2954
2957
}
2955
2958
 
2956
2959
static void vvfat_close(BlockDriverState *bs)