← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/hw/qdev-core.h

  • 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:
include/hw/qdev-core.h
4
4
#include "qemu/queue.h"
5
5
#include "qemu/option.h"
6
6
#include "qemu/typedefs.h"
 
7
#include "qemu/bitmap.h"
7
8
#include "qom/object.h"
8
9
#include "hw/irq.h"
9
10
#include "qapi/error.h"
17
18
#define DEVICE_CLASS(klass) OBJECT_CLASS_CHECK(DeviceClass, (klass), TYPE_DEVICE)
18
19
#define DEVICE_GET_CLASS(obj) OBJECT_GET_CLASS(DeviceClass, (obj), TYPE_DEVICE)
19
20
 
 
21
typedef enum DeviceCategory {
 
22
    DEVICE_CATEGORY_BRIDGE,
 
23
    DEVICE_CATEGORY_USB,
 
24
    DEVICE_CATEGORY_STORAGE,
 
25
    DEVICE_CATEGORY_NETWORK,
 
26
    DEVICE_CATEGORY_INPUT,
 
27
    DEVICE_CATEGORY_DISPLAY,
 
28
    DEVICE_CATEGORY_SOUND,
 
29
    DEVICE_CATEGORY_MISC,
 
30
    DEVICE_CATEGORY_MAX
 
31
} DeviceCategory;
 
32
 
 
33
static inline const char *qdev_category_get_name(DeviceCategory category)
 
34
{
 
35
    static const char *category_names[DEVICE_CATEGORY_MAX] = {
 
36
        [DEVICE_CATEGORY_BRIDGE]  = "Controller/Bridge/Hub",
 
37
        [DEVICE_CATEGORY_USB]     = "USB",
 
38
        [DEVICE_CATEGORY_STORAGE] = "Storage",
 
39
        [DEVICE_CATEGORY_NETWORK] = "Network",
 
40
        [DEVICE_CATEGORY_INPUT]   = "Input",
 
41
        [DEVICE_CATEGORY_DISPLAY] = "Display",
 
42
        [DEVICE_CATEGORY_SOUND]   = "Sound",
 
43
        [DEVICE_CATEGORY_MISC]    = "Misc",
 
44
    };
 
45
 
 
46
    return category_names[category];
 
47
};
 
48
 
20
49
typedef int (*qdev_initfn)(DeviceState *dev);
21
50
typedef int (*qdev_event)(DeviceState *dev);
22
51
typedef void (*qdev_resetfn)(DeviceState *dev);
80
109
    ObjectClass parent_class;
81
110
    /*< public >*/
82
111
 
 
112
    DECLARE_BITMAP(categories, DEVICE_CATEGORY_MAX);
83
113
    const char *fw_name;
84
114
    const char *desc;
85
115
    Property *props;
261
291
 
262
292
void qbus_free(BusState *bus);
263
293
 
264
 
#define FROM_QBUS(type, dev) DO_UPCAST(type, qbus, dev)
265
 
 
266
294
/* This should go away once we get rid of the NULL bus hack */
267
295
BusState *sysbus_get_default(void);
268
296