summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-10-06 10:43:00 +0200
committerAvi Kivity <avi@redhat.com>2009-10-06 10:43:00 +0200
commit5a9f757e2581b64dbc9f35329d24ab9a82316d9b (patch)
tree073365b2fb5e29692d3f05e94a87d99b6e145eea /pc-bios
parentMerge commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d' into upstream-merge (diff)
parentFix pci_add nic not to exit on bad model (diff)
downloadqemu-kvm-5a9f757e2581b64dbc9f35329d24ab9a82316d9b.tar.gz
qemu-kvm-5a9f757e2581b64dbc9f35329d24ab9a82316d9b.tar.bz2
qemu-kvm-5a9f757e2581b64dbc9f35329d24ab9a82316d9b.zip
Merge commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5' into upstream-merge
* commit '07caea315a85ebfe90851f9c2e4ef3fdd24117b5': Fix pci_add nic not to exit on bad model Make it obvious that pci_nic_init() can't fail Fix pci_add storage not to exit on bad first argument Fix pci_vga_init() not to ignore bus argument set correct CS seg limit and flags on sipi Set revision in eeprom correctly for 82557 versions. restore CFLAGS check for conflict and fix recursive CFLAGS issue virtio-pci: return error if virtio_console_init fails qdev: show name of device that fails init vnc: Set invalid buffer pointers to NULL eepro100: Don't allow guests to fail assertions qcow2: Increase maximum cluster size to 2 MB qemu/virtio-pci: remove unnecessary check Conflicts: hw/pc.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/optionrom/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 7ae29ca51..3b25e3101 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -7,9 +7,9 @@ include $(SRC_PATH)/rules.mak
VPATH=$(SRC_PATH)/pc-bios/optionrom
-CFLAGS = -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
+CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
CFLAGS += -I$(SRC_PATH)
-CFLAGS += $(call cc-option, -fno-stack-protector,"")
+CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
QEMU_CFLAGS = $(CFLAGS)
build-all: multiboot.bin extboot.bin