SeaBIOS

seabios@seabios.org

4 participants
3801 discussions

Re: [SeaBIOS] [Qemu-devel] [RFC PATCH v4 06/30] qapi: make visit_type_size fallback to type_int
by Andreas Färber 09 Jan '13

09 Jan '13

Am 18.12.2012 13:41, schrieb Vasilis Liaskovitis: > Currently visit_type_size checks if the visitor's type_size function pointer is > NULL. If not, it calls it, otherwise it calls v->type_uint64(). But neither of > these pointers are ever set. Fallback to calling v->type_int() in this third > (default) case. > > Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> Is this patch still needed? I thought size -> int fallback was fixed differently for the deallocation visitor... Anyway, someone (Anthony?) recently suggested to drop the size visitor completely in favor of string type (cf. frequency visitor discussion). Regards, Andreas > --- > qapi/qapi-visit-core.c | 11 ++++++++++- > 1 files changed, 10 insertions(+), 1 deletions(-) > > diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c > index 7a82b63..497e693 100644 > --- a/qapi/qapi-visit-core.c > +++ b/qapi/qapi-visit-core.c > @@ -236,8 +236,17 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp) > > void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) > { > + int64_t value; > if (!error_is_set(errp)) { > - (v->type_size ? v->type_size : v->type_uint64)(v, obj, name, errp); > + if (v->type_size) { > + v->type_size(v, obj, name, errp); > + } else if (v->type_uint64) { > + v->type_uint64(v, obj, name, errp); > + } else { > + value = *obj; > + v->type_int(v, &value, name, errp); > + *obj = value; > + } > } > } > -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

1 0

vga bios woes
by Alex Williamson 04 Jan '13

04 Jan '13

