diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/file-op-9p.h | 2 | ||||
| -rw-r--r-- | hw/hw.h | 21 | ||||
| -rw-r--r-- | hw/mips.h | 2 | ||||
| -rw-r--r-- | hw/s390-virtio-bus.h | 16 | ||||
| -rw-r--r-- | hw/virtio-9p-xattr.h | 17 | ||||
| -rw-r--r-- | hw/virtio-9p.h | 4 | ||||
| -rw-r--r-- | hw/watchdog.h | 8 |
7 files changed, 33 insertions, 37 deletions
diff --git a/hw/file-op-9p.h b/hw/file-op-9p.h index c7731c2993..126e60e276 100644 --- a/hw/file-op-9p.h +++ b/hw/file-op-9p.h @@ -57,7 +57,7 @@ typedef struct FsContext struct xattr_operations **xops; } FsContext; -extern void cred_init(FsCred *); +void cred_init(FsCred *); typedef struct FileOperations { diff --git a/hw/hw.h b/hw/hw.h index 163a68327e..dd993de10c 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -799,17 +799,16 @@ extern const VMStateDescription vmstate_i2c_slave; #define VMSTATE_END_OF_LIST() \ {} -extern int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, - void *opaque, int version_id); -extern void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, - void *opaque); -extern int vmstate_register(DeviceState *dev, int instance_id, - const VMStateDescription *vmsd, void *base); -extern int vmstate_register_with_alias_id(DeviceState *dev, - int instance_id, - const VMStateDescription *vmsd, - void *base, int alias_id, - int required_for_version); +int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, + void *opaque, int version_id); +void vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, + void *opaque); +int vmstate_register(DeviceState *dev, int instance_id, + const VMStateDescription *vmsd, void *base); +int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, + const VMStateDescription *vmsd, + void *base, int alias_id, + int required_for_version); void vmstate_unregister(DeviceState *dev, const VMStateDescription *vmsd, void *opaque); #endif diff --git a/hw/mips.h b/hw/mips.h index 757e8f931c..73aa8f8b0e 100644 --- a/hw/mips.h +++ b/hw/mips.h @@ -21,7 +21,7 @@ int g364fb_mm_init(target_phys_addr_t vram_base, void mipsnet_init(int base, qemu_irq irq, NICInfo *nd); /* jazz_led.c */ -extern void jazz_led_init(target_phys_addr_t base); +void jazz_led_init(target_phys_addr_t base); /* rc4030.c */ typedef struct rc4030DMAState *rc4030_dma; diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 669b610a14..33379a3ba4 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -58,14 +58,12 @@ typedef struct VirtIOS390Bus { } VirtIOS390Bus; -extern void s390_virtio_device_update_status(VirtIOS390Device *dev); +void s390_virtio_device_update_status(VirtIOS390Device *dev); -extern VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus); -extern VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size); +VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus); +VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size); -extern VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus, - ram_addr_t mem, - int *vq_num); -extern VirtIOS390Device *s390_virtio_bus_find_mem(VirtIOS390Bus *bus, - ram_addr_t mem); -extern void s390_virtio_device_sync(VirtIOS390Device *dev); +VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus, + ram_addr_t mem, int *vq_num); +VirtIOS390Device *s390_virtio_bus_find_mem(VirtIOS390Bus *bus, ram_addr_t mem); +void s390_virtio_device_sync(VirtIOS390Device *dev); diff --git a/hw/virtio-9p-xattr.h b/hw/virtio-9p-xattr.h index a6e31a152f..2bbae2dcb5 100644 --- a/hw/virtio-9p-xattr.h +++ b/hw/virtio-9p-xattr.h @@ -41,16 +41,15 @@ extern XattrOperations *mapped_xattr_ops[]; extern XattrOperations *passthrough_xattr_ops[]; extern XattrOperations *none_xattr_ops[]; -extern ssize_t v9fs_get_xattr(FsContext *ctx, const char *path, - const char *name, void *value, size_t size); -extern ssize_t v9fs_list_xattr(FsContext *ctx, const char *path, - void *value, size_t vsize); -extern int v9fs_set_xattr(FsContext *ctx, const char *path, const char *name, +ssize_t v9fs_get_xattr(FsContext *ctx, const char *path, const char *name, + void *value, size_t size); +ssize_t v9fs_list_xattr(FsContext *ctx, const char *path, void *value, + size_t vsize); +int v9fs_set_xattr(FsContext *ctx, const char *path, const char *name, void *value, size_t size, int flags); -extern int v9fs_remove_xattr(FsContext *ctx, - const char *path, const char *name); -extern ssize_t pt_listxattr(FsContext *ctx, const char *path, - char *name, void *value, size_t size); +int v9fs_remove_xattr(FsContext *ctx, const char *path, const char *name); +ssize_t pt_listxattr(FsContext *ctx, const char *path, char *name, void *value, + size_t size); static inline ssize_t pt_getxattr(FsContext *ctx, const char *path, const char *name, void *value, size_t size) diff --git a/hw/virtio-9p.h b/hw/virtio-9p.h index 6c233192e3..2ae4ce7189 100644 --- a/hw/virtio-9p.h +++ b/hw/virtio-9p.h @@ -495,8 +495,8 @@ typedef struct V9fsReadLinkState V9fsString target; } V9fsReadLinkState; -extern size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count, - size_t offset, size_t size, int pack); +size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count, + size_t offset, size_t size, int pack); static inline size_t do_pdu_unpack(void *dst, struct iovec *sg, int sg_count, size_t offset, size_t size) diff --git a/hw/watchdog.h b/hw/watchdog.h index 8fd32c34da..c12a29311a 100644 --- a/hw/watchdog.h +++ b/hw/watchdog.h @@ -35,9 +35,9 @@ struct WatchdogTimerModel { typedef struct WatchdogTimerModel WatchdogTimerModel; /* in hw/watchdog.c */ -extern int select_watchdog(const char *p); -extern int select_watchdog_action(const char *action); -extern void watchdog_add_model(WatchdogTimerModel *model); -extern void watchdog_perform_action(void); +int select_watchdog(const char *p); +int select_watchdog_action(const char *action); +void watchdog_add_model(WatchdogTimerModel *model); +void watchdog_perform_action(void); #endif /* QEMU_WATCHDOG_H */ |