From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DD74ECE588 for ; Tue, 15 Oct 2019 16:27:42 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50A4E2086A for ; Tue, 15 Oct 2019 16:27:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50A4E2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPfW-0002ys-Cy; Tue, 15 Oct 2019 16:27:30 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPfU-0002yb-U3 for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:27:28 +0000 X-Inumbo-ID: adb7c6ae-ef68-11e9-9396-12813bfff9fa Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id adb7c6ae-ef68-11e9-9396-12813bfff9fa; Tue, 15 Oct 2019 16:27:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BEB018E1CF1; Tue, 15 Oct 2019 16:27:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB9AE19C58; Tue, 15 Oct 2019 16:27:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:34 +0200 Message-Id: <20191015162705.28087-2-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 15 Oct 2019 16:27:27 +0000 (UTC) Subject: [Xen-devel] [PATCH 01/32] hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" VGhlc2UgZGV2aWNlcyBpbXBsZW1lbnRlZCB0aGVpciBsb2FkX3N0YXRlX29sZCgpIGhhbmRsZXIg MTAgeWVhcnMKYWdvLCBwcmV2aW91cyB0byBRRU1VIHYwLjEyLgpTaW5jZSBjb21taXQgY2M0MjVi NWRkZiByZW1vdmVkIHRoZSBwYy0wLjEwIGFuZCBwYy0wLjExIG1hY2hpbmVzLAp3ZSBjYW4gZHJv cCB0aGlzIGNvZGUuCgpOb3RlOiB0aGUgbWlwc19yNGsgbWFjaGluZSBzdGFydGVkIHRvIHVzZSB0 aGUgaTgyNTQgZGV2aWNlIGp1c3QKYWZ0ZXIgUUVNVSB2MC41LjAsIGJ1dCB0aGUgTUlQUyBtYWNo aW5lIHR5cGVzIGFyZSBub3QgdmVyc2lvbmVkLApzbyB0aGVyZSBpcyBubyBtaWdyYXRpb24gY29t cGF0aWJpbGl0eSBpc3N1ZSByZW1vdmluZyB0aGlzIGhhbmRsZXIuCgpTdWdnZXN0ZWQtYnk6IFBl dGVyIE1heWRlbGwgPHBldGVyLm1heWRlbGxAbGluYXJvLm9yZz4KU2lnbmVkLW9mZi1ieTogUGhp bGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgotLS0KIGh3L2FjcGkvcGlp eDQuYyAgICAgICAgIHwgNDAgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBody9p bnRjL2FwaWNfY29tbW9uLmMgICB8IDQ5IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBody9wY2ktaG9zdC9waWl4LmMgICAgICB8IDI1IC0tLS0tLS0tLS0tLS0tLS0t LS0tLQogaHcvdGltZXIvaTgyNTRfY29tbW9uLmMgfCA0MCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KIDQgZmlsZXMgY2hhbmdlZCwgMTU0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2h3L2FjcGkvcGlpeDQuYyBiL2h3L2FjcGkvcGlpeDQuYwppbmRleCA1NzQyYzNkZjg3Li4x ZDI5ZDQzOGM3IDEwMDY0NAotLS0gYS9ody9hY3BpL3BpaXg0LmMKKysrIGIvaHcvYWNwaS9waWl4 NC5jCkBAIC00Miw3ICs0Miw2IEBACiAjaW5jbHVkZSAiaHcvYWNwaS9tZW1vcnlfaG90cGx1Zy5o IgogI2luY2x1ZGUgImh3L2FjcGkvYWNwaV9kZXZfaW50ZXJmYWNlLmgiCiAjaW5jbHVkZSAiaHcv eGVuL3hlbi5oIgotI2luY2x1ZGUgIm1pZ3JhdGlvbi9xZW11LWZpbGUtdHlwZXMuaCIKICNpbmNs dWRlICJtaWdyYXRpb24vdm1zdGF0ZS5oIgogI2luY2x1ZGUgImh3L2NvcmUvY3B1LmgiCiAjaW5j bHVkZSAidHJhY2UuaCIKQEAgLTIwNSw0MyArMjA0LDYgQEAgc3RhdGljIGNvbnN0IFZNU3RhdGVE ZXNjcmlwdGlvbiB2bXN0YXRlX3BjaV9zdGF0dXMgPSB7CiAgICAgfQogfTsKIAotc3RhdGljIGlu dCBhY3BpX2xvYWRfb2xkKFFFTVVGaWxlICpmLCB2b2lkICpvcGFxdWUsIGludCB2ZXJzaW9uX2lk KQotewotICAgIFBJSVg0UE1TdGF0ZSAqcyA9IG9wYXF1ZTsKLSAgICBpbnQgcmV0LCBpOwotICAg IHVpbnQxNl90IHRlbXA7Ci0KLSAgICByZXQgPSBwY2lfZGV2aWNlX2xvYWQoUENJX0RFVklDRShz KSwgZik7Ci0gICAgaWYgKHJldCA8IDApIHsKLSAgICAgICAgcmV0dXJuIHJldDsKLSAgICB9Ci0g ICAgcWVtdV9nZXRfYmUxNnMoZiwgJnMtPmFyLnBtMS5ldnQuc3RzKTsKLSAgICBxZW11X2dldF9i ZTE2cyhmLCAmcy0+YXIucG0xLmV2dC5lbik7Ci0gICAgcWVtdV9nZXRfYmUxNnMoZiwgJnMtPmFy LnBtMS5jbnQuY250KTsKLQotICAgIHJldCA9IHZtc3RhdGVfbG9hZF9zdGF0ZShmLCAmdm1zdGF0 ZV9hcG0sICZzLT5hcG0sIDEpOwotICAgIGlmIChyZXQpIHsKLSAgICAgICAgcmV0dXJuIHJldDsK LSAgICB9Ci0KLSAgICB0aW1lcl9nZXQoZiwgcy0+YXIudG1yLnRpbWVyKTsKLSAgICBxZW11X2dl dF9zYmU2NHMoZiwgJnMtPmFyLnRtci5vdmVyZmxvd190aW1lKTsKLQotICAgIHFlbXVfZ2V0X2Jl MTZzKGYsICh1aW50MTZfdCAqKXMtPmFyLmdwZS5zdHMpOwotICAgIGZvciAoaSA9IDA7IGkgPCAz OyBpKyspIHsKLSAgICAgICAgcWVtdV9nZXRfYmUxNnMoZiwgJnRlbXApOwotICAgIH0KLQotICAg IHFlbXVfZ2V0X2JlMTZzKGYsICh1aW50MTZfdCAqKXMtPmFyLmdwZS5lbik7Ci0gICAgZm9yIChp ID0gMDsgaSA8IDM7IGkrKykgewotICAgICAgICBxZW11X2dldF9iZTE2cyhmLCAmdGVtcCk7Ci0g ICAgfQotCi0gICAgcmV0ID0gdm1zdGF0ZV9sb2FkX3N0YXRlKGYsICZ2bXN0YXRlX3BjaV9zdGF0 dXMsCi0gICAgICAgICZzLT5hY3BpX3BjaV9ob3RwbHVnLmFjcGlfcGNpaHBfcGNpX3N0YXR1c1tB Q1BJX1BDSUhQX0JTRUxfREVGQVVMVF0sIDEpOwotICAgIHJldHVybiByZXQ7Ci19Ci0KIHN0YXRp YyBib29sIHZtc3RhdGVfdGVzdF91c2VfYWNwaV9wY2lfaG90cGx1Zyh2b2lkICpvcGFxdWUsIGlu dCB2ZXJzaW9uX2lkKQogewogICAgIFBJSVg0UE1TdGF0ZSAqcyA9IG9wYXF1ZTsKQEAgLTMxMyw4 ICsyNzUsNiBAQCBzdGF0aWMgY29uc3QgVk1TdGF0ZURlc2NyaXB0aW9uIHZtc3RhdGVfYWNwaSA9 IHsKICAgICAubmFtZSA9ICJwaWl4NF9wbSIsCiAgICAgLnZlcnNpb25faWQgPSAzLAogICAgIC5t aW5pbXVtX3ZlcnNpb25faWQgPSAzLAotICAgIC5taW5pbXVtX3ZlcnNpb25faWRfb2xkID0gMSwK LSAgICAubG9hZF9zdGF0ZV9vbGQgPSBhY3BpX2xvYWRfb2xkLAogICAgIC5wb3N0X2xvYWQgPSB2 bXN0YXRlX2FjcGlfcG9zdF9sb2FkLAogICAgIC5maWVsZHMgPSAoVk1TdGF0ZUZpZWxkW10pIHsK ICAgICAgICAgVk1TVEFURV9QQ0lfREVWSUNFKHBhcmVudF9vYmosIFBJSVg0UE1TdGF0ZSksCmRp ZmYgLS1naXQgYS9ody9pbnRjL2FwaWNfY29tbW9uLmMgYi9ody9pbnRjL2FwaWNfY29tbW9uLmMK aW5kZXggYWFmZDhlMGUzMy4uMzc1Y2I2YWJlOSAxMDA2NDQKLS0tIGEvaHcvaW50Yy9hcGljX2Nv bW1vbi5jCisrKyBiL2h3L2ludGMvYXBpY19jb21tb24uYwpAQCAtMzEsNyArMzEsNiBAQAogI2lu Y2x1ZGUgInN5c2VtdS9rdm0uaCIKICNpbmNsdWRlICJody9xZGV2LXByb3BlcnRpZXMuaCIKICNp bmNsdWRlICJody9zeXNidXMuaCIKLSNpbmNsdWRlICJtaWdyYXRpb24vcWVtdS1maWxlLXR5cGVz LmgiCiAjaW5jbHVkZSAibWlncmF0aW9uL3Ztc3RhdGUuaCIKIAogc3RhdGljIGludCBhcGljX2ly cV9kZWxpdmVyZWQ7CkBAIC0yNjIsNTIgKzI2MSw2IEBAIHN0YXRpYyB2b2lkIGFwaWNfcmVzZXRf Y29tbW9uKERldmljZVN0YXRlICpkZXYpCiAgICAgYXBpY19pbml0X3Jlc2V0KGRldik7CiB9CiAK LS8qIFRoaXMgZnVuY3Rpb24gaXMgb25seSB1c2VkIGZvciBvbGQgc3RhdGUgdmVyc2lvbiAxIGFu ZCAyICovCi1zdGF0aWMgaW50IGFwaWNfbG9hZF9vbGQoUUVNVUZpbGUgKmYsIHZvaWQgKm9wYXF1 ZSwgaW50IHZlcnNpb25faWQpCi17Ci0gICAgQVBJQ0NvbW1vblN0YXRlICpzID0gb3BhcXVlOwot ICAgIEFQSUNDb21tb25DbGFzcyAqaW5mbyA9IEFQSUNfQ09NTU9OX0dFVF9DTEFTUyhzKTsKLSAg ICBpbnQgaTsKLQotICAgIGlmICh2ZXJzaW9uX2lkID4gMikgewotICAgICAgICByZXR1cm4gLUVJ TlZBTDsKLSAgICB9Ci0KLSAgICAvKiBYWFg6IHdoYXQgaWYgdGhlIGJhc2UgY2hhbmdlcz8gKHJl Z2lzdGVyZWQgbWVtb3J5IHJlZ2lvbnMpICovCi0gICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmFw aWNiYXNlKTsKLSAgICBxZW11X2dldF84cyhmLCAmcy0+aWQpOwotICAgIHFlbXVfZ2V0XzhzKGYs ICZzLT5hcmJfaWQpOwotICAgIHFlbXVfZ2V0XzhzKGYsICZzLT50cHIpOwotICAgIHFlbXVfZ2V0 X2JlMzJzKGYsICZzLT5zcHVyaW91c192ZWMpOwotICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5sb2df ZGVzdCk7Ci0gICAgcWVtdV9nZXRfOHMoZiwgJnMtPmRlc3RfbW9kZSk7Ci0gICAgZm9yIChpID0g MDsgaSA8IDg7IGkrKykgewotICAgICAgICBxZW11X2dldF9iZTMycyhmLCAmcy0+aXNyW2ldKTsK LSAgICAgICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPnRtcltpXSk7Ci0gICAgICAgIHFlbXVfZ2V0 X2JlMzJzKGYsICZzLT5pcnJbaV0pOwotICAgIH0KLSAgICBmb3IgKGkgPSAwOyBpIDwgQVBJQ19M VlRfTkI7IGkrKykgewotICAgICAgICBxZW11X2dldF9iZTMycyhmLCAmcy0+bHZ0W2ldKTsKLSAg ICB9Ci0gICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmVzcik7Ci0gICAgcWVtdV9nZXRfYmUzMnMo ZiwgJnMtPmljclswXSk7Ci0gICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmljclsxXSk7Ci0gICAg cWVtdV9nZXRfYmUzMnMoZiwgJnMtPmRpdmlkZV9jb25mKTsKLSAgICBzLT5jb3VudF9zaGlmdCA9 IHFlbXVfZ2V0X2JlMzIoZik7Ci0gICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmluaXRpYWxfY291 bnQpOwotICAgIHMtPmluaXRpYWxfY291bnRfbG9hZF90aW1lID0gcWVtdV9nZXRfYmU2NChmKTsK LSAgICBzLT5uZXh0X3RpbWUgPSBxZW11X2dldF9iZTY0KGYpOwotCi0gICAgaWYgKHZlcnNpb25f aWQgPj0gMikgewotICAgICAgICBzLT50aW1lcl9leHBpcnkgPSBxZW11X2dldF9iZTY0KGYpOwot ICAgIH0KLQotICAgIGlmIChpbmZvLT5wb3N0X2xvYWQpIHsKLSAgICAgICAgaW5mby0+cG9zdF9s b2FkKHMpOwotICAgIH0KLSAgICByZXR1cm4gMDsKLX0KLQogc3RhdGljIGNvbnN0IFZNU3RhdGVE ZXNjcmlwdGlvbiB2bXN0YXRlX2FwaWNfY29tbW9uOwogCiBzdGF0aWMgdm9pZCBhcGljX2NvbW1v bl9yZWFsaXplKERldmljZVN0YXRlICpkZXYsIEVycm9yICoqZXJycCkKQEAgLTQwOCw4ICszNjEs NiBAQCBzdGF0aWMgY29uc3QgVk1TdGF0ZURlc2NyaXB0aW9uIHZtc3RhdGVfYXBpY19jb21tb24g PSB7CiAgICAgLm5hbWUgPSAiYXBpYyIsCiAgICAgLnZlcnNpb25faWQgPSAzLAogICAgIC5taW5p bXVtX3ZlcnNpb25faWQgPSAzLAotICAgIC5taW5pbXVtX3ZlcnNpb25faWRfb2xkID0gMSwKLSAg ICAubG9hZF9zdGF0ZV9vbGQgPSBhcGljX2xvYWRfb2xkLAogICAgIC5wcmVfbG9hZCA9IGFwaWNf cHJlX2xvYWQsCiAgICAgLnByZV9zYXZlID0gYXBpY19kaXNwYXRjaF9wcmVfc2F2ZSwKICAgICAu cG9zdF9sb2FkID0gYXBpY19kaXNwYXRjaF9wb3N0X2xvYWQsCmRpZmYgLS1naXQgYS9ody9wY2kt aG9zdC9waWl4LmMgYi9ody9wY2ktaG9zdC9waWl4LmMKaW5kZXggMTM1YzY0NTUzNS4uMmY0Y2Jj YmZlOSAxMDA2NDQKLS0tIGEvaHcvcGNpLWhvc3QvcGlpeC5jCisrKyBiL2h3L3BjaS1ob3N0L3Bp aXguYwpAQCAtMzMsNyArMzMsNiBAQAogI2luY2x1ZGUgInFhcGkvZXJyb3IuaCIKICNpbmNsdWRl ICJxZW11L3JhbmdlLmgiCiAjaW5jbHVkZSAiaHcveGVuL3hlbi5oIgotI2luY2x1ZGUgIm1pZ3Jh dGlvbi9xZW11LWZpbGUtdHlwZXMuaCIKICNpbmNsdWRlICJtaWdyYXRpb24vdm1zdGF0ZS5oIgog I2luY2x1ZGUgImh3L3BjaS1ob3N0L3BhbS5oIgogI2luY2x1ZGUgInN5c2VtdS9yZXNldC5oIgpA QCAtMTc0LDI4ICsxNzMsNiBAQCBzdGF0aWMgdm9pZCBpNDQwZnhfd3JpdGVfY29uZmlnKFBDSURl dmljZSAqZGV2LAogICAgIH0KIH0KIAotc3RhdGljIGludCBpNDQwZnhfbG9hZF9vbGQoUUVNVUZp bGUqIGYsIHZvaWQgKm9wYXF1ZSwgaW50IHZlcnNpb25faWQpCi17Ci0gICAgUENJSTQ0MEZYU3Rh dGUgKmQgPSBvcGFxdWU7Ci0gICAgUENJRGV2aWNlICpwZCA9IFBDSV9ERVZJQ0UoZCk7Ci0gICAg aW50IHJldCwgaTsKLSAgICB1aW50OF90IHNtbV9lbmFibGVkOwotCi0gICAgcmV0ID0gcGNpX2Rl dmljZV9sb2FkKHBkLCBmKTsKLSAgICBpZiAocmV0IDwgMCkKLSAgICAgICAgcmV0dXJuIHJldDsK LSAgICBpNDQwZnhfdXBkYXRlX21lbW9yeV9tYXBwaW5ncyhkKTsKLSAgICBxZW11X2dldF84cyhm LCAmc21tX2VuYWJsZWQpOwotCi0gICAgaWYgKHZlcnNpb25faWQgPT0gMikgewotICAgICAgICBm b3IgKGkgPSAwOyBpIDwgUElJWF9OVU1fUElSUVM7IGkrKykgewotICAgICAgICAgICAgcWVtdV9n ZXRfYmUzMihmKTsgLyogZHVtbXkgbG9hZCBmb3IgY29tcGF0aWJpbGl0eSAqLwotICAgICAgICB9 Ci0gICAgfQotCi0gICAgcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyBpbnQgaTQ0MGZ4X3Bvc3RfbG9h ZCh2b2lkICpvcGFxdWUsIGludCB2ZXJzaW9uX2lkKQogewogICAgIFBDSUk0NDBGWFN0YXRlICpk ID0gb3BhcXVlOwpAQCAtMjA4LDggKzE4NSw2IEBAIHN0YXRpYyBjb25zdCBWTVN0YXRlRGVzY3Jp cHRpb24gdm1zdGF0ZV9pNDQwZnggPSB7CiAgICAgLm5hbWUgPSAiSTQ0MEZYIiwKICAgICAudmVy c2lvbl9pZCA9IDMsCiAgICAgLm1pbmltdW1fdmVyc2lvbl9pZCA9IDMsCi0gICAgLm1pbmltdW1f dmVyc2lvbl9pZF9vbGQgPSAxLAotICAgIC5sb2FkX3N0YXRlX29sZCA9IGk0NDBmeF9sb2FkX29s ZCwKICAgICAucG9zdF9sb2FkID0gaTQ0MGZ4X3Bvc3RfbG9hZCwKICAgICAuZmllbGRzID0gKFZN U3RhdGVGaWVsZFtdKSB7CiAgICAgICAgIFZNU1RBVEVfUENJX0RFVklDRShwYXJlbnRfb2JqLCBQ Q0lJNDQwRlhTdGF0ZSksCmRpZmYgLS1naXQgYS9ody90aW1lci9pODI1NF9jb21tb24uYyBiL2h3 L3RpbWVyL2k4MjU0X2NvbW1vbi5jCmluZGV4IDU3YmYxMGNjOTQuLjA1MDg3NWI0OTcgMTAwNjQ0 Ci0tLSBhL2h3L3RpbWVyL2k4MjU0X2NvbW1vbi5jCisrKyBiL2h3L3RpbWVyL2k4MjU0X2NvbW1v bi5jCkBAIC0yOSw3ICsyOSw2IEBACiAjaW5jbHVkZSAicWVtdS90aW1lci5oIgogI2luY2x1ZGUg Imh3L3RpbWVyL2k4MjU0LmgiCiAjaW5jbHVkZSAiaHcvdGltZXIvaTgyNTRfaW50ZXJuYWwuaCIK LSNpbmNsdWRlICJtaWdyYXRpb24vcWVtdS1maWxlLXR5cGVzLmgiCiAjaW5jbHVkZSAibWlncmF0 aW9uL3Ztc3RhdGUuaCIKIAogLyogdmFsIG11c3QgYmUgMCBvciAxICovCkBAIC0yMDIsNDMgKzIw MSw2IEBAIHN0YXRpYyBjb25zdCBWTVN0YXRlRGVzY3JpcHRpb24gdm1zdGF0ZV9waXRfY2hhbm5l bCA9IHsKICAgICB9CiB9OwogCi1zdGF0aWMgaW50IHBpdF9sb2FkX29sZChRRU1VRmlsZSAqZiwg dm9pZCAqb3BhcXVlLCBpbnQgdmVyc2lvbl9pZCkKLXsKLSAgICBQSVRDb21tb25TdGF0ZSAqcGl0 ID0gb3BhcXVlOwotICAgIFBJVENvbW1vbkNsYXNzICpjID0gUElUX0NPTU1PTl9HRVRfQ0xBU1Mo cGl0KTsKLSAgICBQSVRDaGFubmVsU3RhdGUgKnM7Ci0gICAgaW50IGk7Ci0KLSAgICBpZiAodmVy c2lvbl9pZCAhPSAxKSB7Ci0gICAgICAgIHJldHVybiAtRUlOVkFMOwotICAgIH0KLQotICAgIGZv ciAoaSA9IDA7IGkgPCAzOyBpKyspIHsKLSAgICAgICAgcyA9ICZwaXQtPmNoYW5uZWxzW2ldOwot ICAgICAgICBzLT5jb3VudCA9IHFlbXVfZ2V0X2JlMzIoZik7Ci0gICAgICAgIHFlbXVfZ2V0X2Jl MTZzKGYsICZzLT5sYXRjaGVkX2NvdW50KTsKLSAgICAgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmNv dW50X2xhdGNoZWQpOwotICAgICAgICBxZW11X2dldF84cyhmLCAmcy0+c3RhdHVzX2xhdGNoZWQp OwotICAgICAgICBxZW11X2dldF84cyhmLCAmcy0+c3RhdHVzKTsKLSAgICAgICAgcWVtdV9nZXRf OHMoZiwgJnMtPnJlYWRfc3RhdGUpOwotICAgICAgICBxZW11X2dldF84cyhmLCAmcy0+d3JpdGVf c3RhdGUpOwotICAgICAgICBxZW11X2dldF84cyhmLCAmcy0+d3JpdGVfbGF0Y2gpOwotICAgICAg ICBxZW11X2dldF84cyhmLCAmcy0+cndfbW9kZSk7Ci0gICAgICAgIHFlbXVfZ2V0XzhzKGYsICZz LT5tb2RlKTsKLSAgICAgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmJjZCk7Ci0gICAgICAgIHFlbXVf Z2V0XzhzKGYsICZzLT5nYXRlKTsKLSAgICAgICAgcy0+Y291bnRfbG9hZF90aW1lID0gcWVtdV9n ZXRfYmU2NChmKTsKLSAgICAgICAgcy0+aXJxX2Rpc2FibGVkID0gMDsKLSAgICAgICAgaWYgKGkg PT0gMCkgewotICAgICAgICAgICAgcy0+bmV4dF90cmFuc2l0aW9uX3RpbWUgPSBxZW11X2dldF9i ZTY0KGYpOwotICAgICAgICB9Ci0gICAgfQotICAgIGlmIChjLT5wb3N0X2xvYWQpIHsKLSAgICAg ICAgYy0+cG9zdF9sb2FkKHBpdCk7Ci0gICAgfQotICAgIHJldHVybiAwOwotfQotCiBzdGF0aWMg aW50IHBpdF9kaXNwYXRjaF9wcmVfc2F2ZSh2b2lkICpvcGFxdWUpCiB7CiAgICAgUElUQ29tbW9u U3RhdGUgKnMgPSBvcGFxdWU7CkBAIC0yNjYsOCArMjI4LDYgQEAgc3RhdGljIGNvbnN0IFZNU3Rh dGVEZXNjcmlwdGlvbiB2bXN0YXRlX3BpdF9jb21tb24gPSB7CiAgICAgLm5hbWUgPSAiaTgyNTQi LAogICAgIC52ZXJzaW9uX2lkID0gMywKICAgICAubWluaW11bV92ZXJzaW9uX2lkID0gMiwKLSAg ICAubWluaW11bV92ZXJzaW9uX2lkX29sZCA9IDEsCi0gICAgLmxvYWRfc3RhdGVfb2xkID0gcGl0 X2xvYWRfb2xkLAogICAgIC5wcmVfc2F2ZSA9IHBpdF9kaXNwYXRjaF9wcmVfc2F2ZSwKICAgICAu cG9zdF9sb2FkID0gcGl0X2Rpc3BhdGNoX3Bvc3RfbG9hZCwKICAgICAuZmllbGRzID0gKFZNU3Rh dGVGaWVsZFtdKSB7Ci0tIAoyLjIxLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGlu Zm8veGVuLWRldmVs From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8CC9C10F14 for ; Tue, 15 Oct 2019 16:27:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 981C52086A for ; Tue, 15 Oct 2019 16:27:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728634AbfJOQ12 (ORCPT ); Tue, 15 Oct 2019 12:27:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64031 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728521AbfJOQ12 (ORCPT ); Tue, 15 Oct 2019 12:27:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BEB018E1CF1; Tue, 15 Oct 2019 16:27:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB9AE19C58; Tue, 15 Oct 2019 16:27:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH 01/32] hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers Date: Tue, 15 Oct 2019 18:26:34 +0200 Message-Id: <20191015162705.28087-2-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 15 Oct 2019 16:27:27 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org These devices implemented their load_state_old() handler 10 years ago, previous to QEMU v0.12. Since commit cc425b5ddf removed the pc-0.10 and pc-0.11 machines, we can drop this code. Note: the mips_r4k machine started to use the i8254 device just after QEMU v0.5.0, but the MIPS machine types are not versioned, so there is no migration compatibility issue removing this handler. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- hw/acpi/piix4.c | 40 --------------------------------- hw/intc/apic_common.c | 49 ----------------------------------------- hw/pci-host/piix.c | 25 --------------------- hw/timer/i8254_common.c | 40 --------------------------------- 4 files changed, 154 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 5742c3df87..1d29d438c7 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -42,7 +42,6 @@ #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "hw/core/cpu.h" #include "trace.h" @@ -205,43 +204,6 @@ static const VMStateDescription vmstate_pci_status = { } }; -static int acpi_load_old(QEMUFile *f, void *opaque, int version_id) -{ - PIIX4PMState *s = opaque; - int ret, i; - uint16_t temp; - - ret = pci_device_load(PCI_DEVICE(s), f); - if (ret < 0) { - return ret; - } - qemu_get_be16s(f, &s->ar.pm1.evt.sts); - qemu_get_be16s(f, &s->ar.pm1.evt.en); - qemu_get_be16s(f, &s->ar.pm1.cnt.cnt); - - ret = vmstate_load_state(f, &vmstate_apm, &s->apm, 1); - if (ret) { - return ret; - } - - timer_get(f, s->ar.tmr.timer); - qemu_get_sbe64s(f, &s->ar.tmr.overflow_time); - - qemu_get_be16s(f, (uint16_t *)s->ar.gpe.sts); - for (i = 0; i < 3; i++) { - qemu_get_be16s(f, &temp); - } - - qemu_get_be16s(f, (uint16_t *)s->ar.gpe.en); - for (i = 0; i < 3; i++) { - qemu_get_be16s(f, &temp); - } - - ret = vmstate_load_state(f, &vmstate_pci_status, - &s->acpi_pci_hotplug.acpi_pcihp_pci_status[ACPI_PCIHP_BSEL_DEFAULT], 1); - return ret; -} - static bool vmstate_test_use_acpi_pci_hotplug(void *opaque, int version_id) { PIIX4PMState *s = opaque; @@ -313,8 +275,6 @@ static const VMStateDescription vmstate_acpi = { .name = "piix4_pm", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 1, - .load_state_old = acpi_load_old, .post_load = vmstate_acpi_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index aafd8e0e33..375cb6abe9 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -31,7 +31,6 @@ #include "sysemu/kvm.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" static int apic_irq_delivered; @@ -262,52 +261,6 @@ static void apic_reset_common(DeviceState *dev) apic_init_reset(dev); } -/* This function is only used for old state version 1 and 2 */ -static int apic_load_old(QEMUFile *f, void *opaque, int version_id) -{ - APICCommonState *s = opaque; - APICCommonClass *info = APIC_COMMON_GET_CLASS(s); - int i; - - if (version_id > 2) { - return -EINVAL; - } - - /* XXX: what if the base changes? (registered memory regions) */ - qemu_get_be32s(f, &s->apicbase); - qemu_get_8s(f, &s->id); - qemu_get_8s(f, &s->arb_id); - qemu_get_8s(f, &s->tpr); - qemu_get_be32s(f, &s->spurious_vec); - qemu_get_8s(f, &s->log_dest); - qemu_get_8s(f, &s->dest_mode); - for (i = 0; i < 8; i++) { - qemu_get_be32s(f, &s->isr[i]); - qemu_get_be32s(f, &s->tmr[i]); - qemu_get_be32s(f, &s->irr[i]); - } - for (i = 0; i < APIC_LVT_NB; i++) { - qemu_get_be32s(f, &s->lvt[i]); - } - qemu_get_be32s(f, &s->esr); - qemu_get_be32s(f, &s->icr[0]); - qemu_get_be32s(f, &s->icr[1]); - qemu_get_be32s(f, &s->divide_conf); - s->count_shift = qemu_get_be32(f); - qemu_get_be32s(f, &s->initial_count); - s->initial_count_load_time = qemu_get_be64(f); - s->next_time = qemu_get_be64(f); - - if (version_id >= 2) { - s->timer_expiry = qemu_get_be64(f); - } - - if (info->post_load) { - info->post_load(s); - } - return 0; -} - static const VMStateDescription vmstate_apic_common; static void apic_common_realize(DeviceState *dev, Error **errp) @@ -408,8 +361,6 @@ static const VMStateDescription vmstate_apic_common = { .name = "apic", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 1, - .load_state_old = apic_load_old, .pre_load = apic_pre_load, .pre_save = apic_dispatch_pre_save, .post_load = apic_dispatch_post_load, diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 135c645535..2f4cbcbfe9 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -33,7 +33,6 @@ #include "qapi/error.h" #include "qemu/range.h" #include "hw/xen/xen.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "hw/pci-host/pam.h" #include "sysemu/reset.h" @@ -174,28 +173,6 @@ static void i440fx_write_config(PCIDevice *dev, } } -static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id) -{ - PCII440FXState *d = opaque; - PCIDevice *pd = PCI_DEVICE(d); - int ret, i; - uint8_t smm_enabled; - - ret = pci_device_load(pd, f); - if (ret < 0) - return ret; - i440fx_update_memory_mappings(d); - qemu_get_8s(f, &smm_enabled); - - if (version_id == 2) { - for (i = 0; i < PIIX_NUM_PIRQS; i++) { - qemu_get_be32(f); /* dummy load for compatibility */ - } - } - - return 0; -} - static int i440fx_post_load(void *opaque, int version_id) { PCII440FXState *d = opaque; @@ -208,8 +185,6 @@ static const VMStateDescription vmstate_i440fx = { .name = "I440FX", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 1, - .load_state_old = i440fx_load_old, .post_load = i440fx_post_load, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 57bf10cc94..050875b497 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -29,7 +29,6 @@ #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" /* val must be 0 or 1 */ @@ -202,43 +201,6 @@ static const VMStateDescription vmstate_pit_channel = { } }; -static int pit_load_old(QEMUFile *f, void *opaque, int version_id) -{ - PITCommonState *pit = opaque; - PITCommonClass *c = PIT_COMMON_GET_CLASS(pit); - PITChannelState *s; - int i; - - if (version_id != 1) { - return -EINVAL; - } - - for (i = 0; i < 3; i++) { - s = &pit->channels[i]; - 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); - qemu_get_8s(f, &s->status); - qemu_get_8s(f, &s->read_state); - qemu_get_8s(f, &s->write_state); - qemu_get_8s(f, &s->write_latch); - qemu_get_8s(f, &s->rw_mode); - qemu_get_8s(f, &s->mode); - qemu_get_8s(f, &s->bcd); - qemu_get_8s(f, &s->gate); - s->count_load_time = qemu_get_be64(f); - s->irq_disabled = 0; - if (i == 0) { - s->next_transition_time = qemu_get_be64(f); - } - } - if (c->post_load) { - c->post_load(pit); - } - return 0; -} - static int pit_dispatch_pre_save(void *opaque) { PITCommonState *s = opaque; @@ -266,8 +228,6 @@ static const VMStateDescription vmstate_pit_common = { .name = "i8254", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 1, - .load_state_old = pit_load_old, .pre_save = pit_dispatch_pre_save, .post_load = pit_dispatch_post_load, .fields = (VMStateField[]) { -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFAA0C10F14 for ; Tue, 15 Oct 2019 16:29:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A78F92086A for ; Tue, 15 Oct 2019 16:29:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A78F92086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPhW-0001Ae-2I for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40801) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPfW-00087m-Ik for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPfU-00048o-Vz for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:27:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56702) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPfU-00048W-NH for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:27:28 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BEB018E1CF1; Tue, 15 Oct 2019 16:27:27 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BB9AE19C58; Tue, 15 Oct 2019 16:27:20 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 01/32] hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers Date: Tue, 15 Oct 2019 18:26:34 +0200 Message-Id: <20191015162705.28087-2-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Tue, 15 Oct 2019 16:27:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These devices implemented their load_state_old() handler 10 years ago, previous to QEMU v0.12. Since commit cc425b5ddf removed the pc-0.10 and pc-0.11 machines, we can drop this code. Note: the mips_r4k machine started to use the i8254 device just after QEMU v0.5.0, but the MIPS machine types are not versioned, so there is no migration compatibility issue removing this handler. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/acpi/piix4.c | 40 --------------------------------- hw/intc/apic_common.c | 49 ----------------------------------------- hw/pci-host/piix.c | 25 --------------------- hw/timer/i8254_common.c | 40 --------------------------------- 4 files changed, 154 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 5742c3df87..1d29d438c7 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -42,7 +42,6 @@ #include "hw/acpi/memory_hotplug.h" #include "hw/acpi/acpi_dev_interface.h" #include "hw/xen/xen.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "hw/core/cpu.h" #include "trace.h" @@ -205,43 +204,6 @@ static const VMStateDescription vmstate_pci_status =3D= { } }; =20 -static int acpi_load_old(QEMUFile *f, void *opaque, int version_id) -{ - PIIX4PMState *s =3D opaque; - int ret, i; - uint16_t temp; - - ret =3D pci_device_load(PCI_DEVICE(s), f); - if (ret < 0) { - return ret; - } - qemu_get_be16s(f, &s->ar.pm1.evt.sts); - qemu_get_be16s(f, &s->ar.pm1.evt.en); - qemu_get_be16s(f, &s->ar.pm1.cnt.cnt); - - ret =3D vmstate_load_state(f, &vmstate_apm, &s->apm, 1); - if (ret) { - return ret; - } - - timer_get(f, s->ar.tmr.timer); - qemu_get_sbe64s(f, &s->ar.tmr.overflow_time); - - qemu_get_be16s(f, (uint16_t *)s->ar.gpe.sts); - for (i =3D 0; i < 3; i++) { - qemu_get_be16s(f, &temp); - } - - qemu_get_be16s(f, (uint16_t *)s->ar.gpe.en); - for (i =3D 0; i < 3; i++) { - qemu_get_be16s(f, &temp); - } - - ret =3D vmstate_load_state(f, &vmstate_pci_status, - &s->acpi_pci_hotplug.acpi_pcihp_pci_status[ACPI_PCIHP_BSEL_DEFAU= LT], 1); - return ret; -} - static bool vmstate_test_use_acpi_pci_hotplug(void *opaque, int version_= id) { PIIX4PMState *s =3D opaque; @@ -313,8 +275,6 @@ static const VMStateDescription vmstate_acpi =3D { .name =3D "piix4_pm", .version_id =3D 3, .minimum_version_id =3D 3, - .minimum_version_id_old =3D 1, - .load_state_old =3D acpi_load_old, .post_load =3D vmstate_acpi_post_load, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState), diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index aafd8e0e33..375cb6abe9 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -31,7 +31,6 @@ #include "sysemu/kvm.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" =20 static int apic_irq_delivered; @@ -262,52 +261,6 @@ static void apic_reset_common(DeviceState *dev) apic_init_reset(dev); } =20 -/* This function is only used for old state version 1 and 2 */ -static int apic_load_old(QEMUFile *f, void *opaque, int version_id) -{ - APICCommonState *s =3D opaque; - APICCommonClass *info =3D APIC_COMMON_GET_CLASS(s); - int i; - - if (version_id > 2) { - return -EINVAL; - } - - /* XXX: what if the base changes? (registered memory regions) */ - qemu_get_be32s(f, &s->apicbase); - qemu_get_8s(f, &s->id); - qemu_get_8s(f, &s->arb_id); - qemu_get_8s(f, &s->tpr); - qemu_get_be32s(f, &s->spurious_vec); - qemu_get_8s(f, &s->log_dest); - qemu_get_8s(f, &s->dest_mode); - for (i =3D 0; i < 8; i++) { - qemu_get_be32s(f, &s->isr[i]); - qemu_get_be32s(f, &s->tmr[i]); - qemu_get_be32s(f, &s->irr[i]); - } - for (i =3D 0; i < APIC_LVT_NB; i++) { - qemu_get_be32s(f, &s->lvt[i]); - } - qemu_get_be32s(f, &s->esr); - qemu_get_be32s(f, &s->icr[0]); - qemu_get_be32s(f, &s->icr[1]); - qemu_get_be32s(f, &s->divide_conf); - s->count_shift =3D qemu_get_be32(f); - qemu_get_be32s(f, &s->initial_count); - s->initial_count_load_time =3D qemu_get_be64(f); - s->next_time =3D qemu_get_be64(f); - - if (version_id >=3D 2) { - s->timer_expiry =3D qemu_get_be64(f); - } - - if (info->post_load) { - info->post_load(s); - } - return 0; -} - static const VMStateDescription vmstate_apic_common; =20 static void apic_common_realize(DeviceState *dev, Error **errp) @@ -408,8 +361,6 @@ static const VMStateDescription vmstate_apic_common =3D= { .name =3D "apic", .version_id =3D 3, .minimum_version_id =3D 3, - .minimum_version_id_old =3D 1, - .load_state_old =3D apic_load_old, .pre_load =3D apic_pre_load, .pre_save =3D apic_dispatch_pre_save, .post_load =3D apic_dispatch_post_load, diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 135c645535..2f4cbcbfe9 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -33,7 +33,6 @@ #include "qapi/error.h" #include "qemu/range.h" #include "hw/xen/xen.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" #include "hw/pci-host/pam.h" #include "sysemu/reset.h" @@ -174,28 +173,6 @@ static void i440fx_write_config(PCIDevice *dev, } } =20 -static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id) -{ - PCII440FXState *d =3D opaque; - PCIDevice *pd =3D PCI_DEVICE(d); - int ret, i; - uint8_t smm_enabled; - - ret =3D pci_device_load(pd, f); - if (ret < 0) - return ret; - i440fx_update_memory_mappings(d); - qemu_get_8s(f, &smm_enabled); - - if (version_id =3D=3D 2) { - for (i =3D 0; i < PIIX_NUM_PIRQS; i++) { - qemu_get_be32(f); /* dummy load for compatibility */ - } - } - - return 0; -} - static int i440fx_post_load(void *opaque, int version_id) { PCII440FXState *d =3D opaque; @@ -208,8 +185,6 @@ static const VMStateDescription vmstate_i440fx =3D { .name =3D "I440FX", .version_id =3D 3, .minimum_version_id =3D 3, - .minimum_version_id_old =3D 1, - .load_state_old =3D i440fx_load_old, .post_load =3D i440fx_post_load, .fields =3D (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCII440FXState), diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 57bf10cc94..050875b497 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -29,7 +29,6 @@ #include "qemu/timer.h" #include "hw/timer/i8254.h" #include "hw/timer/i8254_internal.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" =20 /* val must be 0 or 1 */ @@ -202,43 +201,6 @@ static const VMStateDescription vmstate_pit_channel = =3D { } }; =20 -static int pit_load_old(QEMUFile *f, void *opaque, int version_id) -{ - PITCommonState *pit =3D opaque; - PITCommonClass *c =3D PIT_COMMON_GET_CLASS(pit); - PITChannelState *s; - int i; - - if (version_id !=3D 1) { - return -EINVAL; - } - - for (i =3D 0; i < 3; i++) { - s =3D &pit->channels[i]; - s->count =3D 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); - qemu_get_8s(f, &s->status); - qemu_get_8s(f, &s->read_state); - qemu_get_8s(f, &s->write_state); - qemu_get_8s(f, &s->write_latch); - qemu_get_8s(f, &s->rw_mode); - qemu_get_8s(f, &s->mode); - qemu_get_8s(f, &s->bcd); - qemu_get_8s(f, &s->gate); - s->count_load_time =3D qemu_get_be64(f); - s->irq_disabled =3D 0; - if (i =3D=3D 0) { - s->next_transition_time =3D qemu_get_be64(f); - } - } - if (c->post_load) { - c->post_load(pit); - } - return 0; -} - static int pit_dispatch_pre_save(void *opaque) { PITCommonState *s =3D opaque; @@ -266,8 +228,6 @@ static const VMStateDescription vmstate_pit_common =3D= { .name =3D "i8254", .version_id =3D 3, .minimum_version_id =3D 2, - .minimum_version_id_old =3D 1, - .load_state_old =3D pit_load_old, .pre_save =3D pit_dispatch_pre_save, .post_load =3D pit_dispatch_post_load, .fields =3D (VMStateField[]) { --=20 2.21.0