Skip to contentSkip to conversation

Fix build on 32 bit hosts

PATCH New Blue Swirl 3 participants 3 messages Feb 2, 2011 – Feb 4, 2011 KVM

lore
Share & tools
lore

Blue Swirl

author
#0 lore raw

PATCH 1/1 Fix build on 32 bit hosts

Signed-off-by Blue Swirl <[email protected]>
---
 target-i386/helper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
target-i386/helper.c +0 -0
index 1217452..4bbf9b1 100644
@@ -1148,7 +1148,7 @@ void cpu_inject_x86_mce(CPUState *cenv, int

bank, uint64_t status,

                     continue;
                 }

- qemu_inject_x86_mce(env, 1, 0xa000000000000000, 0, 0, 0);

+                qemu_inject_x86_mce(env, 1, 0xa000000000000000ULL, 0, 0, 0);
             }
         }
     }
Signature · 1 line
1.6.2.4
#1 lore raw

PATCH 1/1 x86: Fix MCA broadcast parameters for TCG case

Quoted 18 lines · Blue Swirl
Signed-off-by Blue Swirl <[email protected]>
---
 target-i386/helper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
target-i386/helper.c +1 -1
index 1217452..4bbf9b1 100644
@@ -1148,7 +1148,7 @@ void cpu_inject_x86_mce(CPUState *cenv, int
 bank, uint64_t status,
                     continue;
                 }
 
-                qemu_inject_x86_mce(env, 1, 0xa000000000000000, 0, 0, 0);
+                qemu_inject_x86_mce(env, 1, 0xa000000000000000ULL, 0, 0, 0);
             }
         }
Quoted 1 line
     }

Let's fix this for real, the value is wrong anyway:

----------8<----------

From: Jan Kiszka <[email protected]>

When broadcasting MCEs, we need to set MCIP and RIPV in mcg_status like it is done for KVM. Use the symbolic constants at this chance.

Signed-off-by Jan Kiszka <[email protected]>
---
 target-i386/helper.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
target-i386/helper.c +2 -2
index d74b6e3..f41416f 100644
@@ -1145,8 +1145,8 @@ void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,
                 if (cenv == env) {
                     continue;
                 }
-
-                qemu_inject_x86_mce(env, 1, 0xa000000000000000, 0, 0, 0);
+                qemu_inject_x86_mce(env, 1, MCI_STATUS_VAL | MCI_STATUS_UC,
+                                    MCG_STATUS_MCIP | MCG_STATUS_RIPV, 0, 0);
             }
         }
     }
Signature · 1 line
1.7.1
Applied
#2 lore raw

Re: [PATCH] x86: Fix MCA broadcast parameters for TCG case

Quoted 23 lines · Jan Kiszka
Quoted 18 lines · Blue Swirl
Signed-off-by Blue Swirl <[email protected]>
---
 target-i386/helper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
target-i386/helper.c +1 -1
index 1217452..4bbf9b1 100644
@@ -1148,7 +1148,7 @@ void cpu_inject_x86_mce(CPUState *cenv, int
 bank, uint64_t status,
                     continue;
                 }
 
-                qemu_inject_x86_mce(env, 1, 0xa000000000000000, 0, 0, 0);
+                qemu_inject_x86_mce(env, 1, 0xa000000000000000ULL, 0, 0, 0);
             }
         }
Quoted 1 line
     }

Let's fix this for real, the value is wrong anyway:

Quoted 8 lines

----------8<----------

From: Jan Kiszka <[email protected]>

When broadcasting MCEs, we need to set MCIP and RIPV in mcg_status like it is done for KVM. Use the symbolic constants at this chance.

Signed-off-by Jan Kiszka <[email protected]>

Applied to uq/master, thanks.