Hi, I was playing a bit with vfio-based PCI device assignment of VGA in qemu and I seem to be hitting a wall just trying to jump into the VGA BIOS. I'm booting qemu with -vga none and assigning a radeon hd5450 via vfio-pci with some extra code to handle passing legacy accesses through to the host. Legacy access hardly seems to matter though as the experiment quickly dies when the vcpu starts executing zero'd memory. gdb shows me something like this: 0x000f257c <__callrom+72>: 66 c7 44 24 16 ff ff movw $0xffff,0x16(%esp) 0x000f2583 <__callrom+79>: 66 c7 44 24 1a ff ff movw $0xffff,0x1a(%esp) 0x000f258a <__callrom+86>: 66 c7 44 24 08 00 f0 movw $0xf000,0x8(%esp) 0x000f2591 <__callrom+93>: b8 80 d1 0f 00 mov $0xfd180,%eax 0x000f2596 <__callrom+98>: 66 89 44 24 0a mov %ax,0xa(%esp) 0x000f259b <__callrom+103>: c1 e5 10 shl $0x10,%ebp 0x000f259e <__callrom+106>: 0f b7 d7 movzwl %di,%edx 0x000f25a1 <__callrom+109>: 09 ea or %ebp,%edx 0x000f25a3 <__callrom+111>: 89 54 24 26 mov %edx,0x26(%esp) 0x000f25a7 <__callrom+115>: 89 e0 mov %esp,%eax 0x000f25a9 <__callrom+117>: 3d 00 70 00 00 cmp $0x7000,%eax 0x000f25ae <__callrom+122>: 76 0a jbe 0xf25ba <__callrom+134> 0x000f25ba <__callrom+134>: 89 f0 mov %esi,%eax 0x000f25bc <__callrom+136>: bb 58 68 00 00 mov $0x6858,%ebx 0x000f25c1 <__callrom+141>: e8 31 98 00 00 call 0xfbdf7 0x000fbdf7: ba 01 be 00 00 mov $0xbe01,%edx 0x000fbdfc: e9 0e ff ff ff jmp 0xfbd0f 0x000fbd0f: 89 c1 mov %eax,%ecx 0x000fbd11: b8 30 00 00 00 mov $0x30,%eax 0x000fbd16: 8e d8 mov %eax,%ds 0x000fbd18: 8e c0 mov %eax,%es 0x000fbd1a: 8e d0 mov %eax,%ss 0x000fbd1c: 8e e0 mov %eax,%fs 0x000fbd1e: 8e e8 mov %eax,%gs 0x000fbd20: 66 ea 26 bd 28 00 ljmpw $0x28,$0xbd26 0x0000bd26: 00 00 add %al,(%eax) (qemu) xp /16x 0x0000bd26 000000000000bd26: 0x00000000 0x00000000 0x00000000 0x00000000 000000000000bd36: 0x00000000 0x00000000 0x00000000 0x00000000 000000000000bd46: 0x00000000 0x00000000 0x00000000 0x00000000 000000000000bd56: 0x00000000 0x00000000 0x00000000 0x00000000 (qemu) xp /16x 0x000c0000 00000000000c0000: 0xe975aa55 0x00000221 0x00000000 0x00000000 00000000000c0010: 0x00000000 0x00000000 0x000001d4 0x42490000 00000000000c0020: 0x0000254d 0x00000000 0x00000000 0x04000000 00000000000c0030: 0x31363720 0x35353932 0x00003032 0x00000000 Trying to follow the code into __callrom(), I'm really confused how the option rom init vector is actually used since callrom() passes the option rom header offset to the init vector rather than anything actually resembling the value of the init vector. I really don't know x86 though, so maybe I'm missing something. The option rom is loaded as a PCI expansion rom from the device, it appears to be non-PnP. The seabios log shows this: Scan for VGA option rom Attempting to init PCI bdf 00:02.0 (vd 1002:68f9) Attempting to map option rom on dev 00:02.0 Option rom sizing returned febe0000 fffe0000 Inspecting possible rom at 0xfebe0000 (vd=1002:68f9 bdf=00:02.0) Copying option rom (size 59904) from 0xfebe0000 to 0x000c0000 handle_08 Checking rom 0x000c0000 (sig aa55 size 117) Running option rom at c000:0003 <here we go into the weeds, I'll continue to see periodic handle_08 if I let it run> Appreciate any hints to make this work. Thanks, Alex

3 7

Re: [SeaBIOS] vga bios woes
by Alex Williamson 04 Jan '13

04 Jan '13

