diff for duplicates of <524AB3AE.5000503@suse.de> diff --git a/a/1.txt b/N1/1.txt index c86012c..0a0800b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -213,7 +213,8 @@ Alex > -int kvm_init(void) > +int kvm_init(QEMUMachine *machine) > { -> static const char upgrade_note[] > "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n" +> static const char upgrade_note[] = +> "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n" > @@ -1350,7 +1352,7 @@ int kvm_init(void) > KVMState *s; > const KVMCapabilityInfo *missing_cap; @@ -349,7 +350,7 @@ Alex > +int xen_init(QEMUMachine *machine) > { > xen_xc = xen_xc_interface_open(0, 0, 0); -> if (xen_xc = XC_HANDLER_INITIAL_VALUE) { +> if (xen_xc == XC_HANDLER_INITIAL_VALUE) { > diff --git a/xen-stub.c b/xen-stub.c > index ad189a6..59927cb 100644 > --- a/xen-stub.c diff --git a/a/content_digest b/N1/content_digest index 2f29bc3..c6bdc94 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,15 +6,14 @@ "ref\087ob79cjvm.fsf@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [RFC PATCH 00/11 Allow PR and HV KVM to coexist in one kernel\0" - "Date\0Tue, 01 Oct 2013 11:36:14 +0000\0" + "Date\0Tue, 01 Oct 2013 13:36:14 +0200\0" "To\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" - "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" - Paul Mackerras <paulus@samba.org> - linuxppc-dev@lists.ozlabs.org - kvm-ppc@vger.kernel.org - <kvm@vger.kernel.org> list <kvm@vger.kernel.org> + "Cc\0<kvm@vger.kernel.org> list <kvm@vger.kernel.org>" Gleb Natapov <gleb@redhat.com> + kvm-ppc@vger.kernel.org + Paul Mackerras <paulus@samba.org> Paolo Bonzini <pbonzini@redhat.com> + linuxppc-dev@lists.ozlabs.org " Andreas F\303\244rber <afaerber@suse.de>\0" "\00:1\0" "b\0" @@ -233,7 +232,8 @@ "> -int kvm_init(void)\n" "> +int kvm_init(QEMUMachine *machine)\n" "> {\n" - "> static const char upgrade_note[] > \"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\\n\"\n" + "> static const char upgrade_note[] =\n" + "> \"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\\n\"\n" "> @@ -1350,7 +1352,7 @@ int kvm_init(void)\n" "> KVMState *s;\n" "> const KVMCapabilityInfo *missing_cap;\n" @@ -369,7 +369,7 @@ "> +int xen_init(QEMUMachine *machine)\n" "> {\n" "> xen_xc = xen_xc_interface_open(0, 0, 0);\n" - "> if (xen_xc = XC_HANDLER_INITIAL_VALUE) {\n" + "> if (xen_xc == XC_HANDLER_INITIAL_VALUE) {\n" "> diff --git a/xen-stub.c b/xen-stub.c\n" "> index ad189a6..59927cb 100644\n" "> --- a/xen-stub.c\n" @@ -406,4 +406,4 @@ "> -aneesh\n" > -bb61a4ee830a9b1caaf2352f4128c11f5bb7bf45ecee4eff7a005530b779f941 +dd473cbaf4fc0178e3810d99cafe398fb6748d4e8aac0909ac60ad77e57914f1
diff --git a/a/1.txt b/N2/1.txt index c86012c..0a0800b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -213,7 +213,8 @@ Alex > -int kvm_init(void) > +int kvm_init(QEMUMachine *machine) > { -> static const char upgrade_note[] > "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n" +> static const char upgrade_note[] = +> "Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\n" > @@ -1350,7 +1352,7 @@ int kvm_init(void) > KVMState *s; > const KVMCapabilityInfo *missing_cap; @@ -349,7 +350,7 @@ Alex > +int xen_init(QEMUMachine *machine) > { > xen_xc = xen_xc_interface_open(0, 0, 0); -> if (xen_xc = XC_HANDLER_INITIAL_VALUE) { +> if (xen_xc == XC_HANDLER_INITIAL_VALUE) { > diff --git a/xen-stub.c b/xen-stub.c > index ad189a6..59927cb 100644 > --- a/xen-stub.c diff --git a/a/content_digest b/N2/content_digest index 2f29bc3..4bfc656 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -6,7 +6,7 @@ "ref\087ob79cjvm.fsf@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [RFC PATCH 00/11 Allow PR and HV KVM to coexist in one kernel\0" - "Date\0Tue, 01 Oct 2013 11:36:14 +0000\0" + "Date\0Tue, 01 Oct 2013 13:36:14 +0200\0" "To\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Cc\0Benjamin Herrenschmidt <benh@kernel.crashing.org>" Paul Mackerras <paulus@samba.org> @@ -233,7 +233,8 @@ "> -int kvm_init(void)\n" "> +int kvm_init(QEMUMachine *machine)\n" "> {\n" - "> static const char upgrade_note[] > \"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\\n\"\n" + "> static const char upgrade_note[] =\n" + "> \"Please upgrade to at least kernel 2.6.29 or recent kvm-kmod\\n\"\n" "> @@ -1350,7 +1352,7 @@ int kvm_init(void)\n" "> KVMState *s;\n" "> const KVMCapabilityInfo *missing_cap;\n" @@ -369,7 +370,7 @@ "> +int xen_init(QEMUMachine *machine)\n" "> {\n" "> xen_xc = xen_xc_interface_open(0, 0, 0);\n" - "> if (xen_xc = XC_HANDLER_INITIAL_VALUE) {\n" + "> if (xen_xc == XC_HANDLER_INITIAL_VALUE) {\n" "> diff --git a/xen-stub.c b/xen-stub.c\n" "> index ad189a6..59927cb 100644\n" "> --- a/xen-stub.c\n" @@ -406,4 +407,4 @@ "> -aneesh\n" > -bb61a4ee830a9b1caaf2352f4128c11f5bb7bf45ecee4eff7a005530b779f941 +e2c87f702eb2b5d0896757baab8952dd6bb6d09cd75bc18d307ae5ab31fb9fb9
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.