← Back to branch summary

~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to src/xen/xen_hypervisor.c

  • Committer: Package Import Robot
  • Author(s): Stefan Bader
  • Date: 2012-10-05 11:35:43 UTC
  • Revision ID: package-import@ubuntu.com-20121005113543-ev8y0jz9ra6que1o
Tags: 0.9.13-0ubuntu12
https://launchpad.net/bugs/914788
https://launchpad.net/bugs/922486
* Refresh fix-ubuntu-xen-qemu-dm-path.patch to only use executable
  names and let the toolchain find out the right paths (LP: #914788).
  Thanks George Dunlap.
* Refresh and re-activate xen_hypervisor-treat-missing-privcmd-file-
  as-temporary.patch (LP: #922486)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xen/xen_hypervisor.c
2034
2034
    ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR);
2035
2035
    if (ret < 0) {
2036
2036
        hv_versions.hypervisor = -1;
 
2037
        in_init = 0;
 
2038
        /* Missing socket may appear after xenfs is loaded as a module */
 
2039
        initialized = 0;
2037
2040
        return -1;
2038
2041
    }
2039
2042
    fd = ret;
2356
2359
                                             guest_archs[i].model,
2357
2360
                                             guest_archs[i].bits,
2358
2361
                                             (STREQ(hostmachine, "x86_64") ?
2359
 
                                              "/usr/lib/xen-default/bin/qemu-dm" :
2360
 
                                              "/usr/lib/xen-default/bin/qemu-dm"),
 
2362
                                              "qemu-dm" :
 
2363
                                              "qemu-dm"),
2361
2364
                                             (guest_archs[i].hvm ?
2362
 
                                              "/usr/lib/xen-default/boot/hvmloader" :
 
2365
                                              "hvmloader" :
2363
2366
                                              NULL),
2364
2367
                                             1,
2365
2368
                                             machines)) == NULL) {