On Thu, 2013-01-03 at 18:43 -0700, Daniel Verkamp wrote: > On Thu, Jan 3, 2013 at 2:31 PM, Alex Williamson > <alex.williamson(a)redhat.com> wrote: > > Hi, > > > > I was playing a bit with vfio-based PCI device assignment of VGA in qemu > > and I seem to be hitting a wall just trying to jump into the VGA BIOS. > > I'm booting qemu with -vga none and assigning a radeon hd5450 via > > vfio-pci with some extra code to handle passing legacy accesses through > > to the host. Legacy access hardly seems to matter though as the > > experiment quickly dies when the vcpu starts executing zero'd memory. > > gdb shows me something like this: > > > > 0x000f257c <__callrom+72>: 66 c7 44 24 16 ff ff movw $0xffff,0x16(%esp) > > 0x000f2583 <__callrom+79>: 66 c7 44 24 1a ff ff movw $0xffff,0x1a(%esp) > > 0x000f258a <__callrom+86>: 66 c7 44 24 08 00 f0 movw $0xf000,0x8(%esp) > > 0x000f2591 <__callrom+93>: b8 80 d1 0f 00 mov $0xfd180,%eax > > 0x000f2596 <__callrom+98>: 66 89 44 24 0a mov %ax,0xa(%esp) > > 0x000f259b <__callrom+103>: c1 e5 10 shl $0x10,%ebp > > 0x000f259e <__callrom+106>: 0f b7 d7 movzwl %di,%edx > > 0x000f25a1 <__callrom+109>: 09 ea or %ebp,%edx > > 0x000f25a3 <__callrom+111>: 89 54 24 26 mov %edx,0x26(%esp) > > 0x000f25a7 <__callrom+115>: 89 e0 mov %esp,%eax > > 0x000f25a9 <__callrom+117>: 3d 00 70 00 00 cmp $0x7000,%eax > > 0x000f25ae <__callrom+122>: 76 0a jbe 0xf25ba <__callrom+134> > > 0x000f25ba <__callrom+134>: 89 f0 mov %esi,%eax > > 0x000f25bc <__callrom+136>: bb 58 68 00 00 mov $0x6858,%ebx > > 0x000f25c1 <__callrom+141>: e8 31 98 00 00 call 0xfbdf7 > > 0x000fbdf7: ba 01 be 00 00 mov $0xbe01,%edx > > 0x000fbdfc: e9 0e ff ff ff jmp 0xfbd0f > > 0x000fbd0f: 89 c1 mov %eax,%ecx > > 0x000fbd11: b8 30 00 00 00 mov $0x30,%eax > > 0x000fbd16: 8e d8 mov %eax,%ds > > 0x000fbd18: 8e c0 mov %eax,%es > > 0x000fbd1a: 8e d0 mov %eax,%ss > > 0x000fbd1c: 8e e0 mov %eax,%fs > > 0x000fbd1e: 8e e8 mov %eax,%gs > > 0x000fbd20: 66 ea 26 bd 28 00 ljmpw $0x28,$0xbd26 > > 0x0000bd26: 00 00 add %al,(%eax) > > I think GDB is probably getting lost at the far jump (ljmpw). To my > knowledge, GDB does not understand the x86 segmented real-mode memory > model. > > The trace above is __callrom() -> farcall16big() -> call16big() -> > __call16big() -> transition16big in romlayout.S, which contains the > ljmpw in question. > > > Trying to follow the code into __callrom(), I'm really confused how the > > option rom init vector is actually used since callrom() passes the > > option rom header offset to the init vector rather than anything > > actually resembling the value of the init vector. I really don't know > > x86 though, so maybe I'm missing something. > > The far address of the ROM initialization vector (seg:offset) is being > loaded into br.code, which will get used later on in the farcall > helper functions noted above. The offset is set to > OPTION_ROM_INITVECTOR by callrom(), which is 3; this is relative to > the segment of the ROM header (hence the FLATPTR_TO_SEG in __callrom). > The ROM header should have a jump at that location to the real > initialization code. > > I don't have any real tips on how to make this work - hopefully > someone else will know the magic incantation to clue in GDB to the new > code segment. > > This blog post also looks relevant: > http://crustynation.net/wiki/doku.php?id=blog:gdb_real_mode Awesome! That gdbinit is magic. Thanks for the pointer, Alex

1 0

Access disk in read-only mode
by Fred . 03 Jan '13

03 Jan '13

Before you could boot a OS from a LiveCD and have it secure because CD is read-only and non-writable. Now less and less machines comes with optical drives. It would be nice with a setting to boot disks or USB as read-only so the OS can not write to the disk.

1 0

Boot sector protection
by Fred . 03 Jan '13

03 Jan '13

Add option to enable boot sector protection to prevent writes to the boot sector and MBR of a hard disk. In order to prevent boot sector viruses and corruption of partition tables.

1 0

[PATCH] enable_vga_console(): print machine UUID under seabios version message
by Laszlo Ersek 22 Dec '12

22 Dec '12

