diff options
| author | Evgeny Voevodin <e.voevodin@samsung.com> | 2012-06-14 10:44:10 +0400 |
|---|---|---|
| committer | Evgeny Voevodin <e.voevodin@samsung.com> | 2012-06-15 11:24:03 +0400 |
| commit | 63d1f301aef401eb4a458f556a53a9e7e094f4db (patch) | |
| tree | 357055380785f0dd0be2409711ee1d5b29fe8328 /hw/virtio-pci.c | |
| parent | 86b1aba4333787600b536c40ea615168bd312383 (diff) | |
| download | qemu-63d1f301aef401eb4a458f556a53a9e7e094f4db.tar.gz qemu-63d1f301aef401eb4a458f556a53a9e7e094f4db.tar.bz2 qemu-63d1f301aef401eb4a458f556a53a9e7e094f4db.zip | |
Tizen ARM: Add maru_arm board.
This commit adds basic maru_arm specific devices.
Few common files are modyfied to support ARM.
Also build.sh is modyfied to find out amount of
host CPUs and speed up compiling.
Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
Diffstat (limited to 'hw/virtio-pci.c')
| -rw-r--r-- | hw/virtio-pci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 784f2d8132..5c02ca5988 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -811,6 +811,7 @@ static int virtio_balloon_exit_pci(PCIDevice *pci_dev) } #ifndef _WIN32 +#ifdef CONFIG_GL extern VirtIODevice *virtio_gl_init(DeviceState *dev); static int virtio_gl_init_pci(PCIDevice *pci_dev) { @@ -825,6 +826,7 @@ static int virtio_gl_init_pci(PCIDevice *pci_dev) return 0; } #endif +#endif static Property virtio_blk_properties[] = { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), @@ -1010,6 +1012,7 @@ static TypeInfo virtio_scsi_info = { #ifndef _WIN32 +#ifdef CONFIG_GL static void virtio_gl_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); @@ -1031,6 +1034,7 @@ static TypeInfo virtio_gl_info = { .class_init = virtio_gl_class_init, }; #endif +#endif static void virtio_pci_register_types(void) { @@ -1040,8 +1044,10 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_balloon_info); type_register_static(&virtio_scsi_info); #ifndef _WIN32 +#ifdef CONFIG_GL type_register_static(&virtio_gl_info); #endif +#endif } |