Patchwork S390: Bail out whithout KVM

login
register
mail settings
Submitter Alexander Graf
Date Dec. 18, 2009, 3:29 p.m.
Message ID <1261150144-1702-1-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/41413/
State New
Headers show

Comments

Alexander Graf - Dec. 18, 2009, 3:29 p.m.
Currently only the S390 KVM target works. To keep users from accidently not
using KVM, let's not even initialize the machine when KVM is not used.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/s390-virtio.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
Andreas Färber - Dec. 18, 2009, 9:05 p.m.
Hi,

Am 18.12.2009 um 16:29 schrieb Alexander Graf:

> Currently only the S390 KVM target works. To keep users from  
> accidently not
> using KVM, let's not even initialize the machine when KVM is not used.

How does this fit together with your "S390 TCG target" patch? Aren't  
they mutually exclusive?  Is this one for stable?

Andreas

> Signed-off-by: Alexander Graf <agraf@suse.de>
> ---
> hw/s390-virtio.c |    7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
> index b57fa9c..a33076a 100644
> --- a/hw/s390-virtio.c
> +++ b/hw/s390-virtio.c
> @@ -142,6 +142,13 @@ static void s390_init(ram_addr_t ram_size,
>     ram_addr_t initrd_size = 0;
>     int i;
>
> +    /* XXX we only work on KVM for now */
> +
> +    if (!kvm_enabled()) {
> +        fprintf(stderr, "The S390 target only works with KVM enabled 
> \n");
> +        exit(1);
> +    }
> +
>     /* get a BUS */
>     s390_bus = s390_virtio_bus_init(&ram_size);
>
> -- 
> 1.6.0.2
>
>
>
Alexander Graf - Dec. 18, 2009, 9:07 p.m.
Andreas Färber wrote:
> Hi,
>
> Am 18.12.2009 um 16:29 schrieb Alexander Graf:
>
>> Currently only the S390 KVM target works. To keep users from
>> accidently not
>> using KVM, let's not even initialize the machine when KVM is not used.
>
> How does this fit together with your "S390 TCG target" patch? Aren't
> they mutually exclusive?  Is this one for stable?

They go hand in hand.

The TCG patch is to enable S390x hosts, so you can run
qemu-system-x86_64 on S390.
This patch is for S390x guests, so qemu-system-s390x refuses to start
without -enable-kvm.

Alex
Andreas Färber - Dec. 18, 2009, 9:23 p.m.
Am 18.12.2009 um 22:07 schrieb Alexander Graf:

> Andreas Färber wrote:
>> Hi,
>>
>> Am 18.12.2009 um 16:29 schrieb Alexander Graf:
>>
>>> Currently only the S390 KVM target works. To keep users from
>>> accidently not
>>> using KVM, let's not even initialize the machine when KVM is not  
>>> used.
>>
>> How does this fit together with your "S390 TCG target" patch? Aren't
>> they mutually exclusive?  Is this one for stable?
>
> They go hand in hand.
>
> The TCG patch is to enable S390x hosts, so you can run
> qemu-system-x86_64 on S390.
> This patch is for S390x guests, so qemu-system-s390x refuses to start
> without -enable-kvm.

Ouch! Thanks for clarifying.

Andreas

Patch

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index b57fa9c..a33076a 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -142,6 +142,13 @@  static void s390_init(ram_addr_t ram_size,
     ram_addr_t initrd_size = 0;
     int i;
 
+    /* XXX we only work on KVM for now */
+
+    if (!kvm_enabled()) {
+        fprintf(stderr, "The S390 target only works with KVM enabled\n");
+        exit(1);
+    }
+
     /* get a BUS */
     s390_bus = s390_virtio_bus_init(&ram_size);