diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-19 08:38:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-19 08:38:16 -0500 |
| commit | f691df528340807d42247fe79a89ea88e6303e1d (patch) | |
| tree | a7d723e846a4754e994026e08d7609c3ea6d3f6f /include/hw | |
| parent | 5dff24bebae5103810002ea76b1d03927e2148f2 (diff) | |
| parent | ad6b40f471cf8bf7b106032145b1b2ac105f99cf (diff) | |
| download | hqemu-f691df528340807d42247fe79a89ea88e6303e1d.zip hqemu-f691df528340807d42247fe79a89ea88e6303e1d.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Stefan Weil (3) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
m25p80: Remove bogus include of devices.h
ssh: Remove unnecessary use of strlen function.
block/ssh: Add missing gcc format attributes
linux-user: change do_semop to return target errno when unsuccessful
w64: Fix compiler warnings (wrong format specifier)
Remove unneeded type casts
virtio.h: drop unused function prototypes
bswap: fix compiler warning
Message-id: 1366371241-23430-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/virtio/virtio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index b21e5c2..d3f1436 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -258,7 +258,6 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, uint32_t host_features); typedef struct virtio_serial_conf virtio_serial_conf; VirtIODevice *virtio_serial_init(DeviceState *dev, virtio_serial_conf *serial); -VirtIODevice *virtio_balloon_init(DeviceState *dev); typedef struct VirtIOSCSIConf VirtIOSCSIConf; VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *conf); typedef struct VirtIORNGConf VirtIORNGConf; @@ -270,7 +269,6 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf); void virtio_net_exit(VirtIODevice *vdev); void virtio_serial_exit(VirtIODevice *vdev); -void virtio_balloon_exit(VirtIODevice *vdev); void virtio_scsi_exit(VirtIODevice *vdev); void virtio_rng_exit(VirtIODevice *vdev); |
