[Qemu-devel] [PATCH] vdi: remove double conversion

[Qemu-devel] [PATCH] vdi: remove double conversion

[Paolo Bonzini]

This should be a problem when running on big-endian machines.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
	It's time to clean up old branch, and I found this nice little
	patch from May 2012.

 block/vdi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/block/vdi.c b/block/vdi.c
index 119d3c7..993430e 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -237,7 +237,6 @@ static void vdi_header_to_le(VdiHeader *header)
     cpu_to_le32s(&header->block_extra);
     cpu_to_le32s(&header->blocks_in_image);
     cpu_to_le32s(&header->blocks_allocated);
-    cpu_to_le32s(&header->blocks_allocated);
     uuid_convert(header->uuid_image);
     uuid_convert(header->uuid_last_snap);
     uuid_convert(header->uuid_link);
-- 
1.8.3.1

[Qemu-devel] [PATCH] x86: correctly implement soft reset

[Paolo Bonzini]

Do not do a hard reset for port 92h, keyboard controller, or cf9h soft reset.
These only reset the CPU.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpus.c                |  9 +++++++++
 hw/i386/pc.c          |  3 ++-
 hw/input/pckbd.c      |  5 +++--
 hw/isa/lpc_ich9.c     | 12 ++++++++++--
 hw/pci-host/piix.c    |  8 ++++++--
 include/sysemu/cpus.h |  1 +
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/cpus.c b/cpus.c
index dd7ac13..822211e 100644
--- a/cpus.c
+++ b/cpus.c
@@ -494,6 +494,15 @@ void hw_error(const char *fmt, ...)
     abort();
 }
 
+void cpu_soft_reset(void)
+{
+    CPUState *cpu;
+
+    CPU_FOREACH(cpu) {
+        cpu_interrupt(cpu, CPU_INTERRUPT_RESET);
+    }
+}
+
 void cpu_synchronize_all_states(void)
 {
     CPUState *cpu;
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index e6369d5..346d6b3 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -45,6 +45,7 @@
 #include "kvm_i386.h"
 #include "hw/xen/xen.h"
 #include "sysemu/blockdev.h"
+#include "sysemu/cpus.h"
 #include "hw/block/block.h"
 #include "ui/qemu-spice.h"
 #include "exec/memory.h"
@@ -477,7 +478,7 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val,
     s->outport = val;
     qemu_set_irq(*s->a20_out, (val >> 1) & 1);
     if ((val & 1) && !(oldval & 1)) {
-        qemu_system_reset_request();
+        cpu_soft_reset();
     }
 }
 
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 29af3d7..fd87776 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -26,6 +26,7 @@
 #include "hw/i386/pc.h"
 #include "hw/input/ps2.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
 
 /* debug PC keyboard */
 //#define DEBUG_KBD
@@ -220,7 +221,7 @@ static void outport_write(KBDState *s, uint32_t val)
         qemu_set_irq(*s->a20_out, (val >> 1) & 1);
     }
     if (!(val & 1)) {
-        qemu_system_reset_request();
+        cpu_soft_reset();
     }
 }
 
@@ -299,7 +300,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,
         s->outport &= ~KBD_OUT_A20;
         break;
     case KBD_CCMD_RESET:
-        qemu_system_reset_request();
+        cpu_soft_reset();
         break;
     case KBD_CCMD_NO_OP:
         /* ignore that */
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index 51ce12d..e9fde85 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -45,6 +45,7 @@
 #include "hw/pci/pci_bus.h"
 #include "exec/address-spaces.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/cpus.h"
 
 static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
 
@@ -507,8 +508,15 @@ static void ich9_rst_cnt_write(void *opaque, hwaddr addr, uint64_t val,
     ICH9LPCState *lpc = opaque;
 
     if (val & 4) {
-        qemu_system_reset_request();
-        return;
+        /* In a real ICH9, FULL_RST affects whether the hardware goes to S5
+         * for 3-5 seconds, but is not enough alone; you need to set SYS_RST
+         * too.
+         */
+        if (val & 2) {
+            qemu_system_reset_request();
+        } else {
+            cpu_soft_reset();
+        }
     }
     lpc->rst_cnt = val & 0xA; /* keep FULL_RST (bit 3) and SYS_RST (bit 1) */
 }
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index ffdc853..1e60172 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -34,6 +34,7 @@
 #include "sysemu/sysemu.h"
 #include "hw/i386/ioapic.h"
 #include "qapi/visitor.h"
+#include "sysemu/cpus.h"
 
 /*
  * I440FX chipset data sheet.
@@ -587,8 +588,11 @@ static void rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned len)
     PIIX3State *d = opaque;
 
     if (val & 4) {
-        qemu_system_reset_request();
-        return;
+        if (val & 2) {
+            qemu_system_reset_request();
+        } else {
+            cpu_soft_reset();
+        }
     }
     d->rcr = val & 2; /* keep System Reset type only */
 }
diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
index 6502488..87b9829 100644
--- a/include/sysemu/cpus.h
+++ b/include/sysemu/cpus.h
@@ -7,6 +7,7 @@ void resume_all_vcpus(void);
 void pause_all_vcpus(void);
 void cpu_stop_current(void);
 
+void cpu_soft_reset(void);
 void cpu_synchronize_all_states(void);
 void cpu_synchronize_all_post_reset(void);
 void cpu_synchronize_all_post_init(void);
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] x86: correctly implement soft reset

[Paolo Bonzini]

Il 06/06/2014 16:06, Paolo Bonzini ha scritto:
> Do not do a hard reset for port 92h, keyboard controller, or cf9h soft reset.
> These only reset the CPU.
>
> Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  cpus.c                |  9 +++++++++
>  hw/i386/pc.c          |  3 ++-
>  hw/input/pckbd.c      |  5 +++--
>  hw/isa/lpc_ich9.c     | 12 ++++++++++--
>  hw/pci-host/piix.c    |  8 ++++++--
>  include/sysemu/cpus.h |  1 +
>  6 files changed, 31 insertions(+), 7 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index dd7ac13..822211e 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -494,6 +494,15 @@ void hw_error(const char *fmt, ...)
>      abort();
>  }
>
> +void cpu_soft_reset(void)
> +{
> +    CPUState *cpu;
> +
> +    CPU_FOREACH(cpu) {
> +        cpu_interrupt(cpu, CPU_INTERRUPT_RESET);
> +    }
> +}
> +
>  void cpu_synchronize_all_states(void)
>  {
>      CPUState *cpu;
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index e6369d5..346d6b3 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -45,6 +45,7 @@
>  #include "kvm_i386.h"
>  #include "hw/xen/xen.h"
>  #include "sysemu/blockdev.h"
> +#include "sysemu/cpus.h"
>  #include "hw/block/block.h"
>  #include "ui/qemu-spice.h"
>  #include "exec/memory.h"
> @@ -477,7 +478,7 @@ static void port92_write(void *opaque, hwaddr addr, uint64_t val,
>      s->outport = val;
>      qemu_set_irq(*s->a20_out, (val >> 1) & 1);
>      if ((val & 1) && !(oldval & 1)) {
> -        qemu_system_reset_request();
> +        cpu_soft_reset();
>      }
>  }
>
> diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
> index 29af3d7..fd87776 100644
> --- a/hw/input/pckbd.c
> +++ b/hw/input/pckbd.c
> @@ -26,6 +26,7 @@
>  #include "hw/i386/pc.h"
>  #include "hw/input/ps2.h"
>  #include "sysemu/sysemu.h"
> +#include "sysemu/cpus.h"
>
>  /* debug PC keyboard */
>  //#define DEBUG_KBD
> @@ -220,7 +221,7 @@ static void outport_write(KBDState *s, uint32_t val)
>          qemu_set_irq(*s->a20_out, (val >> 1) & 1);
>      }
>      if (!(val & 1)) {
> -        qemu_system_reset_request();
> +        cpu_soft_reset();
>      }
>  }
>
> @@ -299,7 +300,7 @@ static void kbd_write_command(void *opaque, hwaddr addr,
>          s->outport &= ~KBD_OUT_A20;
>          break;
>      case KBD_CCMD_RESET:
> -        qemu_system_reset_request();
> +        cpu_soft_reset();
>          break;
>      case KBD_CCMD_NO_OP:
>          /* ignore that */
> diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
> index 51ce12d..e9fde85 100644
> --- a/hw/isa/lpc_ich9.c
> +++ b/hw/isa/lpc_ich9.c
> @@ -45,6 +45,7 @@
>  #include "hw/pci/pci_bus.h"
>  #include "exec/address-spaces.h"
>  #include "sysemu/sysemu.h"
> +#include "sysemu/cpus.h"
>
>  static int ich9_lpc_sci_irq(ICH9LPCState *lpc);
>
> @@ -507,8 +508,15 @@ static void ich9_rst_cnt_write(void *opaque, hwaddr addr, uint64_t val,
>      ICH9LPCState *lpc = opaque;
>
>      if (val & 4) {
> -        qemu_system_reset_request();
> -        return;
> +        /* In a real ICH9, FULL_RST affects whether the hardware goes to S5
> +         * for 3-5 seconds, but is not enough alone; you need to set SYS_RST
> +         * too.
> +         */
> +        if (val & 2) {
> +            qemu_system_reset_request();
> +        } else {
> +            cpu_soft_reset();
> +        }
>      }
>      lpc->rst_cnt = val & 0xA; /* keep FULL_RST (bit 3) and SYS_RST (bit 1) */
>  }
> diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
> index ffdc853..1e60172 100644
> --- a/hw/pci-host/piix.c
> +++ b/hw/pci-host/piix.c
> @@ -34,6 +34,7 @@
>  #include "sysemu/sysemu.h"
>  #include "hw/i386/ioapic.h"
>  #include "qapi/visitor.h"
> +#include "sysemu/cpus.h"
>
>  /*
>   * I440FX chipset data sheet.
> @@ -587,8 +588,11 @@ static void rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned len)
>      PIIX3State *d = opaque;
>
>      if (val & 4) {
> -        qemu_system_reset_request();
> -        return;
> +        if (val & 2) {
> +            qemu_system_reset_request();
> +        } else {
> +            cpu_soft_reset();
> +        }
>      }
>      d->rcr = val & 2; /* keep System Reset type only */
>  }
> diff --git a/include/sysemu/cpus.h b/include/sysemu/cpus.h
> index 6502488..87b9829 100644
> --- a/include/sysemu/cpus.h
> +++ b/include/sysemu/cpus.h
> @@ -7,6 +7,7 @@ void resume_all_vcpus(void);
>  void pause_all_vcpus(void);
>  void cpu_stop_current(void);
>
> +void cpu_soft_reset(void);
>  void cpu_synchronize_all_states(void);
>  void cpu_synchronize_all_post_reset(void);
>  void cpu_synchronize_all_post_init(void);
>

