[libvirt] [PATCH v5 1/9] pvs: add driver skeleton

[Dmitry Guryanov]

On 04/20/2012 08:01 PM, Dmitry Guryanov wrote:
> Add driver, which can report node info only.
>
> changes:
>      * add me to AUTHORS
>      * fix indent in preprocessor directives in pvs_driver.h
>      * remove unneded include
>      * remove pvs_driver.c from po/POTFILES.in
>
> Signed-off-by: Dmitry Guryanov<dguryanov at parallels.com>
> ---
>   AUTHORS                     |    1 +
>   cfg.mk                      |    1 +
>   configure.ac                |   23 ++++
>   docs/drvpvs.html.in         |   28 +++++
>   include/libvirt/virterror.h |    1 +
>   libvirt.spec.in             |    7 +
>   mingw32-libvirt.spec.in     |    6 +
>   src/Makefile.am             |   21 ++++
>   src/conf/domain_conf.c      |    3 +-
>   src/conf/domain_conf.h      |    1 +
>   src/driver.h                |    1 +
>   src/libvirt.c               |   12 ++
>   src/pvs/pvs_driver.c        |  271 +++++++++++++++++++++++++++++++++++++++++++
>   src/pvs/pvs_driver.h        |   51 ++++++++
>   src/util/virterror.c        |    3 +
>   15 files changed, 429 insertions(+), 1 deletions(-)
>   create mode 100644 docs/drvpvs.html.in
>   create mode 100644 src/pvs/pvs_driver.c
>   create mode 100644 src/pvs/pvs_driver.h
>
> diff --git a/AUTHORS b/AUTHORS
> index eee4998..f9c1da2 100644
> --- a/AUTHORS
> +++ b/AUTHORS
> @@ -232,6 +232,7 @@ Patches have also been contributed by:
>     Stefan Bader<stefan.bader at canonical.com>
>     MATSUDA Daiki<matsudadik at intellilink.co.jp>
>     Jan Kiszka<jan.kiszka at siemens.com>
> +  Dmitry Guryanov<dguryanov at parallels.com>

There is a conflict here, should I resend this patch series ?



git am 0001-pvs-add-driver-skeleton.patch
Applying: pvs: add driver skeleton
error: patch failed: AUTHORS:232
error: AUTHORS: patch does not apply
Patch failed at 0001 pvs: add driver skeleton
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

>
>     [....send patches to get your name here....]
>
> diff --git a/cfg.mk b/cfg.mk
> index fb4df2f..c5d7f9b 100644
> --- a/cfg.mk
> +++ b/cfg.mk
> @@ -513,6 +513,7 @@ msg_gen_function += PHYP_ERROR
>   msg_gen_function += VIR_ERROR
>
.........

-- 
Dmitry Guryanov