Message ID | 1538295197-23704-22-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Emi+/z+P"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42NJhV6RnDz9s7T for <incoming@patchwork.ozlabs.org>; Sun, 30 Sep 2018 18:38:02 +1000 (AEST) Received: from localhost ([::1]:54339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1g6XEm-0007kN-DY for incoming@patchwork.ozlabs.org; Sun, 30 Sep 2018 04:38:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WrE-0002CO-Tr for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WrE-0000I0-6i for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:40 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:34101) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1g6WrD-0000GX-W3 for qemu-devel@nongnu.org; Sun, 30 Sep 2018 04:13:40 -0400 Received: by mail-wr1-x42a.google.com with SMTP id z4-v6so9104162wrb.1 for <qemu-devel@nongnu.org>; Sun, 30 Sep 2018 01:13:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x01hBqLh3EUAje9UjtWV7GyAdmgRTo3bQ2kbg9s+14U=; b=Emi+/z+PhZyMRINVX5AoDiPVNVSJ3Fl5ajFqmQ1EGypM/EP+F7RPqd0Td7JvFTsXDD tBMHMiJFO6KEuMBwMDVNmLlAo3Vlbo2G8cDn02Xf4zCaf+pz8qpzzAqYizgzOkyWRv+x k1W5esrDi+jHq1s1zal4BzdK0dnblcO1NjVnJQGSmAyWCYFA+6K/OI7OplOd63LPJf0P O1Poi2N/fwUhqaj4G2686LVP/lxfrrOh8CzpnSzZ7f9AEi7PwFEFABrxDdHguJ4goPEr zppDSdWh5wjLAkJhl/acXBw3i61gxL2tQjlH8Dz4y8uuBgo3Y63k0IusLKxYcxWwiGiH koQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=x01hBqLh3EUAje9UjtWV7GyAdmgRTo3bQ2kbg9s+14U=; b=oi4KsNKX1mC4O2TCmxqxI08G+L4xaZRUXwQTFGMSq34BmdZTrqIrIS7suMie3Dugpe HsmziPw+tFyC55RyM5S86oQVy98qsb2HKZut30yIJewjLblu1JjCHz3AggSASHOuJyN2 /p+hEWVoHBtDx0Xlnj5WpwVbFvrAEU67WIOS6w+cL/OiQ5uhpaRgCw6X9jerSmfpsTT3 x5N3+/YgmDyXTEKVwCmB4SH7I61np+nTcr/FzNki6QAhTt0dqAyo6NIqt2MTYxYLiTbe s0seAAzGjplWXL8q5Bo891GdLJlNpoLk7izaxw6mVn6Bo/GXFjJlZiPgNqtzPUxzmcox xWQA== X-Gm-Message-State: ABuFfojh17ftI9UkC+VeW+qJyvGXO9YwbuPs5w2+hnCqhkf76Sw3zESC 6c+VvRHoxS5A8OjWkCBs7X2oO9zE X-Google-Smtp-Source: ACcGV63axxEGpAhGMVGwz9x4hzElvUH6kHqsNdQAQv4lk0DAFrUYkidJ6Y7Rl6t5Z8dwPNS2fnSfDQ== X-Received: by 2002:a5d:4a12:: with SMTP id m18-v6mr3717872wrq.278.1538295218752; Sun, 30 Sep 2018 01:13:38 -0700 (PDT) Received: from 640k.lan (94-36-187-248.adsl-ull.clienti.tiscali.it. [94.36.187.248]) by smtp.gmail.com with ESMTPSA id u76-v6sm11369194wmd.10.2018.09.30.01.13.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Sep 2018 01:13:38 -0700 (PDT) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Sun, 30 Sep 2018 10:12:19 +0200 Message-Id: <1538295197-23704-22-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> References: <1538295197-23704-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 21/79] util: use fcntl() for qemu_write_pidfile() locking X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/79] virtio: Return true from virtio_queue_empty if broken
|
expand
|
diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 0e3ab9d..fbd0dc8 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -95,6 +95,11 @@ bool qemu_write_pidfile(const char *path, Error **errp) while (1) { struct stat a, b; + struct flock lock = { + .l_type = F_WRLCK, + .l_whence = SEEK_SET, + .l_len = 0, + }; fd = qemu_open(path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR); if (fd == -1) { @@ -107,7 +112,7 @@ bool qemu_write_pidfile(const char *path, Error **errp) goto fail_close; } - if (lockf(fd, F_TLOCK, 0) < 0) { + if (fcntl(fd, F_SETLK, &lock)) { error_setg_errno(errp, errno, "Cannot lock pid file"); goto fail_close; }