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

« back to all changes in this revision

Viewing changes to src/qemu/qemu_hotplug.h

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
# define __QEMU_HOTPLUG_H__
26
26
 
27
27
# include "qemu_conf.h"
 
28
# include "qemu_domain.h"
28
29
# include "domain_conf.h"
29
30
 
30
31
int qemuDomainChangeEjectableMedia(struct qemud_driver *driver,
32
33
                                   virDomainDiskDefPtr disk,
33
34
                                   bool force);
34
35
int qemuDomainCheckEjectableMedia(struct qemud_driver *driver,
35
 
                                  virDomainObjPtr vm);
 
36
                                  virDomainObjPtr vm,
 
37
                                  enum qemuDomainAsyncJob asyncJob);
36
38
int qemuDomainAttachPciDiskDevice(virConnectPtr conn,
37
39
                                  struct qemud_driver *driver,
38
40
                                  virDomainObjPtr vm,
92
94
int qemuDomainDetachNetDevice(struct qemud_driver *driver,
93
95
                              virDomainObjPtr vm,
94
96
                              virDomainDeviceDefPtr dev);
95
 
int qemuDomainDetachHostPciDevice(struct qemud_driver *driver,
96
 
                                  virDomainObjPtr vm,
97
 
                                  virDomainDeviceDefPtr dev);
98
 
int qemuDomainDetachHostUsbDevice(struct qemud_driver *driver,
99
 
                                  virDomainObjPtr vm,
100
 
                                  virDomainDeviceDefPtr dev);
101
97
int qemuDomainDetachHostDevice(struct qemud_driver *driver,
102
98
                               virDomainObjPtr vm,
103
99
                               virDomainDeviceDefPtr dev);