gwj / at91sam9263 · Commits

Commit bee8d6842d1421ce3456779492561a92530e9c5a

Authored by ths
1 parent b99dc0d1

qemu_put signedness fixes, by Andre Przywara. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3824 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 14 changed files with 177 additions and 177 deletions
hw/acpi.c
  View file @bee8d68
... ... @@ -439,7 +439,7 @@ static void pm_save(QEMUFile* f,void *opaque)
439 439 qemu_put_8s(f, &s->apmc);
440 440 qemu_put_8s(f, &s->apms);
441 441 qemu_put_timer(f, s->tmr_timer);
442   - qemu_put_be64s(f, &s->tmr_overflow_time);
  442 + qemu_put_be64(f, s->tmr_overflow_time);
443 443 }
444 444  
445 445 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)
460 460 qemu_get_8s(f, &s->apmc);
461 461 qemu_get_8s(f, &s->apms);
462 462 qemu_get_timer(f, s->tmr_timer);
463   - qemu_get_be64s(f, &s->tmr_overflow_time);
  463 + s->tmr_overflow_time=qemu_get_be64(f);
464 464  
465 465 pm_io_space_update(s);
466 466  
... ...
hw/apic.c
  View file @bee8d68
... ... @@ -761,10 +761,10 @@ static void apic_save(QEMUFile *f, void *opaque)
761 761 qemu_put_be32s(f, &s->icr[0]);
762 762 qemu_put_be32s(f, &s->icr[1]);
763 763 qemu_put_be32s(f, &s->divide_conf);
764   - qemu_put_be32s(f, &s->count_shift);
  764 + qemu_put_be32(f, s->count_shift);
765 765 qemu_put_be32s(f, &s->initial_count);
766   - qemu_put_be64s(f, &s->initial_count_load_time);
767   - qemu_put_be64s(f, &s->next_time);
  766 + qemu_put_be64(f, s->initial_count_load_time);
  767 + qemu_put_be64(f, s->next_time);
768 768  
769 769 qemu_put_timer(f, s->timer);
770 770 }
... ... @@ -797,10 +797,10 @@ static int apic_load(QEMUFile *f, void *opaque, int version_id)
797 797 qemu_get_be32s(f, &s->icr[0]);
798 798 qemu_get_be32s(f, &s->icr[1]);
799 799 qemu_get_be32s(f, &s->divide_conf);
800   - qemu_get_be32s(f, &s->count_shift);
  800 + s->count_shift=qemu_get_be32(f);
801 801 qemu_get_be32s(f, &s->initial_count);
802   - qemu_get_be64s(f, &s->initial_count_load_time);
803   - qemu_get_be64s(f, &s->next_time);
  802 + s->initial_count_load_time=qemu_get_be64(f);
  803 + s->next_time=qemu_get_be64(f);
804 804  
805 805 if (version_id >= 2)
806 806 qemu_get_timer(f, s->timer);
... ...
hw/cirrus_vga.c
  View file @bee8d68
... ... @@ -2985,7 +2985,7 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
2985 2985 qemu_put_buffer(f, s->gr + 2, 254);
2986 2986 qemu_put_8s(f, &s->ar_index);
2987 2987 qemu_put_buffer(f, s->ar, 21);
2988   - qemu_put_be32s(f, &s->ar_flip_flop);
  2988 + qemu_put_be32(f, s->ar_flip_flop);
2989 2989 qemu_put_8s(f, &s->cr_index);
2990 2990 qemu_put_buffer(f, s->cr, 256);
2991 2991 qemu_put_8s(f, &s->msr);
... ... @@ -3000,7 +3000,7 @@ static void cirrus_vga_save(QEMUFile *f, void *opaque)
3000 3000 qemu_put_buffer(f, s->dac_cache, 3);
3001 3001 qemu_put_buffer(f, s->palette, 768);
3002 3002  
3003   - qemu_put_be32s(f, &s->bank_offset);
  3003 + qemu_put_be32(f, s->bank_offset);
3004 3004  
3005 3005 qemu_put_8s(f, &s->cirrus_hidden_dac_lockindex);
3006 3006 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)
3036 3036 qemu_get_buffer(f, s->gr + 2, 254);
3037 3037 qemu_get_8s(f, &s->ar_index);
3038 3038 qemu_get_buffer(f, s->ar, 21);
3039   - qemu_get_be32s(f, &s->ar_flip_flop);
  3039 + s->ar_flip_flop=qemu_get_be32(f);
3040 3040 qemu_get_8s(f, &s->cr_index);
3041 3041 qemu_get_buffer(f, s->cr, 256);
3042 3042 qemu_get_8s(f, &s->msr);
... ... @@ -3051,7 +3051,7 @@ static int cirrus_vga_load(QEMUFile *f, void *opaque, int version_id)
3051 3051 qemu_get_buffer(f, s->dac_cache, 3);
3052 3052 qemu_get_buffer(f, s->palette, 768);
3053 3053  
3054   - qemu_get_be32s(f, &s->bank_offset);
  3054 + s->bank_offset=qemu_get_be32(f);
3055 3055  
3056 3056 qemu_get_8s(f, &s->cirrus_hidden_dac_lockindex);
3057 3057 qemu_get_8s(f, &s->cirrus_hidden_dac_data);
... ...
hw/dma.c
  View file @bee8d68
