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 9BB38CA9EA0 for ; Fri, 18 Oct 2019 13:50:32 +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 6ECEF222C3 for ; Fri, 18 Oct 2019 13:50:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6ECEF222C3 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 1iLSe5-0005xg-Jk; Fri, 18 Oct 2019 13:50:21 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSe4-0005wa-LV for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:50:20 +0000 X-Inumbo-ID: 3920604c-f1ae-11e9-beca-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3920604c-f1ae-11e9-beca-bc764e2007e4; Fri, 18 Oct 2019 13:50:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69BB73175295; Fri, 18 Oct 2019 13:50:19 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C4C760BF1; Fri, 18 Oct 2019 13:50:02 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:46 +0200 Message-Id: <20191018134754.16362-13-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 18 Oct 2019 13:50:19 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 12/20] 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: Peter Maydell , Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost 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 dGVyIE1heWRlbGwgPHBldGVyLm1heWRlbGxAbGluYXJvLm9yZz4KUmV2aWV3ZWQtYnk6IEFsZWtz YW5kYXIgTWFya292aWMgPGFtYXJrb3ZpY0B3YXZlY29tcC5jb20+ClNpZ25lZC1vZmYtYnk6IFBo aWxpcHBlIE1hdGhpZXUtRGF1ZMOpIDxwaGlsbWRAcmVkaGF0LmNvbT4KLS0tCiBody9hY3BpL3Bp aXg0LmMgICAgICAgICB8IDQwIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaHcv aW50Yy9hcGljX2NvbW1vbi5jICAgfCA0OSAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogaHcvcGNpLWhvc3QvcGlpeC5jICAgICAgfCAyNSAtLS0tLS0tLS0tLS0tLS0t LS0tLS0KIGh3L3RpbWVyL2k4MjU0X2NvbW1vbi5jIHwgNDAgLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDE1NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9ody9hY3BpL3BpaXg0LmMgYi9ody9hY3BpL3BpaXg0LmMKaW5kZXggMmVmZDE2MDViOC4u OTNhZWMyZGQyYyAxMDA2NDQKLS0tIGEvaHcvYWNwaS9waWl4NC5jCisrKyBiL2h3L2FjcGkvcGlp eDQuYwpAQCAtNDEsNyArNDEsNiBAQAogI2luY2x1ZGUgImh3L2FjcGkvbWVtb3J5X2hvdHBsdWcu aCIKICNpbmNsdWRlICJody9hY3BpL2FjcGlfZGV2X2ludGVyZmFjZS5oIgogI2luY2x1ZGUgImh3 L3hlbi94ZW4uaCIKLSNpbmNsdWRlICJtaWdyYXRpb24vcWVtdS1maWxlLXR5cGVzLmgiCiAjaW5j bHVkZSAibWlncmF0aW9uL3Ztc3RhdGUuaCIKICNpbmNsdWRlICJody9jb3JlL2NwdS5oIgogI2lu Y2x1ZGUgInRyYWNlLmgiCkBAIC0yMDQsNDMgKzIwMyw2IEBAIHN0YXRpYyBjb25zdCBWTVN0YXRl RGVzY3JpcHRpb24gdm1zdGF0ZV9wY2lfc3RhdHVzID0gewogICAgIH0KIH07CiAKLXN0YXRpYyBp bnQgYWNwaV9sb2FkX29sZChRRU1VRmlsZSAqZiwgdm9pZCAqb3BhcXVlLCBpbnQgdmVyc2lvbl9p ZCkKLXsKLSAgICBQSUlYNFBNU3RhdGUgKnMgPSBvcGFxdWU7Ci0gICAgaW50IHJldCwgaTsKLSAg ICB1aW50MTZfdCB0ZW1wOwotCi0gICAgcmV0ID0gcGNpX2RldmljZV9sb2FkKFBDSV9ERVZJQ0Uo cyksIGYpOwotICAgIGlmIChyZXQgPCAwKSB7Ci0gICAgICAgIHJldHVybiByZXQ7Ci0gICAgfQot ICAgIHFlbXVfZ2V0X2JlMTZzKGYsICZzLT5hci5wbTEuZXZ0LnN0cyk7Ci0gICAgcWVtdV9nZXRf YmUxNnMoZiwgJnMtPmFyLnBtMS5ldnQuZW4pOwotICAgIHFlbXVfZ2V0X2JlMTZzKGYsICZzLT5h ci5wbTEuY250LmNudCk7Ci0KLSAgICByZXQgPSB2bXN0YXRlX2xvYWRfc3RhdGUoZiwgJnZtc3Rh dGVfYXBtLCAmcy0+YXBtLCAxKTsKLSAgICBpZiAocmV0KSB7Ci0gICAgICAgIHJldHVybiByZXQ7 Ci0gICAgfQotCi0gICAgdGltZXJfZ2V0KGYsIHMtPmFyLnRtci50aW1lcik7Ci0gICAgcWVtdV9n ZXRfc2JlNjRzKGYsICZzLT5hci50bXIub3ZlcmZsb3dfdGltZSk7Ci0KLSAgICBxZW11X2dldF9i ZTE2cyhmLCAodWludDE2X3QgKilzLT5hci5ncGUuc3RzKTsKLSAgICBmb3IgKGkgPSAwOyBpIDwg MzsgaSsrKSB7Ci0gICAgICAgIHFlbXVfZ2V0X2JlMTZzKGYsICZ0ZW1wKTsKLSAgICB9Ci0KLSAg ICBxZW11X2dldF9iZTE2cyhmLCAodWludDE2X3QgKilzLT5hci5ncGUuZW4pOwotICAgIGZvciAo aSA9IDA7IGkgPCAzOyBpKyspIHsKLSAgICAgICAgcWVtdV9nZXRfYmUxNnMoZiwgJnRlbXApOwot ICAgIH0KLQotICAgIHJldCA9IHZtc3RhdGVfbG9hZF9zdGF0ZShmLCAmdm1zdGF0ZV9wY2lfc3Rh dHVzLAotICAgICAgICAmcy0+YWNwaV9wY2lfaG90cGx1Zy5hY3BpX3BjaWhwX3BjaV9zdGF0dXNb QUNQSV9QQ0lIUF9CU0VMX0RFRkFVTFRdLCAxKTsKLSAgICByZXR1cm4gcmV0OwotfQotCiBzdGF0 aWMgYm9vbCB2bXN0YXRlX3Rlc3RfdXNlX2FjcGlfcGNpX2hvdHBsdWcodm9pZCAqb3BhcXVlLCBp bnQgdmVyc2lvbl9pZCkKIHsKICAgICBQSUlYNFBNU3RhdGUgKnMgPSBvcGFxdWU7CkBAIC0zMTIs OCArMjc0LDYgQEAgc3RhdGljIGNvbnN0IFZNU3RhdGVEZXNjcmlwdGlvbiB2bXN0YXRlX2FjcGkg PSB7CiAgICAgLm5hbWUgPSAicGlpeDRfcG0iLAogICAgIC52ZXJzaW9uX2lkID0gMywKICAgICAu bWluaW11bV92ZXJzaW9uX2lkID0gMywKLSAgICAubWluaW11bV92ZXJzaW9uX2lkX29sZCA9IDEs Ci0gICAgLmxvYWRfc3RhdGVfb2xkID0gYWNwaV9sb2FkX29sZCwKICAgICAucG9zdF9sb2FkID0g dm1zdGF0ZV9hY3BpX3Bvc3RfbG9hZCwKICAgICAuZmllbGRzID0gKFZNU3RhdGVGaWVsZFtdKSB7 CiAgICAgICAgIFZNU1RBVEVfUENJX0RFVklDRShwYXJlbnRfb2JqLCBQSUlYNFBNU3RhdGUpLApk aWZmIC0tZ2l0IGEvaHcvaW50Yy9hcGljX2NvbW1vbi5jIGIvaHcvaW50Yy9hcGljX2NvbW1vbi5j CmluZGV4IGFhZmQ4ZTBlMzMuLjM3NWNiNmFiZTkgMTAwNjQ0Ci0tLSBhL2h3L2ludGMvYXBpY19j b21tb24uYworKysgYi9ody9pbnRjL2FwaWNfY29tbW9uLmMKQEAgLTMxLDcgKzMxLDYgQEAKICNp bmNsdWRlICJzeXNlbXUva3ZtLmgiCiAjaW5jbHVkZSAiaHcvcWRldi1wcm9wZXJ0aWVzLmgiCiAj aW5jbHVkZSAiaHcvc3lzYnVzLmgiCi0jaW5jbHVkZSAibWlncmF0aW9uL3FlbXUtZmlsZS10eXBl cy5oIgogI2luY2x1ZGUgIm1pZ3JhdGlvbi92bXN0YXRlLmgiCiAKIHN0YXRpYyBpbnQgYXBpY19p cnFfZGVsaXZlcmVkOwpAQCAtMjYyLDUyICsyNjEsNiBAQCBzdGF0aWMgdm9pZCBhcGljX3Jlc2V0 X2NvbW1vbihEZXZpY2VTdGF0ZSAqZGV2KQogICAgIGFwaWNfaW5pdF9yZXNldChkZXYpOwogfQog Ci0vKiBUaGlzIGZ1bmN0aW9uIGlzIG9ubHkgdXNlZCBmb3Igb2xkIHN0YXRlIHZlcnNpb24gMSBh bmQgMiAqLwotc3RhdGljIGludCBhcGljX2xvYWRfb2xkKFFFTVVGaWxlICpmLCB2b2lkICpvcGFx dWUsIGludCB2ZXJzaW9uX2lkKQotewotICAgIEFQSUNDb21tb25TdGF0ZSAqcyA9IG9wYXF1ZTsK LSAgICBBUElDQ29tbW9uQ2xhc3MgKmluZm8gPSBBUElDX0NPTU1PTl9HRVRfQ0xBU1Mocyk7Ci0g ICAgaW50IGk7Ci0KLSAgICBpZiAodmVyc2lvbl9pZCA+IDIpIHsKLSAgICAgICAgcmV0dXJuIC1F SU5WQUw7Ci0gICAgfQotCi0gICAgLyogWFhYOiB3aGF0IGlmIHRoZSBiYXNlIGNoYW5nZXM/IChy ZWdpc3RlcmVkIG1lbW9yeSByZWdpb25zKSAqLwotICAgIHFlbXVfZ2V0X2JlMzJzKGYsICZzLT5h cGljYmFzZSk7Ci0gICAgcWVtdV9nZXRfOHMoZiwgJnMtPmlkKTsKLSAgICBxZW11X2dldF84cyhm LCAmcy0+YXJiX2lkKTsKLSAgICBxZW11X2dldF84cyhmLCAmcy0+dHByKTsKLSAgICBxZW11X2dl dF9iZTMycyhmLCAmcy0+c3B1cmlvdXNfdmVjKTsKLSAgICBxZW11X2dldF84cyhmLCAmcy0+bG9n X2Rlc3QpOwotICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5kZXN0X21vZGUpOwotICAgIGZvciAoaSA9 IDA7IGkgPCA4OyBpKyspIHsKLSAgICAgICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmlzcltpXSk7 Ci0gICAgICAgIHFlbXVfZ2V0X2JlMzJzKGYsICZzLT50bXJbaV0pOwotICAgICAgICBxZW11X2dl dF9iZTMycyhmLCAmcy0+aXJyW2ldKTsKLSAgICB9Ci0gICAgZm9yIChpID0gMDsgaSA8IEFQSUNf TFZUX05COyBpKyspIHsKLSAgICAgICAgcWVtdV9nZXRfYmUzMnMoZiwgJnMtPmx2dFtpXSk7Ci0g ICAgfQotICAgIHFlbXVfZ2V0X2JlMzJzKGYsICZzLT5lc3IpOwotICAgIHFlbXVfZ2V0X2JlMzJz KGYsICZzLT5pY3JbMF0pOwotICAgIHFlbXVfZ2V0X2JlMzJzKGYsICZzLT5pY3JbMV0pOwotICAg IHFlbXVfZ2V0X2JlMzJzKGYsICZzLT5kaXZpZGVfY29uZik7Ci0gICAgcy0+Y291bnRfc2hpZnQg PSBxZW11X2dldF9iZTMyKGYpOwotICAgIHFlbXVfZ2V0X2JlMzJzKGYsICZzLT5pbml0aWFsX2Nv dW50KTsKLSAgICBzLT5pbml0aWFsX2NvdW50X2xvYWRfdGltZSA9IHFlbXVfZ2V0X2JlNjQoZik7 Ci0gICAgcy0+bmV4dF90aW1lID0gcWVtdV9nZXRfYmU2NChmKTsKLQotICAgIGlmICh2ZXJzaW9u X2lkID49IDIpIHsKLSAgICAgICAgcy0+dGltZXJfZXhwaXJ5ID0gcWVtdV9nZXRfYmU2NChmKTsK LSAgICB9Ci0KLSAgICBpZiAoaW5mby0+cG9zdF9sb2FkKSB7Ci0gICAgICAgIGluZm8tPnBvc3Rf bG9hZChzKTsKLSAgICB9Ci0gICAgcmV0dXJuIDA7Ci19Ci0KIHN0YXRpYyBjb25zdCBWTVN0YXRl RGVzY3JpcHRpb24gdm1zdGF0ZV9hcGljX2NvbW1vbjsKIAogc3RhdGljIHZvaWQgYXBpY19jb21t b25fcmVhbGl6ZShEZXZpY2VTdGF0ZSAqZGV2LCBFcnJvciAqKmVycnApCkBAIC00MDgsOCArMzYx LDYgQEAgc3RhdGljIGNvbnN0IFZNU3RhdGVEZXNjcmlwdGlvbiB2bXN0YXRlX2FwaWNfY29tbW9u ID0gewogICAgIC5uYW1lID0gImFwaWMiLAogICAgIC52ZXJzaW9uX2lkID0gMywKICAgICAubWlu aW11bV92ZXJzaW9uX2lkID0gMywKLSAgICAubWluaW11bV92ZXJzaW9uX2lkX29sZCA9IDEsCi0g ICAgLmxvYWRfc3RhdGVfb2xkID0gYXBpY19sb2FkX29sZCwKICAgICAucHJlX2xvYWQgPSBhcGlj X3ByZV9sb2FkLAogICAgIC5wcmVfc2F2ZSA9IGFwaWNfZGlzcGF0Y2hfcHJlX3NhdmUsCiAgICAg LnBvc3RfbG9hZCA9IGFwaWNfZGlzcGF0Y2hfcG9zdF9sb2FkLApkaWZmIC0tZ2l0IGEvaHcvcGNp LWhvc3QvcGlpeC5jIGIvaHcvcGNpLWhvc3QvcGlpeC5jCmluZGV4IDEzNWM2NDU1MzUuLjJmNGNi Y2JmZTkgMTAwNjQ0Ci0tLSBhL2h3L3BjaS1ob3N0L3BpaXguYworKysgYi9ody9wY2ktaG9zdC9w aWl4LmMKQEAgLTMzLDcgKzMzLDYgQEAKICNpbmNsdWRlICJxYXBpL2Vycm9yLmgiCiAjaW5jbHVk ZSAicWVtdS9yYW5nZS5oIgogI2luY2x1ZGUgImh3L3hlbi94ZW4uaCIKLSNpbmNsdWRlICJtaWdy YXRpb24vcWVtdS1maWxlLXR5cGVzLmgiCiAjaW5jbHVkZSAibWlncmF0aW9uL3Ztc3RhdGUuaCIK ICNpbmNsdWRlICJody9wY2ktaG9zdC9wYW0uaCIKICNpbmNsdWRlICJzeXNlbXUvcmVzZXQuaCIK QEAgLTE3NCwyOCArMTczLDYgQEAgc3RhdGljIHZvaWQgaTQ0MGZ4X3dyaXRlX2NvbmZpZyhQQ0lE ZXZpY2UgKmRldiwKICAgICB9CiB9CiAKLXN0YXRpYyBpbnQgaTQ0MGZ4X2xvYWRfb2xkKFFFTVVG aWxlKiBmLCB2b2lkICpvcGFxdWUsIGludCB2ZXJzaW9uX2lkKQotewotICAgIFBDSUk0NDBGWFN0 YXRlICpkID0gb3BhcXVlOwotICAgIFBDSURldmljZSAqcGQgPSBQQ0lfREVWSUNFKGQpOwotICAg IGludCByZXQsIGk7Ci0gICAgdWludDhfdCBzbW1fZW5hYmxlZDsKLQotICAgIHJldCA9IHBjaV9k ZXZpY2VfbG9hZChwZCwgZik7Ci0gICAgaWYgKHJldCA8IDApCi0gICAgICAgIHJldHVybiByZXQ7 Ci0gICAgaTQ0MGZ4X3VwZGF0ZV9tZW1vcnlfbWFwcGluZ3MoZCk7Ci0gICAgcWVtdV9nZXRfOHMo ZiwgJnNtbV9lbmFibGVkKTsKLQotICAgIGlmICh2ZXJzaW9uX2lkID09IDIpIHsKLSAgICAgICAg Zm9yIChpID0gMDsgaSA8IFBJSVhfTlVNX1BJUlFTOyBpKyspIHsKLSAgICAgICAgICAgIHFlbXVf Z2V0X2JlMzIoZik7IC8qIGR1bW15IGxvYWQgZm9yIGNvbXBhdGliaWxpdHkgKi8KLSAgICAgICAg fQotICAgIH0KLQotICAgIHJldHVybiAwOwotfQotCiBzdGF0aWMgaW50IGk0NDBmeF9wb3N0X2xv YWQodm9pZCAqb3BhcXVlLCBpbnQgdmVyc2lvbl9pZCkKIHsKICAgICBQQ0lJNDQwRlhTdGF0ZSAq ZCA9IG9wYXF1ZTsKQEAgLTIwOCw4ICsxODUsNiBAQCBzdGF0aWMgY29uc3QgVk1TdGF0ZURlc2Ny aXB0aW9uIHZtc3RhdGVfaTQ0MGZ4ID0gewogICAgIC5uYW1lID0gIkk0NDBGWCIsCiAgICAgLnZl cnNpb25faWQgPSAzLAogICAgIC5taW5pbXVtX3ZlcnNpb25faWQgPSAzLAotICAgIC5taW5pbXVt X3ZlcnNpb25faWRfb2xkID0gMSwKLSAgICAubG9hZF9zdGF0ZV9vbGQgPSBpNDQwZnhfbG9hZF9v bGQsCiAgICAgLnBvc3RfbG9hZCA9IGk0NDBmeF9wb3N0X2xvYWQsCiAgICAgLmZpZWxkcyA9IChW TVN0YXRlRmllbGRbXSkgewogICAgICAgICBWTVNUQVRFX1BDSV9ERVZJQ0UocGFyZW50X29iaiwg UENJSTQ0MEZYU3RhdGUpLApkaWZmIC0tZ2l0IGEvaHcvdGltZXIvaTgyNTRfY29tbW9uLmMgYi9o dy90aW1lci9pODI1NF9jb21tb24uYwppbmRleCA1N2JmMTBjYzk0Li4wNTA4NzViNDk3IDEwMDY0 NAotLS0gYS9ody90aW1lci9pODI1NF9jb21tb24uYworKysgYi9ody90aW1lci9pODI1NF9jb21t b24uYwpAQCAtMjksNyArMjksNiBAQAogI2luY2x1ZGUgInFlbXUvdGltZXIuaCIKICNpbmNsdWRl ICJody90aW1lci9pODI1NC5oIgogI2luY2x1ZGUgImh3L3RpbWVyL2k4MjU0X2ludGVybmFsLmgi Ci0jaW5jbHVkZSAibWlncmF0aW9uL3FlbXUtZmlsZS10eXBlcy5oIgogI2luY2x1ZGUgIm1pZ3Jh dGlvbi92bXN0YXRlLmgiCiAKIC8qIHZhbCBtdXN0IGJlIDAgb3IgMSAqLwpAQCAtMjAyLDQzICsy MDEsNiBAQCBzdGF0aWMgY29uc3QgVk1TdGF0ZURlc2NyaXB0aW9uIHZtc3RhdGVfcGl0X2NoYW5u ZWwgPSB7CiAgICAgfQogfTsKIAotc3RhdGljIGludCBwaXRfbG9hZF9vbGQoUUVNVUZpbGUgKmYs IHZvaWQgKm9wYXF1ZSwgaW50IHZlcnNpb25faWQpCi17Ci0gICAgUElUQ29tbW9uU3RhdGUgKnBp dCA9IG9wYXF1ZTsKLSAgICBQSVRDb21tb25DbGFzcyAqYyA9IFBJVF9DT01NT05fR0VUX0NMQVNT KHBpdCk7Ci0gICAgUElUQ2hhbm5lbFN0YXRlICpzOwotICAgIGludCBpOwotCi0gICAgaWYgKHZl cnNpb25faWQgIT0gMSkgewotICAgICAgICByZXR1cm4gLUVJTlZBTDsKLSAgICB9Ci0KLSAgICBm b3IgKGkgPSAwOyBpIDwgMzsgaSsrKSB7Ci0gICAgICAgIHMgPSAmcGl0LT5jaGFubmVsc1tpXTsK LSAgICAgICAgcy0+Y291bnQgPSBxZW11X2dldF9iZTMyKGYpOwotICAgICAgICBxZW11X2dldF9i ZTE2cyhmLCAmcy0+bGF0Y2hlZF9jb3VudCk7Ci0gICAgICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5j b3VudF9sYXRjaGVkKTsKLSAgICAgICAgcWVtdV9nZXRfOHMoZiwgJnMtPnN0YXR1c19sYXRjaGVk KTsKLSAgICAgICAgcWVtdV9nZXRfOHMoZiwgJnMtPnN0YXR1cyk7Ci0gICAgICAgIHFlbXVfZ2V0 XzhzKGYsICZzLT5yZWFkX3N0YXRlKTsKLSAgICAgICAgcWVtdV9nZXRfOHMoZiwgJnMtPndyaXRl X3N0YXRlKTsKLSAgICAgICAgcWVtdV9nZXRfOHMoZiwgJnMtPndyaXRlX2xhdGNoKTsKLSAgICAg ICAgcWVtdV9nZXRfOHMoZiwgJnMtPnJ3X21vZGUpOwotICAgICAgICBxZW11X2dldF84cyhmLCAm cy0+bW9kZSk7Ci0gICAgICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5iY2QpOwotICAgICAgICBxZW11 X2dldF84cyhmLCAmcy0+Z2F0ZSk7Ci0gICAgICAgIHMtPmNvdW50X2xvYWRfdGltZSA9IHFlbXVf Z2V0X2JlNjQoZik7Ci0gICAgICAgIHMtPmlycV9kaXNhYmxlZCA9IDA7Ci0gICAgICAgIGlmIChp ID09IDApIHsKLSAgICAgICAgICAgIHMtPm5leHRfdHJhbnNpdGlvbl90aW1lID0gcWVtdV9nZXRf YmU2NChmKTsKLSAgICAgICAgfQotICAgIH0KLSAgICBpZiAoYy0+cG9zdF9sb2FkKSB7Ci0gICAg ICAgIGMtPnBvc3RfbG9hZChwaXQpOwotICAgIH0KLSAgICByZXR1cm4gMDsKLX0KLQogc3RhdGlj IGludCBwaXRfZGlzcGF0Y2hfcHJlX3NhdmUodm9pZCAqb3BhcXVlKQogewogICAgIFBJVENvbW1v blN0YXRlICpzID0gb3BhcXVlOwpAQCAtMjY2LDggKzIyOCw2IEBAIHN0YXRpYyBjb25zdCBWTVN0 YXRlRGVzY3JpcHRpb24gdm1zdGF0ZV9waXRfY29tbW9uID0gewogICAgIC5uYW1lID0gImk4MjU0 IiwKICAgICAudmVyc2lvbl9pZCA9IDMsCiAgICAgLm1pbmltdW1fdmVyc2lvbl9pZCA9IDIsCi0g ICAgLm1pbmltdW1fdmVyc2lvbl9pZF9vbGQgPSAxLAotICAgIC5sb2FkX3N0YXRlX29sZCA9IHBp dF9sb2FkX29sZCwKICAgICAucHJlX3NhdmUgPSBwaXRfZGlzcGF0Y2hfcHJlX3NhdmUsCiAgICAg LnBvc3RfbG9hZCA9IHBpdF9kaXNwYXRjaF9wb3N0X2xvYWQsCiAgICAgLmZpZWxkcyA9IChWTVN0 YXRlRmllbGRbXSkgewotLSAKMi4yMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMu eGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3Rp bmZvL3hlbi1kZXZlbA== 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 4D639CA9EA1 for ; Fri, 18 Oct 2019 14:01:25 +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 0B67420854 for ; Fri, 18 Oct 2019 14:01:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B67420854 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]:40490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSom-0000tT-03 for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 10:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55200) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSe6-0005cs-DW for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSe4-0006ZU-HH for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57058) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSe4-0006Yx-8h for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:50:20 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69BB73175295; Fri, 18 Oct 2019 13:50:19 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C4C760BF1; Fri, 18 Oct 2019 13:50:02 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 12/20] hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers Date: Fri, 18 Oct 2019 15:47:46 +0200 Message-Id: <20191018134754.16362-13-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 18 Oct 2019 13:50:19 +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: Peter Maydell , Stefano Stabellini , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost 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 Reviewed-by: Aleksandar Markovic 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 2efd1605b8..93aec2dd2c 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -41,7 +41,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" @@ -204,43 +203,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; @@ -312,8 +274,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