From bee8d6842d1421ce3456779492561a92530e9c5a Mon Sep 17 00:00:00 2001 From: ths Date: Sun, 16 Dec 2007 23:41:11 +0000 Subject: [PATCH] qemu_put signedness fixes, by Andre Przywara. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3824 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/acpi.c | 4 +- hw/apic.c | 12 ++--- hw/cirrus_vga.c | 8 ++-- hw/dma.c | 12 ++--- hw/i8254.c | 12 ++--- hw/ide.c | 8 ++-- hw/mc146818rtc.c | 36 +++++++------- hw/pcnet.c | 24 +++++----- hw/ps2.c | 36 +++++++------- hw/rtl8139.c | 12 ++--- hw/sb16.c | 120 +++++++++++++++++++++++------------------------ hw/vga.c | 10 ++-- hw/vmware_vga.c | 48 +++++++++---------- vl.c | 12 ++--- 14 files changed, 177 insertions(+), 177 deletions(-) diff --git a/hw/acpi.c b/hw/acpi.c index 5a4b1e4ee6..a2efd9c3ca 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -439,7 +439,7 @@ static void pm_save(QEMUFile* f,void *opaque) qemu_put_8s(f, &s->apmc); qemu_put_8s(f, &s->apms); qemu_put_timer(f, s->tmr_timer); - qemu_put_be64s(f, &s->tmr_overflow_time); + qemu_put_be64(f, s->tmr_overflow_time); } static int pm_load(QEMUFile* f,void* opaque,int version_id) @@ -460,7 +460,7 @@ static int pm_load(QEMUFile* f,void* opaque,int version_id) qemu_get_8s(f, &s->apmc); qemu_get_8s(f, &s->apms); qemu_get_timer(f, s->tmr_timer); - qemu_get_be64s(f, &s->tmr_overflow_time); + s->tmr_overflow_time=qemu_get_be64(f); pm_io_space_update(s); diff --git a/hw/apic.c b/hw/apic.c index 78f49d199b..db02f9a985 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -761,10 +761,10 @@ static void apic_save(QEMUFile *f, void *opaque) qemu_put_be32s(f, &s->icr[0]); qemu_put_be32s(f, &s->icr[1]); qemu_put_be32s(f, &s->divide_conf); - qemu_put_be32s(f, &s->count_shift); + qemu_put_be32(f, s->count_shift); qemu_put_be32s(f, &s->initial_count); - qemu_put_be64s(f, &s->initial_count_load_time); - qemu_put_be64s(f, &s->next_time); + qemu_put_be64(f, s->initial_count_load_time); + qemu_put_be64(f, s->next_time); qemu_put_timer(f, s->timer); } @@ -797,10 +797,10 @@ static int apic_load(QEMUFile *f, void *opaque, int version_id) qemu_get_be32s(f, &s->icr[0]); qemu_get_be32s(f, &s->icr[1]); qemu_get_be32s(f, &s->divide_conf); - qemu_get_be32s(f, &s->count_shift); + s->count_shift=qemu_get_be32(f); qemu_get_be32s(f, &s->initial_count); - qemu_get_be64s(f, &s->initial_count_load_time); - qemu_get_be64s(f, &s->next_time); + s->initial_count_load_time=qemu_get_be64(f); + s->next_time=qemu_get_be64(f); if (version_id >= 2) qemu_get_timer(f, s->timer); diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index c35edf2607..59bfdff56b 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2985,7 +2985,7 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, s->gr + 2, 254); qemu_put_8s(f, &s->ar_index); qemu_put_buffer(f, s->ar, 21); - qemu_put_be32s(f, &s->ar_flip_flop); + qemu_put_be32(f, s->ar_flip_flop); qemu_put_8s(f, &s->cr_index); qemu_put_buffer(f, s->cr, 256); qemu_put_8s(f, &s->msr); @@ -3000,7 +3000,7 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, s->dac_cache, 3); qemu_put_buffer(f, s->palette, 768); - qemu_put_be32s(f, &s->bank_offset); + qemu_put_be32(f, s->bank_offset); qemu_put_8s(f, &s->cirrus_hidden_dac_lockindex); qemu_put_8s(f, &s->cirrus_hidden_dac_data); @@ -3036,7 +3036,7 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, s->gr + 2, 254); qemu_get_8s(f, &s->ar_index); qemu_get_buffer(f, s->ar, 21); - qemu_get_be32s(f, &s->ar_flip_flop); + s->ar_flip_flop=qemu_get_be32(f); qemu_get_8s(f, &s->cr_index); qemu_get_buffer(f, s->cr, 256); qemu_get_8s(f, &s->msr); @@ -3051,7 +3051,7 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, s->dac_cache, 3); qemu_get_buffer(f, s->palette, 768); - qemu_get_be32s(f, &s->bank_offset); + s->bank_offset=qemu_get_be32(f); qemu_get_8s(f, &s->cirrus_hidden_dac_lockindex); qemu_get_8s(f, &s->cirrus_hidden_dac_data); diff --git a/hw/dma.c b/hw/dma.c index d779e4c94a..1891b2278c 100644 --- a/hw/dma.c +++ b/hw/dma.c @@ -482,12 +482,12 @@ static void dma_save (QEMUFile *f, void *opaque) qemu_put_8s (f, &d->command); qemu_put_8s (f, &d->mask); qemu_put_8s (f, &d->flip_flop); - qemu_put_be32s (f, &d->dshift); + qemu_put_be32 (f, d->dshift); for (i = 0; i < 4; ++i) { struct dma_regs *r = &d->regs[i]; - qemu_put_be32s (f, &r->now[0]); - qemu_put_be32s (f, &r->now[1]); + qemu_put_be32 (f, r->now[0]); + qemu_put_be32 (f, r->now[1]); qemu_put_be16s (f, &r->base[0]); qemu_put_be16s (f, &r->base[1]); qemu_put_8s (f, &r->mode); @@ -510,12 +510,12 @@ static int dma_load (QEMUFile *f, void *opaque, int version_id) qemu_get_8s (f, &d->command); qemu_get_8s (f, &d->mask); qemu_get_8s (f, &d->flip_flop); - qemu_get_be32s (f, &d->dshift); + d->dshift=qemu_get_be32 (f); for (i = 0; i < 4; ++i) { struct dma_regs *r = &d->regs[i]; - qemu_get_be32s (f, &r->now[0]); - qemu_get_be32s (f, &r->now[1]); + r->now[0]=qemu_get_be32 (f); + r->now[1]=qemu_get_be32 (f); qemu_get_be16s (f, &r->base[0]); qemu_get_be16s (f, &r->base[1]); qemu_get_8s (f, &r->mode); diff --git a/hw/i8254.c b/hw/i8254.c index 0c59aa3f61..4813b0374c 100644 --- a/hw/i8254.c +++ b/hw/i8254.c @@ -397,7 +397,7 @@ static void pit_save(QEMUFile *f, void *opaque) for(i = 0; i < 3; i++) { s = &pit->channels[i]; - qemu_put_be32s(f, &s->count); + qemu_put_be32(f, s->count); qemu_put_be16s(f, &s->latched_count); qemu_put_8s(f, &s->count_latched); qemu_put_8s(f, &s->status_latched); @@ -409,9 +409,9 @@ static void pit_save(QEMUFile *f, void *opaque) qemu_put_8s(f, &s->mode); qemu_put_8s(f, &s->bcd); qemu_put_8s(f, &s->gate); - qemu_put_be64s(f, &s->count_load_time); + qemu_put_be64(f, s->count_load_time); if (s->irq_timer) { - qemu_put_be64s(f, &s->next_transition_time); + qemu_put_be64(f, s->next_transition_time); qemu_put_timer(f, s->irq_timer); } } @@ -428,7 +428,7 @@ static int pit_load(QEMUFile *f, void *opaque, int version_id) for(i = 0; i < 3; i++) { s = &pit->channels[i]; - qemu_get_be32s(f, &s->count); + s->count=qemu_get_be32(f); qemu_get_be16s(f, &s->latched_count); qemu_get_8s(f, &s->count_latched); qemu_get_8s(f, &s->status_latched); @@ -440,9 +440,9 @@ static int pit_load(QEMUFile *f, void *opaque, int version_id) qemu_get_8s(f, &s->mode); qemu_get_8s(f, &s->bcd); qemu_get_8s(f, &s->gate); - qemu_get_be64s(f, &s->count_load_time); + s->count_load_time=qemu_get_be64(f); if (s->irq_timer) { - qemu_get_be64s(f, &s->next_transition_time); + s->next_transition_time=qemu_get_be64(f); qemu_get_timer(f, s->irq_timer); } } diff --git a/hw/ide.c b/hw/ide.c index 3bf8be01e5..18431e7a33 100644 --- a/hw/ide.c +++ b/hw/ide.c @@ -2509,8 +2509,8 @@ static void ide_init_ioport(IDEState *ide_state, int iobase, int iobase2) /* save per IDE drive data */ static void ide_save(QEMUFile* f, IDEState *s) { - qemu_put_be32s(f, &s->mult_sectors); - qemu_put_be32s(f, &s->identify_set); + qemu_put_be32(f, s->mult_sectors); + qemu_put_be32(f, s->identify_set); if (s->identify_set) { qemu_put_buffer(f, (const uint8_t *)s->identify_data, 512); } @@ -2537,8 +2537,8 @@ static void ide_save(QEMUFile* f, IDEState *s) /* load per IDE drive data */ static void ide_load(QEMUFile* f, IDEState *s) { - qemu_get_be32s(f, &s->mult_sectors); - qemu_get_be32s(f, &s->identify_set); + s->mult_sectors=qemu_get_be32(f); + s->identify_set=qemu_get_be32(f); if (s->identify_set) { qemu_get_buffer(f, (uint8_t *)s->identify_data, 512); } diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index c1d595677b..e1e6427687 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -421,18 +421,18 @@ static void rtc_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, s->cmos_data, 128); qemu_put_8s(f, &s->cmos_index); - qemu_put_be32s(f, &s->current_tm.tm_sec); - qemu_put_be32s(f, &s->current_tm.tm_min); - qemu_put_be32s(f, &s->current_tm.tm_hour); - qemu_put_be32s(f, &s->current_tm.tm_wday); - qemu_put_be32s(f, &s->current_tm.tm_mday); - qemu_put_be32s(f, &s->current_tm.tm_mon); - qemu_put_be32s(f, &s->current_tm.tm_year); + qemu_put_be32(f, s->current_tm.tm_sec); + qemu_put_be32(f, s->current_tm.tm_min); + qemu_put_be32(f, s->current_tm.tm_hour); + qemu_put_be32(f, s->current_tm.tm_wday); + qemu_put_be32(f, s->current_tm.tm_mday); + qemu_put_be32(f, s->current_tm.tm_mon); + qemu_put_be32(f, s->current_tm.tm_year); qemu_put_timer(f, s->periodic_timer); - qemu_put_be64s(f, &s->next_periodic_time); + qemu_put_be64(f, s->next_periodic_time); - qemu_put_be64s(f, &s->next_second_time); + qemu_put_be64(f, s->next_second_time); qemu_put_timer(f, s->second_timer); qemu_put_timer(f, s->second_timer2); } @@ -447,18 +447,18 @@ static int rtc_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, s->cmos_data, 128); qemu_get_8s(f, &s->cmos_index); - qemu_get_be32s(f, &s->current_tm.tm_sec); - qemu_get_be32s(f, &s->current_tm.tm_min); - qemu_get_be32s(f, &s->current_tm.tm_hour); - qemu_get_be32s(f, &s->current_tm.tm_wday); - qemu_get_be32s(f, &s->current_tm.tm_mday); - qemu_get_be32s(f, &s->current_tm.tm_mon); - qemu_get_be32s(f, &s->current_tm.tm_year); + s->current_tm.tm_sec=qemu_get_be32(f); + s->current_tm.tm_min=qemu_get_be32(f); + s->current_tm.tm_hour=qemu_get_be32(f); + s->current_tm.tm_wday=qemu_get_be32(f); + s->current_tm.tm_mday=qemu_get_be32(f); + s->current_tm.tm_mon=qemu_get_be32(f); + s->current_tm.tm_year=qemu_get_be32(f); qemu_get_timer(f, s->periodic_timer); - qemu_get_be64s(f, &s->next_periodic_time); + s->next_periodic_time=qemu_get_be64(f); - qemu_get_be64s(f, &s->next_second_time); + s->next_second_time=qemu_get_be64(f); qemu_get_timer(f, s->second_timer); qemu_get_timer(f, s->second_timer2); return 0; diff --git a/hw/pcnet.c b/hw/pcnet.c index 5a6c36c28f..3466082dc8 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1843,9 +1843,9 @@ static void pcnet_save(QEMUFile *f, void *opaque) if (s->pci_dev) pci_device_save(s->pci_dev, f); - qemu_put_be32s(f, &s->rap); - qemu_put_be32s(f, &s->isr); - qemu_put_be32s(f, &s->lnkst); + qemu_put_be32(f, s->rap); + qemu_put_be32(f, s->isr); + qemu_put_be32(f, s->lnkst); qemu_put_be32s(f, &s->rdra); qemu_put_be32s(f, &s->tdra); qemu_put_buffer(f, s->prom, 16); @@ -1854,10 +1854,10 @@ static void pcnet_save(QEMUFile *f, void *opaque) for (i = 0; i < 32; i++) qemu_put_be16s(f, &s->bcr[i]); qemu_put_be64s(f, &s->timer); - qemu_put_be32s(f, &s->xmit_pos); - qemu_put_be32s(f, &s->recv_pos); + qemu_put_be32(f, s->xmit_pos); + qemu_put_be32(f, s->recv_pos); qemu_put_buffer(f, s->buffer, 4096); - qemu_put_be32s(f, &s->tx_busy); + qemu_put_be32(f, s->tx_busy); qemu_put_timer(f, s->poll_timer); } @@ -1875,9 +1875,9 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id) return ret; } - qemu_get_be32s(f, &s->rap); - qemu_get_be32s(f, &s->isr); - qemu_get_be32s(f, &s->lnkst); + qemu_get_be32s(f, (uint32_t*)&s->rap); + qemu_get_be32s(f, (uint32_t*)&s->isr); + qemu_get_be32s(f, (uint32_t*)&s->lnkst); qemu_get_be32s(f, &s->rdra); qemu_get_be32s(f, &s->tdra); qemu_get_buffer(f, s->prom, 16); @@ -1886,10 +1886,10 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id) for (i = 0; i < 32; i++) qemu_get_be16s(f, &s->bcr[i]); qemu_get_be64s(f, &s->timer); - qemu_get_be32s(f, &s->xmit_pos); - qemu_get_be32s(f, &s->recv_pos); + qemu_get_be32s(f, (uint32_t*)&s->xmit_pos); + qemu_get_be32s(f, (uint32_t*)&s->recv_pos); qemu_get_buffer(f, s->buffer, 4096); - qemu_get_be32s(f, &s->tx_busy); + qemu_get_be32s(f, (uint32_t*)&s->tx_busy); qemu_get_timer(f, s->poll_timer); return 0; diff --git a/hw/ps2.c b/hw/ps2.c index a0adca36ea..130e894784 100644 --- a/hw/ps2.c +++ b/hw/ps2.c @@ -470,19 +470,19 @@ static void ps2_reset(void *opaque) static void ps2_common_save (QEMUFile *f, PS2State *s) { - qemu_put_be32s (f, &s->write_cmd); - qemu_put_be32s (f, &s->queue.rptr); - qemu_put_be32s (f, &s->queue.wptr); - qemu_put_be32s (f, &s->queue.count); + qemu_put_be32 (f, s->write_cmd); + qemu_put_be32 (f, s->queue.rptr); + qemu_put_be32 (f, s->queue.wptr); + qemu_put_be32 (f, s->queue.count); qemu_put_buffer (f, s->queue.data, sizeof (s->queue.data)); } static void ps2_common_load (QEMUFile *f, PS2State *s) { - qemu_get_be32s (f, &s->write_cmd); - qemu_get_be32s (f, &s->queue.rptr); - qemu_get_be32s (f, &s->queue.wptr); - qemu_get_be32s (f, &s->queue.count); + s->write_cmd=qemu_get_be32 (f); + s->queue.rptr=qemu_get_be32 (f); + s->queue.wptr=qemu_get_be32 (f); + s->queue.count=qemu_get_be32 (f); qemu_get_buffer (f, s->queue.data, sizeof (s->queue.data)); } @@ -491,8 +491,8 @@ static void ps2_kbd_save(QEMUFile* f, void* opaque) PS2KbdState *s = (PS2KbdState*)opaque; ps2_common_save (f, &s->common); - qemu_put_be32s(f, &s->scan_enabled); - qemu_put_be32s(f, &s->translate); + qemu_put_be32(f, s->scan_enabled); + qemu_put_be32(f, s->translate); } static void ps2_mouse_save(QEMUFile* f, void* opaque) @@ -506,9 +506,9 @@ static void ps2_mouse_save(QEMUFile* f, void* opaque) qemu_put_8s(f, &s->mouse_wrap); qemu_put_8s(f, &s->mouse_type); qemu_put_8s(f, &s->mouse_detect_state); - qemu_put_be32s(f, &s->mouse_dx); - qemu_put_be32s(f, &s->mouse_dy); - qemu_put_be32s(f, &s->mouse_dz); + qemu_put_be32(f, s->mouse_dx); + qemu_put_be32(f, s->mouse_dy); + qemu_put_be32(f, s->mouse_dz); qemu_put_8s(f, &s->mouse_buttons); } @@ -520,8 +520,8 @@ static int ps2_kbd_load(QEMUFile* f, void* opaque, int version_id) return -EINVAL; ps2_common_load (f, &s->common); - qemu_get_be32s(f, &s->scan_enabled); - qemu_get_be32s(f, &s->translate); + s->scan_enabled=qemu_get_be32(f); + s->translate=qemu_get_be32(f); return 0; } @@ -539,9 +539,9 @@ static int ps2_mouse_load(QEMUFile* f, void* opaque, int version_id) qemu_get_8s(f, &s->mouse_wrap); qemu_get_8s(f, &s->mouse_type); qemu_get_8s(f, &s->mouse_detect_state); - qemu_get_be32s(f, &s->mouse_dx); - qemu_get_be32s(f, &s->mouse_dy); - qemu_get_be32s(f, &s->mouse_dz); + s->mouse_dx=qemu_get_be32(f); + s->mouse_dy=qemu_get_be32(f); + s->mouse_dz=qemu_get_be32(f); qemu_get_8s(f, &s->mouse_buttons); return 0; } diff --git a/hw/rtl8139.c b/hw/rtl8139.c index 8a23bb7b9a..2c6a6984b0 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3172,7 +3172,7 @@ static void rtl8139_save(QEMUFile* f,void* opaque) i = 0; qemu_put_be32s(f, &i); /* unused. */ qemu_put_buffer(f, s->macaddr, 6); - qemu_put_be32s(f, &s->rtl8139_mmio_io_addr); + qemu_put_be32(f, s->rtl8139_mmio_io_addr); qemu_put_be32s(f, &s->currTxDesc); qemu_put_be32s(f, &s->currCPlusRxDesc); @@ -3184,7 +3184,7 @@ static void rtl8139_save(QEMUFile* f,void* opaque) { qemu_put_be16s(f, &s->eeprom.contents[i]); } - qemu_put_be32s(f, &s->eeprom.mode); + qemu_put_be32(f, s->eeprom.mode); qemu_put_be32s(f, &s->eeprom.tick); qemu_put_8s(f, &s->eeprom.address); qemu_put_be16s(f, &s->eeprom.input); @@ -3197,7 +3197,7 @@ static void rtl8139_save(QEMUFile* f,void* opaque) qemu_put_be32s(f, &s->TCTR); qemu_put_be32s(f, &s->TimerInt); - qemu_put_be64s(f, &s->TCTR_base); + qemu_put_be64(f, s->TCTR_base); RTL8139TallyCounters_save(f, &s->tally_counters); } @@ -3267,7 +3267,7 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id) qemu_get_be32s(f, &i); /* unused. */ qemu_get_buffer(f, s->macaddr, 6); - qemu_get_be32s(f, &s->rtl8139_mmio_io_addr); + s->rtl8139_mmio_io_addr=qemu_get_be32(f); qemu_get_be32s(f, &s->currTxDesc); qemu_get_be32s(f, &s->currCPlusRxDesc); @@ -3279,7 +3279,7 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id) { qemu_get_be16s(f, &s->eeprom.contents[i]); } - qemu_get_be32s(f, &s->eeprom.mode); + s->eeprom.mode=qemu_get_be32(f); qemu_get_be32s(f, &s->eeprom.tick); qemu_get_8s(f, &s->eeprom.address); qemu_get_be16s(f, &s->eeprom.input); @@ -3295,7 +3295,7 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id) { qemu_get_be32s(f, &s->TCTR); qemu_get_be32s(f, &s->TimerInt); - qemu_get_be64s(f, &s->TCTR_base); + s->TCTR_base=qemu_get_be64(f); RTL8139TallyCounters_load(f, &s->tally_counters); } diff --git a/hw/sb16.c b/hw/sb16.c index 4e6cc3041f..effbfbcf8d 100644 --- a/hw/sb16.c +++ b/hw/sb16.c @@ -1257,29 +1257,29 @@ static void SB_save (QEMUFile *f, void *opaque) { SB16State *s = opaque; - qemu_put_be32s (f, &s->irq); - qemu_put_be32s (f, &s->dma); - qemu_put_be32s (f, &s->hdma); - qemu_put_be32s (f, &s->port); - qemu_put_be32s (f, &s->ver); - qemu_put_be32s (f, &s->in_index); - qemu_put_be32s (f, &s->out_data_len); - qemu_put_be32s (f, &s->fmt_stereo); - qemu_put_be32s (f, &s->fmt_signed); - qemu_put_be32s (f, &s->fmt_bits); + qemu_put_be32 (f, s->irq); + qemu_put_be32 (f, s->dma); + qemu_put_be32 (f, s->hdma); + qemu_put_be32 (f, s->port); + qemu_put_be32 (f, s->ver); + qemu_put_be32 (f, s->in_index); + qemu_put_be32 (f, s->out_data_len); + qemu_put_be32 (f, s->fmt_stereo); + qemu_put_be32 (f, s->fmt_signed); + qemu_put_be32 (f, s->fmt_bits); qemu_put_be32s (f, &s->fmt); - qemu_put_be32s (f, &s->dma_auto); - qemu_put_be32s (f, &s->block_size); - qemu_put_be32s (f, &s->fifo); - qemu_put_be32s (f, &s->freq); - qemu_put_be32s (f, &s->time_const); - qemu_put_be32s (f, &s->speaker); - qemu_put_be32s (f, &s->needed_bytes); - qemu_put_be32s (f, &s->cmd); - qemu_put_be32s (f, &s->use_hdma); - qemu_put_be32s (f, &s->highspeed); - qemu_put_be32s (f, &s->can_write); - qemu_put_be32s (f, &s->v2x6); + qemu_put_be32 (f, s->dma_auto); + qemu_put_be32 (f, s->block_size); + qemu_put_be32 (f, s->fifo); + qemu_put_be32 (f, s->freq); + qemu_put_be32 (f, s->time_const); + qemu_put_be32 (f, s->speaker); + qemu_put_be32 (f, s->needed_bytes); + qemu_put_be32 (f, s->cmd); + qemu_put_be32 (f, s->use_hdma); + qemu_put_be32 (f, s->highspeed); + qemu_put_be32 (f, s->can_write); + qemu_put_be32 (f, s->v2x6); qemu_put_8s (f, &s->csp_param); qemu_put_8s (f, &s->csp_value); @@ -1288,21 +1288,21 @@ static void SB_save (QEMUFile *f, void *opaque) qemu_put_buffer (f, s->csp_regs, 256); qemu_put_8s (f, &s->csp_index); qemu_put_buffer (f, s->csp_reg83, 4); - qemu_put_be32s (f, &s->csp_reg83r); - qemu_put_be32s (f, &s->csp_reg83w); + qemu_put_be32 (f, s->csp_reg83r); + qemu_put_be32 (f, s->csp_reg83w); qemu_put_buffer (f, s->in2_data, sizeof (s->in2_data)); qemu_put_buffer (f, s->out_data, sizeof (s->out_data)); qemu_put_8s (f, &s->test_reg); qemu_put_8s (f, &s->last_read_byte); - qemu_put_be32s (f, &s->nzero); - qemu_put_be32s (f, &s->left_till_irq); - qemu_put_be32s (f, &s->dma_running); - qemu_put_be32s (f, &s->bytes_per_second); - qemu_put_be32s (f, &s->align); + qemu_put_be32 (f, s->nzero); + qemu_put_be32 (f, s->left_till_irq); + qemu_put_be32 (f, s->dma_running); + qemu_put_be32 (f, s->bytes_per_second); + qemu_put_be32 (f, s->align); - qemu_put_be32s (f, &s->mixer_nreg); + qemu_put_be32 (f, s->mixer_nreg); qemu_put_buffer (f, s->mixer_regs, 256); } @@ -1314,29 +1314,29 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id) return -EINVAL; } - qemu_get_be32s (f, &s->irq); - qemu_get_be32s (f, &s->dma); - qemu_get_be32s (f, &s->hdma); - qemu_get_be32s (f, &s->port); - qemu_get_be32s (f, &s->ver); - qemu_get_be32s (f, &s->in_index); - qemu_get_be32s (f, &s->out_data_len); - qemu_get_be32s (f, &s->fmt_stereo); - qemu_get_be32s (f, &s->fmt_signed); - qemu_get_be32s (f, &s->fmt_bits); + s->irq=qemu_get_be32 (f); + s->dma=qemu_get_be32 (f); + s->hdma=qemu_get_be32 (f); + s->port=qemu_get_be32 (f); + s->ver=qemu_get_be32 (f); + s->in_index=qemu_get_be32 (f); + s->out_data_len=qemu_get_be32 (f); + s->fmt_stereo=qemu_get_be32 (f); + s->fmt_signed=qemu_get_be32 (f); + s->fmt_bits=qemu_get_be32 (f); qemu_get_be32s (f, &s->fmt); - qemu_get_be32s (f, &s->dma_auto); - qemu_get_be32s (f, &s->block_size); - qemu_get_be32s (f, &s->fifo); - qemu_get_be32s (f, &s->freq); - qemu_get_be32s (f, &s->time_const); - qemu_get_be32s (f, &s->speaker); - qemu_get_be32s (f, &s->needed_bytes); - qemu_get_be32s (f, &s->cmd); - qemu_get_be32s (f, &s->use_hdma); - qemu_get_be32s (f, &s->highspeed); - qemu_get_be32s (f, &s->can_write); - qemu_get_be32s (f, &s->v2x6); + s->dma_auto=qemu_get_be32 (f); + s->block_size=qemu_get_be32 (f); + s->fifo=qemu_get_be32 (f); + s->freq=qemu_get_be32 (f); + s->time_const=qemu_get_be32 (f); + s->speaker=qemu_get_be32 (f); + s->needed_bytes=qemu_get_be32 (f); + s->cmd=qemu_get_be32 (f); + s->use_hdma=qemu_get_be32 (f); + s->highspeed=qemu_get_be32 (f); + s->can_write=qemu_get_be32 (f); + s->v2x6=qemu_get_be32 (f); qemu_get_8s (f, &s->csp_param); qemu_get_8s (f, &s->csp_value); @@ -1345,21 +1345,21 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id) qemu_get_buffer (f, s->csp_regs, 256); qemu_get_8s (f, &s->csp_index); qemu_get_buffer (f, s->csp_reg83, 4); - qemu_get_be32s (f, &s->csp_reg83r); - qemu_get_be32s (f, &s->csp_reg83w); + s->csp_reg83r=qemu_get_be32 (f); + s->csp_reg83w=qemu_get_be32 (f); qemu_get_buffer (f, s->in2_data, sizeof (s->in2_data)); qemu_get_buffer (f, s->out_data, sizeof (s->out_data)); qemu_get_8s (f, &s->test_reg); qemu_get_8s (f, &s->last_read_byte); - qemu_get_be32s (f, &s->nzero); - qemu_get_be32s (f, &s->left_till_irq); - qemu_get_be32s (f, &s->dma_running); - qemu_get_be32s (f, &s->bytes_per_second); - qemu_get_be32s (f, &s->align); + s->nzero=qemu_get_be32 (f); + s->left_till_irq=qemu_get_be32 (f); + s->dma_running=qemu_get_be32 (f); + s->bytes_per_second=qemu_get_be32 (f); + s->align=qemu_get_be32 (f); - qemu_get_be32s (f, &s->mixer_nreg); + s->mixer_nreg=qemu_get_be32 (f); qemu_get_buffer (f, s->mixer_regs, 256); if (s->voice) { diff --git a/hw/vga.c b/hw/vga.c index 3d0841c9d6..70b7c6d451 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1687,12 +1687,12 @@ static void vga_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, s->gr, 16); qemu_put_8s(f, &s->ar_index); qemu_put_buffer(f, s->ar, 21); - qemu_put_be32s(f, &s->ar_flip_flop); + qemu_put_be32(f, s->ar_flip_flop); qemu_put_8s(f, &s->cr_index); qemu_put_buffer(f, s->cr, 256); qemu_put_8s(f, &s->msr); qemu_put_8s(f, &s->fcr); - qemu_put_8s(f, &s->st00); + qemu_put_byte(f, s->st00); qemu_put_8s(f, &s->st01); qemu_put_8s(f, &s->dac_state); @@ -1702,7 +1702,7 @@ static void vga_save(QEMUFile *f, void *opaque) qemu_put_buffer(f, s->dac_cache, 3); qemu_put_buffer(f, s->palette, 768); - qemu_put_be32s(f, &s->bank_offset); + qemu_put_be32(f, s->bank_offset); #ifdef CONFIG_BOCHS_VBE qemu_put_byte(f, 1); qemu_put_be16s(f, &s->vbe_index); @@ -1737,7 +1737,7 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, s->gr, 16); qemu_get_8s(f, &s->ar_index); qemu_get_buffer(f, s->ar, 21); - qemu_get_be32s(f, &s->ar_flip_flop); + s->ar_flip_flop=qemu_get_be32(f); qemu_get_8s(f, &s->cr_index); qemu_get_buffer(f, s->cr, 256); qemu_get_8s(f, &s->msr); @@ -1752,7 +1752,7 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id) qemu_get_buffer(f, s->dac_cache, 3); qemu_get_buffer(f, s->palette, 768); - qemu_get_be32s(f, &s->bank_offset); + s->bank_offset=qemu_get_be32(f); is_vbe = qemu_get_byte(f); #ifdef CONFIG_BOCHS_VBE if (!is_vbe) diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 7937e071b6..6cae25ce11 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -1028,41 +1028,41 @@ static CPUWriteMemoryFunc *vmsvga_vram_write[] = { static void vmsvga_save(struct vmsvga_state_s *s, QEMUFile *f) { - qemu_put_be32s(f, &s->depth); - qemu_put_be32s(f, &s->enable); - qemu_put_be32s(f, &s->config); - qemu_put_be32s(f, &s->cursor.id); - qemu_put_be32s(f, &s->cursor.x); - qemu_put_be32s(f, &s->cursor.y); - qemu_put_be32s(f, &s->cursor.on); - qemu_put_be32s(f, &s->index); + qemu_put_be32(f, s->depth); + qemu_put_be32(f, s->enable); + qemu_put_be32(f, s->config); + qemu_put_be32(f, s->cursor.id); + qemu_put_be32(f, s->cursor.x); + qemu_put_be32(f, s->cursor.y); + qemu_put_be32(f, s->cursor.on); + qemu_put_be32(f, s->index); qemu_put_buffer(f, (uint8_t *) s->scratch, s->scratch_size * 4); - qemu_put_be32s(f, &s->new_width); - qemu_put_be32s(f, &s->new_height); + qemu_put_be32(f, s->new_width); + qemu_put_be32(f, s->new_height); qemu_put_be32s(f, &s->guest); qemu_put_be32s(f, &s->svgaid); - qemu_put_be32s(f, &s->syncing); - qemu_put_be32s(f, &s->fb_size); + qemu_put_be32(f, s->syncing); + qemu_put_be32(f, s->fb_size); } static int vmsvga_load(struct vmsvga_state_s *s, QEMUFile *f) { int depth; - qemu_get_be32s(f, &depth); - qemu_get_be32s(f, &s->enable); - qemu_get_be32s(f, &s->config); - qemu_get_be32s(f, &s->cursor.id); - qemu_get_be32s(f, &s->cursor.x); - qemu_get_be32s(f, &s->cursor.y); - qemu_get_be32s(f, &s->cursor.on); - qemu_get_be32s(f, &s->index); + depth=qemu_get_be32(f); + s->enable=qemu_get_be32(f); + s->config=qemu_get_be32(f); + s->cursor.id=qemu_get_be32(f); + s->cursor.x=qemu_get_be32(f); + s->cursor.y=qemu_get_be32(f); + s->cursor.on=qemu_get_be32(f); + s->index=qemu_get_be32(f); qemu_get_buffer(f, (uint8_t *) s->scratch, s->scratch_size * 4); - qemu_get_be32s(f, &s->new_width); - qemu_get_be32s(f, &s->new_height); + s->new_width=qemu_get_be32(f); + s->new_height=qemu_get_be32(f); qemu_get_be32s(f, &s->guest); qemu_get_be32s(f, &s->svgaid); - qemu_get_be32s(f, &s->syncing); - qemu_get_be32s(f, &s->fb_size); + s->syncing=qemu_get_be32(f); + s->fb_size=qemu_get_be32(f); if (s->enable && depth != s->depth) { printf("%s: need colour depth of %i bits to resume operation.\n", diff --git a/vl.c b/vl.c index a1616cf9cf..70950f844a 100644 --- a/vl.c +++ b/vl.c @@ -1126,9 +1126,9 @@ static void timer_save(QEMUFile *f, void *opaque) if (cpu_ticks_enabled) { hw_error("cannot save state if virtual timers are running"); } - qemu_put_be64s(f, &cpu_ticks_offset); - qemu_put_be64s(f, &ticks_per_sec); - qemu_put_be64s(f, &cpu_clock_offset); + qemu_put_be64(f, cpu_ticks_offset); + qemu_put_be64(f, ticks_per_sec); + qemu_put_be64(f, cpu_clock_offset); } static int timer_load(QEMUFile *f, void *opaque, int version_id) @@ -1138,10 +1138,10 @@ static int timer_load(QEMUFile *f, void *opaque, int version_id) if (cpu_ticks_enabled) { return -EINVAL; } - qemu_get_be64s(f, &cpu_ticks_offset); - qemu_get_be64s(f, &ticks_per_sec); + cpu_ticks_offset=qemu_get_be64(f); + ticks_per_sec=qemu_get_be64(f); if (version_id == 2) { - qemu_get_be64s(f, &cpu_clock_offset); + cpu_clock_offset=qemu_get_be64(f); } return 0; } -- GitLab