search for: guestfs__add_cdrom

...ns(+), 6 deletions(-) > create mode 100755 tests/regressions/rhbz563450.sh > create mode 100755 tests/regressions/rhbz563450b.sh > > diff --git a/src/drives.c b/src/drives.c > index 16798a3..4b65dda 100644 > --- a/src/drives.c > +++ b/src/drives.c > @@ -1087,12 +1087,7 @@ guestfs__add_cdrom (guestfs_h *g, const char *filename) > return -1; > } > > - if (access (filename, F_OK) == -1) { > - perrorf (g, "%s", filename); > - return -1; > - } > - > - return guestfs_config (g, "-cdrom", filename); > + return guestfs__add...

...+++++++++ 4 files changed, 100 insertions(+), 6 deletions(-) create mode 100755 tests/regressions/rhbz563450.sh create mode 100755 tests/regressions/rhbz563450b.sh diff --git a/src/drives.c b/src/drives.c index 16798a3..4b65dda 100644 --- a/src/drives.c +++ b/src/drives.c @@ -1087,12 +1087,7 @@ guestfs__add_cdrom (guestfs_h *g, const char *filename) return -1; } - if (access (filename, F_OK) == -1) { - perrorf (g, "%s", filename); - return -1; - } - - return guestfs_config (g, "-cdrom", filename); + return guestfs__add_drive_ro (g, filename); } /* Depending on whe...

...mode 100755 tests/regressions/rhbz563450.sh > > create mode 100755 tests/regressions/rhbz563450b.sh > > > > diff --git a/src/drives.c b/src/drives.c > > index 16798a3..4b65dda 100644 > > --- a/src/drives.c > > +++ b/src/drives.c > > @@ -1087,12 +1087,7 @@ guestfs__add_cdrom (guestfs_h *g, const char > > *filename)> > > return -1; > > > > } > > > > - if (access (filename, F_OK) == -1) { > > - perrorf (g, "%s", filename); > > - return -1; > > - } > > - > > - return gues...

...; (comma) character")); + if (check_path(g, filename)) return -1; - } readonly = optargs->bitmask & GUESTFS_ADD_DRIVE_OPTS_READONLY_BITMASK ? optargs->readonly : 0; @@ -405,10 +413,8 @@ guestfs__add_drive_ro_with_if (guestfs_h *g, const char *filename, int guestfs__add_cdrom (guestfs_h *g, const char *filename) { - if (strchr (filename, ',') != NULL) { - error (g, _("filename cannot contain ',' (comma) character")); + if (check_path(g, filename)) return -1; - } if (access (filename, F_OK) == -1) { perrorf (g, "%s&quo...

...nt +of C<guestfs_add_drive_ro>." }; { defaults with name = "add_drive_ro"; diff --git a/src/drives.c b/src/drives.c index 16798a3..cddde4f 100644 --- a/src/drives.c +++ b/src/drives.c @@ -1081,18 +1081,7 @@ guestfs__add_drive_scratch (guestfs_h *g, int64_t size, int guestfs__add_cdrom (guestfs_h *g, const char *filename) { - if (strchr (filename, ':') != NULL) { - error (g, _("filename cannot contain ':' (colon) character. " - "This is a limitation of qemu.")); - return -1; - } - - if (access (filename, F_OK) == -1) {...

Note: This is a regression in RHEL 6.3. Please review this patch urgently. The description of the bug is here: https://bugzilla.redhat.com/show_bug.cgi?id=812092 This patch set attempts to fix the problem conservatively, because it's a very high risk codepath and very late in the development of RHEL 6.3. The first patch reverts the behaviour of calling realpath(3) and checking for

This rounds off hotplugging support by allowing you to add and remove drives at any stage (before and after launch). Rich.

libguestfs has used double and triple underscores in identifiers. These aren't valid for global names in C++. (http://stackoverflow.com/a/228797) These large but completely mechanical patches change the illegal identifiers to legal ones. Rich.