... ... @@ -482,12 +482,12 @@ static void dma_save (QEMUFile *f, void *opaque)
482 482 qemu_put_8s (f, &d->command);
483 483 qemu_put_8s (f, &d->mask);
484 484 qemu_put_8s (f, &d->flip_flop);
485   - qemu_put_be32s (f, &d->dshift);
  485 + qemu_put_be32 (f, d->dshift);
486 486  
487 487 for (i = 0; i < 4; ++i) {
488 488 struct dma_regs *r = &d->regs[i];
489   - qemu_put_be32s (f, &r->now[0]);
490   - qemu_put_be32s (f, &r->now[1]);
  489 + qemu_put_be32 (f, r->now[0]);
  490 + qemu_put_be32 (f, r->now[1]);
491 491 qemu_put_be16s (f, &r->base[0]);
492 492 qemu_put_be16s (f, &r->base[1]);
493 493 qemu_put_8s (f, &r->mode);
... ... @@ -510,12 +510,12 @@ static int dma_load (QEMUFile *f, void *opaque, int version_id)
510 510 qemu_get_8s (f, &d->command);
511 511 qemu_get_8s (f, &d->mask);
512 512 qemu_get_8s (f, &d->flip_flop);
513   - qemu_get_be32s (f, &d->dshift);
  513 + d->dshift=qemu_get_be32 (f);
514 514  
515 515 for (i = 0; i < 4; ++i) {
516 516 struct dma_regs *r = &d->regs[i];
517   - qemu_get_be32s (f, &r->now[0]);
518   - qemu_get_be32s (f, &r->now[1]);
  517 + r->now[0]=qemu_get_be32 (f);
  518 + r->now[1]=qemu_get_be32 (f);
519 519 qemu_get_be16s (f, &r->base[0]);
520 520 qemu_get_be16s (f, &r->base[1]);
521 521 qemu_get_8s (f, &r->mode);
... ...
hw/i8254.c
  View file @bee8d68
... ... @@ -397,7 +397,7 @@ static void pit_save(QEMUFile *f, void *opaque)
397 397  
398 398 for(i = 0; i < 3; i++) {
399 399 s = &pit->channels[i];
400   - qemu_put_be32s(f, &s->count);
  400 + qemu_put_be32(f, s->count);
401 401 qemu_put_be16s(f, &s->latched_count);
402 402 qemu_put_8s(f, &s->count_latched);
403 403 qemu_put_8s(f, &s->status_latched);
... ... @@ -409,9 +409,9 @@ static void pit_save(QEMUFile *f, void *opaque)
409 409 qemu_put_8s(f, &s->mode);
410 410 qemu_put_8s(f, &s->bcd);
411 411 qemu_put_8s(f, &s->gate);
412   - qemu_put_be64s(f, &s->count_load_time);
  412 + qemu_put_be64(f, s->count_load_time);
413 413 if (s->irq_timer) {
414   - qemu_put_be64s(f, &s->next_transition_time);
  414 + qemu_put_be64(f, s->next_transition_time);
415 415 qemu_put_timer(f, s->irq_timer);
416 416 }
417 417 }
... ... @@ -428,7 +428,7 @@ static int pit_load(QEMUFile *f, void *opaque, int version_id)
428 428  
429 429 for(i = 0; i < 3; i++) {
430 430 s = &pit->channels[i];
431   - qemu_get_be32s(f, &s->count);
  431 + s->count=qemu_get_be32(f);
432 432 qemu_get_be16s(f, &s->latched_count);
433 433 qemu_get_8s(f, &s->count_latched);
434 434 qemu_get_8s(f, &s->status_latched);
... ... @@ -440,9 +440,9 @@ static int pit_load(QEMUFile *f, void *opaque, int version_id)
440 440 qemu_get_8s(f, &s->mode);
441 441 qemu_get_8s(f, &s->bcd);
442 442 qemu_get_8s(f, &s->gate);
443   - qemu_get_be64s(f, &s->count_load_time);
  443 + s->count_load_time=qemu_get_be64(f);
444 444 if (s->irq_timer) {
445   - qemu_get_be64s(f, &s->next_transition_time);
  445 + s->next_transition_time=qemu_get_be64(f);
446 446 qemu_get_timer(f, s->irq_timer);
447 447 }
448 448 }
... ...
hw/ide.c
  View file @bee8d68
... ... @@ -2509,8 +2509,8 @@ static void ide_init_ioport(IDEState *ide_state, int iobase, int iobase2)
2509 2509 /* save per IDE drive data */
2510 2510 static void ide_save(QEMUFile* f, IDEState *s)
2511 2511 {
2512   - qemu_put_be32s(f, &s->mult_sectors);
2513   - qemu_put_be32s(f, &s->identify_set);
  2512 + qemu_put_be32(f, s->mult_sectors);
  2513 + qemu_put_be32(f, s->identify_set);
2514 2514 if (s->identify_set) {
2515 2515 qemu_put_buffer(f, (const uint8_t *)s->identify_data, 512);
2516 2516 }
... ... @@ -2537,8 +2537,8 @@ static void ide_save(QEMUFile* f, IDEState *s)
2537 2537 /* load per IDE drive data */
2538 2538 static void ide_load(QEMUFile* f, IDEState *s)
2539 2539 {
2540   - qemu_get_be32s(f, &s->mult_sectors);
2541   - qemu_get_be32s(f, &s->identify_set);
  2540 + s->mult_sectors=qemu_get_be32(f);
  2541 + s->identify_set=qemu_get_be32(f);
2542 2542 if (s->identify_set) {
2543 2543 qemu_get_buffer(f, (uint8_t *)s->identify_data, 512);
2544 2544 }
... ...
hw/mc146818rtc.c
  View file @bee8d68
... ... @@ -421,18 +421,18 @@ static void rtc_save(QEMUFile *f, void *opaque)
421 421 qemu_put_buffer(f, s->cmos_data, 128);
422 422 qemu_put_8s(f, &s->cmos_index);
423 423  
424   - qemu_put_be32s(f, &s->current_tm.tm_sec);
425   - qemu_put_be32s(f, &s->current_tm.tm_min);
426   - qemu_put_be32s(f, &s->current_tm.tm_hour);
427   - qemu_put_be32s(f, &s->current_tm.tm_wday);
428   - qemu_put_be32s(f, &s->current_tm.tm_mday);
429   - qemu_put_be32s(f, &s->current_tm.tm_mon);
430   - qemu_put_be32s(f, &s->current_tm.tm_year);
  424 + qemu_put_be32(f, s->current_tm.tm_sec);
  425 + qemu_put_be32(f, s->current_tm.tm_min);
  426 + qemu_put_be32(f, s->current_tm.tm_hour);
  427 + qemu_put_be32(f, s->current_tm.tm_wday);
  428 + qemu_put_be32(f, s->current_tm.tm_mday);
  429 + qemu_put_be32(f, s->current_tm.tm_mon);
  430 + qemu_put_be32(f, s->current_tm.tm_year);
431 431  
432 432 qemu_put_timer(f, s->periodic_timer);
433   - qemu_put_be64s(f, &s->next_periodic_time);
  433 + qemu_put_be64(f, s->next_periodic_time);
434 434  
435   - qemu_put_be64s(f, &s->next_second_time);
  435 + qemu_put_be64(f, s->next_second_time);
436 436 qemu_put_timer(f, s->second_timer);
437 437 qemu_put_timer(f, s->second_timer2);
438 438 }
... ... @@ -447,18 +447,18 @@ static int rtc_load(QEMUFile *f, void *opaque, int version_id)
447 447 qemu_get_buffer(f, s->cmos_data, 128);
448 448 qemu_get_8s(f, &s->cmos_index);
449 449  
450   - qemu_get_be32s(f, &s->current_tm.tm_sec);
451   - qemu_get_be32s(f, &s->current_tm.tm_min);
452   - qemu_get_be32s(f, &s->current_tm.tm_hour);
453   - qemu_get_be32s(f, &s->current_tm.tm_wday);
454   - qemu_get_be32s(f, &s->current_tm.tm_mday);
455   - qemu_get_be32s(f, &s->current_tm.tm_mon);
456   - qemu_get_be32s(f, &s->current_tm.tm_year);
  450 + s->current_tm.tm_sec=qemu_get_be32(f);
  451 + s->current_tm.tm_min=qemu_get_be32(f);
  452 + s->current_tm.tm_hour=qemu_get_be32(f);
  453 + s->current_tm.tm_wday=qemu_get_be32(f);
  454 + s->current_tm.tm_mday=qemu_get_be32(f);
  455 + s->current_tm.tm_mon=qemu_get_be32(f);
  456 + s->current_tm.tm_year=qemu_get_be32(f);
457 457  
458 458 qemu_get_timer(f, s->periodic_timer);
459   - qemu_get_be64s(f, &s->next_periodic_time);
  459 + s->next_periodic_time=qemu_get_be64(f);
460 460  
461   - qemu_get_be64s(f, &s->next_second_time);
  461 + s->next_second_time=qemu_get_be64(f);
462 462 qemu_get_timer(f, s->second_timer);
463 463 qemu_get_timer(f, s->second_timer2);
464 464 return 0;
... ...
hw/pcnet.c
  View file @bee8d68
... ... @@ -1843,9 +1843,9 @@ static void pcnet_save(QEMUFile *f, void *opaque)
1843 1843 if (s->pci_dev)
1844 1844 pci_device_save(s->pci_dev, f);
1845 1845  
1846   - qemu_put_be32s(f, &s->rap);
1847   - qemu_put_be32s(f, &s->isr);
1848   - qemu_put_be32s(f, &s->lnkst);
  1846 + qemu_put_be32(f, s->rap);
  1847 + qemu_put_be32(f, s->isr);
  1848 + qemu_put_be32(f, s->lnkst);
1849 1849 qemu_put_be32s(f, &s->rdra);
1850 1850 qemu_put_be32s(f, &s->tdra);
1851 1851 qemu_put_buffer(f, s->prom, 16);
... ... @@ -1854,10 +1854,10 @@ static void pcnet_save(QEMUFile *f, void *opaque)
1854 1854 for (i = 0; i < 32; i++)
1855 1855 qemu_put_be16s(f, &s->bcr[i]);
1856 1856 qemu_put_be64s(f, &s->timer);
1857   - qemu_put_be32s(f, &s->xmit_pos);
1858   - qemu_put_be32s(f, &s->recv_pos);
  1857 + qemu_put_be32(f, s->xmit_pos);
  1858 + qemu_put_be32(f, s->recv_pos);
1859 1859 qemu_put_buffer(f, s->buffer, 4096);
1860   - qemu_put_be32s(f, &s->tx_busy);
  1860 + qemu_put_be32(f, s->tx_busy);
1861 1861 qemu_put_timer(f, s->poll_timer);
1862 1862 }
1863 1863  
... ... @@ -1875,9 +1875,9 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id)
1875 1875 return ret;
1876 1876 }
1877 1877  
1878   - qemu_get_be32s(f, &s->rap);
1879   - qemu_get_be32s(f, &s->isr);
1880   - qemu_get_be32s(f, &s->lnkst);
  1878 + qemu_get_be32s(f, (uint32_t*)&s->rap);
  1879 + qemu_get_be32s(f, (uint32_t*)&s->isr);
  1880 + qemu_get_be32s(f, (uint32_t*)&s->lnkst);
