File 0044-s390-Remove-legacy-s390-virtio-mach.patch of Package qemu.4227

Overview Repositories Revisions Requests Users Attributes Meta

File 0044-s390-Remove-legacy-s390-virtio-mach.patch of Package qemu.4227

From 2f9293aa979749c3c5dd2b97a24ad6e91c8c99c3 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Wed, 27 Mar 2013 01:40:20 +0100
Subject: [PATCH] s390: Remove legacy s390-virtio machine type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don't want to confuse users by offering the legacy, broken
machine type -M s390-virtio. Let's just not include the machine
description in the first place..

Signed-off-by: Alexander Graf <agraf@suse.de>
[AF: Explicitly declare s390-virtio-ccw the default for v2.0.0-rc0]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/s390x/s390-virtio-ccw.c | 1 +
 hw/s390x/s390-virtio.c     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 0d4f6ae2f3..1b5bf59b3a 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -147,6 +147,7 @@ static QEMUMachine ccw_machine = {
     .no_sdcard = 1,
     .use_sclp = 1,
     .max_cpus = 255,
+    .is_default = 1,
 };
 
 static void ccw_machine_init(void)
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index aef200310c..01f89d15d5 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -52,7 +52,9 @@
 #define MAX_BLK_DEVS                    10
 #define ZIPL_FILENAME                   "s390-zipl.rom"
 
+#if 0
 static VirtIOS390Bus *s390_bus;
+#endif
 static S390CPU **ipi_states;
 
 S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
@@ -64,6 +66,7 @@ S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
     return ipi_states[cpu_addr];
 }
 
+#if 0
 static int s390_virtio_hcall_notify(const uint64_t *args)
 {
     uint64_t mem = args[0];
@@ -123,6 +126,7 @@ static void s390_virtio_register_hcalls(void)
     s390_register_virtio_hypercall(KVM_S390_VIRTIO_SET_STATUS,
                                    s390_virtio_hcall_set_status);
 }
+#endif
 
 /*
  * The number of running CPUs. On s390 a shutdown is the state of all CPUs
@@ -223,6 +227,7 @@ void s390_create_virtio_net(BusState *bus, const char *name)
     }
 }
 
+#if 0
 /* PC hardware initialisation */
 static void s390_init(QEMUMachineInitArgs *args)
 {
@@ -301,3 +306,4 @@ static void s390_machine_init(void)
 }
 
 machine_init(s390_machine_init);
+#endif

Places

File 0044-s390-Remove-legacy-s390-virtio-mach.patch of Package qemu.4227

Places