39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From c8c702a9970572800626be337e3b5c8b44e4bcca Mon Sep 17 00:00:00 2001
|
|
From: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
Date: Sat, 25 Nov 2023 02:43:50 -0800
|
|
Subject: [PATCH] hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM)
|
|
|
|
cherry picked from commit 99337bd1e3a323d07dc29da99cf3f48d3990ad81
|
|
|
|
Signed-off-by: Lev Kujawski <lkujaw@member.fsf.org>
|
|
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
|
Message-Id: <20220528204702.167912-1-lkujaw@member.fsf.org>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
Signed-off-by: Wanghe Xiao <xiaowanghe_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/ide/atapi.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
|
|
index b626199e3d..88b2890faf 100644
|
|
--- a/hw/ide/atapi.c
|
|
+++ b/hw/ide/atapi.c
|
|
@@ -318,7 +318,7 @@ static void ide_atapi_cmd_reply(IDEState *s, int size, int max_size)
|
|
}
|
|
}
|
|
|
|
-/* start a CD-CDROM read command */
|
|
+/* start a CD-ROM read command */
|
|
static void ide_atapi_cmd_read_pio(IDEState *s, int lba, int nb_sectors,
|
|
int sector_size)
|
|
{
|
|
@@ -417,7 +417,7 @@ eot:
|
|
ide_set_inactive(s, false);
|
|
}
|
|
|
|
-/* start a CD-CDROM read command with DMA */
|
|
+/* start a CD-ROM read command with DMA */
|
|
/* XXX: test if DMA is available */
|
|
static void ide_atapi_cmd_read_dma(IDEState *s, int lba, int nb_sectors,
|
|
int sector_size)
|
|
--
|
|
2.27.0
|
|
|