1881 1881 qemu_get_be32s(f, &s->rdra);
1882 1882 qemu_get_be32s(f, &s->tdra);
1883 1883 qemu_get_buffer(f, s->prom, 16);
... ... @@ -1886,10 +1886,10 @@ static int pcnet_load(QEMUFile *f, void *opaque, int version_id)
1886 1886 for (i = 0; i < 32; i++)
1887 1887 qemu_get_be16s(f, &s->bcr[i]);
1888 1888 qemu_get_be64s(f, &s->timer);
1889   - qemu_get_be32s(f, &s->xmit_pos);
1890   - qemu_get_be32s(f, &s->recv_pos);
  1889 + qemu_get_be32s(f, (uint32_t*)&s->xmit_pos);
  1890 + qemu_get_be32s(f, (uint32_t*)&s->recv_pos);
1891 1891 qemu_get_buffer(f, s->buffer, 4096);
1892   - qemu_get_be32s(f, &s->tx_busy);
  1892 + qemu_get_be32s(f, (uint32_t*)&s->tx_busy);
1893 1893 qemu_get_timer(f, s->poll_timer);
1894 1894  
1895 1895 return 0;
... ...
hw/ps2.c
  View file @bee8d68
... ... @@ -470,19 +470,19 @@ static void ps2_reset(void *opaque)
470 470  
471 471 static void ps2_common_save (QEMUFile *f, PS2State *s)
472 472 {
473   - qemu_put_be32s (f, &s->write_cmd);
474   - qemu_put_be32s (f, &s->queue.rptr);
475   - qemu_put_be32s (f, &s->queue.wptr);
476   - qemu_put_be32s (f, &s->queue.count);
  473 + qemu_put_be32 (f, s->write_cmd);
  474 + qemu_put_be32 (f, s->queue.rptr);
  475 + qemu_put_be32 (f, s->queue.wptr);
  476 + qemu_put_be32 (f, s->queue.count);
477 477 qemu_put_buffer (f, s->queue.data, sizeof (s->queue.data));
478 478 }
479 479  
480 480 static void ps2_common_load (QEMUFile *f, PS2State *s)
481 481 {
482   - qemu_get_be32s (f, &s->write_cmd);
483   - qemu_get_be32s (f, &s->queue.rptr);
484   - qemu_get_be32s (f, &s->queue.wptr);
485   - qemu_get_be32s (f, &s->queue.count);
  482 + s->write_cmd=qemu_get_be32 (f);
  483 + s->queue.rptr=qemu_get_be32 (f);
  484 + s->queue.wptr=qemu_get_be32 (f);
  485 + s->queue.count=qemu_get_be32 (f);
486 486 qemu_get_buffer (f, s->queue.data, sizeof (s->queue.data));
487 487 }
488 488  
... ... @@ -491,8 +491,8 @@ static void ps2_kbd_save(QEMUFile* f, void* opaque)
491 491 PS2KbdState *s = (PS2KbdState*)opaque;
492 492  
493 493 ps2_common_save (f, &s->common);
494   - qemu_put_be32s(f, &s->scan_enabled);
495   - qemu_put_be32s(f, &s->translate);
  494 + qemu_put_be32(f, s->scan_enabled);
  495 + qemu_put_be32(f, s->translate);
