← Back to branch summary

~pmdj/ubuntu/trusty/qemu/2.9+applesmc+fadtv3

« back to all changes in this revision

Viewing changes to hw/s390x/s390-virtio-ccw.c

  • Committer: Phil Dennis-Jordan
  • Date: 2017-07-21 08:03:43 UTC
  • mfrom: (1.1.1)
  • Revision ID: phil@philjordan.eu-20170721080343-2yr2vdj7713czahv
New upstream release 2.9.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/s390x/s390-virtio-ccw.c
63
63
    if (!sch || !css_subch_visible(sch)) {
64
64
        return -EINVAL;
65
65
    }
66
 
    if (queue >= VIRTIO_CCW_QUEUE_MAX) {
 
66
    if (queue >= VIRTIO_QUEUE_MAX) {
67
67
        return -EINVAL;
68
68
    }
69
69
    virtio_queue_notify(virtio_ccw_get_vdev(sch), queue);
116
116
    /* get a BUS */
117
117
    css_bus = virtual_css_bus_init();
118
118
    s390_init_ipl_dev(machine->kernel_filename, machine->kernel_cmdline,
119
 
                      machine->initrd_filename, "s390-ccw.img", true);
 
119
                      machine->initrd_filename, "s390-ccw.img",
 
120
                      "s390-netboot.img", true);
120
121
    s390_flic_init();
121
122
 
122
123
    dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE);
335
336
    }                                                                         \
336
337
    type_init(ccw_machine_register_##suffix)
337
338
 
 
339
#define CCW_COMPAT_2_8 \
 
340
        HW_COMPAT_2_8 \
 
341
        {\
 
342
            .driver   = TYPE_S390_FLIC_COMMON,\
 
343
            .property = "adapter_routes_max_batch",\
 
344
            .value    = "64",\
 
345
        },
 
346
 
338
347
#define CCW_COMPAT_2_7 \
339
348
        HW_COMPAT_2_7
340
349
 
341
350
#define CCW_COMPAT_2_6 \
342
 
        CCW_COMPAT_2_7 \
343
351
        HW_COMPAT_2_6 \
344
352
        {\
345
353
            .driver   = TYPE_S390_IPL,\
352
360
        },
353
361
 
354
362
#define CCW_COMPAT_2_5 \
355
 
        CCW_COMPAT_2_6 \
356
363
        HW_COMPAT_2_5
357
364
 
358
365
#define CCW_COMPAT_2_4 \
395
402
            .value    = "0",\
396
403
        },
397
404
 
 
405
static void ccw_machine_2_9_instance_options(MachineState *machine)
 
406
{
 
407
}
 
408
 
 
409
static void ccw_machine_2_9_class_options(MachineClass *mc)
 
410
{
 
411
}
 
412
DEFINE_CCW_MACHINE(2_9, "2.9", true);
 
413
 
398
414
static void ccw_machine_2_8_instance_options(MachineState *machine)
399
415
{
 
416
    ccw_machine_2_9_instance_options(machine);
400
417
}
401
418
 
402
419
static void ccw_machine_2_8_class_options(MachineClass *mc)
403
420
{
 
421
    ccw_machine_2_9_class_options(mc);
 
422
    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_8);
404
423
}
405
 
DEFINE_CCW_MACHINE(2_8, "2.8", true);
 
424
DEFINE_CCW_MACHINE(2_8, "2.8", false);
406
425
 
407
426
static void ccw_machine_2_7_instance_options(MachineState *machine)
408
427
{