- Devel - libvirt List Archives

[Libvir] [PATCH 4/4] HACKING: begin to describe contributor/coding guidelines
by Jim Meyering 10 Apr '08

10 Apr '08

This is the name many projects already use for their code-contribution guidelines, but if people here prefer something different, it's trivial to change. For now, it's not included in the tarball (and I think that's appropriate), but adding it there is fine, too. Of course, this is just one small part. Dan Berrange posted a preliminary list a few months ago, describing some aspects of existing practice, and those belong here, too. Jim ----------------------- HACKING: New file: begin to describe contributor/coding guidelines. diff --git a/HACKING b/HACKING new file mode 100644 index 0000000..a90addc --- /dev/null +++ b/HACKING @@ -0,0 +1,45 @@ +Libvirt contributor guidelines +============================== + + +Code indentation +================ +Libvirt's C source code generally adheres to some basic code-formatting +conventions. The existing code base is not totally consistent on this +front, but we do prefer that contributed code be formatted similarly. +In short, use spaces-not-TABs for indentation, use 4 spaces for each +indentation level, and other than that, follow the K&R style. + +If you use Emacs, add the following to one of one of your start-up files +(e.g., ~/.emacs), to help ensure that you get indentation right: + + ;;; When editing C sources in libvirt, use this style. + (defun libvirt-c-mode () + "C mode with adjusted defaults for use with libvirt." + (interactive) + (c-set-style "K&R") + (setq indent-tabs-mode nil) ; indent using spaces, not TABs + (setq c-indent-level 4) + (setq c-basic-offset 4)) + (add-hook 'c-mode-hook + '(lambda () (if (string-match "/libvirt" (buffer-file-name)) + (libvirt-c-mode)))) + +Code formatting (especially for new code) +========================================= +With new code, we can be even more strict. +Please apply the following function (using GNU indent) to any new code. +Note that this also gives you an idea of the type of spacing we prefer +around operators and keywords: + + indent-libvirt() + { + indent -bad -bap -bbb -bli4 -br -ce -brs -cs -i4 -l75 -lc75 \ + -sbi4 -psl -saf -sai -saw -sbi4 -ss -sc -cdw -cli4 -npcs -nbc \ + --no-tabs "$@" + } + +Note that sometimes you'll have to postprocess that output further, by +piping it through "expand -i", since some leading TABs can get through. +Usually they're in macro definitions or strings, and should be converted +anyhow. -- 1.5.5.24.g3cff

3 3

[Libvir] [PATCH 3/4] Ensure that no C source file uses TABs for indentation
by Jim Meyering 10 Apr '08

10 Apr '08

Ensure that no C source file uses TABs for indentation. * Makefile.maint (sc_TAB_in_indentation): New rule. diff --git a/Makefile.maint b/Makefile.maint index a357d74..4e41134 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -287,6 +287,17 @@ sc_trailing_blank: { echo '$(ME): found trailing blank(s)' \ 1>&2; exit 1; } || : +# Ensure that no C source file uses TABs for indentation. +# Also match *.h.in files, to get libvirt.h.in. +# Exclude files in gnulib, since they're imported. +sc_TAB_in_indentation: + @grep -lE '^ * ' /dev/null \ + $$($(VC_LIST_EXCEPT) \ + | grep -E '\.[ch](\.in)?$$' \ + | grep -v '^gnulib/') && \ + { echo '$(ME): found TAB(s) use for indentation; use spaces' \ + 1>&2; exit 1; } || : + # Match lines like the following, but where there is only one space # between the options and the description: # -D, --all-repeated[=delimit-method] print all duplicate lines\n -- 1.5.5.24.g3cff

3 3

[Libvir] [PATCH 2/4] Convert TAB-based indentation in .[ch] files to spaces
by Jim Meyering 10 Apr '08

10 Apr '08

3 2

[Libvir] [PATCH 1/4] Remove vim: and emacs local variable settings from C source
by Jim Meyering 10 Apr '08

10 Apr '08

Remove all vim: and emacs local variable settings in .c and .h files. Done with these commands: git grep -l Local.variab|xargs \ perl -0x3b -pi -e 's,\n+/\*\n \* vim:(.|\n)*,\n,' git grep -l Local.variab|xargs \ perl -0x3b -pi -e 's,\n+/\*\n \* Local variables:\n(.|\n)*,\n,' --- proxy/libvirt_proxy.c | 14 -------------- python/libvir.c | 14 -------------- qemud/event.c | 8 -------- qemud/internal.h | 9 --------- qemud/mdns.c | 11 ----------- qemud/qemud.c | 9 --------- qemud/remote.c | 9 --------- qemud/remote_protocol.x | 15 --------------- src/bridge.c | 9 --------- src/bridge.h | 9 --------- src/buf.c | 14 -------------- src/capabilities.c | 9 --------- src/capabilities.h | 9 --------- src/conf.c | 10 ---------- src/conf.h | 9 --------- src/console.c | 9 --------- src/console.h | 9 --------- src/driver.h | 14 -------------- src/event.c | 10 ---------- src/hash.c | 15 --------------- src/internal.h | 14 -------------- src/iptables.c | 9 --------- src/iptables.h | 9 --------- src/libvirt.c | 15 --------------- src/lxc_conf.c | 10 ---------- src/lxc_container.c | 10 ---------- src/lxc_container.h | 10 ---------- src/lxc_driver.c | 9 --------- src/lxc_driver.h | 9 --------- src/nodeinfo.c | 10 ---------- src/openvz_driver.c | 9 --------- src/openvz_driver.h | 10 ---------- src/parthelper.c | 13 ------------- src/proxy_internal.c | 14 -------------- src/proxy_internal.h | 14 -------------- src/qemu_conf.c | 9 --------- src/qemu_conf.h | 9 --------- src/qemu_driver.c | 9 --------- src/qemu_driver.h | 9 --------- src/qparams.c | 14 -------------- src/qparams.h | 14 -------------- src/remote_internal.c | 14 -------------- src/remote_internal.h | 14 -------------- src/stats_linux.c | 13 ------------- src/stats_linux.h | 13 ------------- src/storage_backend.c | 15 --------------- src/storage_backend.h | 14 -------------- src/storage_backend_disk.c | 14 -------------- src/storage_backend_disk.h | 14 -------------- src/storage_backend_fs.c | 14 -------------- src/storage_backend_fs.h | 14 -------------- src/storage_backend_iscsi.c | 14 -------------- src/storage_backend_iscsi.h | 14 -------------- src/storage_backend_logical.c | 14 -------------- src/storage_backend_logical.h | 14 -------------- src/storage_conf.c | 14 -------------- src/storage_conf.h | 15 --------------- src/storage_driver.c | 14 -------------- src/storage_driver.h | 14 -------------- src/test.c | 14 -------------- src/test.h | 9 --------- src/util.c | 8 -------- src/uuid.c | 10 ---------- src/virsh.c | 14 -------------- src/virterror.c | 14 -------------- src/xen_internal.c | 13 ------------- src/xen_unified.c | 14 -------------- src/xen_unified.h | 14 -------------- src/xend_internal.c | 9 --------- src/xm_internal.c | 8 -------- src/xml.c | 9 --------- src/xs_internal.c | 8 -------- tests/nodeinfotest.c | 9 --------- tests/qemuxml2argvtest.c | 9 --------- tests/qemuxml2xmltest.c | 9 --------- tests/sexpr2xmltest.c | 8 -------- tests/statstest.c | 9 --------- tests/testutils.c | 10 ---------- tests/testutils.h | 9 --------- tests/xmconfigtest.c | 9 --------- 80 files changed, 0 insertions(+), 912 deletions(-) diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index bed3ae8..75504ef 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -846,17 +846,3 @@ int main(void) { } #endif /* WITH_XEN */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/python/libvir.c b/python/libvir.c index fe650e8..96cbc29 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -1453,17 +1453,3 @@ initcygvirtmod initialized = 1; } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/qemud/event.c b/qemud/event.c index c744738..f478fe0 100644 --- a/qemud/event.c +++ b/qemud/event.c @@ -501,11 +501,3 @@ int virEventRunOnce(void) { return 0; } -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/qemud/internal.h b/qemud/internal.h index da55675..3f95af8 100644 --- a/qemud/internal.h +++ b/qemud/internal.h @@ -184,12 +184,3 @@ int qemudGetSocketIdentity(int fd, uid_t *uid, pid_t *pid); #endif #endif - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/qemud/mdns.c b/qemud/mdns.c index e5c99cb..692ed3c 100644 --- a/qemud/mdns.c +++ b/qemud/mdns.c @@ -488,14 +488,3 @@ void libvirtd_mdns_stop(struct libvirtd_mdns *mdns) avahi_client_free(mdns->client); mdns->client = NULL; } - - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/qemud/qemud.c b/qemud/qemud.c index 6534ec3..23af042 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2220,12 +2220,3 @@ int main(int argc, char **argv) { qemudCleanup(server); return ret; } - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/qemud/remote.c b/qemud/remote.c index 787146e..e249529 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -3464,12 +3464,3 @@ make_nonnull_storage_vol (remote_nonnull_storage_vol *vol_dst, virStorageVolPtr vol_dst->name = strdup (vol_src->name); vol_dst->key = strdup (vol_src->key); } - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/qemud/remote_protocol.x b/qemud/remote_protocol.x index a3ea3f0..e73ffaa 100644 --- a/qemud/remote_protocol.x +++ b/qemud/remote_protocol.x @@ -1062,18 +1062,3 @@ struct remote_message_header { unsigned serial; /* Serial number of message. */ remote_message_status status; }; - - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/bridge.c b/src/bridge.c index f5c27af..b5af09c 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -771,12 +771,3 @@ brSetEnableSTP(brControl *ctl ATTRIBUTE_UNUSED, } #endif /* WITH_QEMU */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/bridge.h b/src/bridge.h index 5dcca00..cf444e0 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -104,12 +104,3 @@ int brGetEnableSTP (brControl *ctl, #endif /* WITH_QEMU */ #endif /* __QEMUD_BRIDGE_H__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/buf.c b/src/buf.c index 72d9f52..236219d 100644 --- a/src/buf.c +++ b/src/buf.c @@ -382,17 +382,3 @@ virBufferStrcat(virBufferPtr buf, ...) va_end(ap); return 0; } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/capabilities.c b/src/capabilities.c index 01bb308..18fc2a3 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -690,12 +690,3 @@ virCapabilitiesFormatXML(virCapsPtr caps) free(xml.content); return NULL; } - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/capabilities.h b/src/capabilities.h index b379e51..770779c 100644 --- a/src/capabilities.h +++ b/src/capabilities.h @@ -169,12 +169,3 @@ virCapabilitiesFormatXML(virCapsPtr caps); #endif /* __VIR_CAPABILITIES_H */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/conf.c b/src/conf.c index b955028..064c0fe 100644 --- a/src/conf.c +++ b/src/conf.c @@ -963,13 +963,3 @@ error: virBufferFree(buf); return(ret); } - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/conf.h b/src/conf.h index 53c9456..a575824 100644 --- a/src/conf.h +++ b/src/conf.h @@ -95,12 +95,3 @@ int __virConfWriteMem (char *memory, } #endif #endif /* __VIR_CONF_H__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/console.c b/src/console.c index 079d4ef..46b323e 100644 --- a/src/console.c +++ b/src/console.c @@ -198,12 +198,3 @@ int vshRunConsole(const char *tty) { } #endif /* !__MINGW32__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/console.h b/src/console.h index 279800d..f36791b 100644 --- a/src/console.h +++ b/src/console.h @@ -38,12 +38,3 @@ extern "C" { #endif /* !__MINGW32__ */ #endif /* __VIR_CONSOLE_H__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/driver.h b/src/driver.h index efb0887..4724560 100644 --- a/src/driver.h +++ b/src/driver.h @@ -590,17 +590,3 @@ int virRegisterStateDriver(virStateDriverPtr); } #endif /* __cplusplus */ #endif /* __VIR_DRIVER_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/event.c b/src/event.c index 274db9d..bd36797 100644 --- a/src/event.c +++ b/src/event.c @@ -83,13 +83,3 @@ void __virEventRegisterImpl(virEventAddHandleFunc addHandle, updateTimeoutImpl = updateTimeout; removeTimeoutImpl = removeTimeout; } - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/hash.c b/src/hash.c index b029e4f..409400b 100644 --- a/src/hash.c +++ b/src/hash.c @@ -1344,18 +1344,3 @@ virUnrefStorageVol(virStorageVolPtr vol) { pthread_mutex_unlock(&vol->conn->lock); return (refs); } - - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/internal.h b/src/internal.h index dde673b..605bd82 100644 --- a/src/internal.h +++ b/src/internal.h @@ -329,17 +329,3 @@ virDomainPtr __virDomainMigrateFinish (virConnectPtr dconn, const char *dname, c } #endif /* __cplusplus */ #endif /* __VIR_INTERNAL_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/iptables.c b/src/iptables.c index c08a00e..249262a 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -1158,12 +1158,3 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx, } #endif /* WITH_QEMU */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/iptables.h b/src/iptables.h index e33513e..95f07de 100644 --- a/src/iptables.h +++ b/src/iptables.h @@ -98,12 +98,3 @@ int iptablesRemoveForwardMasquerade (iptablesContext *ctx, #endif /* WITH_QEMU */ #endif /* __QEMUD_IPTABLES_H__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/libvirt.c b/src/libvirt.c index e4a1c3b..39fe8bc 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5021,18 +5021,3 @@ virStorageVolGetPath(virStorageVolPtr vol) virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); return NULL; } - - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/lxc_conf.c b/src/lxc_conf.c index 325a1bf..fd45709 100644 --- a/src/lxc_conf.c +++ b/src/lxc_conf.c @@ -886,13 +886,3 @@ int lxcDeleteConfig(virConnectPtr conn, } #endif /* WITH_LXC */ - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/lxc_container.c b/src/lxc_container.c index d02c23b..2c7cbeb 100644 --- a/src/lxc_container.c +++ b/src/lxc_container.c @@ -217,13 +217,3 @@ cleanup: } #endif /* WITH_LXC */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ - diff --git a/src/lxc_container.h b/src/lxc_container.h index d8deecf..7d5341d 100644 --- a/src/lxc_container.h +++ b/src/lxc_container.h @@ -32,13 +32,3 @@ int lxcChild( void *argv ); #endif /* LXC_DRIVER_H */ #endif /* LXC_CONTAINER_H */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ - diff --git a/src/lxc_driver.c b/src/lxc_driver.c index db597e1..f6539b4 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1071,12 +1071,3 @@ int lxcRegister(void) } #endif /* WITH_LXC */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/lxc_driver.h b/src/lxc_driver.h index 5a7d76e..0515875 100644 --- a/src/lxc_driver.h +++ b/src/lxc_driver.h @@ -34,12 +34,3 @@ int lxcRegister(void); #endif /* WITH_LXC */ #endif /* LXC_DRIVER_H */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index ff5784e..77b2072 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -170,13 +170,3 @@ int virNodeInfoPopulate(virConnectPtr conn, return -1; #endif } - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/openvz_driver.c b/src/openvz_driver.c index 1db3c60..0bae4fd 100644 --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -781,12 +781,3 @@ int openvzRegister(void) { } #endif /* WITH_OPENVZ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/openvz_driver.h b/src/openvz_driver.h index 0ffcfc6..0c1716c 100644 --- a/src/openvz_driver.h +++ b/src/openvz_driver.h @@ -52,13 +52,3 @@ int openvzRegister(void); fprintf(stderr, "\n"); } #endif - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/parthelper.c b/src/parthelper.c index 44cc052..d593c49 100644 --- a/src/parthelper.c +++ b/src/parthelper.c @@ -112,16 +112,3 @@ int main(int argc, char **argv) return 0; } -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/proxy_internal.c b/src/proxy_internal.c index 7022323..2a9fb55 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -1108,17 +1108,3 @@ xenProxyDomainGetOSType(virDomainPtr domain) } #endif /* WITH_XEN */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/proxy_internal.h b/src/proxy_internal.h index fb44d0d..0d8e5a8 100644 --- a/src/proxy_internal.h +++ b/src/proxy_internal.h @@ -102,17 +102,3 @@ extern char * xenProxyDomainDumpXML(virDomainPtr domain, } #endif /* __cplusplus */ #endif /* __LIBVIR_PROXY_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 6ff0852..774183b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -3257,12 +3257,3 @@ int qemudDeleteConfig(virConnectPtr conn, } #endif /* WITH_QEMU */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/qemu_conf.h b/src/qemu_conf.h index f52b359..c59b1fa 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -434,12 +434,3 @@ char * qemudGenerateNetworkXML (virConnectPtr conn, #endif /* WITH_QEMU */ #endif /* __QEMUD_CONF_H */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 87b58db..0ed4262 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -3104,12 +3104,3 @@ int qemudRegister(void) { } #endif /* WITH_QEMU */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/qemu_driver.h b/src/qemu_driver.h index 72b397c..a8a0319 100644 --- a/src/qemu_driver.h +++ b/src/qemu_driver.h @@ -36,12 +36,3 @@ int qemudRegister(void); #endif /* WITH_QEMU */ #endif /* QEMUD_DRIVER_H */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/qparams.c b/src/qparams.c index 1c06fb1..c5ed1f6 100644 --- a/src/qparams.c +++ b/src/qparams.c @@ -231,17 +231,3 @@ qparam_query_parse (const char *query) free_qparam_set (ps); return NULL; } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/qparams.h b/src/qparams.h index 09b460a..8cdaeae 100644 --- a/src/qparams.h +++ b/src/qparams.h @@ -54,17 +54,3 @@ extern struct qparam_set *qparam_query_parse (const char *query); extern void free_qparam_set (struct qparam_set *ps); #endif /* _QPARAMS_H_ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/remote_internal.c b/src/remote_internal.c index 38eed42..065ee97 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -4813,17 +4813,3 @@ remoteRegister (void) return 0; } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/remote_internal.h b/src/remote_internal.h index ce8f400..336b9a5 100644 --- a/src/remote_internal.h +++ b/src/remote_internal.h @@ -51,17 +51,3 @@ int remoteRegister (void); } #endif #endif /* __VIR_REMOTE_INTERNAL_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/stats_linux.c b/src/stats_linux.c index 4cbe92a..bf46ca2 100644 --- a/src/stats_linux.c +++ b/src/stats_linux.c @@ -445,16 +445,3 @@ linuxDomainInterfaceStats (virConnectPtr conn, const char *path, } #endif /* __linux__ */ -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/stats_linux.h b/src/stats_linux.h index ada4005..8fd9b00 100644 --- a/src/stats_linux.h +++ b/src/stats_linux.h @@ -26,16 +26,3 @@ extern int xenLinuxDomainDeviceID(virConnectPtr conn, int domid, const char *dev #endif /* __linux__ */ #endif /* __STATS_LINUX_H__ */ -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend.c b/src/storage_backend.c index 92aecfd..65847fb 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -623,18 +623,3 @@ virStorageBackendRunProgNul(virConnectPtr conn, return 0; } - - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend.h b/src/storage_backend.h index 1533e7e..0ec0d90 100644 --- a/src/storage_backend.h +++ b/src/storage_backend.h @@ -143,17 +143,3 @@ int virStorageBackendRunProgNul(virConnectPtr conn, void *data); #endif /* __VIR_STORAGE_BACKEND_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_disk.c b/src/storage_backend_disk.c index 55bfd8d..0efc968 100644 --- a/src/storage_backend_disk.c +++ b/src/storage_backend_disk.c @@ -521,17 +521,3 @@ virStorageBackend virStorageBackendDisk = { .volType = VIR_STORAGE_VOL_BLOCK, }; - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_disk.h b/src/storage_backend_disk.h index e80ac61..e1c7391 100644 --- a/src/storage_backend_disk.h +++ b/src/storage_backend_disk.h @@ -29,17 +29,3 @@ extern virStorageBackend virStorageBackendDisk; #endif /* __VIR_STORAGE_BACKEND_DISK_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 867910f..d0eb32a 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -1108,17 +1108,3 @@ virStorageBackend virStorageBackendNetFileSystem = { .volType = VIR_STORAGE_VOL_FILE, }; #endif /* WITH_STORAGE_FS */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_fs.h b/src/storage_backend_fs.h index 3b8697f..2136d68 100644 --- a/src/storage_backend_fs.h +++ b/src/storage_backend_fs.h @@ -33,17 +33,3 @@ extern virStorageBackend virStorageBackendNetFileSystem; extern virStorageBackend virStorageBackendDirectory; #endif /* __VIR_STORAGE_BACKEND_FS_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_iscsi.c b/src/storage_backend_iscsi.c index da2b666..02bf8a3 100644 --- a/src/storage_backend_iscsi.c +++ b/src/storage_backend_iscsi.c @@ -520,17 +520,3 @@ virStorageBackend virStorageBackendISCSI = { .volType = VIR_STORAGE_VOL_BLOCK, }; - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_iscsi.h b/src/storage_backend_iscsi.h index fb902fd..665ed13 100644 --- a/src/storage_backend_iscsi.h +++ b/src/storage_backend_iscsi.h @@ -29,17 +29,3 @@ extern virStorageBackend virStorageBackendISCSI; #endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index f8a075d..2d5dd70 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -515,17 +515,3 @@ virStorageBackend virStorageBackendLogical = { .volType = VIR_STORAGE_VOL_BLOCK, }; - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_backend_logical.h b/src/storage_backend_logical.h index b3fade4..19814df 100644 --- a/src/storage_backend_logical.h +++ b/src/storage_backend_logical.h @@ -29,17 +29,3 @@ extern virStorageBackend virStorageBackendLogical; #endif /* __VIR_STORAGE_BACKEND_LOGVOL_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_conf.c b/src/storage_conf.c index 0c19aef..566aaeb 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -1236,17 +1236,3 @@ virStoragePoolObjDeleteDef(virConnectPtr conn, return 0; } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_conf.h b/src/storage_conf.h index 9ed5e9f..e3577b5 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -297,18 +297,3 @@ void virStoragePoolObjRemove(virStorageDriverStatePtr driver, virStoragePoolObjPtr pool); #endif /* __VIR_STORAGE_DRIVER_H__ */ - - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_driver.c b/src/storage_driver.c index fc3db4c..d0e38f6 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -1250,17 +1250,3 @@ int storageRegister(void) { virRegisterStateDriver(&stateDriver); return 0; } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/storage_driver.h b/src/storage_driver.h index 9c332bb..500ea02 100644 --- a/src/storage_driver.h +++ b/src/storage_driver.h @@ -29,17 +29,3 @@ int storageRegister(void); #endif /* __VIR_STORAGE_DRIVER_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/test.c b/src/test.c index 0a3779a..84c6fc5 100644 --- a/src/test.c +++ b/src/test.c @@ -2116,17 +2116,3 @@ testRegister(void) } #endif /* WITH_TEST */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/test.h b/src/test.h index a20ee22..ffc5d7b 100644 --- a/src/test.h +++ b/src/test.h @@ -36,12 +36,3 @@ int testRegister(void); } #endif #endif /* __VIR_TEST_INTERNAL_H__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/util.c b/src/util.c index 801f615..595e721 100644 --- a/src/util.c +++ b/src/util.c @@ -769,11 +769,3 @@ virParseMacAddr(const char* str, unsigned char *addr) return -1; } - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * End: - */ diff --git a/src/uuid.c b/src/uuid.c index 78b90e5..fea1764 100644 --- a/src/uuid.c +++ b/src/uuid.c @@ -187,13 +187,3 @@ void virUUIDFormat(const unsigned char *uuid, char *uuidstr) uuid[12], uuid[13], uuid[14], uuid[15]); uuidstr[VIR_UUID_STRING_BUFLEN-1] = '\0'; } - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/virsh.c b/src/virsh.c index 9534af4..817cb98 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -6615,17 +6615,3 @@ main(int argc, char **argv) vshDeinit(ctl); exit(ret ? EXIT_SUCCESS : EXIT_FAILURE); } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/virterror.c b/src/virterror.c index 21109f2..35328b0 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -716,17 +716,3 @@ __virErrorMsg(virErrorNumber error, const char *info) } return (errmsg); } - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xen_internal.c b/src/xen_internal.c index 9189e32..7ad0803 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -3278,16 +3278,3 @@ xenHypervisorGetVcpuMax(virDomainPtr domain) } #endif /* WITH_XEN */ -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xen_unified.c b/src/xen_unified.c index d67332f..d9117d9 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -1324,17 +1324,3 @@ xenUnifiedRegister (void) } #endif /* WITH_XEN */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xen_unified.h b/src/xen_unified.h index dda2679..c530508 100644 --- a/src/xen_unified.h +++ b/src/xen_unified.h @@ -127,17 +127,3 @@ char *xenDomainUsedCpus(virDomainPtr dom); #endif #endif /* __VIR_XEN_UNIFIED_H__ */ - -/* - * vim: set tabstop=4: - * vim: set shiftwidth=4: - * vim: set expandtab: - */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xend_internal.c b/src/xend_internal.c index 29d9762..877b487 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -3946,12 +3946,3 @@ error: #endif /* ! PROXY */ #endif /* WITH_XEN */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xm_internal.c b/src/xm_internal.c index f609029..e759345 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -3161,11 +3161,3 @@ xenXMDomainDetachDevice(virDomainPtr domain, const char *xml) { } #endif /* WITH_XEN */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xml.c b/src/xml.c index 0864dc3..429c1d7 100644 --- a/src/xml.c +++ b/src/xml.c @@ -1773,12 +1773,3 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class, } #endif /* WITH_XEN */ #endif /* !PROXY */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/src/xs_internal.c b/src/xs_internal.c index d1cf8d8..c944cd2 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -950,11 +950,3 @@ char *xenStoreDomainGetName(virConnectPtr conn, #endif /* WITH_XEN */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index c80e65c..8cde403 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -100,12 +100,3 @@ main(int argc, char **argv) exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f4b3e32..59ea21d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -202,12 +202,3 @@ main(int argc, char **argv) int main (void) { exit (77); /* means 'test skipped' for automake */ } #endif /* WITH_QEMU */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f37f948..69cf77b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -165,12 +165,3 @@ main(int argc, char **argv) int main (void) { exit (77); /* means 'test skipped' to automake */ } #endif /* WITH_QEMU */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index d6dae0d..06c2b01 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -306,11 +306,3 @@ main(void) return(0); } #endif /* WITH_XEN */ -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/statstest.c b/tests/statstest.c index 2d6fc1d..9c0981d 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -216,12 +216,3 @@ main(void) #endif exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/testutils.c b/tests/testutils.c index 80b1022..238c229 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -206,13 +206,3 @@ int virtTestCaptureProgramOutput(const char *const argv[], } } } - - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/testutils.h b/tests/testutils.h index c3a9ab1..44bbb4c 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -36,12 +36,3 @@ extern "C" { } #endif #endif /* __VIT_TEST_UTILS_H__ */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 424eae4..c2161f1 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -344,12 +344,3 @@ main(void) return(0); } #endif /* WITH_XEN */ - -/* - * Local variables: - * indent-tabs-mode: nil - * c-indent-level: 4 - * c-basic-offset: 4 - * tab-width: 4 - * End: - */ -- 1.5.5.24.g3cff

3 2

[Libvir] [PATCH] Enable 'make syntax-check's sc_changelog rule.
by Jim Meyering 10 Apr '08

10 Apr '08

I went ahead and wrote the change: Enable 'make syntax-check's sc_changelog rule. * Makefile.maint (sc_changelog): Adapt to work with legacy ChangeLog entry header lines. * Makefile.cfg (local-checks-to-skip): Remove sc_changelog. --- Makefile.cfg | 1 - Makefile.maint | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.cfg b/Makefile.cfg index 7e8ddcf..e0d5528 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -32,7 +32,6 @@ local-checks-to-skip = \ sc_GPL_version \ sc_always_defined_macros \ sc_cast_of_alloca_return_value \ - sc_changelog \ sc_dd_max_sym_length \ sc_error_exit_success \ sc_file_system \ diff --git a/Makefile.maint b/Makefile.maint index a357d74..65d6fc2 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -166,8 +166,12 @@ sc_obsolete_symbols: # FIXME: warn about definitions of EXIT_FAILURE, EXIT_SUCCESS, STREQ # Each nonempty line must start with a year number, or a TAB. +# Or day-of-week+space. +changelog_entry_header_regexp = \ + ([12][0-9][0-9][0-9]| .|(Mon|Tue|Wed|Thu|Fri|Sat|Sun) ) sc_changelog: - @grep -n '^[^12 ]' $$(find . -maxdepth 2 -name ChangeLog) && \ + @grep -Evn '(^$$|^$(changelog_entry_header_regexp))' \ + $$(find . -maxdepth 2 -name ChangeLog) && \ { echo '$(ME): found unexpected prefix in a ChangeLog' 1>&2; \ exit 1; } || : -- 1.5.5.rc2.7.g144a

2 2

[Libvir] What is the Difference Between virConnCopyLastError and virCopyLastError?
by ajishrao 10 Apr '08

10 Apr '08

Hi, I am little confused about these api's such as virConnCopyLastError and virCopyLastError. Please correct my understanding. 1. virConnCopyLastError expects 2 parameter connection and virErrorPtr, This is used only after getting successful connection, If i call this without connection say it is NULL, I hope it will return -1 if no what will it return? 2. virCopyLastError expects on 1 parameter virErrorPtr, this can be used any time, even before getting connection, If it is No. Then when will i use virCopyLastError api? 3. If virConnectOpen/virConnectOpenReadOnly fails which api should be called to know the error code? Thanks & Regards --Ajish

3 2

[Libvir] [PATCH] Have xenDaemonDetachDevice() remove device configuration
by Ryan Scott 10 Apr '08

10 Apr '08

When a user runs 'virsh detach-disk' on a running domain, the disk is removed, but reappears after the domain is rebooted. This seems odd, as someone who types detach-disk most likely wants the change to be permanent. This patch updates the code in xenDaemonDetachDevice() to pass the rm_cfg flag to Xen, so that the change is committed to the domain's configuration file. This change depends on a xen patch that was committed to unstable on March 20: http://lists.xensource.com/archives/html/xen-changelog/2008-03/msg00122.html -Ryan diff --git a/src/xend_internal.c b/src/xend_internal.c --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -3347,7 +3347,7 @@ xenDaemonDetachDevice(virDomainPtr domai if (virDomainXMLDevID(domain, xml, class, ref, sizeof(ref))) return (-1); return(xend_op(domain->conn, domain->name, "op", "device_destroy", - "type", class, "dev", ref, NULL)); + "type", class, "dev", ref, "force", "0", "rm_cfg", "1", NULL)); }

4 5

[Libvir] [PATCH 0/2] Start, shutdown and destroy linux containers
by Dave Leskovec 10 Apr '08

10 Apr '08

Reposting the patches to start, shutdown and destroy containers with updates for feedback received so far. Thanks! -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

2 3

[Libvir] [PATCH 2/2] lxc: Shutdown and destroy container
by Dave Leskovec 10 Apr '08

10 Apr '08

This is a repost of the shutdown and destroy container support. Changes in this version: * Moved state changes to after the signal is successfully sent rather than restoring if it failed. * Signal handling in lxc_container goes away since the tty forwarding process is no longer the container root process. * Since the tty forwarding process is now outside the container, we have to kill and wait for it in the destroy. Thanks! -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

2 2

[Libvir] [PATCH 1/2] lxc: start container
by Dave Leskovec 10 Apr '08

10 Apr '08

This is a repost of the start container support. Changes from the last version: * Report an error when allocation for init string fails in lxcExecContainerInit() * Change to find by name in lxcStartDomain() * Move tty forwarding process outside of the container. This allows consolidating the forwarding into a single process at a later time. This also means the the container init process as specified by the user now runs as the container root process with pid = 1. The tty setup will require some (hopefully minor) modifications when pts namespaces are enabled. * Add header comments to a number of the functions. This is an updated rough outline of the functions involved in starting a container and the namespace and process under which they run: lxcVmStart() - runs under libvirtd process lxcSetupTtyTunnel() - opens and configures parent tty lxcSetupContainerTty() - opens container tty fork child process calls lxcTtyForward() see below parent continues lxcStartContainer - see below return lxcStartContainer() - runs in parent namespace, libvirtd process Allocate stack for container clone() - child process will start in lxcChild() see below return lxcChild() - runs within container, child process from clone() mount user filesystems mount container /proc lxcExecWithTty() - see below, will not return lxcExecWithTty() - runs within container, root process lxcSetContainerStdio - sets container tty as primary console lxcExecContainerInit - see below, should not return exit() lxcExecContainerInit() - runs within container, root process exec containers init if exec fails, exit() Thanks! -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

2 2