496 496 }
497 497  
498 498 static void ps2_mouse_save(QEMUFile* f, void* opaque)
... ... @@ -506,9 +506,9 @@ static void ps2_mouse_save(QEMUFile* f, void* opaque)
506 506 qemu_put_8s(f, &s->mouse_wrap);
507 507 qemu_put_8s(f, &s->mouse_type);
508 508 qemu_put_8s(f, &s->mouse_detect_state);
509   - qemu_put_be32s(f, &s->mouse_dx);
510   - qemu_put_be32s(f, &s->mouse_dy);
511   - qemu_put_be32s(f, &s->mouse_dz);
  509 + qemu_put_be32(f, s->mouse_dx);
  510 + qemu_put_be32(f, s->mouse_dy);
  511 + qemu_put_be32(f, s->mouse_dz);
512 512 qemu_put_8s(f, &s->mouse_buttons);
513 513 }
514 514  
... ... @@ -520,8 +520,8 @@ static int ps2_kbd_load(QEMUFile* f, void* opaque, int version_id)
520 520 return -EINVAL;
521 521  
522 522 ps2_common_load (f, &s->common);
523   - qemu_get_be32s(f, &s->scan_enabled);
524   - qemu_get_be32s(f, &s->translate);
  523 + s->scan_enabled=qemu_get_be32(f);
  524 + s->translate=qemu_get_be32(f);
525 525 return 0;
526 526 }
527 527  
... ... @@ -539,9 +539,9 @@ static int ps2_mouse_load(QEMUFile* f, void* opaque, int version_id)
539 539 qemu_get_8s(f, &s->mouse_wrap);
540 540 qemu_get_8s(f, &s->mouse_type);
541 541 qemu_get_8s(f, &s->mouse_detect_state);
542   - qemu_get_be32s(f, &s->mouse_dx);
543   - qemu_get_be32s(f, &s->mouse_dy);
544   - qemu_get_be32s(f, &s->mouse_dz);
  542 + s->mouse_dx=qemu_get_be32(f);
  543 + s->mouse_dy=qemu_get_be32(f);
  544 + s->mouse_dz=qemu_get_be32(f);
