Skip to content

Commit 03fee66

Browse files
elmarcobonzini
elmarco
authored and
bonzini
committed
vmstate: constify VMStateField
Because they are supposed to remain const. Signed-off-by: Marc-André Lureau <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 5aaac46 commit 03fee66

File tree

22 files changed

+162
-135
lines changed

22 files changed

+162
-135
lines changed

Diff for: ‎hw/display/virtio-gpu.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ static const VMStateDescription vmstate_virtio_gpu_scanouts = {
10731073
};
10741074

10751075
static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size,
1076-
VMStateField *field, QJSON *vmdesc)
1076+
const VMStateField *field, QJSON *vmdesc)
10771077
{
10781078
VirtIOGPU *g = opaque;
10791079
struct virtio_gpu_simple_resource *res;
@@ -1101,7 +1101,7 @@ static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size,
11011101
}
11021102

11031103
static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size,
1104-
VMStateField *field)
1104+
const VMStateField *field)
11051105
{
11061106
VirtIOGPU *g = opaque;
11071107
struct virtio_gpu_simple_resource *res;

Diff for: ‎hw/intc/s390_flic_kvm.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static void kvm_s390_release_adapter_routes(S390FLICState *fs,
376376
* reached
377377
*/
378378
static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size,
379-
VMStateField *field, QJSON *vmdesc)
379+
const VMStateField *field, QJSON *vmdesc)
380380
{
381381
KVMS390FLICState *flic = opaque;
382382
int len = FLIC_SAVE_INITIAL_SIZE;
@@ -426,7 +426,7 @@ static int kvm_flic_save(QEMUFile *f, void *opaque, size_t size,
426426
* in QEMUFile
427427
*/
428428
static int kvm_flic_load(QEMUFile *f, void *opaque, size_t size,
429-
VMStateField *field)
429+
const VMStateField *field)
430430
{
431431
uint64_t len = 0;
432432
uint64_t count = 0;

Diff for: ‎hw/nvram/eeprom93xx.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ struct _eeprom_t {
9595
*/
9696

9797
static int get_uint16_from_uint8(QEMUFile *f, void *pv, size_t size,
98-
VMStateField *field)
98+
const VMStateField *field)
9999
{
100100
uint16_t *v = pv;
101101
*v = qemu_get_ubyte(f);
102102
return 0;
103103
}
104104

105-
static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field,
106-
QJSON *vmdesc)
105+
static int put_unused(QEMUFile *f, void *pv, size_t size,
106+
const VMStateField *field, QJSON *vmdesc)
107107
{
108108
fprintf(stderr, "uint16_from_uint8 is used only for backwards compatibility.\n");
109109
fprintf(stderr, "Never should be used to write a new state.\n");

Diff for: ‎hw/nvram/fw_cfg.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -520,15 +520,15 @@ static void fw_cfg_reset(DeviceState *d)
520520
*/
521521

522522
static int get_uint32_as_uint16(QEMUFile *f, void *pv, size_t size,
523-
VMStateField *field)
523+
const VMStateField *field)
524524
{
525525
uint32_t *v = pv;
526526
*v = qemu_get_be16(f);
527527
return 0;
528528
}
529529

530-
static int put_unused(QEMUFile *f, void *pv, size_t size, VMStateField *field,
531-
QJSON *vmdesc)
530+
static int put_unused(QEMUFile *f, void *pv, size_t size,
531+
const VMStateField *field, QJSON *vmdesc)
532532
{
533533
fprintf(stderr, "uint32_as_uint16 is only used for backward compatibility.\n");
534534
fprintf(stderr, "This functions shouldn't be called.\n");

Diff for: ‎hw/pci/msix.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -625,15 +625,15 @@ void msix_unset_vector_notifiers(PCIDevice *dev)
625625
}
626626

627627
static int put_msix_state(QEMUFile *f, void *pv, size_t size,
628-
VMStateField *field, QJSON *vmdesc)
628+
const VMStateField *field, QJSON *vmdesc)
629629
{
630630
msix_save(pv, f);
631631

632632
return 0;
633633
}
634634

635635
static int get_msix_state(QEMUFile *f, void *pv, size_t size,
636-
VMStateField *field)
636+
const VMStateField *field)
637637
{
638638
msix_load(pv, f);
639639
return 0;

Diff for: ‎hw/pci/pci.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ int pci_bus_numa_node(PCIBus *bus)
450450
}
451451