Nevermind, this patch is an old one.

Paolo

Re: [Qemu-devel] [Qemu-trivial] [PATCH] x86: correctly implement soft reset

[Michael Tokarev]

06.06.2014 18:06, Paolo Bonzini wrote:
> Do not do a hard reset for port 92h, keyboard controller, or cf9h soft reset.
> These only reset the CPU.

I'm not sure how this is -trivial material? :)

Thanks,

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH] x86: correctly implement soft reset

[Michael Tokarev]

08.06.2014 17:15, Michael Tokarev wrote:
> 06.06.2014 18:06, Paolo Bonzini wrote:
>> Do not do a hard reset for port 92h, keyboard controller, or cf9h soft reset.
>> These only reset the CPU.
> 
> I'm not sure how this is -trivial material? :)

Ping?
This patch hasn't been applied so far, do you want to actually push it?

Thanks,

/mjt

Re: [Qemu-devel] [Qemu-trivial] [PATCH] x86: correctly implement soft reset

[Paolo Bonzini]

Il 21/06/2014 17:12, Michael Tokarev ha scritto:
>>> >> Do not do a hard reset for port 92h, keyboard controller, or cf9h soft reset.
>>> >> These only reset the CPU.
>> >
>> > I'm not sure how this is -trivial material? :)
> Ping?
> This patch hasn't been applied so far, do you want to actually push it?

No, I submitted this by mistake.  This version of the patch had review 
comments that I haven't had time to address yet.

Paolo

Re: [Qemu-devel] [PATCH] vdi: remove double conversion

[Benoît Canet]

The Friday 06 Jun 2014 à 16:06:52 (+0200), Paolo Bonzini wrote :
> This should be a problem when running on big-endian machines.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 	It's time to clean up old branch, and I found this nice little
> 	patch from May 2012.
> 
>  block/vdi.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/block/vdi.c b/block/vdi.c
> index 119d3c7..993430e 100644
> --- a/block/vdi.c
> +++ b/block/vdi.c
> @@ -237,7 +237,6 @@ static void vdi_header_to_le(VdiHeader *header)
>      cpu_to_le32s(&header->block_extra);
>      cpu_to_le32s(&header->blocks_in_image);
>      cpu_to_le32s(&header->blocks_allocated);
> -    cpu_to_le32s(&header->blocks_allocated);
>      uuid_convert(header->uuid_image);
>      uuid_convert(header->uuid_last_snap);
>      uuid_convert(header->uuid_link);
> -- 
> 1.8.3.1
> 
> 
Reviewed-by: Benoit Canet <benoit@irqsave.net>

Re: [Qemu-devel] [PATCH] vdi: remove double conversion

[Stefan Weil]

Am 06.06.2014 16:14, schrieb Benoît Canet:
> The Friday 06 Jun 2014 à 16:06:52 (+0200), Paolo Bonzini wrote :
>> This should be a problem when running on big-endian machines.
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> 	It's time to clean up old branch, and I found this nice little
>> 	patch from May 2012.
>>
>>  block/vdi.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/block/vdi.c b/block/vdi.c
>> index 119d3c7..993430e 100644
>> --- a/block/vdi.c
>> +++ b/block/vdi.c
>> @@ -237,7 +237,6 @@ static void vdi_header_to_le(VdiHeader *header)
>>      cpu_to_le32s(&header->block_extra);
>>      cpu_to_le32s(&header->blocks_in_image);
>>      cpu_to_le32s(&header->blocks_allocated);
>> -    cpu_to_le32s(&header->blocks_allocated);
>>      uuid_convert(header->uuid_image);
>>      uuid_convert(header->uuid_last_snap);
>>      uuid_convert(header->uuid_link);
>> -- 
>> 1.8.3.1
>>
>>
> Reviewed-by: Benoit Canet <benoit@irqsave.net>
> 

Autsch, that's a really old (2009) copy+paste bug. Thanks for fixing it.

Reviewed-by: Stefan Weil <sw@weilnetz.de>
(creator of that bug)

Re: [Qemu-devel] [Qemu-trivial] [PATCH] vdi: remove double conversion

[Michael Tokarev]

Applied to -trivial, thank you!

/mjt