| Message ID | 1307521686-22833-1-git-send-email-hdegoede@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 08.06.2011 10:28, schrieb Hans de Goede: > --- > hw/lsi53c895a.c | 2 -- > target-i386/kvm.c | 4 ++-- > 2 files changed, 2 insertions(+), 4 deletions(-) SoB is missing. And don't we have multiple patches to fix the same thing already? Someone should just merge them... Kevin
On Wed, Jun 08, 2011 at 11:22:06AM +0200, Kevin Wolf wrote: > Am 08.06.2011 10:28, schrieb Hans de Goede: > > --- > > hw/lsi53c895a.c | 2 -- > > target-i386/kvm.c | 4 ++-- > > 2 files changed, 2 insertions(+), 4 deletions(-) > > SoB is missing. And don't we have multiple patches to fix the same thing > already? Someone should just merge them... Yes these fixes have already been submitted several times, it would indeed be good to finally have them merged ;) Christophe
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c index 83084b6..90c6cbc 100644 --- a/hw/lsi53c895a.c +++ b/hw/lsi53c895a.c @@ -889,7 +889,6 @@ static void lsi_do_msgout(LSIState *s) uint8_t msg; int len; uint32_t current_tag; - SCSIDevice *current_dev; lsi_request *current_req, *p, *p_next; int id; @@ -901,7 +900,6 @@ static void lsi_do_msgout(LSIState *s) current_req = lsi_find_by_tag(s, current_tag); } id = (current_tag >> 8) & 0xf; - current_dev = s->bus.devs[id]; DPRINTF("MSG out len=%d\n", s->dbc); while (s->dbc) { diff --git a/target-i386/kvm.c b/target-i386/kvm.c index faedc6c..6f003b0 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -970,7 +970,7 @@ static int kvm_get_xsave(CPUState *env) #ifdef KVM_CAP_XSAVE struct kvm_xsave* xsave; int ret, i; - uint16_t cwd, swd, twd, fop; + uint16_t cwd, swd, twd; if (!kvm_has_xsave()) { return kvm_get_fpu(env); @@ -986,7 +986,7 @@ static int kvm_get_xsave(CPUState *env) cwd = (uint16_t)xsave->region[0]; swd = (uint16_t)(xsave->region[0] >> 16); twd = (uint16_t)xsave->region[1]; - fop = (uint16_t)(xsave->region[1] >> 16); + /* fop = (uint16_t)(xsave->region[1] >> 16); */ env->fpstt = (swd >> 11) & 7; env->fpus = swd; env->fpuc = cwd;