mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trivial patches pull request 20210927

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmFRlEoSHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748jc8P/AjRCWsyzyGoZzYGgqFvswVNgZOJ68jJ
 MGox0StjKVhkoYyvjbCSj6GCfmsw0wRJ0p3VmwuIcNlVhu0S3qsEjQXE4Vc/95jb
 nrWwrqy/Q8koW8IVmuMqU7ushmVf1kqcUcjRuAqMmNSopQ84ARqCFEhzT4hrDga6
 T5fHWylHQqv6Vdia2r87Tn7OdNi5i+r7u20rojojG0zNUfDsUrWNFN9n31+k66jD
 ut/sHQXhPrOChUbqKKl/YU815NkmpEoRCiWKzV8WL9RKRBfenti2b1OAvOlBBGi5
 ABaocxNQyY+vr6dP3Rvq8vZwKg1+Z1HxSUdMCMIHBI36mrq+kAN7M4ugCk8DwmzZ
 nwJKcmEuBt0AK/EJaSBJPm6NrwGdEiRlKp3xceh3z3Ufnyvsg+GN7Mr0TtwmUr3o
 qWDSkMo9CmzT+YRsHxAOXa5+J854/VpZH+OQ52WZbkK9fqGmvV6nu50zzlGuhSXg
 H27j0XaGG59Z/xZYGi5KztdofFFAXfJOWmVkIaSVQT4Sb8nf98dFH2wnPzGoMTBW
 HQ+icF5i+1lKdRaNEkqPD3bsy5pDMbBfqf4BvqyS1ttpsJHm0Npy5w9nOOf8gXgy
 vRtS0zT8+T70Cdx8CX/Cwea0GGPd3KbwHBX6wf4Se+5PFCsRCjQcVpKhiWIiddJg
 BgwK+HgW3EWf
 =yP28
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.2-pull-request' into staging

Trivial patches pull request 20210927

# gpg: Signature made Mon 27 Sep 2021 10:52:10 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-6.2-pull-request:
  multi-process: fix usage information
  hmp: Drop a bogus sentence from set_password's documentation
  hmp: Unbreak "change vnc"
  hw/loader: Restrict PC_ROM_* definitions to hw/i386/pc
  docs/nvdimm: Update nvdimm option value in machine example

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-09-27 11:08:36 +01:00
commit 9b03a11782
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/nvdimm.txt
View File

@ -15,7 +15,7 @@ backend (i.e. memory-backend-file and memory-backend-ram). A simple
way to create a vNVDIMM device at startup time is done via the
following command line options:
-machine pc,nvdimm
-machine pc,nvdimm=on
-m $RAM_SIZE,slots=$N,maxmem=$MAX_SIZE
-object memory-backend-file,id=mem1,share=on,mem-path=$PATH,size=$NVDIMM_SIZE,readonly=off
-device nvdimm,id=nvdimm1,memdev=mem1,unarmed=off

2
docs/system/multi-process.rst
View File

@ -45,7 +45,7 @@ Following is a description of command-line used to launch mpqemu.
-device lsi53c895a,id=lsi0 \
-drive id=drive_image2,file=/build/ol7-nvme-test-1.qcow2 \
-device scsi-hd,id=drive2,drive=drive_image2,bus=lsi0.0,scsi-id=0 \
-object x-remote-object,id=robj1,devid=lsi1,fd=4,
-object x-remote-object,id=robj1,devid=lsi0,fd=4,
* QEMU:

11
hmp-commands.hx
View File

@ -1522,12 +1522,11 @@ ERST
SRST
``set_password [ vnc | spice ] password [ action-if-connected ]``
Change spice/vnc password. Use zero to make the password stay valid
forever. *action-if-connected* specifies what should happen in
case a connection is established: *fail* makes the password change
fail. *disconnect* changes the password and disconnects the
client. *keep* changes the password and keeps the connection up.
*keep* is the default.
Change spice/vnc password. *action-if-connected* specifies what
should happen in case a connection is established: *fail* makes the
password change fail. *disconnect* changes the password and
disconnects the client. *keep* changes the password and keeps the
connection up. *keep* is the default.
ERST
{

6
hw/i386/pc.c
View File

@ -843,6 +843,12 @@ void xen_load_linux(PCMachineState *pcms)
x86ms->fw_cfg = fw_cfg;
}
#define PC_ROM_MIN_VGA 0xc0000
#define PC_ROM_MIN_OPTION 0xc8000
#define PC_ROM_MAX 0xe0000
#define PC_ROM_ALIGN 0x800
#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA)
void pc_memory_init(PCMachineState *pcms,
MemoryRegion *system_memory,
MemoryRegion *rom_memory,

6
include/hw/loader.h
View File

@ -336,12 +336,6 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict);
#define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \
rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true)
#define PC_ROM_MIN_VGA 0xc0000
#define PC_ROM_MIN_OPTION 0xc8000
#define PC_ROM_MAX 0xe0000
#define PC_ROM_ALIGN 0x800
#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA)
int rom_add_vga(const char *file);
int rom_add_option(const char *file, int32_t bootindex);

2
monitor/hmp-cmds.c
View File

@ -1496,7 +1496,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
}
if (strcmp(target, "passwd") == 0 ||
strcmp(target, "password") == 0) {
if (arg) {
if (!arg) {
MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
return;