diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/audio/virtio-snd.c | 2 | ||||
| -rw-r--r-- | hw/cxl/cxl-component-utils.c | 4 | ||||
| -rw-r--r-- | hw/cxl/cxl-mailbox-utils.c | 2 | ||||
| -rw-r--r-- | hw/mem/memory-device.c | 2 | ||||
| -rw-r--r-- | hw/net/cadence_gem.c | 8 | ||||
| -rw-r--r-- | hw/ppc/spapr_pci.c | 4 | ||||
| -rw-r--r-- | hw/watchdog/wdt_aspeed.c | 1 |
7 files changed, 11 insertions, 12 deletions
diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c index a18a9949a7..2fe966e311 100644 --- a/hw/audio/virtio-snd.c +++ b/hw/audio/virtio-snd.c @@ -1126,7 +1126,7 @@ static void virtio_snd_realize(DeviceState *dev, Error **errp) status = virtio_snd_set_pcm_params(vsnd, i, &default_params); if (status != cpu_to_le32(VIRTIO_SND_S_OK)) { error_setg(errp, - "Can't initalize stream params, device responded with %s.", + "Can't initialize stream params, device responded with %s.", print_code(status)); return; } diff --git a/hw/cxl/cxl-component-utils.c b/hw/cxl/cxl-component-utils.c index d0245cc55d..29d477492b 100644 --- a/hw/cxl/cxl-component-utils.c +++ b/hw/cxl/cxl-component-utils.c @@ -81,7 +81,7 @@ static uint64_t cxl_cache_mem_read_reg(void *opaque, hwaddr offset, return 0; default: /* - * In line with specifiction limitaions on access sizes, this + * In line with specification limitaions on access sizes, this * routine is not called with other sizes. */ g_assert_not_reached(); @@ -152,7 +152,7 @@ static void cxl_cache_mem_write_reg(void *opaque, hwaddr offset, uint64_t value, return; default: /* - * In line with specifiction limitaions on access sizes, this + * In line with specification limitaions on access sizes, this * routine is not called with other sizes. */ g_assert_not_reached(); diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index b365575097..6eff56fb1b 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -431,7 +431,7 @@ static CXLRetCode cmd_identify_switch_device(const struct cxl_cmd *cmd, out = (struct cxl_fmapi_ident_switch_dev_resp_pl *)payload_out; *out = (struct cxl_fmapi_ident_switch_dev_resp_pl) { .num_physical_ports = num_phys_ports + 1, /* 1 USP */ - .num_vcss = 1, /* Not yet support multiple VCS - potentialy tricky */ + .num_vcss = 1, /* Not yet support multiple VCS - potentially tricky */ .active_vcs_bitmask[0] = 0x1, .total_vppbs = num_phys_ports + 1, .bound_vppbs = num_phys_ports + 1, diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index e0704b8dc3..a1b1af26bc 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -29,7 +29,7 @@ static bool memory_device_is_empty(const MemoryDeviceState *md) /* dropping const here is fine as we don't touch the memory region */ mr = mdc->get_memory_region((MemoryDeviceState *)md, &local_err); if (local_err) { - /* Not empty, we'll report errors later when ontaining the MR again. */ + /* Not empty, we'll report errors later when containing the MR again. */ error_free(local_err); return false; } diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 5b989f5b52..19adbc0e19 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -225,8 +225,8 @@ REG32(WOLAN, 0xb8) /* Wake on LAN reg */ REG32(IPGSTRETCH, 0xbc) /* IPG Stretch reg */ REG32(SVLAN, 0xc0) /* Stacked VLAN reg */ REG32(MODID, 0xfc) /* Module ID reg */ -REG32(OCTTXLO, 0x100) /* Octects transmitted Low reg */ -REG32(OCTTXHI, 0x104) /* Octects transmitted High reg */ +REG32(OCTTXLO, 0x100) /* Octets transmitted Low reg */ +REG32(OCTTXHI, 0x104) /* Octets transmitted High reg */ REG32(TXCNT, 0x108) /* Error-free Frames transmitted */ REG32(TXBCNT, 0x10c) /* Error-free Broadcast Frames */ REG32(TXMCNT, 0x110) /* Error-free Multicast Frame */ @@ -245,8 +245,8 @@ REG32(EXCESSCOLLCNT, 0x140) /* Excessive Collision Frames */ REG32(LATECOLLCNT, 0x144) /* Late Collision Frames */ REG32(DEFERTXCNT, 0x148) /* Deferred Transmission Frames */ REG32(CSENSECNT, 0x14c) /* Carrier Sense Error Counter */ -REG32(OCTRXLO, 0x150) /* Octects Received register Low */ -REG32(OCTRXHI, 0x154) /* Octects Received register High */ +REG32(OCTRXLO, 0x150) /* Octets Received register Low */ +REG32(OCTRXHI, 0x154) /* Octets Received register High */ REG32(RXCNT, 0x158) /* Error-free Frames Received */ REG32(RXBROADCNT, 0x15c) /* Error-free Broadcast Frames RX */ REG32(RXMULTICNT, 0x160) /* Error-free Multicast Frames RX */ diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c index a27024e45a..6760823e13 100644 --- a/hw/ppc/spapr_pci.c +++ b/hw/ppc/spapr_pci.c @@ -1555,7 +1555,7 @@ static void spapr_pci_pre_plug(HotplugHandler *plug_handler, */ if (plugged_dev->hotplugged) { error_setg(errp, QERR_BUS_NO_HOTPLUG, - object_get_typename(OBJECT(phb))); + phb->parent_obj.bus->qbus.name); return; } } @@ -1676,7 +1676,7 @@ static void spapr_pci_unplug_request(HotplugHandler *plug_handler, if (!phb->dr_enabled) { error_setg(errp, QERR_BUS_NO_HOTPLUG, - object_get_typename(OBJECT(phb))); + phb->parent_obj.bus->qbus.name); return; } diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index d267aa185c..273a49d360 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -14,7 +14,6 @@ #include "qemu/module.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" -#include "hw/misc/aspeed_scu.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" #include "hw/watchdog/wdt_aspeed.h" |