545 545 qemu_get_8s(f, &s->mouse_buttons);
546 546 return 0;
547 547 }
... ...
hw/rtl8139.c
  View file @bee8d68
... ... @@ -3172,7 +3172,7 @@ static void rtl8139_save(QEMUFile* f,void* opaque)
3172 3172 i = 0;
3173 3173 qemu_put_be32s(f, &i); /* unused. */
3174 3174 qemu_put_buffer(f, s->macaddr, 6);
3175   - qemu_put_be32s(f, &s->rtl8139_mmio_io_addr);
  3175 + qemu_put_be32(f, s->rtl8139_mmio_io_addr);
3176 3176  
3177 3177 qemu_put_be32s(f, &s->currTxDesc);
3178 3178 qemu_put_be32s(f, &s->currCPlusRxDesc);
... ... @@ -3184,7 +3184,7 @@ static void rtl8139_save(QEMUFile* f,void* opaque)
3184 3184 {
3185 3185 qemu_put_be16s(f, &s->eeprom.contents[i]);
3186 3186 }
3187   - qemu_put_be32s(f, &s->eeprom.mode);
  3187 + qemu_put_be32(f, s->eeprom.mode);
3188 3188 qemu_put_be32s(f, &s->eeprom.tick);
3189 3189 qemu_put_8s(f, &s->eeprom.address);
3190 3190 qemu_put_be16s(f, &s->eeprom.input);
... ... @@ -3197,7 +3197,7 @@ static void rtl8139_save(QEMUFile* f,void* opaque)
3197 3197  
3198 3198 qemu_put_be32s(f, &s->TCTR);
3199 3199 qemu_put_be32s(f, &s->TimerInt);
3200   - qemu_put_be64s(f, &s->TCTR_base);
  3200 + qemu_put_be64(f, s->TCTR_base);
3201 3201  
3202 3202 RTL8139TallyCounters_save(f, &s->tally_counters);
3203 3203 }
... ... @@ -3267,7 +3267,7 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
3267 3267  
3268 3268 qemu_get_be32s(f, &i); /* unused. */
3269 3269 qemu_get_buffer(f, s->macaddr, 6);
3270   - qemu_get_be32s(f, &s->rtl8139_mmio_io_addr);
  3270 + s->rtl8139_mmio_io_addr=qemu_get_be32(f);
3271 3271  
3272 3272 qemu_get_be32s(f, &s->currTxDesc);
3273 3273 qemu_get_be32s(f, &s->currCPlusRxDesc);
... ... @@ -3279,7 +3279,7 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
3279 3279 {
3280 3280 qemu_get_be16s(f, &s->eeprom.contents[i]);
3281 3281 }
3282   - qemu_get_be32s(f, &s->eeprom.mode);
  3282 + s->eeprom.mode=qemu_get_be32(f);
3283 3283 qemu_get_be32s(f, &s->eeprom.tick);
3284 3284 qemu_get_8s(f, &s->eeprom.address);
3285 3285 qemu_get_be16s(f, &s->eeprom.input);
... ... @@ -3295,7 +3295,7 @@ static int rtl8139_load(QEMUFile* f,void* opaque,int version_id)
3295 3295 {
3296 3296 qemu_get_be32s(f, &s->TCTR);
3297 3297 qemu_get_be32s(f, &s->TimerInt);
3298   - qemu_get_be64s(f, &s->TCTR_base);
  3298 + s->TCTR_base=qemu_get_be64(f);
3299 3299  
3300 3300 RTL8139TallyCounters_load(f, &s->tally_counters);
3301 3301 }
... ...
hw/sb16.c
  View file @bee8d68
... ... @@ -1257,29 +1257,29 @@ static void SB_save (QEMUFile *f, void *opaque)
1257 1257 {
1258 1258 SB16State *s = opaque;
1259 1259  
1260   - qemu_put_be32s (f, &s->irq);
1261   - qemu_put_be32s (f, &s->dma);
1262   - qemu_put_be32s (f, &s->hdma);
1263   - qemu_put_be32s (f, &s->port);
1264   - qemu_put_be32s (f, &s->ver);
1265   - qemu_put_be32s (f, &s->in_index);
1266   - qemu_put_be32s (f, &s->out_data_len);
1267   - qemu_put_be32s (f, &s->fmt_stereo);
1268   - qemu_put_be32s (f, &s->fmt_signed);
1269   - qemu_put_be32s (f, &s->fmt_bits);
  1260 + qemu_put_be32 (f, s->irq);
  1261 + qemu_put_be32 (f, s->dma);
  1262 + qemu_put_be32 (f, s->hdma);
  1263 + qemu_put_be32 (f, s->port);
  1264 + qemu_put_be32 (f, s->ver);
  1265 + qemu_put_be32 (f, s->in_index);
  1266 + qemu_put_be32 (f, s->out_data_len);
  1267 + qemu_put_be32 (f, s->fmt_stereo);
  1268 + qemu_put_be32 (f, s->fmt_signed);
  1269 + qemu_put_be32 (f, s->fmt_bits);
1270 1270 qemu_put_be32s (f, &s->fmt);
1271   - qemu_put_be32s (f, &s->dma_auto);
1272   - qemu_put_be32s (f, &s->block_size);
1273   - qemu_put_be32s (f, &s->fifo);
1274   - qemu_put_be32s (f, &s->freq);
1275   - qemu_put_be32s (f, &s->time_const);
1276   - qemu_put_be32s (f, &s->speaker);
1277   - qemu_put_be32s (f, &s->needed_bytes);
1278   - qemu_put_be32s (f, &s->cmd);
1279   - qemu_put_be32s (f, &s->use_hdma);
1280   - qemu_put_be32s (f, &s->highspeed);
1281   - qemu_put_be32s (f, &s->can_write);
1282   - qemu_put_be32s (f, &s->v2x6);
  1271 + qemu_put_be32 (f, s->dma_auto);
  1272 + qemu_put_be32 (f, s->block_size);
  1273 + qemu_put_be32 (f, s->fifo);
  1274 + qemu_put_be32 (f, s->freq);
  1275 + qemu_put_be32 (f, s->time_const);
  1276 + qemu_put_be32 (f, s->speaker);
  1277 + qemu_put_be32 (f, s->needed_bytes);
  1278 + qemu_put_be32 (f, s->cmd);
  1279 + qemu_put_be32 (f, s->use_hdma);
  1280 + qemu_put_be32 (f, s->highspeed);
  1281 + qemu_put_be32 (f, s->can_write);
  1282 + qemu_put_be32 (f, s->v2x6);
1283 1283  
1284 1284 qemu_put_8s (f, &s->csp_param);
1285 1285 qemu_put_8s (f, &s->csp_value);
... ... @@ -1288,21 +1288,21 @@ static void SB_save (QEMUFile *f, void *opaque)
1288 1288 qemu_put_buffer (f, s->csp_regs, 256);
1289 1289 qemu_put_8s (f, &s->csp_index);
1290 1290 qemu_put_buffer (f, s->csp_reg83, 4);
1291   - qemu_put_be32s (f, &s->csp_reg83r);
1292   - qemu_put_be32s (f, &s->csp_reg83w);
  1291 + qemu_put_be32 (f, s->csp_reg83r);
  1292 + qemu_put_be32 (f, s->csp_reg83w);
1293 1293  
1294 1294 qemu_put_buffer (f, s->in2_data, sizeof (s->in2_data));
1295 1295 qemu_put_buffer (f, s->out_data, sizeof (s->out_data));
1296 1296 qemu_put_8s (f, &s->test_reg);
1297 1297 qemu_put_8s (f, &s->last_read_byte);
1298 1298  
1299   - qemu_put_be32s (f, &s->nzero);
1300   - qemu_put_be32s (f, &s->left_till_irq);
1301   - qemu_put_be32s (f, &s->dma_running);
1302   - qemu_put_be32s (f, &s->bytes_per_second);
1303   - qemu_put_be32s (f, &s->align);
  1299 + qemu_put_be32 (f, s->nzero);
  1300 + qemu_put_be32 (f, s->left_till_irq);
  1301 + qemu_put_be32 (f, s->dma_running);
  1302 + qemu_put_be32 (f, s->bytes_per_second);
  1303 + qemu_put_be32 (f, s->align);
1304 1304  
1305   - qemu_put_be32s (f, &s->mixer_nreg);
  1305 + qemu_put_be32 (f, s->mixer_nreg);
1306 1306 qemu_put_buffer (f, s->mixer_regs, 256);
1307 1307 }
1308 1308  
... ... @@ -1314,29 +1314,29 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id)
1314 1314 return -EINVAL;
1315 1315 }
1316 1316  
1317   - qemu_get_be32s (f, &s->irq);
1318   - qemu_get_be32s (f, &s->dma);
1319   - qemu_get_be32s (f, &s->hdma);
1320   - qemu_get_be32s (f, &s->port);
1321   - qemu_get_be32s (f, &s->ver);
1322   - qemu_get_be32s (f, &s->in_index);
1323   - qemu_get_be32s (f, &s->out_data_len);
1324   - qemu_get_be32s (f, &s->fmt_stereo);
1325   - qemu_get_be32s (f, &s->fmt_signed);
1326   - qemu_get_be32s (f, &s->fmt_bits);
  1317 + s->irq=qemu_get_be32 (f);
  1318 + s->dma=qemu_get_be32 (f);
  1319 + s->hdma=qemu_get_be32 (f);
  1320 + s->port=qemu_get_be32 (f);
  1321 + s->ver=qemu_get_be32 (f);
  1322 + s->in_index=qemu_get_be32 (f);
  1323 + s->out_data_len=qemu_get_be32 (f);
  1324 + s->fmt_stereo=qemu_get_be32 (f);
  1325 + s->fmt_signed=qemu_get_be32 (f);
  1326 + s->fmt_bits=qemu_get_be32 (f);