There are users who would like to see the UUID at startup, and it probably won't bother others. Related RHBZ: 876250. Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- src/util.h | 1 + src/bootsplash.c | 15 ++++++++++++++- src/output.c | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 1 deletions(-) diff --git a/src/util.h b/src/util.h index 7723bb1..aafa9b0 100644 --- a/src/util.h +++ b/src/util.h @@ -227,6 +227,7 @@ void __set_code_invalid(struct bregs *regs, u32 linecode, const char *fname); void __set_code_unimplemented(struct bregs *regs, u32 linecode , const char *fname); void hexdump(const void *d, int len); +void format_uuid(char buf[37], const u8 uuid[16]); #define dprintf(lvl, fmt, args...) do { \ if (CONFIG_DEBUG_LEVEL && (lvl) <= CONFIG_DEBUG_LEVEL) \ diff --git a/src/bootsplash.c b/src/bootsplash.c index 78023a5..622d86e 100644 --- a/src/bootsplash.c +++ b/src/bootsplash.c @@ -12,6 +12,7 @@ #include "jpeg.h" // splash #include "vbe.h" // struct vbe_info #include "bmp.h" // bmp_alloc +#include "paravirt.h" // qemu_cfg_get_uuid /**************************************************************** @@ -33,6 +34,18 @@ call16_int10(struct bregs *br) * VGA text / graphics console ****************************************************************/ +static void +print_hello(void) +{ + u8 uuid[16] = { 0 }; + char uuid_str[37]; + + qemu_cfg_get_uuid(uuid); + format_uuid(uuid_str, uuid); + + printf("SeaBIOS (version %s)\nMachine UUID %s\n\n", VERSION, uuid_str); +} + void enable_vga_console(void) { @@ -45,7 +58,7 @@ enable_vga_console(void) call16_int10(&br); // Write to screen. - printf("SeaBIOS (version %s)\n\n", VERSION); + print_hello(); } static int diff --git a/src/output.c b/src/output.c index 83de7f4..f4cdbc0 100644 --- a/src/output.c +++ b/src/output.c @@ -474,6 +474,21 @@ hexdump(const void *d, int len) debug_serial_flush(); } +void format_uuid(char buf[37], const u8 uuid[16]) +{ + snprintf(buf, 37 + , "%02x%02x%02x%02x" + "-%02x%02x" + "-%02x%02x" + "-%02x%02x" + "-%02x%02x%02x%02x%02x%02x" + , uuid[ 0], uuid[ 1], uuid[ 2], uuid[ 3] + , uuid[ 4], uuid[ 5] + , uuid[ 6], uuid[ 7] + , uuid[ 8], uuid[ 9] + , uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15]); +} + static void dump_regs(struct bregs *regs) { -- 1.7.1

3 19

[announce] qemu firmware repo
by Gerd Hoffmann 21 Dec '12

21 Dec '12

Hi, yum repository with fresh qemu firmware builds is available now: http://www.kraxel.org/repos/ Provides rpms with seabios, tianocore (efi), coreboot and ipxe binaries. enjoy, Gerd PS: /me will disappear into xmas season shortly, so any issues will have to wait 'til next year. jenkins should continue to provide fresh builds when new commits appear in the upstream repos.

1 0

Re: [SeaBIOS] [PATCH] display_uuid(): fix incomplete check after the loop
by Amos Kong 21 Dec '12

21 Dec '12

