xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xen.org
Cc: Christoph Egger <Christoph.Egger@amd.com>,
	Ian Jackson <ian.jackson@eu.citrix.com>,
	Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 3/9] pygrub: don't leave fds open
Date: Wed, 11 Jul 2012 11:23:46 +0100	[thread overview]
Message-ID: <1342002232-75531-4-git-send-email-roger.pau@citrix.com> (raw)
In-Reply-To: <1342002232-75531-1-git-send-email-roger.pau@citrix.com>

On NetBSD a block device can only be opened once, so make sure pygrub
closes it every time, if this is not done libfsimage is not able to
open the disk later.

Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Christoph Egger <Christoph.Egger@amd.com>
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
 tools/pygrub/src/pygrub |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 6dd44ac..ad78c22 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -67,6 +67,7 @@ def get_solaris_slice(file, offset):
     fd = os.open(file, os.O_RDONLY)
     os.lseek(fd, offset + (DK_LABEL_LOC * SECTOR_SIZE), 0)
     buf = os.read(fd, 512)
+    os.close(fd)
     if struct.unpack("<H", buf[508:510])[0] != DKL_MAGIC:
         raise RuntimeError, "Invalid disklabel magic"
 
@@ -93,6 +94,7 @@ def get_fs_offset_gpt(file):
         buf = os.read(fd, partsize)
         offsets.append(struct.unpack("<Q", buf[32:40])[0] * SECTOR_SIZE)
         i -= 1
+    os.close(fd)
     return offsets
 
 FDISK_PART_SOLARIS=0xbf
@@ -116,6 +118,7 @@ def get_partition_offsets(file):
 
     fd = os.open(file, os.O_RDONLY)
     buf = os.read(fd, 512)
+    os.close(fd)
     for poff in (446, 462, 478, 494): # partition offsets
 
         # MBR contains a 16 byte descriptor per partition
-- 
1.7.7.5 (Apple Git-26)

  parent reply	other threads:[~2012-07-11 10:23 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-11 10:23 [PATCH 0/9] NetBSD: minor fixes and hotplug execution Roger Pau Monne
2012-07-11 10:23 ` [PATCH 1/9] xenstore: don't print an error when gntdev cannot be opened Roger Pau Monne
2012-07-23 11:42   ` Ian Campbell
2012-07-11 10:23 ` [PATCH 2/9] tools/build: fix pygrub linking Roger Pau Monne
2012-07-11 11:00   ` Christoph Egger
2012-07-12 16:30     ` Roger Pau Monne
2012-07-17 16:22       ` Ian Jackson
2012-07-17 16:34         ` Roger Pau Monne
2012-07-17 18:17           ` Ian Jackson
2012-07-18  8:26             ` Roger Pau Monne
2012-07-18 10:48               ` Ian Jackson
2012-07-18 13:55                 ` Roger Pau Monne
2012-07-19 14:48                   ` Ian Jackson
2012-07-19 15:00                     ` Roger Pau Monne
2012-07-19 15:03                       ` Ian Jackson
2012-07-11 10:23 ` Roger Pau Monne [this message]
2012-07-11 11:02   ` [PATCH 3/9] pygrub: don't leave fds open Christoph Egger
2012-07-17 16:01   ` Ian Jackson
2012-07-11 10:23 ` [PATCH 4/9] build: include Tools.mk first in tools/Rules.mk Roger Pau Monne
2012-07-11 11:52   ` Christoph Egger
2012-07-23 11:34   ` Ian Campbell
2012-07-23 12:19     ` Christoph Egger
2012-07-25  9:32     ` Roger Pau Monne
2012-07-25 10:39       ` Ian Campbell
2012-07-25 10:56         ` Roger Pau Monne
2012-07-25 16:43           ` Ian Campbell
2012-07-11 10:23 ` [PATCH 5/9] libxl: react correctly to POLLHUP Roger Pau Monne
2012-07-17 16:01   ` Ian Jackson
2012-07-11 10:23 ` [PATCH 6/9] libxl: check backend state before setting it to "closing" Roger Pau Monne
2012-07-17 16:05   ` Ian Jackson
2012-07-11 10:23 ` [PATCH 7/9] hotplug/NetBSD: check type of file to attach from params Roger Pau Monne
2012-07-11 11:54   ` Christoph Egger
2012-07-17 16:06   ` Ian Jackson
2012-07-17 16:35     ` Roger Pau Monne
2012-07-11 10:23 ` [PATCH 8/9] libxl: call hotplug scripts from xl for NetBSD Roger Pau Monne
2012-07-17 16:07   ` Ian Jackson
2012-07-11 10:23 ` [PATCH 9/9] init/NetBSD: move xenbackendd to xend init script Roger Pau Monne
2012-07-11 12:02   ` Christoph Egger
2012-07-17 16:08   ` Ian Jackson
2012-07-17 16:23     ` Roger Pau Monne
2012-07-18  9:04       ` Christoph Egger
2012-07-18  9:43         ` Roger Pau Monne
2012-07-18  9:46           ` Christoph Egger
2012-07-18  9:46           ` Roger Pau Monne
2012-07-18 10:50         ` Ian Jackson
2012-07-18 11:02           ` Roger Pau Monne
2012-07-18  9:02     ` Christoph Egger
2012-07-23 12:20 ` [PATCH 0/9] NetBSD: minor fixes and hotplug execution Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1342002232-75531-4-git-send-email-roger.pau@citrix.com \
    --to=roger.pau@citrix.com \
    --cc=Christoph.Egger@amd.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).