[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] [s390] fix kernel_commandline handling
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PATCH 1/7] [s390] fix kernel_commandline handling |
Date: |
Mon, 23 Apr 2012 11:52:19 +0200 |
From: Christian Borntraeger <address@hidden>
The current handling of kernel parameters is broken. The pointer
is always valid, even if no -kernel or -append is specified.
We must check if the kernel rom address is valid instead,
otherwise qemu might segfault.
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390-virtio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 1ebe70d..c79784c 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -274,7 +274,7 @@ static void s390_init(ram_addr_t my_ram_size,
memcpy(rom_ptr(INITRD_PARM_SIZE), &initrd_size, 8);
}
- if (kernel_cmdline) {
+ if (rom_ptr(KERN_PARM_AREA)) {
/* we have to overwrite values in the kernel image, which are "rom" */
memcpy(rom_ptr(KERN_PARM_AREA), kernel_cmdline,
strlen(kernel_cmdline) + 1);
--
1.7.9.6
- [Qemu-devel] [PATCH 0/7] Fixes for s390, Christian Borntraeger, 2012/04/23
- [Qemu-devel] [PATCH 2/7] [s390] fix error handling on kernel and initrd failures, Christian Borntraeger, 2012/04/23
- [Qemu-devel] [PATCH 5/7] [s390] support reboot for kvm on s390, Christian Borntraeger, 2012/04/23
- [Qemu-devel] [PATCH 6/7] [s390] remove default cdrom, sd-card and floppy support, Christian Borntraeger, 2012/04/23
- [Qemu-devel] [PATCH 1/7] [s390] fix kernel_commandline handling,
Christian Borntraeger <=
- [Qemu-devel] [PATCH 3/7] [s390] reboot: reset device pages on reboot, Christian Borntraeger, 2012/04/23
- [Qemu-devel] [PATCH 7/7] [s390] dont call system_shutdown on disabled wait, Christian Borntraeger, 2012/04/23
- [Qemu-devel] [PATCH 4/7] [s390] reset avail and used index on reboot, Christian Borntraeger, 2012/04/23
- Re: [Qemu-devel] [PATCH 4/7] [s390] reset avail and used index on reboot, Jens Freimann, 2012/04/26
Re: [Qemu-devel] [PATCH 0/7] Fixes for s390, Alexander Graf, 2012/04/26