Hi Laszlo, > In the v2->v3 change of what would become commit 37676f83 > <http://www.seabios.org/pipermail/seabios/2012-December/005166.html>, > the > defense against an initial "addr > end" condition ("wraparound") was > erroneously loosened. > > Signed-off-by: Laszlo Ersek <lersek at redhat.com> > --- > src/smbios.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/smbios.c b/src/smbios.c > index aaa99bc..23713a2 100644 > --- a/src/smbios.c > +++ b/src/smbios.c > @@ -569,8 +569,8 @@ display_uuid(void) > addr += 2; > } > > - /* parsing finished, UUID not found */ > - if (addr == end) > + /* parsing finished or skipped entirely, UUID not found */ > + if (addr >= end) It's a stricter check, but I didn't find it will happen. > return; > > uuid = (u8 *)(addr + offsetof(struct smbios_type_1, uuid)); > -- > 1.7.1 | void | display_uuid(void) | { | u32 addr, end; | u8 *uuid; | u8 empty_uuid[16] = { 0 }; | | if (SMBiosAddr == NULL) | return; | | addr = SMBiosAddr->structure_table_address; | end = addr + SMBiosAddr->structure_table_length; structure_table_length is unsigned, end always >= addr here. | /* the following takes care of any initial wraparound too */ | while (addr < end) { | const struct smbios_structure_header *hdr; | | /* partial structure header */ | if (end - addr < sizeof(struct smbios_structure_header)) | return; | | hdr = (struct smbios_structure_header *)addr; | | /* partial structure */ | if (end - addr < hdr->length) | return; | | /* any Type 1 structure version will do that has the UUID */ | if (hdr->type == 1 && | hdr->length >= offsetof(struct smbios_type_1, uuid) + 16) | break; In this point, it just passes the while condition check, and addr doesn't change. * addr < end | | /* done with formatted area, skip string-set */ | addr += hdr->length; | | while (end - addr >= 2 && | (*(u8 *)addr != '\0' || | *(u8 *)(addr+1) != '\0')) | ++addr; | | /* structure terminator not found */ | if (end - addr < 2) | return; We have above check here, it means if it passes this check end >= addr + 2 | | addr += 2; After above sentence, end >= addr, there is only one condition that while condition check fails: * addr = end | } The above analysis means that we can only get this point by two conditions: * 'break' (addr < end) * not pass while's condition check (addr >= end) So the 'addr' will never be larger than 'end'. However, add this stricter check is harmless. | /* parsing finished, UUID not found */ | if (addr == end) | return; -- Amos.

2 2

Re: [SeaBIOS] [RFC PATCH v4 25/30] acpi_ich9: add hot-remove capability
by Blue Swirl 19 Dec '12

19 Dec '12

On Tue, Dec 18, 2012 at 12:41 PM, Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> wrote: > --- > hw/acpi_ich9.c | 28 +++++++++++++++++++++++++++- > hw/acpi_ich9.h | 1 + > 2 files changed, 28 insertions(+), 1 deletions(-) > > diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c > index abafbb5..f5dc1c9 100644 > --- a/hw/acpi_ich9.c > +++ b/hw/acpi_ich9.c > @@ -105,12 +105,29 @@ static uint32_t memhp_readb(void *opaque, uint32_t addr) > return val; > } > > +static void memhp_writeb(void *opaque, uint32_t addr, uint32_t val) > +{ > + switch (addr) { > + case ICH9_MEM_EJ_BASE - ICH9_MEM_BASE: > + dimm_notify(val, DIMM_REMOVE_SUCCESS); > + break; > + default: > + ICH9_DEBUG("memhp write invalid %x <== %d\n", addr, val); > + } > + ICH9_DEBUG("memhp write %x <== %d\n", addr, val); > +} > + > static const MemoryRegionOps ich9_memhp_ops = { > .old_portio = (MemoryRegionPortio[]) { > { > .offset = 0, .len = DIMM_BITMAP_BYTES, .size = 1, > .read = memhp_readb, > }, > + { > + .offset = ICH9_MEM_EJ_BASE - ICH9_MEM_BASE, > + .len = 1, .size = 1, > + .write = memhp_writeb, > + }, > PORTIO_END_OF_LIST() > }, > .endianness = DEVICE_LITTLE_ENDIAN, > @@ -234,6 +251,13 @@ static void enable_mem_device(ICH9LPCState *s, int memdevice) > g->mems_sts[memdevice/8] |= (1 << (memdevice%8)); > } > > +static void disable_mem_device(ICH9LPCState *s, int memdevice) > +{ > + struct gpe_regs *g = &s->pm.gperegs; > + s->pm.acpi_regs.gpe.sts[0] |= ICH9_MEM_HOTPLUG_STATUS; > + g->mems_sts[memdevice/8] &= ~(1 << (memdevice%8)); Spaces around '/' and '%'. > +} > + > static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int > add) > { > @@ -243,6 +267,8 @@ static int ich9_dimm_hotplug(DeviceState *qdev, DimmDevice *dev, int > > if (add) { > enable_mem_device(s, slot->idx); > + } else { > + disable_mem_device(s, slot->idx); > } > pm_update_sci(&s->pm); > return 0; > @@ -270,7 +296,7 @@ void ich9_pm_init(void *device, qemu_irq sci_irq, qemu_irq cmos_s3) > memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); > > memory_region_init_io(&pm->io_memhp, &ich9_memhp_ops, pm, "apci-memhp0", > - DIMM_BITMAP_BYTES); > + DIMM_BITMAP_BYTES + 1); > memory_region_add_subregion(get_system_io(), ICH9_MEM_BASE, &pm->io_memhp); > > dimm_bus_hotplug(ich9_dimm_hotplug, &lpc->d.qdev); > diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h > index 4419247..af61a2d 100644 > --- a/hw/acpi_ich9.h > +++ b/hw/acpi_ich9.h > @@ -24,6 +24,7 @@ > #include "acpi.h" > > #define ICH9_MEM_BASE 0xaf80 > +#define ICH9_MEM_EJ_BASE 0xafa0 > #define ICH9_MEM_HOTPLUG_STATUS 8 > > typedef struct ICH9LPCPMRegs { > -- > 1.7.9 >