452452
static int get_pci_config_device(QEMUFile *f, void *pv, size_t size,
453-
VMStateField *field)
453+
const VMStateField *field)
454454
{
455455
PCIDevice *s = container_of(pv, PCIDevice, config);
456456
PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(s);
@@ -490,7 +490,7 @@ static int get_pci_config_device(QEMUFile *f, void *pv, size_t size,
490490

491491
/* just put buffer */
492492
static int put_pci_config_device(QEMUFile *f, void *pv, size_t size,
493-
VMStateField *field, QJSON *vmdesc)
493+
const VMStateField *field, QJSON *vmdesc)
494494
{
495495
const uint8_t **v = pv;
496496
assert(size == pci_config_size(container_of(pv, PCIDevice, config)));
@@ -506,7 +506,7 @@ static VMStateInfo vmstate_info_pci_config = {
506506
};
507507

508508
static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size,
509-
VMStateField *field)
509+
const VMStateField *field)
510510
{
511511
PCIDevice *s = container_of(pv, PCIDevice, irq_state);
512512
uint32_t irq_state[PCI_NUM_PINS];
@@ -528,7 +528,7 @@ static int get_pci_irq_state(QEMUFile *f, void *pv, size_t size,
528528
}
529529

530530
static int put_pci_irq_state(QEMUFile *f, void *pv, size_t size,
531-
VMStateField *field, QJSON *vmdesc)
531+
const VMStateField *field, QJSON *vmdesc)
532532
{
533533
int i;
534534
PCIDevice *s = container_of(pv, PCIDevice, irq_state);

Diff for: ‎hw/pci/shpc.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -688,16 +688,17 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
688688
shpc_cap_update_dword(d);
689689
}
690690

691-
static int shpc_save(QEMUFile *f, void *pv, size_t size, VMStateField *field,
692-
QJSON *vmdesc)
691+
static int shpc_save(QEMUFile *f, void *pv, size_t size,
692+
const VMStateField *field, QJSON *vmdesc)
693693
{
694694
PCIDevice *d = container_of(pv, PCIDevice, shpc);
695695
qemu_put_buffer(f, d->shpc->config, SHPC_SIZEOF(d));
696696

697697
return 0;
698698
}
699699

700-
static int shpc_load(QEMUFile *f, void *pv, size_t size, VMStateField *field)
700+
static int shpc_load(QEMUFile *f, void *pv, size_t size,
701+
const VMStateField *field)
701702
{
702703
PCIDevice *d = container_of(pv, PCIDevice, shpc);
703704
int ret = qemu_get_buffer(f, d->shpc->config, SHPC_SIZEOF(d));

Diff for: ‎hw/scsi/scsi-bus.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1571,7 +1571,7 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int id, int lun)
15711571
/* SCSI request list. For simplicity, pv points to the whole device */
15721572

15731573
static int put_scsi_requests(QEMUFile *f, void *pv, size_t size,
1574-
VMStateField *field, QJSON *vmdesc)
1574+
const VMStateField *field, QJSON *vmdesc)
15751575
{
15761576
SCSIDevice *s = pv;
15771577
SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, s->qdev.parent_bus);
@@ -1599,7 +1599,7 @@ static int put_scsi_requests(QEMUFile *f, void *pv, size_t size,
15991599
}
16001600

16011601
static int get_scsi_requests(QEMUFile *f, void *pv, size_t size,
1602-
VMStateField *field)
1602+
const VMStateField *field)
16031603
{
16041604
SCSIDevice *s = pv;
16051605
SCSIBus *bus = DO_UPCAST(SCSIBus, qbus, s->qdev.parent_bus);

Diff for: ‎hw/timer/twl92230.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -750,15 +750,15 @@ static int menelaus_rx(I2CSlave *i2c)
750750
*/
751751

752752
static int get_int32_as_uint16(QEMUFile *f, void *pv, size_t size,
753-
VMStateField *field)
753+
const VMStateField *field)
754754
{
755755
int *v = pv;
756756
*v = qemu_get_be16(f);
757757
return 0;
758758
}
759759

