← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to hw/misc/applesmc.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/misc/applesmc.c
73
73
struct AppleSMCState {
74
74
    ISADevice parent_obj;
75
75
 
 
76
    MemoryRegion io_data;
 
77
    MemoryRegion io_cmd;
76
78
    uint32_t iobase;
77
79
    uint8_t cmd;
78
80
    uint8_t status;
86
88
    QLIST_HEAD(, AppleSMCData) data_def;
87
89
};
88
90
 
89
 
static void applesmc_io_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
 
91
static void applesmc_io_cmd_write(void *opaque, hwaddr addr, uint64_t val,
 
92
                                  unsigned size)
90
93
{
91
94
    AppleSMCState *s = opaque;
92
95
 
115
118
    }
116
119
}
117
120
 
118
 
static void applesmc_io_data_writeb(void *opaque, uint32_t addr, uint32_t val)
 
121
static void applesmc_io_data_write(void *opaque, hwaddr addr, uint64_t val,
 
122
                                   unsigned size)
119
123
{
120
124
    AppleSMCState *s = opaque;
121
125
 
138
142
    }
139
143
}
140
144
 
141
 
static uint32_t applesmc_io_data_readb(void *opaque, uint32_t addr1)
 
145
static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr1,
 
146
                                      unsigned size)
142
147
{
143
148
    AppleSMCState *s = opaque;
144
149
    uint8_t retval = 0;
162
167
    return retval;
163
168
}
164
169
 
165
 
static uint32_t applesmc_io_cmd_readb(void *opaque, uint32_t addr1)
 
170
static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr1, unsigned size)
166
171
{
167
172
    AppleSMCState *s = opaque;
168
173
 
201
206
    applesmc_add_key(s, "MSSD", 1, "\0x3");
202
207
}
203
208
 
204
 
static int applesmc_isa_init(ISADevice *dev)
 
209
static const MemoryRegionOps applesmc_data_io_ops = {
 
210
    .write = applesmc_io_data_write,
 
211
    .read = applesmc_io_data_read,
 
212
    .endianness = DEVICE_NATIVE_ENDIAN,
 
213
    .impl = {
 
214
        .min_access_size = 1,
 
215
        .max_access_size = 1,
 
216
    },
 
217
};
 
218
 
 
219
static const MemoryRegionOps applesmc_cmd_io_ops = {
 
220
    .write = applesmc_io_cmd_write,
 
221
    .read = applesmc_io_cmd_read,
 
222
    .endianness = DEVICE_NATIVE_ENDIAN,
 
223
    .impl = {
 
224
        .min_access_size = 1,
 
225
        .max_access_size = 1,
 
226
    },
 
227
};
 
228
 
 
229
static void applesmc_isa_realize(DeviceState *dev, Error **errp)
205
230
{
206
231
    AppleSMCState *s = APPLE_SMC(dev);
207
232
 
208
 
    register_ioport_read(s->iobase + APPLESMC_DATA_PORT, 4, 1,
209
 
                         applesmc_io_data_readb, s);
210
 
    register_ioport_read(s->iobase + APPLESMC_CMD_PORT, 4, 1,
211
 
                         applesmc_io_cmd_readb, s);
212
 
    register_ioport_write(s->iobase + APPLESMC_DATA_PORT, 4, 1,
213
 
                          applesmc_io_data_writeb, s);
214
 
    register_ioport_write(s->iobase + APPLESMC_CMD_PORT, 4, 1,
215
 
                          applesmc_io_cmd_writeb, s);
 
233
    memory_region_init_io(&s->io_data, OBJECT(s), &applesmc_data_io_ops, s,
 
234
                          "applesmc-data", 4);
 
235
    isa_register_ioport(&s->parent_obj, &s->io_data,
 
236
                        s->iobase + APPLESMC_DATA_PORT);
 
237
 
 
238
    memory_region_init_io(&s->io_cmd, OBJECT(s), &applesmc_cmd_io_ops, s,
 
239
                          "applesmc-cmd", 4);
 
240
    isa_register_ioport(&s->parent_obj, &s->io_cmd,
 
241
                        s->iobase + APPLESMC_CMD_PORT);
216
242
 
217
243
    if (!s->osk || (strlen(s->osk) != 64)) {
218
244
        fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n");
220
246
    }
221
247
 
222
248
    QLIST_INIT(&s->data_def);
223
 
    qdev_applesmc_isa_reset(&dev->qdev);
224
 
 
225
 
    return 0;
 
249
    qdev_applesmc_isa_reset(dev);
226
250
}
227
251
 
228
252
static Property applesmc_isa_properties[] = {
235
259
static void qdev_applesmc_class_init(ObjectClass *klass, void *data)
236
260
{
237
261
    DeviceClass *dc = DEVICE_CLASS(klass);
238
 
    ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
239
 
    ic->init = applesmc_isa_init;
 
262
 
 
263
    dc->realize = applesmc_isa_realize;
240
264
    dc->reset = qdev_applesmc_isa_reset;
241
265
    dc->props = applesmc_isa_properties;
 
266
    set_bit(DEVICE_CATEGORY_MISC, dc->categories);
242
267
}
243
268
 
244
269
static const TypeInfo applesmc_isa_info = {