[libvirt] [PATCH 1/2] maint: rename virtaudit to match file contents
* src/util/virtaudit.[ch]: Rename... * src/util/viraudit.[ch]: ...to match virAudit* API. * src/Makefile.am (UTIL_SOURCES): Reflect rename. * daemon/libvirtd.c: Likewise. * po/POTFILES.in: Likewise. * src/libvirt_private.syms: Likewise. * src/qemu/qemu_audit.c: Likewise. --- First suggested here: https://www.redhat.com/archives/libvir-list/2011-April/msg00368.html although we still don't have viratomic.h or virobject.h implemented yet. daemon/libvirtd.c | 2 +- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_audit.c | 2 +- src/util/{virtaudit.c => viraudit.c} | 4 ++-- src/util/{virtaudit.h => viraudit.h} | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename src/util/{virtaudit.c => viraudit.c} (98%) rename src/util/{virtaudit.h => viraudit.h} (96%) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index a4198d9..97db696 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -52,7 +52,7 @@ #include "remote_driver.h" #include "hooks.h" #include "uuid.h" -#include "virtaudit.h" +#include "viraudit.h" #ifdef WITH_DRIVER_MODULES # include "driver.h" diff --git a/po/POTFILES.in b/po/POTFILES.in index 32eaa2d..1b63378 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -120,7 +120,7 @@ src/util/stats_linux.c src/util/storage_file.c src/util/sysinfo.c src/util/util.c -src/util/virtaudit.c +src/util/viraudit.c src/util/virterror.c src/util/xml.c src/vbox/vbox_MSCOMGlue.c diff --git a/src/Makefile.am b/src/Makefile.am index cd8a7e9..ff85db3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,8 +79,8 @@ UTIL_SOURCES = \ util/threadpool.c util/threadpool.h \ util/uuid.c util/uuid.h \ util/util.c util/util.h \ + util/viraudit.c util/viraudit.h \ util/xml.c util/xml.h \ - util/virtaudit.c util/virtaudit.h \ util/virterror.c util/virterror_internal.h EXTRA_DIST += util/threads-pthread.c util/threads-win32.c diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1112398..4d78fcf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1058,7 +1058,7 @@ virUUIDGenerate; virUUIDParse; -# virtaudit.h +# viraudit.h virAuditClose; virAuditEncode; virAuditLog; diff --git a/src/qemu/qemu_audit.c b/src/qemu/qemu_audit.c index 1baef40..1d88fb5 100644 --- a/src/qemu/qemu_audit.c +++ b/src/qemu/qemu_audit.c @@ -27,7 +27,7 @@ #include <sys/types.h> #include "qemu_audit.h" -#include "virtaudit.h" +#include "viraudit.h" #include "uuid.h" #include "logging.h" #include "memory.h" diff --git a/src/util/virtaudit.c b/src/util/viraudit.c similarity index 98% rename from src/util/virtaudit.c rename to src/util/viraudit.c index 560f7b7..ebf3119 100644 --- a/src/util/virtaudit.c +++ b/src/util/viraudit.c @@ -1,5 +1,5 @@ /* - * virtaudit.c: auditing support + * viraudit.c: auditing support * * Copyright (C) 2010-2011 Red Hat, Inc. * @@ -29,7 +29,7 @@ #include "virterror_internal.h" #include "logging.h" -#include "virtaudit.h" +#include "viraudit.h" #include "util.h" #include "files.h" #include "memory.h" diff --git a/src/util/virtaudit.h b/src/util/viraudit.h similarity index 96% rename from src/util/virtaudit.h rename to src/util/viraudit.h index a558a17..9d8c359 100644 --- a/src/util/virtaudit.h +++ b/src/util/viraudit.h @@ -1,7 +1,7 @@ /* - * virtaudit.h: auditing support + * viraudit.h: auditing support * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- 1.7.4.4
* src/qemu/qemu_driver.c (doCoreDump): Guarantee fd is closed. --- Spotted by hand, while working on virDomainSaveFlags. src/qemu/qemu_driver.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1356c54..f9d2de4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2525,10 +2525,11 @@ cleanup: return ret; } -static int doCoreDump(struct qemud_driver *driver, - virDomainObjPtr vm, - const char *path, - enum qemud_save_formats compress) +static int +doCoreDump(struct qemud_driver *driver, + virDomainObjPtr vm, + const char *path, + enum qemud_save_formats compress) { int fd = -1; int ret = -1; @@ -2554,6 +2555,7 @@ static int doCoreDump(struct qemud_driver *driver, ret = 0; cleanup: + VIR_FORCE_CLOSE(fd); if (ret != 0) unlink(path); return ret; -- 1.7.4.4
On Mon, Jul 11, 2011 at 05:44:59PM -0600, Eric Blake wrote:
* src/qemu/qemu_driver.c (doCoreDump): Guarantee fd is closed. ---
Spotted by hand, while working on virDomainSaveFlags.
src/qemu/qemu_driver.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1356c54..f9d2de4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2525,10 +2525,11 @@ cleanup: return ret; }
-static int doCoreDump(struct qemud_driver *driver, - virDomainObjPtr vm, - const char *path, - enum qemud_save_formats compress) +static int +doCoreDump(struct qemud_driver *driver, + virDomainObjPtr vm, + const char *path, + enum qemud_save_formats compress) { int fd = -1; int ret = -1; @@ -2554,6 +2555,7 @@ static int doCoreDump(struct qemud_driver *driver, ret = 0;
cleanup: + VIR_FORCE_CLOSE(fd); if (ret != 0) unlink(path); return ret;
ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On 07/12/2011 02:54 AM, Daniel P. Berrange wrote:
On Mon, Jul 11, 2011 at 05:44:59PM -0600, Eric Blake wrote:
* src/qemu/qemu_driver.c (doCoreDump): Guarantee fd is closed. ---
Spotted by hand, while working on virDomainSaveFlags.
ACK
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Mon, Jul 11, 2011 at 05:44:58PM -0600, Eric Blake wrote:
* src/util/virtaudit.[ch]: Rename... * src/util/viraudit.[ch]: ...to match virAudit* API. * src/Makefile.am (UTIL_SOURCES): Reflect rename. * daemon/libvirtd.c: Likewise. * po/POTFILES.in: Likewise. * src/libvirt_private.syms: Likewise. * src/qemu/qemu_audit.c: Likewise. ---
First suggested here: https://www.redhat.com/archives/libvir-list/2011-April/msg00368.html
although we still don't have viratomic.h or virobject.h implemented yet.
ACK Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On 07/12/2011 02:53 AM, Daniel P. Berrange wrote:
On Mon, Jul 11, 2011 at 05:44:58PM -0600, Eric Blake wrote:
* src/util/virtaudit.[ch]: Rename... * src/util/viraudit.[ch]: ...to match virAudit* API. * src/Makefile.am (UTIL_SOURCES): Reflect rename. * daemon/libvirtd.c: Likewise. * po/POTFILES.in: Likewise. * src/libvirt_private.syms: Likewise. * src/qemu/qemu_audit.c: Likewise. ---
ACK
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Daniel P. Berrange -
Eric Blake