mirror of https://github.com/proxmox/mirror_qemu
target-s390x: Mark as unmigratable
CPU_SAVE_VERSION was undefined, so "cpu_common" VMState and cpu_{save,load}() were not registered. They were no-ops. Therefore there is no backwards compatibility to keep, so we can mark S390CPU as unmigratable at device level. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Alexander Graf <agraf@suse.de> Reviewed-by: Juan Quintela <quintela@redhat.com>master
parent
1e45d31b04
commit
c7396bbb25
|
@ -1,4 +1,4 @@
|
||||||
obj-y += translate.o helper.o cpu.o interrupt.o
|
obj-y += translate.o helper.o cpu.o interrupt.o
|
||||||
obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o
|
obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o
|
||||||
obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o
|
obj-$(CONFIG_SOFTMMU) += ioinst.o
|
||||||
obj-$(CONFIG_KVM) += kvm.o
|
obj-$(CONFIG_KVM) += kvm.o
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "qemu/timer.h"
|
#include "qemu/timer.h"
|
||||||
#ifndef CONFIG_USER_ONLY
|
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
|
#ifndef CONFIG_USER_ONLY
|
||||||
#include "sysemu/arch_init.h"
|
#include "sysemu/arch_init.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -135,13 +135,21 @@ static void s390_cpu_finalize(Object *obj)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const VMStateDescription vmstate_s390_cpu = {
|
||||||
|
.name = "cpu",
|
||||||
|
.unmigratable = 1,
|
||||||
|
};
|
||||||
|
|
||||||
static void s390_cpu_class_init(ObjectClass *oc, void *data)
|
static void s390_cpu_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
S390CPUClass *scc = S390_CPU_CLASS(oc);
|
S390CPUClass *scc = S390_CPU_CLASS(oc);
|
||||||
CPUClass *cc = CPU_CLASS(scc);
|
CPUClass *cc = CPU_CLASS(scc);
|
||||||
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
|
||||||
scc->parent_reset = cc->reset;
|
scc->parent_reset = cc->reset;
|
||||||
cc->reset = s390_cpu_reset;
|
cc->reset = s390_cpu_reset;
|
||||||
|
|
||||||
|
dc->vmsd = &vmstate_s390_cpu;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo s390_cpu_type_info = {
|
static const TypeInfo s390_cpu_type_info = {
|
||||||
|
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
* QEMU S390x machine definitions
|
|
||||||
*
|
|
||||||
* Copyright (c) 2009 Alexander Graf <agraf@suse.de>
|
|
||||||
*
|
|
||||||
* This library is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This library is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "hw/hw.h"
|
|
||||||
#include "hw/boards.h"
|
|
||||||
|
|
||||||
void cpu_save(QEMUFile *f, void *opaque)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
int cpu_load(QEMUFile *f, void *opaque, int version_id)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
Loading…
Reference in New Issue