mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial patches 20200901 # gpg: Signature made Tue 01 Sep 2020 15:08:59 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-5.2-pull-request: (44 commits) docs/system: Fix grammar in documentation main-loop: Fix comment hw/display/vga:Remove redundant statement in vga_draw_graphic() hw/intc: fix default registers value in exynos4210_combiner_read() usb/bus: Remove dead assignment in usb_get_fw_dev_path() vfio/platform: Remove dead assignment in vfio_intp_interrupt() hw/net/virtio-net:Remove redundant statement in virtio_net_rsc_tcp_ctrl_check() hw/virtio/vhost-user:Remove dead assignment in scrub_shadow_regions() target/arm/translate-a64:Remove redundant statement in disas_simd_two_reg_misc_fp16() target/arm/translate-a64:Remove dead assignment in handle_scalar_simd_shli() hw/arm/omap1:Remove redundant statement in omap_clkdsp_read() hw/arm/virt-acpi-build:Remove dead assignment in build_madt() linux-user: Add strace support for printing OFD fcntl operations util/vfio-helpers: Unify trace-events size format hw/net/xilinx_axienet: Remove unused code hw/scsi/scsi-disk: Replace magic '512' value by BDRV_SECTOR_SIZE hw/ide/pci: Replace magic '512' value by BDRV_SECTOR_SIZE hw/ide/atapi: Replace magic '512' value by BDRV_SECTOR_SIZE hw/ide/ahci: Replace magic '512' value by BDRV_SECTOR_SIZE hw/ide/core: Trivial typo fix ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
@@ -48,13 +48,14 @@ Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
|
||||
Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
|
||||
Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com>
|
||||
Frederic Konrad <konrad@adacore.com> <fred.konrad@greensocs.com>
|
||||
Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
|
||||
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
|
||||
Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>
|
||||
Radoslaw Biernacki <rad@semihalf.com> <radoslaw.biernacki@linaro.org>
|
||||
Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
|
||||
Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
|
||||
Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
|
||||
Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
|
||||
Paul Burton <paulburton@kernel.org> <paul@archlinuxmips.org>
|
||||
Paul Burton <paulburton@kernel.org> <pburton@wavecomp.com>
|
||||
Stefan Brankovic <stefan.brankovic@syrmia.com> <stefan.brankovic@rt-rk.com.com>
|
||||
Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
|
||||
|
||||
|
||||
@@ -171,6 +171,7 @@ AVR TCG CPUs
|
||||
M: Michael Rolnik <mrolnik@gmail.com>
|
||||
R: Sarah Harris <S.E.Harris@kent.ac.uk>
|
||||
S: Maintained
|
||||
F: docs/system/target-avr.rst
|
||||
F: gdb-xml/avr-cpu.xml
|
||||
F: target/avr/
|
||||
F: tests/acceptance/machine_avr6.py
|
||||
|
||||
@@ -1053,14 +1053,11 @@ static int vmdk_open_sparse(BlockDriverState *bs, BdrvChild *file, int flags,
|
||||
switch (magic) {
|
||||
case VMDK3_MAGIC:
|
||||
return vmdk_open_vmfs_sparse(bs, file, flags, errp);
|
||||
break;
|
||||
case VMDK4_MAGIC:
|
||||
return vmdk_open_vmdk4(bs, file, flags, options, errp);
|
||||
break;
|
||||
default:
|
||||
error_setg(errp, "Image not in VMDK format");
|
||||
return -EINVAL;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -95,10 +95,10 @@ References
|
||||
-----------------
|
||||
|
||||
AMD Memory Encryption whitepaper:
|
||||
http://amd-dev.wpengine.netdna-cdn.com/wordpress/media/2013/12/AMD_Memory_Encryption_Whitepaper_v7-Public.pdf
|
||||
https://developer.amd.com/wordpress/media/2013/12/AMD_Memory_Encryption_Whitepaper_v7-Public.pdf
|
||||
|
||||
Secure Encrypted Virtualization Key Management:
|
||||
[1] http://support.amd.com/TechDocs/55766_SEV-KM API_Specification.pdf
|
||||
[1] http://developer.amd.com/wordpress/media/2017/11/55766_SEV-KM-API_Specification.pdf
|
||||
|
||||
KVM Forum slides:
|
||||
http://www.linux-kvm.org/images/7/74/02x08A-Thomas_Lendacky-AMDs_Virtualizatoin_Memory_Encryption_Technology.pdf
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ over-commit and, even if not implemented yet, migration support will be
|
||||
possible with some HW assistance.
|
||||
|
||||
A project presentation accompany this document:
|
||||
- http://events.linuxfoundation.org/sites/events/files/slides/lpc-2017-pvrdma-marcel-apfelbaum-yuval-shaia.pdf
|
||||
- https://blog.linuxplumbersconf.org/2017/ocw/system/presentations/4730/original/lpc-2017-pvrdma-marcel-apfelbaum-yuval-shaia.pdf
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -57,12 +57,12 @@ macOS
|
||||
-----
|
||||
|
||||
The project supports building with the two most recent versions of
|
||||
macOS, with the current homebrew package set available.
|
||||
macOS, with the current Homebrew package set available.
|
||||
|
||||
FreeBSD
|
||||
-------
|
||||
|
||||
The project aims to support the all the versions which are not end of
|
||||
The project aims to support all versions which are not end of
|
||||
life.
|
||||
|
||||
NetBSD
|
||||
@@ -75,5 +75,5 @@ new major version is released.
|
||||
OpenBSD
|
||||
-------
|
||||
|
||||
The project aims to support the all the versions which are not end of
|
||||
The project aims to support all versions which are not end of
|
||||
life.
|
||||
|
||||
+26
-15
@@ -17,21 +17,32 @@ https://github.com/seharris/qemu-avr-tests/blob/master/free-rtos/Demo/AVR_ATMega
|
||||
Following are examples of possible usages, assuming demo.elf is compiled for
|
||||
AVR cpu
|
||||
|
||||
- Continuous non interrupted execution:
|
||||
``qemu-system-avr -machine mega2560 -bios demo.elf``
|
||||
- Continuous non interrupted execution::
|
||||
|
||||
- Continuous non interrupted execution with serial output into telnet window:
|
||||
``qemu-system-avr -machine mega2560 -bios demo.elf -serial
|
||||
tcp::5678,server,nowait -nographic``
|
||||
and then in another shell
|
||||
``telnet localhost 5678``
|
||||
qemu-system-avr -machine mega2560 -bios demo.elf
|
||||
|
||||
- Debugging wit GDB debugger:
|
||||
``qemu-system-avr -machine mega2560 -bios demo.elf -s -S``
|
||||
and then in another shell
|
||||
``avr-gdb demo.elf``
|
||||
and then within GDB shell
|
||||
``target remote :1234``
|
||||
- Continuous non interrupted execution with serial output into telnet window::
|
||||
|
||||
- Print out executed instructions:
|
||||
``qemu-system-avr -machine mega2560 -bios demo.elf -d in_asm``
|
||||
qemu-system-avr -M mega2560 -bios demo.elf -nographic \
|
||||
-serial tcp::5678,server,nowait
|
||||
|
||||
and then in another shell::
|
||||
|
||||
telnet localhost 5678
|
||||
|
||||
- Debugging wit GDB debugger::
|
||||
|
||||
qemu-system-avr -machine mega2560 -bios demo.elf -s -S
|
||||
|
||||
and then in another shell::
|
||||
|
||||
avr-gdb demo.elf
|
||||
|
||||
and then within GDB shell::
|
||||
|
||||
target remote :1234
|
||||
|
||||
- Print out executed instructions (that have not been translated by the JIT
|
||||
compiler yet)::
|
||||
|
||||
qemu-system-avr -machine mega2560 -bios demo.elf -d in_asm
|
||||
|
||||
@@ -1774,7 +1774,6 @@ static uint64_t omap_clkdsp_read(void *opaque, hwaddr addr,
|
||||
return s->clkm.dsp_rstct2;
|
||||
|
||||
case 0x18: /* DSP_SYSST */
|
||||
cpu = CPU(s->cpu);
|
||||
return (s->clkm.clocking_scheme << 11) | s->clkm.cold_start |
|
||||
(cpu->halted << 6); /* Quite useless... */
|
||||
}
|
||||
|
||||
@@ -633,12 +633,11 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
|
||||
int madt_start = table_data->len;
|
||||
const MemMapEntry *memmap = vms->memmap;
|
||||
const int *irqmap = vms->irqmap;
|
||||
AcpiMultipleApicTable *madt;
|
||||
AcpiMadtGenericDistributor *gicd;
|
||||
AcpiMadtGenericMsiFrame *gic_msi;
|
||||
int i;
|
||||
|
||||
madt = acpi_data_push(table_data, sizeof *madt);
|
||||
acpi_data_push(table_data, sizeof(AcpiMultipleApicTable));
|
||||
|
||||
gicd = acpi_data_push(table_data, sizeof *gicd);
|
||||
gicd->type = ACPI_APIC_GENERIC_DISTRIBUTOR;
|
||||
|
||||
@@ -213,7 +213,6 @@ static uint32_t pflash_devid_query(PFlashCFI01 *pfl, hwaddr offset)
|
||||
default:
|
||||
trace_pflash_device_info(offset);
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
/* Replicate responses for each device in bank. */
|
||||
if (pfl->device_width < pfl->bank_width) {
|
||||
|
||||
+2
-1
@@ -64,7 +64,7 @@ void foreach_dynamic_sysbus_device(FindSysbusDeviceFunc *func, void *opaque)
|
||||
.opaque = opaque,
|
||||
};
|
||||
|
||||
/* Loop through all sysbus devices that were spawened outside the machine */
|
||||
/* Loop through all sysbus devices that were spawned outside the machine */
|
||||
container = container_get(qdev_get_machine(), "/peripheral");
|
||||
find_sysbus_device(container, &find);
|
||||
container = container_get(qdev_get_machine(), "/peripheral-anon");
|
||||
@@ -199,6 +199,7 @@ void sysbus_init_mmio(SysBusDevice *dev, MemoryRegion *memory)
|
||||
|
||||
MemoryRegion *sysbus_mmio_get_region(SysBusDevice *dev, int n)
|
||||
{
|
||||
assert(n >= 0 && n < QDEV_MAX_MMIO);
|
||||
return dev->mmio[n].memory;
|
||||
}
|
||||
|
||||
|
||||
@@ -1637,7 +1637,6 @@ static int cirrus_vga_read_cr(CirrusVGAState * s, unsigned reg_index)
|
||||
return s->vga.cr[s->vga.cr_index];
|
||||
case 0x26: // Attribute Controller Index Readback (R)
|
||||
return s->vga.ar_index & 0x3f;
|
||||
break;
|
||||
default:
|
||||
qemu_log_mask(LOG_GUEST_ERROR,
|
||||
"cirrus: inport cr_index 0x%02x\n", reg_index);
|
||||
|
||||
@@ -161,7 +161,6 @@ static int qxl_log_cmd_draw(PCIQXLDevice *qxl, QXLDrawable *draw, int group_id)
|
||||
switch (draw->type) {
|
||||
case QXL_DRAW_COPY:
|
||||
return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@@ -180,7 +179,6 @@ static int qxl_log_cmd_draw_compat(PCIQXLDevice *qxl, QXLCompatDrawable *draw,
|
||||
switch (draw->type) {
|
||||
case QXL_DRAW_COPY:
|
||||
return qxl_log_cmd_draw_copy(qxl, &draw->u.copy, group_id);
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1674,7 +1674,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update)
|
||||
if (!(s->cr[VGA_CRTC_MODE] & 2)) {
|
||||
addr = (addr & ~0x8000) | ((y1 & 2) << 14);
|
||||
}
|
||||
update = full_update;
|
||||
page0 = addr & s->vbe_size_mask;
|
||||
page1 = (addr + bwidth - 1) & s->vbe_size_mask;
|
||||
if (full_update) {
|
||||
|
||||
@@ -51,11 +51,9 @@ static uint8_t max7310_rx(I2CSlave *i2c)
|
||||
switch (s->command) {
|
||||
case 0x00: /* Input port */
|
||||
return s->level ^ s->polarity;
|
||||
break;
|
||||
|
||||
case 0x01: /* Output port */
|
||||
return s->level & ~s->direction;
|
||||
break;
|
||||
|
||||
case 0x02: /* Polarity inversion */
|
||||
return s->polarity;
|
||||
@@ -65,7 +63,6 @@ static uint8_t max7310_rx(I2CSlave *i2c)
|
||||
|
||||
case 0x04: /* Timeout */
|
||||
return s->status;
|
||||
break;
|
||||
|
||||
case 0xff: /* Reserved */
|
||||
return 0xff;
|
||||
|
||||
@@ -3168,7 +3168,6 @@ static int vtd_irte_get(IntelIOMMUState *iommu, uint16_t index,
|
||||
index, entry->irte.sid_vtype);
|
||||
/* Take this as verification failure. */
|
||||
return -VTD_FR_IR_SID_ERR;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s)
|
||||
|
||||
ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret));
|
||||
fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret));
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
||||
+3
-2
@@ -1151,7 +1151,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis,
|
||||
if (!ncq_tfs->sector_count) {
|
||||
ncq_tfs->sector_count = 0x10000;
|
||||
}
|
||||
size = ncq_tfs->sector_count * 512;
|
||||
size = ncq_tfs->sector_count * BDRV_SECTOR_SIZE;
|
||||
ahci_populate_sglist(ad, &ncq_tfs->sglist, ncq_tfs->cmdh, size, 0);
|
||||
|
||||
if (ncq_tfs->sglist.size < size) {
|
||||
@@ -1703,7 +1703,8 @@ static int ahci_state_post_load(void *opaque, int version_id)
|
||||
return -1;
|
||||
}
|
||||
ahci_populate_sglist(ncq_tfs->drive, &ncq_tfs->sglist,
|
||||
ncq_tfs->cmdh, ncq_tfs->sector_count * 512,
|
||||
ncq_tfs->cmdh,
|
||||
ncq_tfs->sector_count * BDRV_SECTOR_SIZE,
|
||||
0);
|
||||
if (ncq_tfs->sector_count != ncq_tfs->sglist.size >> 9) {
|
||||
return -1;
|
||||
|
||||
+4
-4
@@ -824,9 +824,9 @@ static void cmd_get_configuration(IDEState *s, uint8_t *buf)
|
||||
*
|
||||
* Only a problem if the feature/profiles grow.
|
||||
*/
|
||||
if (max_len > 512) {
|
||||
if (max_len > BDRV_SECTOR_SIZE) {
|
||||
/* XXX: assume 1 sector */
|
||||
max_len = 512;
|
||||
max_len = BDRV_SECTOR_SIZE;
|
||||
}
|
||||
|
||||
memset(buf, 0, max_len);
|
||||
@@ -1186,8 +1186,8 @@ static void cmd_read_dvd_structure(IDEState *s, uint8_t* buf)
|
||||
}
|
||||
}
|
||||
|
||||
memset(buf, 0, max_len > IDE_DMA_BUF_SECTORS * 512 + 4 ?
|
||||
IDE_DMA_BUF_SECTORS * 512 + 4 : max_len);
|
||||
memset(buf, 0, max_len > IDE_DMA_BUF_SECTORS * BDRV_SECTOR_SIZE + 4 ?
|
||||
IDE_DMA_BUF_SECTORS * BDRV_SECTOR_SIZE + 4 : max_len);
|
||||
|
||||
switch (format) {
|
||||
case 0x00 ... 0x7f:
|
||||
|
||||
+1
-1
@@ -709,7 +709,7 @@ void ide_cancel_dma_sync(IDEState *s)
|
||||
/*
|
||||
* We can't cancel Scatter Gather DMA in the middle of the
|
||||
* operation or a partial (not full) DMA transfer would reach
|
||||
* the storage so we wait for completion instead (we beahve
|
||||
* the storage so we wait for completion instead (we behave
|
||||
* like if the DMA was completed by the time the guest trying
|
||||
* to cancel dma with bmdma_cmd_writeb with BM_CMD_START not
|
||||
* set).
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user