Matthew Booth
2011-Oct-18 12:44 UTC
[Libguestfs] [PATCH 1/5] launch: Store drive information in guestfs_h
This is a NFC on its own, but provides a place-holder for drive metadata which can be used after launch. --- src/guestfs-internal.h | 17 +++++++- src/guestfs.c | 20 +++++++++ src/launch.c | 104 +++++++++++++++++++++++++++--------------------- src/virt.c | 4 +- 4 files changed, 96 insertions(+), 49 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-launch-Store-drive-information-in-guestfs_h.patch Type: text/x-patch Size: 8561 bytes Desc: not available URL: <http://listman.redhat.com/archives/libguestfs/attachments/20111018/6bfbb902/attachment.bin>
--- src/inspect_fs_unix.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0002-NFC-Remove-unnecessary-goto.patch Type: text/x-patch Size: 879 bytes Desc: not available URL: <http://listman.redhat.com/archives/libguestfs/attachments/20111018/0bc97283/attachment.bin>
Matthew Booth
2011-Oct-18 12:44 UTC
[Libguestfs] [PATCH 3/5] inspect: Add drive naming hints
We currently use a heuristic to guess how drive names we find referenced in the guest map to drive names in the appliance. If this heuristic fails it can cause inspection to fail. This change adds a new 'name' option to add_drive_opts, which allows the user to explicitly pass the name of a drive to libguestfs if it is known. This change also updates the fstab-parsing inspection code to use this information if it is available. --- generator/generator_actions.ml | 7 ++++- regressions/test-inspect-fstab.sh | 40 ++++++++++++++++++++++++--- src/guestfs-internal.h | 1 + src/inspect_fs_unix.c | 55 ++++++++++++++++++++++++------------- src/launch.c | 4 +++ 5 files changed, 83 insertions(+), 24 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0003-inspect-Add-drive-naming-hints.patch Type: text/x-patch Size: 7164 bytes Desc: not available URL: <http://listman.redhat.com/archives/libguestfs/attachments/20111018/02224e48/attachment.bin>
Matthew Booth
2011-Oct-18 12:44 UTC
[Libguestfs] [PATCH 4/5] inspect: Don't assume number of captures in match functions
It is possible for the pcre library to return a variable number of captures for a single regular expression. e.g.: ^/dev/(cciss/c\d+d\d+)(?:p(\d+))?$ This will return either 1 or 2 captures depending on whether the device has a partition suffix. The current match wrappers don't allow for this, and require that a predictable number of matches are returned. This change updates match, match1, match2, and match3 to ignore the specific number of matches returned. Instead, any returned captures are assigned to the given arguments, and any remaining arguments are set to NULL. --- src/match.c | 43 +++++++++++++------------------------------ 1 files changed, 13 insertions(+), 30 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0004-inspect-Don-t-assume-number-of-captures-in-match-fun.patch Type: text/x-patch Size: 2901 bytes Desc: not available URL: <http://listman.redhat.com/archives/libguestfs/attachments/20111018/cd78584c/attachment.bin>
Matthew Booth
2011-Oct-18 12:44 UTC
[Libguestfs] [PATCH 5/5] inspect: Handle cciss devices in /etc/fstab
--- regressions/test-inspect-fstab.sh | 36 ++++++++++++++++++++++++++++++++++++ src/inspect_fs_unix.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) -------------- next part -------------- A non-text attachment was scrubbed... Name: 0005-inspect-Handle-cciss-devices-in-etc-fstab.patch Type: text/x-patch Size: 3288 bytes Desc: not available URL: <http://listman.redhat.com/archives/libguestfs/attachments/20111018/08fa5af8/attachment.bin>