diff for duplicates of <87ob79cjvm.fsf@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index a19290b..24ff194 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -208,7 +208,8 @@ index b87215c..3863abd 100644 -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; @@ -344,7 +345,7 @@ index 839f14f..ac3654b 100644 +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 b1e3706..b1ed9ff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,15 +5,14 @@ "ref\0524990A9.60704@suse.de\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 00/11 Allow PR and HV KVM to coexist in one kernel\0" - "Date\0Tue, 01 Oct 2013 11:38:21 +0000\0" + "Date\0Tue, 01 Oct 2013 16:56:21 +0530\0" "To\0Alexander Graf <agraf@suse.de>\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> - " Paolo Bonzini <pbonzini@redhat.com>\0" + kvm-ppc@vger.kernel.org + Paul Mackerras <paulus@samba.org> + Paolo Bonzini <pbonzini@redhat.com> + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "Alexander Graf <agraf@suse.de> writes:\n" @@ -226,7 +225,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" @@ -362,7 +362,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" @@ -402,4 +402,4 @@ "\n" -aneesh -dcb48e27eb3acc40deee000d8601dbd4d64f1e9f8cde0714734e1d7fe5c8324c +daf86e748016d25ed2b5cfa6f03a5b212302b510b44628c960d67e6e434b0aa8
diff --git a/a/1.txt b/N2/1.txt index a19290b..24ff194 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -208,7 +208,8 @@ index b87215c..3863abd 100644 -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; @@ -344,7 +345,7 @@ index 839f14f..ac3654b 100644 +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 b1e3706..278c822 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,13 +5,13 @@ "ref\0524990A9.60704@suse.de\0" "From\0Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>\0" "Subject\0Re: [RFC PATCH 00/11 Allow PR and HV KVM to coexist in one kernel\0" - "Date\0Tue, 01 Oct 2013 11:38:21 +0000\0" + "Date\0Tue, 01 Oct 2013 16:56:21 +0530\0" "To\0Alexander Graf <agraf@suse.de>\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> + " \\<kvm\\@vger.kernel.org\\> list <kvm@vger.kernel.org>" Gleb Natapov <gleb@redhat.com> " Paolo Bonzini <pbonzini@redhat.com>\0" "\00:1\0" @@ -226,7 +226,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" @@ -362,7 +363,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" @@ -402,4 +403,4 @@ "\n" -aneesh -dcb48e27eb3acc40deee000d8601dbd4d64f1e9f8cde0714734e1d7fe5c8324c +efc9e2f437ef9f75c8c29cef27ba3eca2f08e16547b8e78637a3d989d9ffb5e7
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.