1327 1327 qemu_get_be32s (f, &s->fmt);
1328   - qemu_get_be32s (f, &s->dma_auto);
1329   - qemu_get_be32s (f, &s->block_size);
1330   - qemu_get_be32s (f, &s->fifo);
1331   - qemu_get_be32s (f, &s->freq);
1332   - qemu_get_be32s (f, &s->time_const);
1333   - qemu_get_be32s (f, &s->speaker);
1334   - qemu_get_be32s (f, &s->needed_bytes);
1335   - qemu_get_be32s (f, &s->cmd);
1336   - qemu_get_be32s (f, &s->use_hdma);
1337   - qemu_get_be32s (f, &s->highspeed);
1338   - qemu_get_be32s (f, &s->can_write);
1339   - qemu_get_be32s (f, &s->v2x6);
  1328 + s->dma_auto=qemu_get_be32 (f);
  1329 + s->block_size=qemu_get_be32 (f);
  1330 + s->fifo=qemu_get_be32 (f);
  1331 + s->freq=qemu_get_be32 (f);
  1332 + s->time_const=qemu_get_be32 (f);
  1333 + s->speaker=qemu_get_be32 (f);
  1334 + s->needed_bytes=qemu_get_be32 (f);
  1335 + s->cmd=qemu_get_be32 (f);
  1336 + s->use_hdma=qemu_get_be32 (f);
  1337 + s->highspeed=qemu_get_be32 (f);
  1338 + s->can_write=qemu_get_be32 (f);
  1339 + s->v2x6=qemu_get_be32 (f);
1340 1340  
1341 1341 qemu_get_8s (f, &s->csp_param);
1342 1342 qemu_get_8s (f, &s->csp_value);
... ... @@ -1345,21 +1345,21 @@ static int SB_load (QEMUFile *f, void *opaque, int version_id)
1345 1345 qemu_get_buffer (f, s->csp_regs, 256);
1346 1346 qemu_get_8s (f, &s->csp_index);
1347 1347 qemu_get_buffer (f, s->csp_reg83, 4);
1348   - qemu_get_be32s (f, &s->csp_reg83r);
1349   - qemu_get_be32s (f, &s->csp_reg83w);
  1348 + s->csp_reg83r=qemu_get_be32 (f);
  1349 + s->csp_reg83w=qemu_get_be32 (f);
1350 1350  
1351 1351 qemu_get_buffer (f, s->in2_data, sizeof (s->in2_data));
1352 1352 qemu_get_buffer (f, s->out_data, sizeof (s->out_data));
1353 1353 qemu_get_8s (f, &s->test_reg);
1354 1354 qemu_get_8s (f, &s->last_read_byte);
1355 1355  
1356   - qemu_get_be32s (f, &s->nzero);
1357   - qemu_get_be32s (f, &s->left_till_irq);
1358   - qemu_get_be32s (f, &s->dma_running);
1359   - qemu_get_be32s (f, &s->bytes_per_second);
1360   - qemu_get_be32s (f, &s->align);
  1356 + s->nzero=qemu_get_be32 (f);
  1357 + s->left_till_irq=qemu_get_be32 (f);
  1358 + s->dma_running=qemu_get_be32 (f);
  1359 + s->bytes_per_second=qemu_get_be32 (f);
  1360 + s->align=qemu_get_be32 (f);
1361 1361  
1362   - qemu_get_be32s (f, &s->mixer_nreg);
  1362 + s->mixer_nreg=qemu_get_be32 (f);
1363 1363 qemu_get_buffer (f, s->mixer_regs, 256);
1364 1364  
1365 1365 if (s->voice) {
... ...
hw/vga.c
  View file @bee8d68
... ... @@ -1687,12 +1687,12 @@ static void vga_save(QEMUFile *f, void *opaque)
1687 1687 qemu_put_buffer(f, s->gr, 16);
1688 1688 qemu_put_8s(f, &s->ar_index);
1689 1689 qemu_put_buffer(f, s->ar, 21);
1690   - qemu_put_be32s(f, &s->ar_flip_flop);
  1690 + qemu_put_be32(f, s->ar_flip_flop);
1691 1691 qemu_put_8s(f, &s->cr_index);
1692 1692 qemu_put_buffer(f, s->cr, 256);
1693 1693 qemu_put_8s(f, &s->msr);
1694 1694 qemu_put_8s(f, &s->fcr);
1695   - qemu_put_8s(f, &s->st00);
  1695 + qemu_put_byte(f, s->st00);
1696 1696 qemu_put_8s(f, &s->st01);
1697 1697  
1698 1698 qemu_put_8s(f, &s->dac_state);
... ... @@ -1702,7 +1702,7 @@ static void vga_save(QEMUFile *f, void *opaque)
1702 1702 qemu_put_buffer(f, s->dac_cache, 3);
1703 1703 qemu_put_buffer(f, s->palette, 768);
1704 1704  
1705   - qemu_put_be32s(f, &s->bank_offset);
  1705 + qemu_put_be32(f, s->bank_offset);
1706 1706 #ifdef CONFIG_BOCHS_VBE
1707 1707 qemu_put_byte(f, 1);
1708 1708 qemu_put_be16s(f, &s->vbe_index);
... ... @@ -1737,7 +1737,7 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id)
1737 1737 qemu_get_buffer(f, s->gr, 16);
1738 1738 qemu_get_8s(f, &s->ar_index);
1739 1739 qemu_get_buffer(f, s->ar, 21);
1740   - qemu_get_be32s(f, &s->ar_flip_flop);
  1740 + s->ar_flip_flop=qemu_get_be32(f);
1741 1741 qemu_get_8s(f, &s->cr_index);
1742 1742 qemu_get_buffer(f, s->cr, 256);
1743 1743 qemu_get_8s(f, &s->msr);
... ... @@ -1752,7 +1752,7 @@ static int vga_load(QEMUFile *f, void *opaque, int version_id)
1752 1752 qemu_get_buffer(f, s->dac_cache, 3);
1753 1753 qemu_get_buffer(f, s->palette, 768);
1754 1754  
1755   - qemu_get_be32s(f, &s->bank_offset);
  1755 + s->bank_offset=qemu_get_be32(f);
1756 1756 is_vbe = qemu_get_byte(f);
1757 1757 #ifdef CONFIG_BOCHS_VBE
1758 1758 if (!is_vbe)
... ...
hw/vmware_vga.c
  View file @bee8d68
... ... @@ -1028,41 +1028,41 @@ static CPUWriteMemoryFunc *vmsvga_vram_write[] = {
1028 1028  
1029 1029 static void vmsvga_save(struct vmsvga_state_s *s, QEMUFile *f)
1030 1030 {
1031   - qemu_put_be32s(f, &s->depth);
1032   - qemu_put_be32s(f, &s->enable);
1033   - qemu_put_be32s(f, &s->config);
1034   - qemu_put_be32s(f, &s->cursor.id);
1035   - qemu_put_be32s(f, &s->cursor.x);
1036   - qemu_put_be32s(f, &s->cursor.y);
1037   - qemu_put_be32s(f, &s->cursor.on);
1038   - qemu_put_be32s(f, &s->index);
  1031 + qemu_put_be32(f, s->depth);
  1032 + qemu_put_be32(f, s->enable);
  1033 + qemu_put_be32(f, s->config);
  1034 + qemu_put_be32(f, s->cursor.id);
  1035 + qemu_put_be32(f, s->cursor.x);
  1036 + qemu_put_be32(f, s->cursor.y);
  1037 + qemu_put_be32(f, s->cursor.on);
  1038 + qemu_put_be32(f, s->index);
1039 1039 qemu_put_buffer(f, (uint8_t *) s->scratch, s->scratch_size * 4);
1040   - qemu_put_be32s(f, &s->new_width);
1041   - qemu_put_be32s(f, &s->new_height);
  1040 + qemu_put_be32(f, s->new_width);
  1041 + qemu_put_be32(f, s->new_height);
1042 1042 qemu_put_be32s(f, &s->guest);
1043 1043 qemu_put_be32s(f, &s->svgaid);
1044   - qemu_put_be32s(f, &s->syncing);
1045   - qemu_put_be32s(f, &s->fb_size);
  1044 + qemu_put_be32(f, s->syncing);
  1045 + qemu_put_be32(f, s->fb_size);
1046 1046 }
1047 1047  
1048 1048 static int vmsvga_load(struct vmsvga_state_s *s, QEMUFile *f)
1049 1049 {
1050 1050 int depth;
1051   - qemu_get_be32s(f, &depth);
1052   - qemu_get_be32s(f, &s->enable);
1053   - qemu_get_be32s(f, &s->config);
1054   - qemu_get_be32s(f, &s->cursor.id);
1055   - qemu_get_be32s(f, &s->cursor.x);
1056   - qemu_get_be32s(f, &s->cursor.y);
1057   - qemu_get_be32s(f, &s->cursor.on);
1058   - qemu_get_be32s(f, &s->index);
  1051 + depth=qemu_get_be32(f);
  1052 + s->enable=qemu_get_be32(f);
  1053 + s->config=qemu_get_be32(f);
  1054 + s->cursor.id=qemu_get_be32(f);
  1055 + s->cursor.x=qemu_get_be32(f);
  1056 + s->cursor.y=qemu_get_be32(f);
  1057 + s->cursor.on=qemu_get_be32(f);
  1058 + s->index=qemu_get_be32(f);
1059 1059 qemu_get_buffer(f, (uint8_t *) s->scratch, s->scratch_size * 4);
1060   - qemu_get_be32s(f, &s->new_width);
1061   - qemu_get_be32s(f, &s->new_height);
  1060 + s->new_width=qemu_get_be32(f);
  1061 + s->new_height=qemu_get_be32(f);
1062 1062 qemu_get_be32s(f, &s->guest);
1063 1063 qemu_get_be32s(f, &s->svgaid);
1064   - qemu_get_be32s(f, &s->syncing);
1065   - qemu_get_be32s(f, &s->fb_size);
  1064 + s->syncing=qemu_get_be32(f);
  1065 + s->fb_size=qemu_get_be32(f);
1066 1066  
1067 1067 if (s->enable && depth != s->depth) {
1068 1068 printf("%s: need colour depth of %i bits to resume operation.\n",
... ...
... ... @@ -1126,9 +1126,9 @@ static void timer_save(QEMUFile *f, void *opaque)
1126 1126 if (cpu_ticks_enabled) {
1127 1127 hw_error("cannot save state if virtual timers are running");
1128 1128 }
1129   - qemu_put_be64s(f, &cpu_ticks_offset);
1130   - qemu_put_be64s(f, &ticks_per_sec);
1131   - qemu_put_be64s(f, &cpu_clock_offset);
  1129 + qemu_put_be64(f, cpu_ticks_offset);
  1130 + qemu_put_be64(f, ticks_per_sec);
  1131 + qemu_put_be64(f, cpu_clock_offset);
1132 1132 }
1133 1133  
1134 1134 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)
1138 1138 if (cpu_ticks_enabled) {
1139 1139 return -EINVAL;
1140 1140 }
1141   - qemu_get_be64s(f, &cpu_ticks_offset);
1142   - qemu_get_be64s(f, &ticks_per_sec);
  1141 + cpu_ticks_offset=qemu_get_be64(f);
  1142 + ticks_per_sec=qemu_get_be64(f);
1143 1143 if (version_id == 2) {
1144   - qemu_get_be64s(f, &cpu_clock_offset);
  1144 + cpu_clock_offset=qemu_get_be64(f);
1145 1145 }
1146 1146 return 0;
1147 1147 }
... ...