From: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
To: kvm-devel <kvm-devel@lists.sourceforge.net>
Subject: [PATCH 4/5] qemu: PCI_COMMAND_SERR redefined from linux headers
Date: Thu, 27 Mar 2008 18:40:49 -0500 [thread overview]
Message-ID: <20080327234049.GF15662@tapir> (raw)
In-Reply-To: <20080327232723.GB15662@tapir>
qemu/hw/cirrus_vga.c:193:1: warning: "PCI_COMMAND_SERR" redefined
In file included from /usr/include/linux/pci.h:21,
from /var/tmp/portage/app-emulation/kvm-64/work/kvm-64/qemu/hw/pci.h:6,
from /var/tmp/portage/app-emulation/kvm-64/work/kvm-64/qemu/hw/cirrus_vga.c:31:
/usr/include/linux/pci_regs.h:40:1: warning: this is the location of the previous definition
Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
---
qemu/hw/cirrus_vga.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c
index e14ec35..86ed511 100644
--- a/qemu/hw/cirrus_vga.c
+++ b/qemu/hw/cirrus_vga.c
@@ -190,7 +190,7 @@
#define PCI_COMMAND_PALETTESNOOPING 0x0020
#define PCI_COMMAND_PARITYDETECTION 0x0040
#define PCI_COMMAND_ADDRESSDATASTEPPING 0x0080
-#define PCI_COMMAND_SERR 0x0100
+#define PCI_COMMAND_SOFTERR 0x0100
#define PCI_COMMAND_BACKTOBACKTRANS 0x0200
// PCI 0x08, 0xff000000 (0x09-0x0b:class,0x08:rev)
#define PCI_CLASS_BASE_DISPLAY 0x03
--
1.5.3.7
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
next prev parent reply other threads:[~2008-03-27 23:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-27 23:27 [PATCH 0/5] trivial fixes to silence compilation warnings Carlo Marcelo Arenas Belon
2008-03-27 23:30 ` [PATCH 1/5] libkvm: export kvm_disable_pit_creation to support -no-kvm-pit Carlo Marcelo Arenas Belon
2008-03-27 23:35 ` [PATCH 2/5] qemu: cpu_model is a pointer to a constant string Carlo Marcelo Arenas Belon
2008-03-27 23:38 ` [PATCH 3/5] qemu: model in NICInfo " Carlo Marcelo Arenas Belon
2008-03-27 23:40 ` Carlo Marcelo Arenas Belon [this message]
[not found] ` <47EC981D.7040104@qumranet.com>
2008-03-28 9:09 ` [PATCH] qemu: remove conflicting dependency to <linux/pci.h> Carlo Marcelo Arenas Belon
2008-03-30 9:38 ` Avi Kivity
2008-03-27 23:42 ` [PATCH 5/5] qemu: ARRAY_SIZE redefined Carlo Marcelo Arenas Belon
[not found] ` <47EC9875.3020404@qumranet.com>
2008-03-28 7:44 ` Carlo Marcelo Arenas Belon
2008-03-28 8:39 ` [PATCH] qemu: use ARRAY_SIZE macro as provided by osdep.h Carlo Marcelo Arenas Belon
2008-03-30 9:37 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080327234049.GF15662@tapir \
--to=carenas@sajinet.com.pe \
--cc=kvm-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox