~ubuntu-branches/ubuntu/raring/qemu-kvm/raring

« back to all changes in this revision

Viewing changes to hw/hw.h

  • Committer: Serge Hallyn
  • Date: 2011-12-06 22:40:24 UTC
  • mfrom: (1.2.8)
  • Revision ID: serge.hallyn@ubuntu.com-20111206224024-x6bw4wnn65pgf55v
Tags: 1.0+noroms-0ubuntu1
* New upstream release
* Remaining changes from upstream:
  - removed all binary roms and tests/pi_10.com
* debian/qemu-kvm.links: qemu is now called qemu-system-i386, don't symlink
  it
* remove patches applied upstream:
  - debian/patches/vpc.patch
  - debian/patches/e1000-Dont-set-the-Capabilities-List-bit.patch
  - debian/patches/CVE-2011-4111.patch
* replace default-to-tcg.patch with simpler fallback-to-tcg.patch
* keep remaining patches:
  - larger_default_ram_size.patch
  - CVE-2011-2212-virtqueue-indirect-overflow.patch
  - qemuifup-fix-paths.patch
  - dont-try-to-hotplug-cpu.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
85
85
int qemu_file_rate_limit(QEMUFile *f);
86
86
int64_t qemu_file_set_rate_limit(QEMUFile *f, int64_t new_rate);
87
87
int64_t qemu_file_get_rate_limit(QEMUFile *f);
88
 
int qemu_file_has_error(QEMUFile *f);
89
 
void qemu_file_set_error(QEMUFile *f);
 
88
int qemu_file_get_error(QEMUFile *f);
 
89
void qemu_file_set_error(QEMUFile *f, int error);
90
90
 
91
91
/* Try to send any outstanding data.  This function is useful when output is
92
92
 * halted due to rate limiting or EAGAIN errors occur as it can be used to
324
324
 
325
325
struct VMStateDescription {
326
326
    const char *name;
 
327
    int unmigratable;
327
328
    int version_id;
328
329
    int minimum_version_id;
329
330
    int minimum_version_id_old;
700
701
    .offset     = vmstate_offset_pointer(_state, _field, ptimer_state), \
701
702
}
702
703
 
 
704
extern const VMStateDescription vmstate_hid_keyboard_device;
 
705
 
 
706
#define VMSTATE_HID_KEYBOARD_DEVICE(_field, _state) {                \
 
707
    .name       = (stringify(_field)),                               \
 
708
    .size       = sizeof(HIDState),                                  \
 
709
    .vmsd       = &vmstate_hid_keyboard_device,                      \
 
710
    .flags      = VMS_STRUCT,                                        \
 
711
    .offset     = vmstate_offset_value(_state, _field, HIDState),    \
 
712
}
 
713
 
 
714
extern const VMStateDescription vmstate_hid_ptr_device;
 
715
 
 
716
#define VMSTATE_HID_POINTER_DEVICE(_field, _state) {                 \
 
717
    .name       = (stringify(_field)),                               \
 
718
    .size       = sizeof(HIDState),                                  \
 
719
    .vmsd       = &vmstate_hid_ptr_device,                           \
 
720
    .flags      = VMS_STRUCT,                                        \
 
721
    .offset     = vmstate_offset_value(_state, _field, HIDState),    \
 
722
}
 
723
 
703
724
/* _f : field name
704
725
   _f_n : num of elements field_name
705
726
   _n : num of elements