1 0

Re: [SeaBIOS] [RFC PATCH v4 19/30] Implement "info memory-total" and "query-memory-total"
by Blue Swirl 19 Dec '12

19 Dec '12

On Tue, Dec 18, 2012 at 12:41 PM, Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> wrote: > Returns total physical memory available to guest in bytes, including hotplugged > memory. Note that the number reported here may be different from what the guest > sees e.g. if the guest has not logically onlined hotplugged memory. > > This functionality is provided independently of a balloon device, since a > guest can be using ACPI memory hotplug without using a balloon device. > > v3->v4: Moved qmp command implementation to vl.c. This prevents a circular > header dependency problem. > > Signed-off-by: Vasilis Liaskovitis <vasilis.liaskovitis(a)profitbricks.com> > --- > hmp-commands.hx | 2 ++ > hmp.c | 7 +++++++ > hmp.h | 1 + > hw/dimm.c | 14 ++++++++++++++ > hw/dimm.h | 1 + > monitor.c | 7 +++++++ > qapi-schema.json | 11 +++++++++++ > qmp-commands.hx | 20 ++++++++++++++++++++ > vl.c | 9 +++++++++ > 9 files changed, 72 insertions(+), 0 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 010b8c9..3fbd975 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -1570,6 +1570,8 @@ show device tree > show qdev device model list > @item info roms > show roms > +@item info memory-total > +show memory-total > @end table > ETEXI > > diff --git a/hmp.c b/hmp.c > index 180ba2b..fb39b0d 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -628,6 +628,13 @@ void hmp_info_block_jobs(Monitor *mon) > } > } > > +void hmp_info_memory_total(Monitor *mon) > +{ > + uint64_t ram_total; > + ram_total = (uint64_t)qmp_query_memory_total(NULL); > + monitor_printf(mon, "MemTotal: %lu\n", ram_total); Wrong format on 32 bit hosts, please use PRIu64. > +} > + > void hmp_quit(Monitor *mon, const QDict *qdict) > { > monitor_suspend(mon); > diff --git a/hmp.h b/hmp.h > index 0ab03be..25a3a70 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -36,6 +36,7 @@ void hmp_info_spice(Monitor *mon); > void hmp_info_balloon(Monitor *mon); > void hmp_info_pci(Monitor *mon); > void hmp_info_block_jobs(Monitor *mon); > +void hmp_info_memory_total(Monitor *mon); > void hmp_quit(Monitor *mon, const QDict *qdict); > void hmp_stop(Monitor *mon, const QDict *qdict); > void hmp_system_reset(Monitor *mon, const QDict *qdict); > diff --git a/hw/dimm.c b/hw/dimm.c > index e384952..f181e54 100644 > --- a/hw/dimm.c > +++ b/hw/dimm.c > @@ -189,6 +189,20 @@ void dimm_setup_fwcfg_layout(uint64_t *fw_cfg_slots) > } > } > > +uint64_t get_hp_memory_total(void) > +{ > + DimmBus *bus; > + DimmDevice *slot; > + uint64_t info = 0; > + > + QLIST_FOREACH(bus, &memory_buses, next) { > + QTAILQ_FOREACH(slot, &bus->dimmlist, nextdimm) { > + info += slot->size; > + } > + } > + return info; > +} > + > static int dimm_init(DeviceState *s) > { > DimmBus *bus = DIMM_BUS(qdev_get_parent_bus(s)); > diff --git a/hw/dimm.h b/hw/dimm.h > index 75a6911..5130b2c 100644 > --- a/hw/dimm.h > +++ b/hw/dimm.h > @@ -85,5 +85,6 @@ DimmBus *dimm_bus_create(Object *parent, const char *name, uint32_t max_dimms, > dimm_calcoffset_fn pmc_set_offset); > void dimm_config_create(char *id, uint64_t size, const char *bus, uint64_t node, > uint32_t dimm_idx, uint32_t populated); > +uint64_t get_hp_memory_total(void); > > #endif > diff --git a/monitor.c b/monitor.c > index c0e32d6..6e87d0d 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -2708,6 +2708,13 @@ static mon_cmd_t info_cmds[] = { > .mhandler.info = hmp_info_balloon, > }, > { > + .name = "memory-total", > + .args_type = "", > + .params = "", > + .help = "show total memory size", > + .mhandler.info = hmp_info_memory_total, > + }, > + { > .name = "qtree", > .args_type = "", > .params = "", > diff --git a/qapi-schema.json b/qapi-schema.json > index 5dfa052..33f88d6 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -2903,6 +2903,17 @@ > { 'command': 'query-target', 'returns': 'TargetInfo' } > > ## > +# @query-memory-total: > +# > +# Returns total memory in bytes, including hotplugged dimms > +# > +# Returns: int > +# > +# Since: 1.4 > +## > +{ 'command': 'query-memory-total', 'returns': 'int' } > + > +## > # @QKeyCode: > # > # An enumeration of key name. > diff --git a/qmp-commands.hx b/qmp-commands.hx > index 5c692d0..a99117a 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -2654,3 +2654,23 @@ EQMP > .args_type = "", > .mhandler.cmd_new = qmp_marshal_input_query_target, > }, > + > + { > + .name = "query-memory-total", > + .args_type = "", > + .mhandler.cmd_new = qmp_marshal_input_query_memory_total > + }, > +SQMP > +query-memory-total > +---------- > + > +Return total memory in bytes, including hotplugged dimms > + > +Example: > + > +-> { "execute": "query-memory-total" } > +<- { > + "return": 1073741824 > + } > + > +EQMP > diff --git a/vl.c b/vl.c > index 8406933..80803c5 100644 > --- a/vl.c > +++ b/vl.c > @@ -126,6 +126,7 @@ int main(int argc, char **argv) > #include "hw/xen.h" > #include "hw/qdev.h" > #include "hw/loader.h" > +#include "hw/dimm.h" > #include "bt-host.h" > #include "net.h" > #include "net/slirp.h" > @@ -442,6 +443,14 @@ StatusInfo *qmp_query_status(Error **errp) > return info; > } > > +int64_t qmp_query_memory_total(Error **errp) > +{ > + uint64_t info; > + info = ram_size + get_hp_memory_total(); > + > + return (int64_t)info; > +} > + > /***********************************************************/ > /* real time host monotonic timer */ > > -- > 1.7.9 >

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS