diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/compat.h | 10 | ||||
| -rw-r--r-- | include/hw/virtio/virtio-bus.h | 3 | ||||
| -rw-r--r-- | include/sysemu/kvm.h | 8 |
3 files changed, 20 insertions, 1 deletions
diff --git a/include/hw/compat.h b/include/hw/compat.h index 896a1b0508..d0b1c4f1ef 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -10,7 +10,15 @@ .driver = "e1000",\ .property = "extra_mac_registers",\ .value = "off",\ - }, + },{\ + .driver = "virtio-pci",\ + .property = "x-disable-pcie",\ + .value = "on",\ + },{\ + .driver = "virtio-pci",\ + .property = "migrate-extra",\ + .value = "off",\ + }, #define HW_COMPAT_2_3 \ {\ diff --git a/include/hw/virtio/virtio-bus.h b/include/hw/virtio/virtio-bus.h index 8811415fa6..6c3d4cb19e 100644 --- a/include/hw/virtio/virtio-bus.h +++ b/include/hw/virtio/virtio-bus.h @@ -44,9 +44,12 @@ typedef struct VirtioBusClass { void (*notify)(DeviceState *d, uint16_t vector); void (*save_config)(DeviceState *d, QEMUFile *f); void (*save_queue)(DeviceState *d, int n, QEMUFile *f); + void (*save_extra_state)(DeviceState *d, QEMUFile *f); int (*load_config)(DeviceState *d, QEMUFile *f); int (*load_queue)(DeviceState *d, int n, QEMUFile *f); int (*load_done)(DeviceState *d, QEMUFile *f); + int (*load_extra_state)(DeviceState *d, QEMUFile *f); + bool (*has_extra_state)(DeviceState *d); bool (*query_guest_notifiers)(DeviceState *d); int (*set_guest_notifiers)(DeviceState *d, int nvqs, bool assign); int (*set_host_notifier)(DeviceState *d, int n, bool assigned); diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 4ac6176879..b31f325fa2 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -53,6 +53,7 @@ extern bool kvm_gsi_routing_allowed; extern bool kvm_gsi_direct_mapping; extern bool kvm_readonly_mem_allowed; extern bool kvm_direct_msi_allowed; +extern bool kvm_ioeventfd_any_length_allowed; #if defined CONFIG_KVM || !defined NEED_CPU_H #define kvm_enabled() (kvm_allowed) @@ -153,6 +154,12 @@ extern bool kvm_direct_msi_allowed; */ #define kvm_direct_msi_enabled() (kvm_direct_msi_allowed) +/** + * kvm_ioeventfd_any_length_enabled: + * Returns: true if KVM allows any length io eventfd. + */ +#define kvm_ioeventfd_any_length_enabled() (kvm_ioeventfd_any_length_allowed) + #else #define kvm_enabled() (0) #define kvm_irqchip_in_kernel() (false) @@ -166,6 +173,7 @@ extern bool kvm_direct_msi_allowed; #define kvm_gsi_direct_mapping() (false) #define kvm_readonly_mem_enabled() (false) #define kvm_direct_msi_enabled() (false) +#define kvm_ioeventfd_any_length_enabled() (false) #endif struct kvm_run; |