From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HccOA-0000Ce-Sy for qemu-devel@nongnu.org; Sat, 14 Apr 2007 03:09:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HccO8-0000Bn-2V for qemu-devel@nongnu.org; Sat, 14 Apr 2007 03:09:38 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HccO7-0000Bi-QW for qemu-devel@nongnu.org; Sat, 14 Apr 2007 03:09:35 -0400 Received: from ug-out-1314.google.com ([66.249.92.173]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HccJj-00030N-D5 for qemu-devel@nongnu.org; Sat, 14 Apr 2007 03:05:04 -0400 Received: by ug-out-1314.google.com with SMTP id j40so592763ugd for ; Sat, 14 Apr 2007 00:05:00 -0700 (PDT) Message-ID: Date: Sat, 14 Apr 2007 10:05:00 +0300 From: "Blue Swirl" Subject: Re: [Qemu-devel] FDC and M48T59 save/reset methods In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_17250_20908440.1176534300434" References: <200704132122.17066.paul@codesourcery.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook Cc: qemu-devel@nongnu.org ------=_Part_17250_20908440.1176534300434 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline On 4/14/07, Blue Swirl wrote: > On 4/14/07, Blue Swirl wrote: > > On 4/13/07, Paul Brook wrote: > > > > I'd like to commit the attached FDC and M48T59 device save and reset > > > > methods. After this change, all Sparc32 devices can be saved. > > > > > > > > Any comments? > > > > > > Do you also need to save the state of the attached drives? > > > > Yes, at least motor state, head position and last operation status. > > I'll update the patch. > > Is this version OK? Replying to myself: no, it does not even compile. This version does. ------=_Part_17250_20908440.1176534300434 Content-Type: text/x-patch; name=common_arch_saves.diff; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_f0hq4qdw Content-Disposition: attachment; filename="common_arch_saves.diff" SW5kZXg6IHFlbXUvaHcvZmRjLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcWVtdS5vcmlnL2h3L2ZkYy5jCTIw MDctMDQtMTMgMTk6MjI6NTYuMDAwMDAwMDAwICswMDAwCisrKyBxZW11L2h3L2ZkYy5jCTIwMDct MDQtMTQgMDc6MDA6NTEuMDAwMDAwMDAwICswMDAwCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIFFF TVUgRmxvcHB5IGRpc2sgZW11bGF0b3IgKEludGVsIDgyMDc4KQogICogCi0gKiBDb3B5cmlnaHQg KGMpIDIwMDMgSm9jZWx5biBNYXllcgorICogQ29weXJpZ2h0IChjKSAyMDAzLCAyMDA3IEpvY2Vs eW4gTWF5ZXIKICAqIAogICogUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRlZCwgZnJlZSBvZiBj aGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEgY29weQogICogb2YgdGhpcyBzb2Z0d2Fy ZSBhbmQgYXNzb2NpYXRlZCBkb2N1bWVudGF0aW9uIGZpbGVzICh0aGUgIlNvZnR3YXJlIiksIHRv IGRlYWwKQEAgLTQ4NSw2ICs0ODUsOTkgQEAKICAgICBmZGN0cmxfd3JpdGVfbWVtLAogfTsKIAor c3RhdGljIHZvaWQgZmRfc2F2ZSAoUUVNVUZpbGUgKmYsIGZkcml2ZV90ICpmZCkKK3sKKyAgICB1 aW50OF90IHRtcDsKKworICAgIHRtcCA9IGZkLT5kcmZsYWdzOworICAgIHFlbXVfcHV0XzhzKGYs ICZ0bXApOworICAgIHFlbXVfcHV0XzhzKGYsICZmZC0+aGVhZCk7CisgICAgcWVtdV9wdXRfOHMo ZiwgJmZkLT50cmFjayk7CisgICAgcWVtdV9wdXRfOHMoZiwgJmZkLT5zZWN0KTsKKyAgICBxZW11 X3B1dF84cyhmLCAmZmQtPmRpcik7CisgICAgcWVtdV9wdXRfOHMoZiwgJmZkLT5ydyk7Cit9CisK K3N0YXRpYyB2b2lkIGZkY19zYXZlIChRRU1VRmlsZSAqZiwgdm9pZCAqb3BhcXVlKQoreworICAg IGZkY3RybF90ICpzID0gb3BhcXVlOworCisgICAgcWVtdV9wdXRfOHMoZiwgJnMtPnN0YXRlKTsK KyAgICBxZW11X3B1dF84cyhmLCAmcy0+ZG1hX2VuKTsKKyAgICBxZW11X3B1dF84cyhmLCAmcy0+ Y3VyX2Rydik7CisgICAgcWVtdV9wdXRfOHMoZiwgJnMtPmJvb3RzZWwpOworICAgIHFlbXVfcHV0 X2J1ZmZlcihmLCBzLT5maWZvLCBGRF9TRUNUT1JfTEVOKTsKKyAgICBxZW11X3B1dF9iZTMycyhm LCAmcy0+ZGF0YV9wb3MpOworICAgIHFlbXVfcHV0X2JlMzJzKGYsICZzLT5kYXRhX2xlbik7Cisg ICAgcWVtdV9wdXRfOHMoZiwgJnMtPmRhdGFfc3RhdGUpOworICAgIHFlbXVfcHV0XzhzKGYsICZz LT5kYXRhX2Rpcik7CisgICAgcWVtdV9wdXRfOHMoZiwgJnMtPmludF9zdGF0dXMpOworICAgIHFl bXVfcHV0XzhzKGYsICZzLT5lb3QpOworICAgIHFlbXVfcHV0XzhzKGYsICZzLT50aW1lcjApOwor ICAgIHFlbXVfcHV0XzhzKGYsICZzLT50aW1lcjEpOworICAgIHFlbXVfcHV0XzhzKGYsICZzLT5w cmVjb21wX3Ryayk7CisgICAgcWVtdV9wdXRfOHMoZiwgJnMtPmNvbmZpZyk7CisgICAgcWVtdV9w dXRfOHMoZiwgJnMtPmxvY2spOworICAgIHFlbXVfcHV0XzhzKGYsICZzLT5wd3JkKTsKKyAgICBm ZF9zYXZlKGYsICZzLT5kcml2ZXNbMF0pOworICAgIGZkX3NhdmUoZiwgJnMtPmRyaXZlc1sxXSk7 Cit9CisKK3N0YXRpYyBpbnQgZmRfbG9hZCAoUUVNVUZpbGUgKmYsIGZkcml2ZV90ICpmZCkKK3sK KyAgICB1aW50OF90IHRtcDsKKworICAgIHFlbXVfZ2V0XzhzKGYsICZ0bXApOworICAgIGZkLT5k cmZsYWdzID0gdG1wOworICAgIHFlbXVfZ2V0XzhzKGYsICZmZC0+aGVhZCk7CisgICAgcWVtdV9n ZXRfOHMoZiwgJmZkLT50cmFjayk7CisgICAgcWVtdV9nZXRfOHMoZiwgJmZkLT5zZWN0KTsKKyAg ICBxZW11X2dldF84cyhmLCAmZmQtPmRpcik7CisgICAgcWVtdV9nZXRfOHMoZiwgJmZkLT5ydyk7 CisKKyAgICByZXR1cm4gMDsKK30KKworc3RhdGljIGludCBmZGNfbG9hZCAoUUVNVUZpbGUgKmYs IHZvaWQgKm9wYXF1ZSwgaW50IHZlcnNpb25faWQpCit7CisgICAgZmRjdHJsX3QgKnMgPSBvcGFx dWU7CisgICAgaW50IHJldDsKKworICAgIGlmICh2ZXJzaW9uX2lkICE9IDEpCisgICAgICAgIHJl dHVybiAtRUlOVkFMOworCisgICAgcWVtdV9nZXRfOHMoZiwgJnMtPnN0YXRlKTsKKyAgICBxZW11 X2dldF84cyhmLCAmcy0+ZG1hX2VuKTsKKyAgICBxZW11X2dldF84cyhmLCAmcy0+Y3VyX2Rydik7 CisgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmJvb3RzZWwpOworICAgIHFlbXVfZ2V0X2J1ZmZlcihm LCBzLT5maWZvLCBGRF9TRUNUT1JfTEVOKTsKKyAgICBxZW11X2dldF9iZTMycyhmLCAmcy0+ZGF0 YV9wb3MpOworICAgIHFlbXVfZ2V0X2JlMzJzKGYsICZzLT5kYXRhX2xlbik7CisgICAgcWVtdV9n ZXRfOHMoZiwgJnMtPmRhdGFfc3RhdGUpOworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5kYXRhX2Rp cik7CisgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmludF9zdGF0dXMpOworICAgIHFlbXVfZ2V0Xzhz KGYsICZzLT5lb3QpOworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT50aW1lcjApOworICAgIHFlbXVf Z2V0XzhzKGYsICZzLT50aW1lcjEpOworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5wcmVjb21wX3Ry ayk7CisgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmNvbmZpZyk7CisgICAgcWVtdV9nZXRfOHMoZiwg JnMtPmxvY2spOworICAgIHFlbXVfZ2V0XzhzKGYsICZzLT5wd3JkKTsKKworICAgIHJldCA9IGZk X2xvYWQoZiwgJnMtPmRyaXZlc1swXSk7CisgICAgaWYgKHJldCA9PSAwKQorICAgICAgICByZXQg PSBmZF9sb2FkKGYsICZzLT5kcml2ZXNbMV0pOworCisgICAgcmV0dXJuIHJldDsKK30KKworc3Rh dGljIHZvaWQgZmRjdHJsX2V4dGVybmFsX3Jlc2V0KHZvaWQgKm9wYXF1ZSkKK3sKKyAgICBmZGN0 cmxfdCAqcyA9IG9wYXF1ZTsKKworICAgIGZkY3RybF9yZXNldChzLCAwKTsKK30KKwogZmRjdHJs X3QgKmZkY3RybF9pbml0IChxZW11X2lycSBpcnEsIGludCBkbWFfY2hhbm4sIGludCBtZW1fbWFw cGVkLCAKICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgaW9fYmFzZSwKICAgICAgICAg ICAgICAgICAgICAgICAgQmxvY2tEcml2ZXJTdGF0ZSAqKmZkcykKQEAgLTUyNSw2ICs2MTgsOCBA QAogICAgICAgICByZWdpc3Rlcl9pb3BvcnRfd3JpdGUoaW9fYmFzZSArIDB4MDEsIDUsIDEsICZm ZGN0cmxfd3JpdGUsIGZkY3RybCk7CiAgICAgICAgIHJlZ2lzdGVyX2lvcG9ydF93cml0ZShpb19i YXNlICsgMHgwNywgMSwgMSwgJmZkY3RybF93cml0ZSwgZmRjdHJsKTsKICAgICB9CisgICAgcmVn aXN0ZXJfc2F2ZXZtKCJmZGMiLCBpb19iYXNlLCAxLCBmZGNfc2F2ZSwgZmRjX2xvYWQsIGZkY3Ry bCk7CisgICAgcWVtdV9yZWdpc3Rlcl9yZXNldChmZGN0cmxfZXh0ZXJuYWxfcmVzZXQsIGZkY3Ry bCk7CiAgICAgZm9yIChpID0gMDsgaSA8IDI7IGkrKykgewogICAgICAgICBmZF9yZXZhbGlkYXRl KCZmZGN0cmwtPmRyaXZlc1tpXSk7CiAgICAgfQpJbmRleDogcWVtdS9ody9tNDh0NTkuYwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBxZW11Lm9yaWcvaHcvbTQ4dDU5LmMJMjAwNy0wNC0xMyAxOToyMjo1Ni4wMDAw MDAwMDAgKzAwMDAKKysrIHFlbXUvaHcvbTQ4dDU5LmMJMjAwNy0wNC0xNCAwNjo1MTowMy4wMDAw MDAwMDAgKzAwMDAKQEAgLTEsNyArMSw3IEBACiAvKgogICogUUVNVSBNNDhUNTkgYW5kIE00OFQw OCBOVlJBTSBlbXVsYXRpb24gZm9yIFBQQyBQUkVQIGFuZCBTcGFyYyBwbGF0Zm9ybXMKICAqIAot ICogQ29weXJpZ2h0IChjKSAyMDAzLTIwMDUgSm9jZWx5biBNYXllcgorICogQ29weXJpZ2h0IChj KSAyMDAzLTIwMDUsIDIwMDcgSm9jZWx5biBNYXllcgogICogCiAgKiBQZXJtaXNzaW9uIGlzIGhl cmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcgYSBj b3B5CiAgKiBvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmls ZXMgKHRoZSAiU29mdHdhcmUiKSwgdG8gZGVhbApAQCAtNTc1LDEyICs1NzUsNDcgQEAKICAgICAm bnZyYW1fcmVhZGwsCiB9OwogCitzdGF0aWMgdm9pZCBtNDh0NTlfc2F2ZShRRU1VRmlsZSAqZiwg dm9pZCAqb3BhcXVlKQoreworICAgIG00OHQ1OV90ICpzID0gb3BhcXVlOworCisgICAgcWVtdV9w dXRfOHMoZiwgJnMtPmxvY2spOworICAgIHFlbXVfcHV0X2JlMTZzKGYsICZzLT5hZGRyKTsKKyAg ICBxZW11X3B1dF9idWZmZXIoZiwgcy0+YnVmZmVyLCBzLT5zaXplKTsKK30KKworc3RhdGljIGlu dCBtNDh0NTlfbG9hZChRRU1VRmlsZSAqZiwgdm9pZCAqb3BhcXVlLCBpbnQgdmVyc2lvbl9pZCkK K3sKKyAgICBtNDh0NTlfdCAqcyA9IG9wYXF1ZTsKKworICAgIGlmICh2ZXJzaW9uX2lkICE9IDEp CisgICAgICAgIHJldHVybiAtRUlOVkFMOworCisgICAgcWVtdV9nZXRfOHMoZiwgJnMtPmxvY2sp OworICAgIHFlbXVfZ2V0X2JlMTZzKGYsICZzLT5hZGRyKTsKKyAgICBxZW11X2dldF9idWZmZXIo Ziwgcy0+YnVmZmVyLCBzLT5zaXplKTsKKworICAgIHJldHVybiAwOworfQorCitzdGF0aWMgdm9p ZCBtNDh0NTlfcmVzZXQodm9pZCAqb3BhcXVlKQoreworICAgIG00OHQ1OV90ICpOVlJBTSA9IG9w YXF1ZTsKKworICAgIGlmIChOVlJBTS0+YWxybV90aW1lciAhPSBOVUxMKQorICAgICAgICBxZW11 X2RlbF90aW1lcihOVlJBTS0+YWxybV90aW1lcik7CisKKyAgICBpZiAoTlZSQU0tPndkX3RpbWVy ICE9IE5VTEwpCisgICAgICAgIHFlbXVfZGVsX3RpbWVyKE5WUkFNLT53ZF90aW1lcik7Cit9CisK IC8qIEluaXRpYWxpc2F0aW9uIHJvdXRpbmUgKi8KIG00OHQ1OV90ICptNDh0NTlfaW5pdCAocWVt dV9pcnEgSVJRLCB0YXJnZXRfdWxvbmcgbWVtX2Jhc2UsCiAgICAgICAgICAgICAgICAgICAgICAg IHVpbnQzMl90IGlvX2Jhc2UsIHVpbnQxNl90IHNpemUsCiAgICAgICAgICAgICAgICAgICAgICAg IGludCB0eXBlKQogewogICAgIG00OHQ1OV90ICpzOworICAgIHRhcmdldF91bG9uZyBzYXZlX2Jh c2U7CiAKICAgICBzID0gcWVtdV9tYWxsb2N6KHNpemVvZihtNDh0NTlfdCkpOwogICAgIGlmICgh cykKQEAgLTYxMCw1ICs2NDUsOSBAQAogICAgIH0KICAgICBzLT5sb2NrID0gMDsKIAorICAgIHFl bXVfcmVnaXN0ZXJfcmVzZXQobTQ4dDU5X3Jlc2V0LCBzKTsKKyAgICBzYXZlX2Jhc2UgPSBtZW1f YmFzZSA/IG1lbV9iYXNlIDogaW9fYmFzZTsKKyAgICByZWdpc3Rlcl9zYXZldm0oIm00OHQ1OSIs IHNhdmVfYmFzZSwgMSwgbTQ4dDU5X3NhdmUsIG00OHQ1OV9sb2FkLCBzKTsKKwogICAgIHJldHVy biBzOwogfQo= ------=_Part_17250_20908440.1176534300434--