mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
savevm: Remove all the unneeded version_minimum_id_old (x86)
After previous Peter patch, they are redundant. This way we don't assign them except when needed. Once there, there were lots of case where the ".fields" indentation was wrong: .fields = (VMStateField []) { and .fields = (VMStateField []) { Change all the combinations to: .fields = (VMStateField[]){ The biggest problem (appart from aesthetics) was that checkpatch complained when we copy&pasted the code from one place to another. Signed-off-by: Juan Quintela <quintela@redhat.com> Acked-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
3aff6c2fea
commit
d49805aeea
65 changed files with 113 additions and 219 deletions
|
@ -1163,8 +1163,7 @@ static const VMStateDescription vmstate_ac97_bm_regs = {
|
|||
.name = "ac97_bm_regs",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.minimum_version_id_old = 1,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32 (bdbar, AC97BusMasterRegs),
|
||||
VMSTATE_UINT8 (civ, AC97BusMasterRegs),
|
||||
VMSTATE_UINT8 (lvi, AC97BusMasterRegs),
|
||||
|
@ -1211,9 +1210,8 @@ static const VMStateDescription vmstate_ac97 = {
|
|||
.name = "ac97",
|
||||
.version_id = 3,
|
||||
.minimum_version_id = 2,
|
||||
.minimum_version_id_old = 2,
|
||||
.post_load = ac97_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_PCI_DEVICE (dev, AC97LinkState),
|
||||
VMSTATE_UINT32 (glob_cnt, AC97LinkState),
|
||||
VMSTATE_UINT32 (glob_sta, AC97LinkState),
|
||||
|
|
|
@ -137,8 +137,7 @@ static const VMStateDescription vmstate_cs4231 = {
|
|||
.name ="cs4231",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.minimum_version_id_old = 1,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32_ARRAY(regs, CSState, CS_REGS),
|
||||
VMSTATE_UINT8_ARRAY(dregs, CSState, CS_DREGS),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -621,10 +621,9 @@ static const VMStateDescription vmstate_cs4231a = {
|
|||
.name = "cs4231a",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.minimum_version_id_old = 1,
|
||||
.pre_load = cs4231a_pre_load,
|
||||
.post_load = cs4231a_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32_ARRAY (regs, CSState, CS_REGS),
|
||||
VMSTATE_BUFFER (dregs, CSState),
|
||||
VMSTATE_INT32 (dma_running, CSState),
|
||||
|
|
|
@ -953,8 +953,7 @@ static const VMStateDescription vmstate_es1370_channel = {
|
|||
.name = "es1370_channel",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.minimum_version_id_old = 2,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32 (shift, struct chan),
|
||||
VMSTATE_UINT32 (leftover, struct chan),
|
||||
VMSTATE_UINT32 (scount, struct chan),
|
||||
|
@ -997,9 +996,8 @@ static const VMStateDescription vmstate_es1370 = {
|
|||
.name = "es1370",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.minimum_version_id_old = 2,
|
||||
.post_load = es1370_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_PCI_DEVICE (dev, ES1370State),
|
||||
VMSTATE_STRUCT_ARRAY (chan, ES1370State, NB_CHANNELS, 2,
|
||||
vmstate_es1370_channel, struct chan),
|
||||
|
|
|
@ -222,8 +222,7 @@ static const VMStateDescription vmstate_gus = {
|
|||
.name = "gus",
|
||||
.version_id = 2,
|
||||
.minimum_version_id = 2,
|
||||
.minimum_version_id_old = 2,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_INT32 (pos, GUSState),
|
||||
VMSTATE_INT32 (left, GUSState),
|
||||
VMSTATE_INT32 (shift, GUSState),
|
||||
|
|
|
@ -583,7 +583,7 @@ static void hda_audio_reset(DeviceState *dev)
|
|||
static const VMStateDescription vmstate_hda_audio_stream = {
|
||||
.name = "hda-audio-stream",
|
||||
.version_id = 1,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32(stream, HDAAudioStream),
|
||||
VMSTATE_UINT32(channel, HDAAudioStream),
|
||||
VMSTATE_UINT32(format, HDAAudioStream),
|
||||
|
@ -601,7 +601,7 @@ static const VMStateDescription vmstate_hda_audio = {
|
|||
.name = "hda-audio",
|
||||
.version_id = 2,
|
||||
.post_load = hda_audio_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_STRUCT_ARRAY(st, HDAAudioState, 4, 0,
|
||||
vmstate_hda_audio_stream,
|
||||
HDAAudioStream),
|
||||
|
|
|
@ -1176,7 +1176,7 @@ static int intel_hda_post_load(void *opaque, int version)
|
|||
static const VMStateDescription vmstate_intel_hda_stream = {
|
||||
.name = "intel-hda-stream",
|
||||
.version_id = 1,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32(ctl, IntelHDAStream),
|
||||
VMSTATE_UINT32(lpib, IntelHDAStream),
|
||||
VMSTATE_UINT32(cbl, IntelHDAStream),
|
||||
|
@ -1192,7 +1192,7 @@ static const VMStateDescription vmstate_intel_hda = {
|
|||
.name = "intel-hda",
|
||||
.version_id = 1,
|
||||
.post_load = intel_hda_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_PCI_DEVICE(pci, IntelHDAState),
|
||||
|
||||
/* registers */
|
||||
|
|
|
@ -1289,9 +1289,8 @@ static const VMStateDescription vmstate_sb16 = {
|
|||
.name = "sb16",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.minimum_version_id_old = 1,
|
||||
.post_load = sb16_post_load,
|
||||
.fields = (VMStateField []) {
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT32 (irq, SB16State),
|
||||
VMSTATE_UINT32 (dma, SB16State),
|
||||
VMSTATE_UINT32 (hdma, SB16State),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue