| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
|
| |
Two bits of XDR both contained a definition called 'str' which
means that 'xdr_str' was being exported globally twice. Because
of the linker script this didn't affect us. But it's best to
rename this global so that conflicts cannot arise.
(cherry picked from commit 27ef6f9171127afd248f38d280cf3d0eae51fdaf)
|
|
|
|
|
|
|
|
| |
Without this option, qemu will read some defaults from /etc/qemu/
configuration files.
Cherry picked from commit 6d15d4e7c27477507ba355384a340ce86cec617b
and backported to stable 1.2 branch.
|
|
|
|
| |
(cherry picked from commit 4d2f1632ad655130fafab3bf7fe8fa5cb59705d8)
|
|
|
|
|
| |
This haven't been used -- and haven't worked -- for a long time.
(cherry picked from commit c56fa58721a710aeb4a41bd73a472354a2128069)
|
|
|
|
|
|
| |
See:
http://www.python.org/dev/peps/pep-0353/#conversion-guidelines
(cherry picked from commit 012b1c71f4eda3ae779da51d7d81c199d90f667d)
|
| |
|
|
|
|
| |
(cherry picked from commit 29925244c1be2d1d5f71d46eba205278624a1366)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some tests in the regressions directory deliberately print
error messages. As long as they still PASS, this is OK.
However these tests also printed some misleading messages
about what error to expect. Since error messages were slightly
different across distros, these messages were not accurate.
Therefore remove these messages, and replace with a general
message before all tests telling users not to worry about
errors from the tests as long as the tests don't fail.
Cherry picked from commit e7ee6eebed6ee3a5b56c0482ba2770e697d8febc
and rebased for stable branch.
|
|
|
|
| |
(cherry picked from commit 2fd8c259d3daa88b0cdf98090bb57f3dbd178432)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adding the readonly=on option is not so clever. This causes
qemu to present the disk as read-only to the guest. (The
expected behaviour of snapshots=on,readonly=on was that it
would open the disk O_RDONLY but present a writable disk to
the guest).
Since the guest sees a read-only disk, we are unable to do any
recovery if a filesystem on the disk is inconsistent. This basically
prevents most accesses to live disk images.
What we really want is a qemu option which presents a writable
disk to the guest, but only opens the disk on the host side with
O_RDONLY, to alleviate the udev bug RHBZ#571714.
This reverts commit 676462684e05dd8341dd695762dd99a87d8ec022.
(cherry picked from commit 799d52be4f08f6c70c0e8ba1aa7367ba4cdd78c4)
|
|
|
|
|
|
|
|
| |
The 'name' parameter is not used on the right hand side of the
match, so it can be removed.
Cherry picked from commit 2e7da2a2f3bbc6d6db148d7dc2ce238bf56f34db
and rebased for stable branch.
|
|
|
|
|
|
|
|
|
|
| |
This resolves a warning from gcc 4.5:
assuming signed overflow does not occur when simplifying
conditional to constant
This page explains the issues in some detail:
http://www.airs.com/blog/archives/120
(cherry picked from commit 321ca1ef91a90cec5b94058b84420e8018e3f1d8)
|
|
|
|
|
|
|
|
| |
Only one function currently uses DeviceList. The generated code
unfortunately hard-coded the argument name from that function.
Cherry picked from aac51942aab63a9355ad6724345ea923148bf2a9
and rebased for stable branch.
|
|
|
|
|
|
| |
Various language bindings simply need this, so we have to allow
it even though it's a GCC extension.
(cherry picked from commit 0c0976496dafda4d172c5a7fc787d6a87d5bce8d)
|
| |
|
|
|
|
| |
(cherry picked from commit 70d27f6e796097630134bd8ebc2b65a65b1bf5c4)
|
|
|
|
|
|
|
|
|
| |
Note to self: The 'tempfile' function does *not* default to
removing files with the program exits!
For stable-1.2 branch:
- Cherry picked from commit 10ea14a3f1adb7023dd0601e4759bd24a030a1c3
- Rebase.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Testing this against a Fedora disk image:
$ ./fish/guestfish --ro -a F13.img -m /dev/sda1 --listen
export GUESTFISH_PID=6033
$ ./fish/guestfish --remote=6033 -- ping-daemon
$ ./fish/guestfish --remote=6033 -- ping-daemon
$ ./fish/guestfish --remote=6033 -- exit
Without this fix the first remote command would fail because
qemu would have already been killed.
For stable-1.2 branch:
- Cherry picked from commit 8161ea9bb046c8450384b5b15e1f4b2f3dca582b
- Rebased for older guestfish code.
|
|
|
|
| |
(cherry picked from commit 015b7a2ee6b4ba0f1400640fa16e2526a69d081e)
|
|
|
|
|
| |
See: http://lists.fedoraproject.org/pipermail/devel/2010-June/137953.html
(cherry picked from commit 9928498ad87ed1d7a1c191d5637d36d5f9b09ee4)
|
|
|
|
| |
(cherry picked from commit 61adbba900a4150110d9fcd20097b3a5c249e6c7)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There's a thread safety issue with the current OCaml bindings which
is well explained in the bug report:
https://bugzilla.redhat.com/show_bug.cgi?id=604691
This commit fixes the safety issue by copying strings temporarily
before releasing the thread lock. Updated code looks like this:
char *filename = guestfs_safe_strdup (g, String_val (filenamev));
int r;
caml_enter_blocking_section ();
r = guestfs_add_drive_ro (g, filename);
caml_leave_blocking_section ();
free (filename);
if (r == -1)
ocaml_guestfs_raise_error (g, "add_drive_ro");
Also included is a regression test.
For stable-1.2 branch:
- cherry picked from commit 1079f74704a06c06996e547fdecf20a8f92799c6
- generator code rebased
|
|
|
|
| |
(cherry picked from commit e67e216118df3a724482cb698a868ecbaacbf326)
|
|
|
|
| |
(cherry picked from commit 91b00dc092be17a309f14fc35f41dbf1e41c4c58)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Before this commit, if you used the -h and --csv options together
you would get these warnings from virt-df:
$ virt-df -h --csv Guest
Virtual Machine,Filesystem,Size,Used,Available,Use%
Argument "13.5G" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298.
Argument "4.7G" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298.
Argument "8.1G" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298.
"/dev/vg_trick/RHEL55x64","/dev/VolGroup00/LogVol00",13,4,8,34.8%
Argument "98.7M" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298.
Argument "18.8M" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298.
Argument "74.9M" isn't numeric in printf at /home/rjones/d/libguestfs/tools/virt-df line 298.
"/dev/vg_trick/RHEL55x64","/dev/vda1",98,18,74,19.0%
We could fix this so that the human-readable numbers get written
into the CSV file. However would probably be wrong for most uses
of the CSV format (databases and spreadsheets) since they would not
be able to interpret these human-readable numbers, or worse could
misinterpret, eg. thinking that "1M" and "1G" are both 1.
Therefore this commit disallows this combination of options.
(cherry picked from commit aaf03a51a26ee501f5dbf2720bbb8a5e3b4e1e6b)
|
|
|
|
|
|
|
|
|
| |
Using IfAvailable "featurename" we allow individual tests to
only run if the feature is available in the daemon.
This will allow us to extend testing to a lot more optional
features such as NTFS.
(cherry picked from commit f9d08600c52dc0730e7dad8d9259b59e32aeece2)
|
|
|
|
|
| |
This commit is just code motion.
(cherry picked from commit cbe80b2bcfdee437d195f25aaf6f5d96329ab360)
|
|
|
|
| |
(cherry picked from commit dccd9b8f525cfae49b89c38066d752e6c054c7f6)
|
| |
|
|
|
|
| |
(cherry picked from commit ac37f65aaf1f162a2cc57fa8c296a1ff4109adb9)
|
|
|
|
| |
(cherry picked from commit cbb026036826f2ab40237aec0b0c5453b859625d)
|
|
|
|
|
|
|
|
|
| |
This fixes the following commands when run with RHEL 5-era parted:
get-bootable
get-parttype
part-list
(cherry picked from commit 3ab2d089f3eb34562bc2c9ce4310869b46c69d70)
|
|
|
|
| |
(cherry picked from commit aee7d55fcf754d97d945c318ec06d6387ade067b)
|
|
|
|
|
|
| |
For stable-1.2 branch:
- cherry picked from commit 1020b212b189968ead013436cac79019fbd8fdad
- rebased for 1.2 branch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
With this change, the exit status indicates error for non-existent
commands.
$ guestfish -h foo
foo: command not known, use -h to list all commands
$ echo $?
1
$ guestfish help foo
foo: command not known, use -h to list all commands
$ echo $?
1
For stable-1.2 branch:
- cherry picked from commit f2b7a8e15c49ebc70c7ea56aefb340362aae5a99
- rebased for the 1.2 branch
|
|
|
|
|
|
|
|
| |
This also adds a regression test.
For stable-1.2 branch:
- cherry picked from commit 9733d4746988b3a072d8bb1daac4b9795b8f4134
- modify the regression test to apply against the generator
|
|
|
|
| |
(cherry picked from commit 52f9cd4882135910ea06e1e50ac6441d455c9ab1)
|
|
|
|
|
|
| |
By killing the cache file, we make blkid work in situations such
as a just-created filesystem.
(cherry picked from commit 21c42e9fabf6cea3d564e338a314479ef120502a)
|
|
|
|
|
| |
Note that there is no change to the semantics of the code.
(cherry picked from commit 85c71f8fff3e80f549342bf995b686ba7303c2b4)
|
|
|
|
| |
(cherry picked from commit fc1dc099a1ceeea45d3c21c699daf39618ca714a)
|
|
|
|
| |
(cherry picked from commit 0e42861ccf9e55582db13828ca4eaef213de1f8a)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Latest augeas includes a lens for /etc/modules.conf. If this new lens is
present, the code to force the Modprobe lens to try to match /etc/modules.conf
as well results in /etc/modules.conf not being parsed at all. This results in
modprobe_aliases in virt-inspector output being empty.
This change is equivalent to change cfd28d1140393667913689b7b9bcf21c8bfe592c
from virt-v2v.
An effect of this change is that the Modules_conf augeas lens is now required
for correct operation on guests which use /etc/modules.conf.
Fixes RHBZ#596776
(cherry picked from commit 245ed4b8eb076a8c4cc5787f49d21c4f68630f9f)
|
|
|
|
| |
(cherry picked from commit 0f6c6239fe0d1b4624e4e9776559c21486a9c7cf)
|
|
|
|
| |
(cherry picked from commit 11eeb8885c7a8ffb59e12cd5fb2ae0fc324df383)
|
|
|
|
| |
(cherry picked from commit 8355d3245623c106439ca5ef66f24972c8e09019)
|
|
|
|
| |
(cherry picked from commit d12a702fe1898f3ea421210d92c705440efe07a8)
|
|
|
|
| |
(cherry picked from commit 4412fd951ee7766ee9a70bf66b5cf11378a64ed0)
|
|
|
|
| |
(cherry picked from commit b8861242d13cc034383a56ba891d3e0b9123a99c)
|
|
|
|
| |
(cherry picked from commit c1e3cff523d72e8110cbc568a3c280e57c2aabca)
|