Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

monitor: Add support for write command #1589

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+95 −23
Open

monitor: Add support for write command #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1457044
Added write monitor command
jamesbrq Feb 17, 2024
f13bfe3
Sdd support of write monitor command
jamesbrq Feb 17, 2024
206596b
Added support for virtual memory vs physical memory
jamesbrq Feb 20, 2024
7a22cac
Added write monitor command
jamesbrq Feb 17, 2024
5533e88
Sdd support of write monitor command
jamesbrq Feb 17, 2024
199445f
Added support for virtual memory vs physical memory
jamesbrq Feb 20, 2024
bf0193b
Merge branch 'master' of https://github.com/jamesbrq/xemu
jamesbrq Apr 16, 2024
b96f564
Merge branch 'master' into master
jamesbrq Apr 23, 2024
30eea59
Merge branch 'master' into master
jamesbrq May 7, 2024
6d275c5
Merge branch 'xemu-project:master' into master
jamesbrq Jul 5, 2024
203597b
Merge branch 'xemu-project:master' into master
jamesbrq Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions hmp-commands.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,35 @@ ERST
.cmd = hmp_quit,
.flags = "p",
},

SRST
``w``
Write to virtual memory.
ERST

{
.name = "w",
.args_type = "addr:l,size:i,data:i",
.params = "addr size data",
.help = "write to virtual memory",
.cmd = hmp_write,
.flags = "p",
},

SRST
``wp``
Write to physical memory.
ERST

{
.name = "wp",
.args_type = "addr:l,size:i,data:i",
.params = "addr size data",
.help = "write to physical memory",
.cmd = hmp_write_physical,
.flags = "p",
},

SRST
``quit`` or ``q``
Quit the emulator.
Expand Down
2 changes: 2 additions & 0 deletions include/exec/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,6 +2721,8 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
hwaddr len,
bool is_write);

void ram_write(hwaddr addr, void *ptr, hwaddr len, int is_physcial);

/**
* address_space_cache_invalidate: complete a write to a #MemoryRegionCache
*
Expand Down
2 changes: 2 additions & 0 deletions include/monitor/hmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

bool hmp_handle_error(Monitor *mon, Error *err);

void hmp_write(Monitor *mon, const QDict *qdict);
void hmp_write_physical(Monitor *mon, const QDict *qdict);
void hmp_info_name(Monitor *mon, const QDict *qdict);
void hmp_info_version(Monitor *mon, const QDict *qdict);
void hmp_info_kvm(Monitor *mon, const QDict *qdict);
Expand Down
55 changes: 36 additions & 19 deletions monitor/hmp-cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,18 @@
*/

#include "qemu/osdep.h"
#include "monitor/hmp.h"
#include "net/net.h"
#include "net/eth.h"
#include "chardev/char.h"
#include "sysemu/block-backend.h"
#include "sysemu/runstate.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/timer.h"
#include "qemu/sockets.h"
#include "qemu/help_option.h"
#include "exec/memory.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert any non-essential changes to this header order

#include "hw/core/cpu.h"
#include "hw/intc/intc.h"
#include "migration/misc.h"
#include "migration/snapshot.h"
#include "monitor/hmp.h"
#include "monitor/monitor-internal.h"
#include "qapi/error.h"
#include "net/eth.h"
#include "net/net.h"
#include "qapi/clone-visitor.h"
#include "qapi/error.h"
#include "qapi/opts-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-block.h"
Expand All @@ -44,21 +42,24 @@
#include "qapi/qapi-commands-tpm.h"
#include "qapi/qapi-commands-ui.h"
#include "qapi/qapi-commands-virtio.h"
#include "qapi/qapi-visit-virtio.h"
#include "qapi/qapi-visit-net.h"
#include "qapi/qapi-visit-migration.h"
#include "qapi/qapi-visit-net.h"
#include "qapi/qapi-visit-virtio.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
#include "qom/object_interfaces.h"
#include "ui/console.h"
#include "qemu/config-file.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "hw/core/cpu.h"
#include "hw/intc/intc.h"
#include "migration/snapshot.h"
#include "migration/misc.h"
#include "qemu/help_option.h"
#include "qemu/option.h"
#include "qemu/sockets.h"
#include "qemu/timer.h"
#include "qom/object_interfaces.h"
#include "sysemu/block-backend.h"
#include "sysemu/runstate.h"
#include "ui/console.h"

#ifdef CONFIG_SPICE
#include <spice/enums.h>
Expand Down Expand Up @@ -123,6 +124,22 @@ void hmp_info_version(Monitor *mon, const QDict *qdict)
qapi_free_VersionInfo(info);
}

void hmp_write(Monitor *mon, const QDict *qdict)
{
uint32_t addr = qdict_get_int(qdict, "addr");
int data = qdict_get_int(qdict, "data");
int size = qdict_get_int(qdict, "size");
ram_write(addr, &data, size, 0);
}

void hmp_write_physical(Monitor *mon, const QDict *qdict)
{
uint32_t addr = qdict_get_int(qdict, "addr");
int data = qdict_get_int(qdict, "data");
int size = qdict_get_int(qdict, "size");
ram_write(addr, &data, size, 1);
}

void hmp_info_kvm(Monitor *mon, const QDict *qdict)
{
KvmInfo *info;
Expand Down
31 changes: 27 additions & 4 deletions softmmu/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@
#include "qom/object.h"
#include "trace.h"

#include "exec/address-spaces.h"
#include "exec/memory-internal.h"
#include "exec/ram_addr.h"
#include "hw/boards.h"
#include "hw/core/cpu.h"
#include "migration/vmstate.h"
#include "qemu/accel.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "sysemu/tcg.h"
#include "qemu/accel.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above re header order

#include "hw/boards.h"
#include "migration/vmstate.h"
#include "exec/address-spaces.h"

//#define DEBUG_UNASSIGNED

Expand Down Expand Up @@ -3595,6 +3596,28 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled)
}
}


void ram_write(hwaddr addr, void *ptr, hwaddr len, int is_physical)
{
MemoryRegion *sm = get_system_memory();
MemoryRegion *mr;
uint8_t *buf = ptr;
CPUState *cs = qemu_get_cpu(0);
if (is_physical) {
QTAILQ_FOREACH (mr, &sm->subregions, subregions_link) {
if (strcmp(memory_region_name(mr), "xbox.ram") == 0) {
uint8_t *ram_ptr = qemu_map_ram_ptr(mr->ram_block, addr);
memcpy(ram_ptr, buf, len);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there not an existing physical memory write function somewhere?

Anyway, we should check here that we don't accidentally write out of bounds

break;
}
}
} else {
if (cpu_memory_rw_debug(cs, addr, buf, len, 1) < 0) {
qemu_printf("Cannot access memory\n");
}
}
}

void memory_region_init_ram(MemoryRegion *mr,
Object *owner,
const char *name,
Expand Down