From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MPdfV-00029C-KM for qemu-devel@nongnu.org; Sat, 11 Jul 2009 10:35:13 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MPdfU-000290-7K for qemu-devel@nongnu.org; Sat, 11 Jul 2009 10:35:12 -0400 Received: from [199.232.76.173] (port=32940 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MPdfU-00028x-1o for qemu-devel@nongnu.org; Sat, 11 Jul 2009 10:35:12 -0400 Received: from fg-out-1718.google.com ([72.14.220.156]:52454) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MPdfT-0008FO-GB for qemu-devel@nongnu.org; Sat, 11 Jul 2009 10:35:11 -0400 Received: by fg-out-1718.google.com with SMTP id l27so246115fgb.8 for ; Sat, 11 Jul 2009 07:35:09 -0700 (PDT) MIME-Version: 1.0 Date: Sat, 11 Jul 2009 16:35:09 +0200 Message-ID: <761ea48b0907110735s1b4871bdq1cac53f782161eb2@mail.gmail.com> From: Laurent Desnogues Content-Type: multipart/mixed; boundary=000e0cd2a028f5a3c9046e6efe2c Subject: [Qemu-devel] [PATCH] User mode: Handle the timezone argument for gettimeofday and settimeofday List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --000e0cd2a028f5a3c9046e6efe2c Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hello, this patch: - adds the timezone parameter to gettimeofday and settimeofday - allows the timeval pointer to be NULL (as per the man page of my system and quick testing) Laurent Signed-off-by: Laurent Desnogues --000e0cd2a028f5a3c9046e6efe2c Content-Type: application/octet-stream; name="timezone.patch" Content-Disposition: attachment; filename="timezone.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_fx0ft3jl0 ZGlmZiAtLWdpdCBhL2xpbnV4LXVzZXIvc3lzY2FsbC5jIGIvbGludXgtdXNlci9zeXNjYWxsLmMK aW5kZXggMDAwOTYyMy4uMzI2ZGE3MiAxMDA2NDQKLS0tIGEvbGludXgtdXNlci9zeXNjYWxsLmMK KysrIGIvbGludXgtdXNlci9zeXNjYWxsLmMKQEAgLTg0OSw2ICs4NDksMzggQEAgc3RhdGljIGlu bGluZSBhYmlfbG9uZyBjb3B5X3RvX3VzZXJfdGltZXZhbChhYmlfdWxvbmcgdGFyZ2V0X3R2X2Fk ZHIsCiAgICAgcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyBpbmxpbmUgYWJpX2xvbmcgY29weV9mcm9t X3VzZXJfdGltZXpvbmUoc3RydWN0IHRpbWV6b25lICp0eiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYWJpX3Vsb25nIHRhcmdldF90el9hZGRyKQorewor ICAgIHN0cnVjdCB0YXJnZXRfdGltZXpvbmUgKnRhcmdldF90ejsKKworICAgIGlmICghbG9ja191 c2VyX3N0cnVjdChWRVJJRllfUkVBRCwgdGFyZ2V0X3R6LCB0YXJnZXRfdHpfYWRkciwgMSkpCisg ICAgICAgIHJldHVybiAtVEFSR0VUX0VGQVVMVDsKKworICAgIF9fZ2V0X3VzZXIodHotPnR6X21p bnV0ZXN3ZXN0LCAmdGFyZ2V0X3R6LT50el9taW51dGVzd2VzdCk7CisgICAgX19nZXRfdXNlcih0 ei0+dHpfZHN0dGltZSwgJnRhcmdldF90ei0+dHpfZHN0dGltZSk7CisKKyAgICB1bmxvY2tfdXNl cl9zdHJ1Y3QodGFyZ2V0X3R6LCB0YXJnZXRfdHpfYWRkciwgMCk7CisKKyAgICByZXR1cm4gMDsK K30KKworc3RhdGljIGlubGluZSBhYmlfbG9uZyBjb3B5X3RvX3VzZXJfdGltZXpvbmUoYWJpX3Vs b25nIHRhcmdldF90el9hZGRyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29uc3Qgc3RydWN0IHRpbWV6b25lICp0eikKK3sKKyAgICBzdHJ1Y3QgdGFyZ2V0 X3RpbWV6b25lICp0YXJnZXRfdHo7CisKKyAgICBpZiAoIWxvY2tfdXNlcl9zdHJ1Y3QoVkVSSUZZ X1dSSVRFLCB0YXJnZXRfdHosIHRhcmdldF90el9hZGRyLCAwKSkKKyAgICAgICAgcmV0dXJuIC1U QVJHRVRfRUZBVUxUOworCisgICAgX19wdXRfdXNlcih0ei0+dHpfbWludXRlc3dlc3QsICZ0YXJn ZXRfdHotPnR6X21pbnV0ZXN3ZXN0KTsKKyAgICBfX3B1dF91c2VyKHR6LT50el9kc3R0aW1lLCAm dGFyZ2V0X3R6LT50el9kc3R0aW1lKTsKKworICAgIHVubG9ja191c2VyX3N0cnVjdCh0YXJnZXRf dHosIHRhcmdldF90el9hZGRyLCAxKTsKKworICAgIHJldHVybiAwOworfQorCiBzdGF0aWMgaW5s aW5lIGFiaV9sb25nIGNvcHlfZnJvbV91c2VyX21xX2F0dHIoc3RydWN0IG1xX2F0dHIgKmF0dHIs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWJpX3Vsb25n IHRhcmdldF9tcV9hdHRyX2FkZHIpCiB7CkBAIC01MDY1LDE5ICs1MDk3LDM1IEBAIGFiaV9sb25n IGRvX3N5c2NhbGwodm9pZCAqY3B1X2VudiwgaW50IG51bSwgYWJpX2xvbmcgYXJnMSwKICAgICBj YXNlIFRBUkdFVF9OUl9nZXR0aW1lb2ZkYXk6CiAgICAgICAgIHsKICAgICAgICAgICAgIHN0cnVj dCB0aW1ldmFsIHR2OwotICAgICAgICAgICAgcmV0ID0gZ2V0X2Vycm5vKGdldHRpbWVvZmRheSgm dHYsIE5VTEwpKTsKKyAgICAgICAgICAgIHN0cnVjdCB0aW1lem9uZSB0ejsKKyAgICAgICAgICAg IHJldCA9IGdldF9lcnJubyhnZXR0aW1lb2ZkYXkoJnR2LCAmdHopKTsKICAgICAgICAgICAgIGlm ICghaXNfZXJyb3IocmV0KSkgewotICAgICAgICAgICAgICAgIGlmIChjb3B5X3RvX3VzZXJfdGlt ZXZhbChhcmcxLCAmdHYpKQotICAgICAgICAgICAgICAgICAgICBnb3RvIGVmYXVsdDsKKyAgICAg ICAgICAgICAgaWYgKGFyZzEpIHsKKyAgICAgICAgICAgICAgICAgIGlmIChjb3B5X3RvX3VzZXJf dGltZXZhbChhcmcxLCAmdHYpKQorICAgICAgICAgICAgICAgICAgICAgIGdvdG8gZWZhdWx0Owor ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIGlmIChhcmcyKSB7CisgICAgICAgICAgICAg ICAgICBpZiAoY29weV90b191c2VyX3RpbWV6b25lKGFyZzIsICZ0eikpCisgICAgICAgICAgICAg ICAgICAgICAgZ290byBlZmF1bHQ7CisgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAg ICAgICAgfQogICAgICAgICBicmVhazsKICAgICBjYXNlIFRBUkdFVF9OUl9zZXR0aW1lb2ZkYXk6 CiAgICAgICAgIHsKLSAgICAgICAgICAgIHN0cnVjdCB0aW1ldmFsIHR2OwotICAgICAgICAgICAg aWYgKGNvcHlfZnJvbV91c2VyX3RpbWV2YWwoJnR2LCBhcmcxKSkKLSAgICAgICAgICAgICAgICBn b3RvIGVmYXVsdDsKLSAgICAgICAgICAgIHJldCA9IGdldF9lcnJubyhzZXR0aW1lb2ZkYXkoJnR2 LCBOVUxMKSk7CisgICAgICAgICAgICBzdHJ1Y3QgdGltZXZhbCB0djEsICp0diA9ICZ0djE7Cisg ICAgICAgICAgICBzdHJ1Y3QgdGltZXpvbmUgdHoxLCAqdHogPSAmdHoxOworICAgICAgICAgICAg aWYgKGFyZzEpIHsKKyAgICAgICAgICAgICAgICBpZiAoY29weV9mcm9tX3VzZXJfdGltZXZhbCh0 diwgYXJnMSkpCisgICAgICAgICAgICAgICAgICAgIGdvdG8gZWZhdWx0OworICAgICAgICAgICAg fSBlbHNlCisgICAgICAgICAgICAgICAgdHYgPSBOVUxMOworICAgICAgICAgICAgaWYgKGFyZzIp IHsKKyAgICAgICAgICAgICAgICBpZiAoY29weV9mcm9tX3VzZXJfdGltZXpvbmUodHosIGFyZzIp KQorICAgICAgICAgICAgICAgICAgICBnb3RvIGVmYXVsdDsKKyAgICAgICAgICAgIH0gZWxzZQor ICAgICAgICAgICAgICAgIHR6ID0gTlVMTDsKKyAgICAgICAgICAgIHJldCA9IGdldF9lcnJubyhz ZXR0aW1lb2ZkYXkodHYsIHR6KSk7CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CiAjaWZkZWYg VEFSR0VUX05SX3NlbGVjdApkaWZmIC0tZ2l0IGEvbGludXgtdXNlci9zeXNjYWxsX2RlZnMuaCBi L2xpbnV4LXVzZXIvc3lzY2FsbF9kZWZzLmgKaW5kZXggYWM1ZGJjNS4uNDNkM2UyZSAxMDA2NDQK LS0tIGEvbGludXgtdXNlci9zeXNjYWxsX2RlZnMuaAorKysgYi9saW51eC11c2VyL3N5c2NhbGxf ZGVmcy5oCkBAIC0xMzgsNiArMTM4LDExIEBAIHN0cnVjdCB0YXJnZXRfdGltZXZhbCB7CiAgICAg YWJpX2xvbmcgdHZfdXNlYzsKIH07CiAKK3N0cnVjdCB0YXJnZXRfdGltZXpvbmUgeworICAgIGlu dCB0el9taW51dGVzd2VzdDsKKyAgICBpbnQgdHpfZHN0dGltZTsKK307CisKIHN0cnVjdCB0YXJn ZXRfdGltZXNwZWMgewogICAgIGFiaV9sb25nIHR2X3NlYzsKICAgICBhYmlfbG9uZyB0dl9uc2Vj Owo= --000e0cd2a028f5a3c9046e6efe2c--