Merge remote-tracking branch 'mst/tags/for_anthony' into staging

[qemu.git] / hw / s390x / ipl.c

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 0aeb003c9d559587f7a959340f9d8756d5bb7d3b..1a6397b88e8173eef1f833e3782ebe808f3e8cb9 100644 (file)
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -62,10 +62,10 @@ typedef struct S390IPLState {
 static int s390_ipl_init(SysBusDevice *dev)
 {
     S390IPLState *ipl = S390_IPL(dev);
 static int s390_ipl_init(SysBusDevice *dev)
 {
     S390IPLState *ipl = S390_IPL(dev);

-    ram_addr_t kernel_size = 0;
+    int kernel_size;

 
     if (!ipl->kernel) {
 
     if (!ipl->kernel) {

-        ram_addr_t bios_size = 0;
+        int bios_size;

         char *bios_filename;
 
         /* Load zipl bootloader */
         char *bios_filename;
 
         /* Load zipl bootloader */


@@ -80,7 +80,7 @@ static int s390_ipl_init(SysBusDevice *dev)
 
         bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL,
                              NULL, 1, ELF_MACHINE, 0);
 
         bios_size = load_elf(bios_filename, NULL, NULL, &ipl->start_addr, NULL,
                              NULL, 1, ELF_MACHINE, 0);

-        if (bios_size == -1UL) {
+        if (bios_size == -1) {

             bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START,
                                             4096);
             ipl->start_addr = ZIPL_IMAGE_START;
             bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START,
                                             4096);
             ipl->start_addr = ZIPL_IMAGE_START;


@@ -90,17 +90,17 @@ static int s390_ipl_init(SysBusDevice *dev)
         }
         g_free(bios_filename);
 
         }
         g_free(bios_filename);
 

-        if ((long)bios_size < 0) {
+        if (bios_size == -1) {

             hw_error("could not load bootloader '%s'\n", bios_name);
         }
         return 0;
     } else {
         kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL, NULL,
                                NULL, 1, ELF_MACHINE, 0);
             hw_error("could not load bootloader '%s'\n", bios_name);
         }
         return 0;
     } else {
         kernel_size = load_elf(ipl->kernel, NULL, NULL, NULL, NULL,
                                NULL, 1, ELF_MACHINE, 0);

-        if (kernel_size == -1UL) {
+        if (kernel_size == -1) {

             kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
         }
             kernel_size = load_image_targphys(ipl->kernel, 0, ram_size);
         }

-        if (kernel_size == -1UL) {
+        if (kernel_size == -1) {

             fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);
             return -1;
         }
             fprintf(stderr, "could not load kernel '%s'\n", ipl->kernel);
             return -1;
         }


@@ -115,7 +115,8 @@ static int s390_ipl_init(SysBusDevice *dev)
         ipl->start_addr = KERN_IMAGE_START;
     }
     if (ipl->initrd) {
         ipl->start_addr = KERN_IMAGE_START;
     }
     if (ipl->initrd) {

-        ram_addr_t initrd_offset, initrd_size;
+        ram_addr_t initrd_offset;
+        int initrd_size;

 
         initrd_offset = INITRD_START;
         while (kernel_size + 0x100000 > initrd_offset) {
 
         initrd_offset = INITRD_START;
         while (kernel_size + 0x100000 > initrd_offset) {


@@ -123,7 +124,7 @@ static int s390_ipl_init(SysBusDevice *dev)
         }
         initrd_size = load_image_targphys(ipl->initrd, initrd_offset,
                                           ram_size - initrd_offset);
         }
         initrd_size = load_image_targphys(ipl->initrd, initrd_offset,
                                           ram_size - initrd_offset);

-        if (initrd_size == -1UL) {
+        if (initrd_size == -1) {

             fprintf(stderr, "qemu: could not load initrd '%s'\n", ipl->initrd);
             exit(1);
         }
             fprintf(stderr, "qemu: could not load initrd '%s'\n", ipl->initrd);
             exit(1);
         }


@@ -154,17 +155,19 @@ static void s390_ipl_reset(DeviceState *dev)
     env->psw.mask = IPL_PSW_MASK;
 
     if (!ipl->kernel) {
     env->psw.mask = IPL_PSW_MASK;
 
     if (!ipl->kernel) {

-        /* booting firmware, tell what device to boot from */
+        /* Tell firmware, if there is a preferred boot device */
+        env->regs[7] = -1;

         DeviceState *dev_st = get_boot_device(0);
         DeviceState *dev_st = get_boot_device(0);

-        VirtioCcwDevice *ccw_dev = (VirtioCcwDevice *) object_dynamic_cast(
-                OBJECT(&(dev_st->parent_obj)), "virtio-blk-ccw");
-
-        if (ccw_dev) {
-            env->regs[7] = ccw_dev->sch->cssid << 24 |
-                           ccw_dev->sch->ssid << 16 |
-                           ccw_dev->sch->devno;
-        } else {
-            env->regs[7] = -1;
+        if (dev_st) {
+            VirtioCcwDevice *ccw_dev = (VirtioCcwDevice *) object_dynamic_cast(
+                OBJECT(qdev_get_parent_bus(dev_st)->parent),
+                TYPE_VIRTIO_CCW_DEVICE);
+
+            if (ccw_dev) {
+                env->regs[7] = ccw_dev->sch->cssid << 24 |
+                               ccw_dev->sch->ssid << 16 |
+                               ccw_dev->sch->devno;
+            }

         }
     }
 
         }
     }
 


@@ -179,7 +182,6 @@ static void s390_ipl_class_init(ObjectClass *klass, void *data)
     k->init = s390_ipl_init;
     dc->props = s390_ipl_properties;
     dc->reset = s390_ipl_reset;
     k->init = s390_ipl_init;
     dc->props = s390_ipl_properties;
     dc->reset = s390_ipl_reset;

-    dc->no_user = 1;

 }
 
 static const TypeInfo s390_ipl_info = {
 }
 
 static const TypeInfo s390_ipl_info = {