760760
static int put_int32_as_uint16(QEMUFile *f, void *pv, size_t size,
761-
VMStateField *field, QJSON *vmdesc)
761+
const VMStateField *field, QJSON *vmdesc)
762762
{
763763
int *v = pv;
764764
qemu_put_be16(f, *v);

Diff for: ‎hw/usb/redirect.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -2155,7 +2155,7 @@ static int usbredir_post_load(void *priv, int version_id)
21552155

21562156
/* For usbredirparser migration */
21572157
static int usbredir_put_parser(QEMUFile *f, void *priv, size_t unused,
2158-
VMStateField *field, QJSON *vmdesc)
2158+
const VMStateField *field, QJSON *vmdesc)
21592159
{
21602160
USBRedirDevice *dev = priv;
21612161
uint8_t *data;
@@ -2178,7 +2178,7 @@ static int usbredir_put_parser(QEMUFile *f, void *priv, size_t unused,
21782178
}
21792179

21802180
static int usbredir_get_parser(QEMUFile *f, void *priv, size_t unused,
2181-
VMStateField *field)
2181+
const VMStateField *field)
21822182
{
21832183
USBRedirDevice *dev = priv;
21842184
uint8_t *data;
@@ -2222,7 +2222,7 @@ static const VMStateInfo usbredir_parser_vmstate_info = {
22222222

22232223
/* For buffered packets (iso/irq) queue migration */
22242224
static int usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused,
2225-
VMStateField *field, QJSON *vmdesc)
2225+
const VMStateField *field, QJSON *vmdesc)
22262226
{
22272227
struct endp_data *endp = priv;
22282228
USBRedirDevice *dev = endp->dev;
@@ -2245,7 +2245,7 @@ static int usbredir_put_bufpq(QEMUFile *f, void *priv, size_t unused,
22452245
}
22462246

22472247
static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused,
2248-
VMStateField *field)
2248+
const VMStateField *field)
22492249
{
22502250
struct endp_data *endp = priv;
22512251
USBRedirDevice *dev = endp->dev;
@@ -2349,7 +2349,7 @@ static const VMStateDescription usbredir_ep_vmstate = {
23492349

23502350
/* For PacketIdQueue migration */
23512351
static int usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused,
2352-
VMStateField *field, QJSON *vmdesc)
2352+
const VMStateField *field, QJSON *vmdesc)
23532353
{
23542354
struct PacketIdQueue *q = priv;
23552355
USBRedirDevice *dev = q->dev;
@@ -2368,7 +2368,7 @@ static int usbredir_put_packet_id_q(QEMUFile *f, void *priv, size_t unused,
23682368
}
23692369

23702370
static int usbredir_get_packet_id_q(QEMUFile *f, void *priv, size_t unused,
2371-
VMStateField *field)
2371+
const VMStateField *field)
23722372
{
23732373
struct PacketIdQueue *q = priv;
23742374
USBRedirDevice *dev = q->dev;

Diff for: ‎hw/virtio/virtio.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ static const VMStateDescription vmstate_virtio_ringsize = {
18161816
};
18171817

18181818
static int get_extra_state(QEMUFile *f, void *pv, size_t size,
1819-
VMStateField *field)
1819+
const VMStateField *field)
18201820
{
18211821
VirtIODevice *vdev = pv;
18221822
BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
@@ -1830,7 +1830,7 @@ static int get_extra_state(QEMUFile *f, void *pv, size_t size,
18301830
}
18311831

18321832
static int put_extra_state(QEMUFile *f, void *pv, size_t size,
1833-
VMStateField *field, QJSON *vmdesc)
1833+
const VMStateField *field, QJSON *vmdesc)
18341834
{
18351835
VirtIODevice *vdev = pv;
18361836
BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
@@ -1979,14 +1979,14 @@ int virtio_save(VirtIODevice *vdev, QEMUFile *f)
19791979

19801980
/* A wrapper for use as a VMState .put function */
19811981
static int virtio_device_put(QEMUFile *f, void *opaque, size_t size,
1982-
VMStateField *field, QJSON *vmdesc)
1982+
const VMStateField *field, QJSON *vmdesc)
19831983
{
19841984
return virtio_save(VIRTIO_DEVICE(opaque), f);
19851985
}
19861986

19871987
/* A wrapper for use as a VMState .get function */
19881988
static int virtio_device_get(QEMUFile *f, void *opaque, size_t size,
1989-
VMStateField *field)
1989+
const VMStateField *field)
19901990
{
19911991
VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
19921992
DeviceClass *dc = DEVICE_CLASS(VIRTIO_DEVICE_GET_CLASS(vdev));

Diff for: ‎include/migration/vmstate.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ typedef struct VMStateField VMStateField;
4040
*/
4141
struct VMStateInfo {
4242
const char *name;
43-
int (*get)(QEMUFile *f, void *pv, size_t size, VMStateField *field);
44-
int (*put)(QEMUFile *f, void *pv, size_t size, VMStateField *field,
43+
int (*get)(QEMUFile *f, void *pv, size_t size, const VMStateField *field);
44+
int (*put)(QEMUFile *f, void *pv, size_t size, const VMStateField *field,
4545
QJSON *vmdesc);
4646
};
4747

@@ -186,7 +186,7 @@ struct VMStateDescription {
186186
int (*post_load)(void *opaque, int version_id);
187187
int (*pre_save)(void *opaque);
188188
bool (*needed)(void *opaque);
189-
VMStateField *fields;
189+
const VMStateField *fields;
190190
const VMStateDescription **subsections;
191191
};
192192

Diff for: ‎migration/savevm.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,16 @@ void timer_get(QEMUFile *f, QEMUTimer *ts)
263263
* Not in vmstate.c to not add qemu-timer.c as dependency to vmstate.c
264264
*/
265265

266-
static int get_timer(QEMUFile *f, void *pv, size_t size, VMStateField *field)
266+
static int get_timer(QEMUFile *f, void *pv, size_t size,
267+
const VMStateField *field)
267268
{
268269
QEMUTimer *v = pv;
269270
timer_get(f, v);
270271
return 0;
271272
}
272273

273-
static int put_timer(QEMUFile *f, void *pv, size_t size, VMStateField *field,
274-
QJSON *vmdesc)
274+
static int put_timer(QEMUFile *f, void *pv, size_t size,
275+
const VMStateField *field, QJSON *vmdesc)
275276
{
276277
QEMUTimer *v = pv;
277278
timer_put(f, v);

0 commit comments

Comments
 (0)